diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-12 19:53:33 -0800 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-12 19:53:33 -0800 |
| commit | 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 (patch) | |
| tree | 2e0051ccb147b0553d50c14681c50881098859d6 /arch/powerpc/kernel/setup-common.c | |
| parent | e89dc9209692293434da45ec31826a55becb91c0 (diff) | |
| parent | 9e6c67fd2716720d9029d38ea25884efcfdedeb6 (diff) | |
| download | kernel_samsung_smdk4412-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.tar.gz kernel_samsung_smdk4412-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.tar.bz2 kernel_samsung_smdk4412-1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/powerpc/kernel/setup-common.c')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index bae4bff138f..33e7f2c7f19 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -33,7 +33,7 @@ #include <asm/io.h> #include <asm/prom.h> #include <asm/processor.h> -#include <asm/systemcfg.h> +#include <asm/vdso_datapage.h> #include <asm/pgtable.h> #include <asm/smp.h> #include <asm/elf.h> @@ -444,10 +444,8 @@ void __init check_for_initrd(void) if (initrd_start >= KERNELBASE && initrd_end >= KERNELBASE && initrd_end > initrd_start) ROOT_DEV = Root_RAM0; - else { - printk("Bogus initrd %08lx %08lx\n", initrd_start, initrd_end); + else initrd_start = initrd_end = 0; - } if (initrd_start) printk("Found initrd at 0x%lx:0x%lx\n", initrd_start, initrd_end); @@ -566,7 +564,7 @@ void __init smp_setup_cpu_maps(void) cpu_set(cpu ^ 0x1, cpu_sibling_map[cpu]); } - _systemcfg->processorCount = num_present_cpus(); + vdso_data->processorCount = num_present_cpus(); #endif /* CONFIG_PPC64 */ } #endif /* CONFIG_SMP */ |