diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 17:11:29 -0700 |
| commit | 40193713df2cdb9c233b3fc2029ecdccb40cb1e4 (patch) | |
| tree | db2ce73665b250672f5f5c0cf7544ec370c122f9 /arch/ppc64/kernel/pSeries_smp.c | |
| parent | 8f3d17fb7bcb7c255197d11469fb5e9695c9d2f4 (diff) | |
| parent | c594adad5653491813959277fb87a2fef54c4e05 (diff) | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pSeries_smp.c')
| -rw-r--r-- | arch/ppc64/kernel/pSeries_smp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/ppc64/kernel/pSeries_smp.c index 62c55a12356..79c7f322366 100644 --- a/arch/ppc64/kernel/pSeries_smp.c +++ b/arch/ppc64/kernel/pSeries_smp.c @@ -41,6 +41,7 @@ #include <asm/machdep.h> #include <asm/xics.h> #include <asm/cputable.h> +#include <asm/firmware.h> #include <asm/system.h> #include <asm/rtas.h> #include <asm/plpar_wrappers.h> @@ -326,7 +327,7 @@ static void __devinit smp_xics_setup_cpu(int cpu) if (cpu != boot_cpuid) xics_setup_cpu(); - if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR) + if (firmware_has_feature(FW_FEATURE_SPLPAR)) vpa_init(cpu); cpu_clear(cpu, of_spin_map); |