projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'origin/next' into kvm-ppc-next
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
setup_64.c
diff --git
a/arch/powerpc/kernel/setup_64.c
b/arch/powerpc/kernel/setup_64.c
index
8a022f5
..
fe6a58c
100644
(file)
--- a/
arch/powerpc/kernel/setup_64.c
+++ b/
arch/powerpc/kernel/setup_64.c
@@
-76,7
+76,7
@@
#endif
int boot_cpuid = 0;
-int
__initdata
spinning_secondaries;
+int spinning_secondaries;
u64 ppc64_pft_size;
/* Pick defaults since we might want to patch instructions