diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-11-12 11:17:41 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-11-12 11:17:41 -0500 |
| commit | 83e1ff9c69bc7ea9e26cb09f1da2960e3904ec6c (patch) | |
| tree | 71ab4ccc2f9f1456ebad96663c25cbe45cc2bf8c | |
| parent | de8314e6bce3a00cba4b524d9ee71d526fada7a1 (diff) | |
| download | longterm-queue-2.6.34-83e1ff9c69bc7ea9e26cb09f1da2960e3904ec6c.tar.gz | |
percpu-fix-first-chunk-match: fix build failure with missing }
The essence of this commit on mailine was:
if (...) {
...
+ newcode;
...
} else
...
but in 2.6.34, it was:
if (...)
...
else
...
so, unlike the original, we also have to replace the else line
(vs. it just being context) and add in the closing brace.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/percpu-fix-first-chunk-match-in-per_cpu_ptr_to_phys.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/percpu-fix-first-chunk-match-in-per_cpu_ptr_to_phys.patch b/queue/percpu-fix-first-chunk-match-in-per_cpu_ptr_to_phys.patch index 4b81855..bccec22 100644 --- a/queue/percpu-fix-first-chunk-match-in-per_cpu_ptr_to_phys.patch +++ b/queue/percpu-fix-first-chunk-match-in-per_cpu_ptr_to_phys.patch @@ -1,4 +1,4 @@ -From dabf4ac8a53988bd6bc3aaa1070fb52f719a10b2 Mon Sep 17 00:00:00 2001 +From 60e2515f6a0529723dd59b7b968ce7300fe8ae35 Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Fri, 18 Jun 2010 11:44:31 +0200 Subject: [PATCH] percpu: fix first chunk match in per_cpu_ptr_to_phys() @@ -22,15 +22,12 @@ Tested-by: Cliff Wickman <cpw@sgi.com> [PG: for 2.6.34, diffstat differs slightly due to a trivial indenting difference, and 34 does not have the _maybe_unused annotation to delete] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - mm/percpu.c | 30 ++++++++++++++++++++++++++++-- - 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/mm/percpu.c b/mm/percpu.c -index 717cc6e..4e91b81 100644 +index 717cc6e..558543b 100644 --- a/mm/percpu.c +++ b/mm/percpu.c -@@ -1343,8 +1343,34 @@ bool is_kernel_percpu_address(unsigned long addr) +@@ -1343,10 +1343,36 @@ bool is_kernel_percpu_address(unsigned long addr) */ phys_addr_t per_cpu_ptr_to_phys(void *addr) { @@ -65,8 +62,11 @@ index 717cc6e..4e91b81 100644 + if ((unsigned long)addr < VMALLOC_START || + (unsigned long)addr >= VMALLOC_END) return __pa(addr); - else +- else ++ } else return page_to_phys(vmalloc_to_page(addr)); + } + -- 1.7.12.1 |