[PATCH] ppc64: silence perfmon exception warnings

We dont need to use the PERFMON exception on POWER5, in fact the firmware
returns an error.  Due to this just remove the warning.

Also now that we have proper runlatch support we can remove the bootup
hack.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c
index 2f704a2cafb1a4f5dc9ece21349c6837b0dc8f72..02b8ac4e016883cfc5e4bfa0e151995346d4dc55 100644 (file)
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
@@ -112,7 +112,6 @@ void ppc64_enable_pmcs(void)
        unsigned long hid0;
 #ifdef CONFIG_PPC_PSERIES
        unsigned long set, reset;
-       int ret;
 #endif /* CONFIG_PPC_PSERIES */
 
        /* Only need to enable them once */
@@ -145,11 +144,7 @@ void ppc64_enable_pmcs(void)
        case PLATFORM_PSERIES_LPAR:
                set = 1UL << 63;
                reset = 0;
-               ret = plpar_hcall_norets(H_PERFMON, set, reset);
-               if (ret)
-                       printk(KERN_ERR "H_PERFMON call on cpu %u "
-                              "returned %d\n",
-                              smp_processor_id(), ret);
+               plpar_hcall_norets(H_PERFMON, set, reset);
                break;
 #endif /* CONFIG_PPC_PSERIES */
 
@@ -161,13 +156,6 @@ void ppc64_enable_pmcs(void)
        /* instruct hypervisor to maintain PMCs */
        if (cur_cpu_spec->firmware_features & FW_FEATURE_SPLPAR)
                get_paca()->lppaca.pmcregs_in_use = 1;
-
-       /*
-        * On SMT machines we have to set the run latch in the ctrl register
-        * in order to make PMC6 spin.
-        */
-       if (cpu_has_feature(CPU_FTR_SMT))
-               ppc64_runlatch_on();
 #endif /* CONFIG_PPC_PSERIES */
 }