diff options
author | Paul Mackerras <paulus@samba.org> | 2006-08-08 09:09:11 +0200 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-08-08 09:09:11 +0200 |
commit | 32bc6e095d75233e7c87cc6fa0e07942b124d194 (patch) | |
tree | 8f83ef9a23d52d1305878b65dd98fc22b09b7f3e /arch/powerpc/platforms/pseries/setup.c | |
parent | [POWERPC] Update lppaca offset comments (diff) | |
parent | [POWERPC] Fix might-sleep warning on removing cpus (diff) | |
download | linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.tar.xz linux-32bc6e095d75233e7c87cc6fa0e07942b124d194.zip |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/platforms/pseries/setup.c')
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index 6ebeecfd6bcb..1587efc51057 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); |