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 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
setup_32.c
diff --git
a/arch/powerpc/kernel/setup_32.c
b/arch/powerpc/kernel/setup_32.c
index
93666f9
..
1d2fbc9
100644
(file)
--- a/
arch/powerpc/kernel/setup_32.c
+++ b/
arch/powerpc/kernel/setup_32.c
@@
-46,7
+46,7
@@
extern void bootx_init(unsigned long r4, unsigned long phys);
extern void bootx_init(unsigned long r4, unsigned long phys);
-int boot_cpuid;
+int boot_cpuid
= -1
;
EXPORT_SYMBOL_GPL(boot_cpuid);
int boot_cpuid_phys;
EXPORT_SYMBOL_GPL(boot_cpuid);
int boot_cpuid_phys;
@@
-246,7
+246,7
@@
static void __init irqstack_early_init(void)
unsigned int i;
/* interrupt stacks must be in lowmem, we get that for free on ppc32
unsigned int i;
/* interrupt stacks must be in lowmem, we get that for free on ppc32
- * as the memblock is limited to lowmem by
MEMBLOCK_REAL_LIMIT
*/
+ * as the memblock is limited to lowmem by
default
*/
for_each_possible_cpu(i) {
softirq_ctx[i] = (struct thread_info *)
__va(memblock_alloc(THREAD_SIZE, THREAD_SIZE));
for_each_possible_cpu(i) {
softirq_ctx[i] = (struct thread_info *)
__va(memblock_alloc(THREAD_SIZE, THREAD_SIZE));