vserver 2.0 rc7

[linux-2.6.git] / arch / ppc64 / kernel / sysfs.c

diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c
index 4eacd4f..c8fa656 100644 (file)
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
@@ -18,7 +18,7 @@
 #include <asm/systemcfg.h>
 #include <asm/paca.h>
 #include <asm/lppaca.h>
-
+#include <asm/machdep.h>
 
 static DEFINE_PER_CPU(struct cpu, cpu_devices);
 
@@ -63,7 +63,7 @@ static int __init smt_setup(void)
        unsigned int *val;
        unsigned int cpu;
 
-       if (!cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (!cpu_has_feature(CPU_FTR_SMT))
                return 1;
 
        options = find_path_device("/options");
@@ -86,7 +86,7 @@ static int __init setup_smt_snooze_delay(char *str)
        unsigned int cpu;
        int snooze;
 
-       if (!cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (!cpu_has_feature(CPU_FTR_SMT))
                return 1;
 
        smt_snooze_cmdline = 1;
@@ -113,7 +113,6 @@ void ppc64_enable_pmcs(void)
 #ifdef CONFIG_PPC_PSERIES
        unsigned long set, reset;
        int ret;
-       unsigned int ctrl;
 #endif /* CONFIG_PPC_PSERIES */
 
        /* Only need to enable them once */
@@ -167,11 +166,8 @@ void ppc64_enable_pmcs(void)
         * On SMT machines we have to set the run latch in the ctrl register
         * in order to make PMC6 spin.
         */
-       if (cur_cpu_spec->cpu_features & CPU_FTR_SMT) {
-               ctrl = mfspr(CTRLF);
-               ctrl |= RUNLATCH;
-               mtspr(CTRLT, ctrl);
-       }
+       if (cpu_has_feature(CPU_FTR_SMT))
+               ppc64_runlatch_on();
 #endif /* CONFIG_PPC_PSERIES */
 }
 
@@ -266,7 +262,7 @@ static void register_cpu_online(unsigned int cpu)
        struct sys_device *s = &c->sysdev;
 
 #ifndef CONFIG_PPC_ISERIES
-       if (cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (cpu_has_feature(CPU_FTR_SMT))
                sysdev_create_file(s, &attr_smt_snooze_delay);
 #endif
 
@@ -275,7 +271,7 @@ static void register_cpu_online(unsigned int cpu)
        sysdev_create_file(s, &attr_mmcr0);
        sysdev_create_file(s, &attr_mmcr1);
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_MMCRA)
+       if (cpu_has_feature(CPU_FTR_MMCRA))
                sysdev_create_file(s, &attr_mmcra);
 
        sysdev_create_file(s, &attr_pmc1);
@@ -285,12 +281,12 @@ static void register_cpu_online(unsigned int cpu)
        sysdev_create_file(s, &attr_pmc5);
        sysdev_create_file(s, &attr_pmc6);
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_PMC8) {
+       if (cpu_has_feature(CPU_FTR_PMC8)) {
                sysdev_create_file(s, &attr_pmc7);
                sysdev_create_file(s, &attr_pmc8);
        }
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (cpu_has_feature(CPU_FTR_SMT))
                sysdev_create_file(s, &attr_purr);
 }
 
@@ -303,7 +299,7 @@ static void unregister_cpu_online(unsigned int cpu)
        BUG_ON(c->no_control);
 
 #ifndef CONFIG_PPC_ISERIES
-       if (cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (cpu_has_feature(CPU_FTR_SMT))
                sysdev_remove_file(s, &attr_smt_snooze_delay);
 #endif
 
@@ -312,7 +308,7 @@ static void unregister_cpu_online(unsigned int cpu)
        sysdev_remove_file(s, &attr_mmcr0);
        sysdev_remove_file(s, &attr_mmcr1);
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_MMCRA)
+       if (cpu_has_feature(CPU_FTR_MMCRA))
                sysdev_remove_file(s, &attr_mmcra);
 
        sysdev_remove_file(s, &attr_pmc1);
@@ -322,12 +318,12 @@ static void unregister_cpu_online(unsigned int cpu)
        sysdev_remove_file(s, &attr_pmc5);
        sysdev_remove_file(s, &attr_pmc6);
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_PMC8) {
+       if (cpu_has_feature(CPU_FTR_PMC8)) {
                sysdev_remove_file(s, &attr_pmc7);
                sysdev_remove_file(s, &attr_pmc8);
        }
 
-       if (cur_cpu_spec->cpu_features & CPU_FTR_SMT)
+       if (cpu_has_feature(CPU_FTR_SMT))
                sysdev_remove_file(s, &attr_purr);
 }
 #endif /* CONFIG_HOTPLUG_CPU */
@@ -413,9 +409,7 @@ static int __init topology_init(void)
                 * CPU.  For instance, the boot cpu might never be valid
                 * for hotplugging.
                 */
-#ifdef CONFIG_HOTPLUG_CPU
-               if (systemcfg->platform != PLATFORM_PSERIES_LPAR)
-#endif
+               if (!ppc_md.cpu_die)
                        c->no_control = 1;
 
                if (cpu_online(cpu) || (c->no_control == 0)) {