diff options
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/kernel/cputable.c | 1 | ||||
-rw-r--r-- | arch/ppc64/kernel/lparcfg.c | 6 | ||||
-rw-r--r-- | arch/ppc64/kernel/pSeries_iommu.c | 3 | ||||
-rw-r--r-- | arch/ppc64/kernel/pSeries_setup.c | 6 | ||||
-rw-r--r-- | arch/ppc64/kernel/pSeries_smp.c | 3 | ||||
-rw-r--r-- | arch/ppc64/kernel/process.c | 3 | ||||
-rw-r--r-- | arch/ppc64/kernel/sysfs.c | 3 | ||||
-rw-r--r-- | arch/ppc64/kernel/time.c | 3 |
8 files changed, 17 insertions, 11 deletions
diff --git a/arch/ppc64/kernel/cputable.c b/arch/ppc64/kernel/cputable.c index 84fdd27498a5..6294fc7bd442 100644 --- a/arch/ppc64/kernel/cputable.c +++ b/arch/ppc64/kernel/cputable.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
21 | 21 | ||
22 | #include <asm/cputable.h> | 22 | #include <asm/cputable.h> |
23 | #include <asm/firmware.h> | ||
23 | 24 | ||
24 | struct cpu_spec* cur_cpu_spec = NULL; | 25 | struct cpu_spec* cur_cpu_spec = NULL; |
25 | EXPORT_SYMBOL(cur_cpu_spec); | 26 | EXPORT_SYMBOL(cur_cpu_spec); |
diff --git a/arch/ppc64/kernel/lparcfg.c b/arch/ppc64/kernel/lparcfg.c index 938353848cd0..9d034ff062b1 100644 --- a/arch/ppc64/kernel/lparcfg.c +++ b/arch/ppc64/kernel/lparcfg.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include <asm/iSeries/HvLpConfig.h> | 29 | #include <asm/iSeries/HvLpConfig.h> |
30 | #include <asm/lppaca.h> | 30 | #include <asm/lppaca.h> |
31 | #include <asm/hvcall.h> | 31 | #include <asm/hvcall.h> |
32 | #include <asm/cputable.h> | 32 | #include <asm/firmware.h> |
33 | #include <asm/rtas.h> | 33 | #include <asm/rtas.h> |
34 | #include <asm/system.h> | 34 | #include <asm/system.h> |
35 | #include <asm/time.h> | 35 | #include <asm/time.h> |
@@ -377,7 +377,7 @@ static int lparcfg_data(struct seq_file *m, void *v) | |||
377 | 377 | ||
378 | partition_active_processors = lparcfg_count_active_processors(); | 378 | partition_active_processors = lparcfg_count_active_processors(); |
379 | 379 | ||
380 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) { | 380 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) { |
381 | unsigned long h_entitled, h_unallocated; | 381 | unsigned long h_entitled, h_unallocated; |
382 | unsigned long h_aggregation, h_resource; | 382 | unsigned long h_aggregation, h_resource; |
383 | unsigned long pool_idle_time, pool_procs; | 383 | unsigned long pool_idle_time, pool_procs; |
@@ -571,7 +571,7 @@ int __init lparcfg_init(void) | |||
571 | mode_t mode = S_IRUSR; | 571 | mode_t mode = S_IRUSR; |
572 | 572 | ||
573 | /* Allow writing if we have FW_FEATURE_SPLPAR */ | 573 | /* Allow writing if we have FW_FEATURE_SPLPAR */ |
574 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) { | 574 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) { |
575 | lparcfg_fops.write = lparcfg_write; | 575 | lparcfg_fops.write = lparcfg_write; |
576 | mode |= S_IWUSR; | 576 | mode |= S_IWUSR; |
577 | } | 577 | } |
diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c index a5786be9c654..9d5e1e7fc389 100644 --- a/arch/ppc64/kernel/pSeries_iommu.c +++ b/arch/ppc64/kernel/pSeries_iommu.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <asm/plpar_wrappers.h> | 45 | #include <asm/plpar_wrappers.h> |
46 | #include <asm/pSeries_reconfig.h> | 46 | #include <asm/pSeries_reconfig.h> |
47 | #include <asm/systemcfg.h> | 47 | #include <asm/systemcfg.h> |
48 | #include <asm/firmware.h> | ||
48 | #include "pci.h" | 49 | #include "pci.h" |
49 | 50 | ||
50 | #define DBG(fmt...) | 51 | #define DBG(fmt...) |
@@ -546,7 +547,7 @@ void iommu_init_early_pSeries(void) | |||
546 | } | 547 | } |
547 | 548 | ||
548 | if (systemcfg->platform & PLATFORM_LPAR) { | 549 | if (systemcfg->platform & PLATFORM_LPAR) { |
549 | if (ppc64_firmware_features & FW_FEATURE_MULTITCE) { | 550 | if (firmware_has_feature(FW_FEATURE_MULTITCE)) { |
550 | ppc_md.tce_build = tce_buildmulti_pSeriesLP; | 551 | ppc_md.tce_build = tce_buildmulti_pSeriesLP; |
551 | ppc_md.tce_free = tce_freemulti_pSeriesLP; | 552 | ppc_md.tce_free = tce_freemulti_pSeriesLP; |
552 | } else { | 553 | } else { |
diff --git a/arch/ppc64/kernel/pSeries_setup.c b/arch/ppc64/kernel/pSeries_setup.c index d3975ac71cfb..0058f32a3d89 100644 --- a/arch/ppc64/kernel/pSeries_setup.c +++ b/arch/ppc64/kernel/pSeries_setup.c | |||
@@ -60,7 +60,7 @@ | |||
60 | #include <asm/nvram.h> | 60 | #include <asm/nvram.h> |
61 | #include <asm/plpar_wrappers.h> | 61 | #include <asm/plpar_wrappers.h> |
62 | #include <asm/xics.h> | 62 | #include <asm/xics.h> |
63 | #include <asm/cputable.h> | 63 | #include <asm/firmware.h> |
64 | 64 | ||
65 | #include "i8259.h" | 65 | #include "i8259.h" |
66 | #include "mpic.h" | 66 | #include "mpic.h" |
@@ -231,11 +231,11 @@ static void __init pSeries_setup_arch(void) | |||
231 | 231 | ||
232 | pSeries_nvram_init(); | 232 | pSeries_nvram_init(); |
233 | 233 | ||
234 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) | 234 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) |
235 | vpa_init(boot_cpuid); | 235 | vpa_init(boot_cpuid); |
236 | 236 | ||
237 | /* Choose an idle loop */ | 237 | /* Choose an idle loop */ |
238 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) { | 238 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) { |
239 | if (get_paca()->lppaca.shared_proc) { | 239 | if (get_paca()->lppaca.shared_proc) { |
240 | printk(KERN_INFO "Using shared processor idle loop\n"); | 240 | printk(KERN_INFO "Using shared processor idle loop\n"); |
241 | ppc_md.idle_loop = pseries_shared_idle; | 241 | ppc_md.idle_loop = pseries_shared_idle; |
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/ppc64/kernel/pSeries_smp.c index 8312d324aaae..79c7f3223665 100644 --- a/arch/ppc64/kernel/pSeries_smp.c +++ b/arch/ppc64/kernel/pSeries_smp.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <asm/machdep.h> | 41 | #include <asm/machdep.h> |
42 | #include <asm/xics.h> | 42 | #include <asm/xics.h> |
43 | #include <asm/cputable.h> | 43 | #include <asm/cputable.h> |
44 | #include <asm/firmware.h> | ||
44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
45 | #include <asm/rtas.h> | 46 | #include <asm/rtas.h> |
46 | #include <asm/plpar_wrappers.h> | 47 | #include <asm/plpar_wrappers.h> |
@@ -326,7 +327,7 @@ static void __devinit smp_xics_setup_cpu(int cpu) | |||
326 | if (cpu != boot_cpuid) | 327 | if (cpu != boot_cpuid) |
327 | xics_setup_cpu(); | 328 | xics_setup_cpu(); |
328 | 329 | ||
329 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) | 330 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) |
330 | vpa_init(cpu); | 331 | vpa_init(cpu); |
331 | 332 | ||
332 | cpu_clear(cpu, of_spin_map); | 333 | cpu_clear(cpu, of_spin_map); |
diff --git a/arch/ppc64/kernel/process.c b/arch/ppc64/kernel/process.c index 390f434283af..9bad983333b1 100644 --- a/arch/ppc64/kernel/process.c +++ b/arch/ppc64/kernel/process.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <asm/machdep.h> | 50 | #include <asm/machdep.h> |
51 | #include <asm/iSeries/HvCallHpt.h> | 51 | #include <asm/iSeries/HvCallHpt.h> |
52 | #include <asm/cputable.h> | 52 | #include <asm/cputable.h> |
53 | #include <asm/firmware.h> | ||
53 | #include <asm/sections.h> | 54 | #include <asm/sections.h> |
54 | #include <asm/tlbflush.h> | 55 | #include <asm/tlbflush.h> |
55 | #include <asm/time.h> | 56 | #include <asm/time.h> |
@@ -206,7 +207,7 @@ struct task_struct *__switch_to(struct task_struct *prev, | |||
206 | /* purr is nothing but processor time base */ | 207 | /* purr is nothing but processor time base */ |
207 | 208 | ||
208 | #if defined(CONFIG_PPC_PSERIES) | 209 | #if defined(CONFIG_PPC_PSERIES) |
209 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) { | 210 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) { |
210 | struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); | 211 | struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); |
211 | long unsigned start_tb, current_tb; | 212 | long unsigned start_tb, current_tb; |
212 | start_tb = old_thread->start_tb; | 213 | start_tb = old_thread->start_tb; |
diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c index 90b653c724fa..e399963521c0 100644 --- a/arch/ppc64/kernel/sysfs.c +++ b/arch/ppc64/kernel/sysfs.c | |||
@@ -13,6 +13,7 @@ | |||
13 | #include <asm/current.h> | 13 | #include <asm/current.h> |
14 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
15 | #include <asm/cputable.h> | 15 | #include <asm/cputable.h> |
16 | #include <asm/firmware.h> | ||
16 | #include <asm/hvcall.h> | 17 | #include <asm/hvcall.h> |
17 | #include <asm/prom.h> | 18 | #include <asm/prom.h> |
18 | #include <asm/systemcfg.h> | 19 | #include <asm/systemcfg.h> |
@@ -154,7 +155,7 @@ void ppc64_enable_pmcs(void) | |||
154 | 155 | ||
155 | #ifdef CONFIG_PPC_PSERIES | 156 | #ifdef CONFIG_PPC_PSERIES |
156 | /* instruct hypervisor to maintain PMCs */ | 157 | /* instruct hypervisor to maintain PMCs */ |
157 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) | 158 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) |
158 | get_paca()->lppaca.pmcregs_in_use = 1; | 159 | get_paca()->lppaca.pmcregs_in_use = 1; |
159 | #endif /* CONFIG_PPC_PSERIES */ | 160 | #endif /* CONFIG_PPC_PSERIES */ |
160 | } | 161 | } |
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 1c05cee05315..d523056fd660 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
@@ -67,6 +67,7 @@ | |||
67 | #include <asm/prom.h> | 67 | #include <asm/prom.h> |
68 | #include <asm/sections.h> | 68 | #include <asm/sections.h> |
69 | #include <asm/systemcfg.h> | 69 | #include <asm/systemcfg.h> |
70 | #include <asm/firmware.h> | ||
70 | 71 | ||
71 | u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; | 72 | u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; |
72 | 73 | ||
@@ -372,7 +373,7 @@ int timer_interrupt(struct pt_regs * regs) | |||
372 | 373 | ||
373 | /* collect purr register values often, for accurate calculations */ | 374 | /* collect purr register values often, for accurate calculations */ |
374 | #if defined(CONFIG_PPC_PSERIES) | 375 | #if defined(CONFIG_PPC_PSERIES) |
375 | if (ppc64_firmware_features & FW_FEATURE_SPLPAR) { | 376 | if (firmware_has_feature(FW_FEATURE_SPLPAR)) { |
376 | struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); | 377 | struct cpu_usage *cu = &__get_cpu_var(cpu_usage_array); |
377 | cu->current_tb = mfspr(SPRN_PURR); | 378 | cu->current_tb = mfspr(SPRN_PURR); |
378 | } | 379 | } |