diff for duplicates of <1426893517-2511-20-git-send-email-mcgrof@do-not-panic.com>
diff --git a/a/1.txt b/N1/1.txt
index 3b838ca..6df1a5e 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -127,7 +127,7 @@ index a2261d0..5bc94d3 100644
@@ -419,7 +412,6 @@ static int vesafb_probe(struct platform_device *dev)
request_region(0x3c0, 32, "vesafb");
- if (mtrr == 3) {
+ if (mtrr = 3) {
-#ifdef CONFIG_MTRR
unsigned int temp_size = size_total;
@@ -139,11 +139,10 @@ index a2261d0..5bc94d3 100644
- par->wc_cookie = mtrr_add(vesafb_fix.smem_start,
- temp_size,
- MTRR_TYPE_WRCOMB, 1);
-+ par->wc_cookie =
-+ arch_phys_wc_add(vesafb_fix.smem_start,
++ par->wc_cookie + arch_phys_wc_add(vesafb_fix.smem_start,
+ temp_size);
temp_size >>= 1;
-- } while (temp_size >= PAGE_SIZE && par->wc_cookie == -EINVAL);
+- } while (temp_size >= PAGE_SIZE && par->wc_cookie = -EINVAL);
-#endif
+ } while (temp_size >= PAGE_SIZE && par->wc_cookie < 0);
+
diff --git a/a/content_digest b/N1/content_digest
index 66d7a40..6c8fb64 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -8,7 +8,7 @@
"Subject\0[PATCH v1 19/47] video: fbdev: vesafb: use arch_phys_wc_add()\0"
]
[
- "Date\0Fri, 20 Mar 2015 16:18:09 -0700\0"
+ "Date\0Fri, 20 Mar 2015 23:18:09 +0000\0"
]
[
"To\0luto\@amacapital.net",
@@ -170,7 +170,7 @@
"\@\@ -419,7 +412,6 \@\@ static int vesafb_probe(struct platform_device *dev)\n",
" \trequest_region(0x3c0, 32, \"vesafb\");\n",
" \n",
- " \tif (mtrr == 3) {\n",
+ " \tif (mtrr = 3) {\n",
"-#ifdef CONFIG_MTRR\n",
" \t\tunsigned int temp_size = size_total;\n",
" \n",
@@ -182,11 +182,10 @@
"-\t\t\tpar->wc_cookie = mtrr_add(vesafb_fix.smem_start,\n",
"-\t\t\t\t\t\t temp_size,\n",
"-\t\t\t\t\t\t MTRR_TYPE_WRCOMB, 1);\n",
- "+\t\t\tpar->wc_cookie =\n",
- "+\t\t\t\tarch_phys_wc_add(vesafb_fix.smem_start,\n",
+ "+\t\t\tpar->wc_cookie +\t\t\t\tarch_phys_wc_add(vesafb_fix.smem_start,\n",
"+\t\t\t\t\t\t temp_size);\n",
" \t\t\ttemp_size >>= 1;\n",
- "-\t\t} while (temp_size >= PAGE_SIZE && par->wc_cookie == -EINVAL);\n",
+ "-\t\t} while (temp_size >= PAGE_SIZE && par->wc_cookie = -EINVAL);\n",
"-#endif\n",
"+\t\t} while (temp_size >= PAGE_SIZE && par->wc_cookie < 0);\n",
"+\n",
@@ -215,4 +214,4 @@
"2.3.2.209.gd67f9d5.dirty"
]
-9df65a88f6db9ee193eb7644912998b42c20897e0563acc036ce515607191c60
+1a05bc3419e41be26e082e1bb4a22ad0dd9b8bbc3b1e8d916cc6b254a9e4a503
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.