git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
[pandora-kernel.git]
/
arch
/
ia64
/
mm
/
discontig.c
diff --git
a/arch/ia64/mm/discontig.c
b/arch/ia64/mm/discontig.c
index
78026aa
..
d8c5fcd
100644
(file)
--- a/
arch/ia64/mm/discontig.c
+++ b/
arch/ia64/mm/discontig.c
@@
-144,7
+144,7
@@
static void *per_cpu_node_setup(void *cpu_data, int node)
for_each_possible_early_cpu(cpu) {
if (cpu == 0) {
- void *cpu0_data = __
phys_per_cpu_start - PERCPU_PAGE_SIZE
;
+ void *cpu0_data = __
cpu0_per_cpu
;
__per_cpu_offset[cpu] = (char*)cpu0_data -
__per_cpu_start;
} else if (node == node_cpuid[cpu].nid) {