summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pseries/setup.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-08-19 17:27:27 -0400
committerJeff Garzik <jeff@garzik.org>2006-08-19 17:27:27 -0400
commit499792ec6dc737467e5486527cef95ed7d74fba9 (patch)
treeb88c4ef9d4491c17f71d26d33e73f05f7c7ea6a0 /arch/powerpc/platforms/pseries/setup.c
parent421b20b9c44b3fcdc07d6af875dad5ae86fad014 (diff)
parentd14b50cc60ca465290fcdb3b88e7d5fb684361ed (diff)
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r--arch/powerpc/platforms/pseries/setup.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index 71c634e0b87..31867a701fc 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -213,8 +213,6 @@ static void pseries_lpar_enable_pmcs(void)
{
unsigned long set, reset;
- power4_enable_pmcs();
-
set = 1UL << 63;
reset = 0;
plpar_hcall_norets(H_PERFMON, set, reset);