diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2005-09-28 00:45:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-28 10:46:41 -0400 |
commit | f4208b9a9538baabad197276076bc1d4f52d42b9 (patch) | |
tree | a13d24a36d77d948c47b8f948cd426aa84da42ff /arch | |
parent | f36462f078403c1859a7e58177b28e01b3a179e4 (diff) |
[PATCH] ppc: fix stupid thinko in oprofile fix
I did something stupid in my oprofile fix, here's the obvious fix:
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc/kernel/perfmon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc/kernel/perfmon.c b/arch/ppc/kernel/perfmon.c index 04c18788e85f..22df9a596a0f 100644 --- a/arch/ppc/kernel/perfmon.c +++ b/arch/ppc/kernel/perfmon.c | |||
@@ -45,9 +45,8 @@ static void dummy_perf(struct pt_regs *regs) | |||
45 | mtpmr(PMRN_PMGC0, pmgc0); | 45 | mtpmr(PMRN_PMGC0, pmgc0); |
46 | } | 46 | } |
47 | 47 | ||
48 | #elif CONFIG_6xx | 48 | #elif defined(CONFIG_6xx) |
49 | /* Ensure exceptions are disabled */ | 49 | /* Ensure exceptions are disabled */ |
50 | |||
51 | static void dummy_perf(struct pt_regs *regs) | 50 | static void dummy_perf(struct pt_regs *regs) |
52 | { | 51 | { |
53 | unsigned int mmcr0 = mfspr(SPRN_MMCR0); | 52 | unsigned int mmcr0 = mfspr(SPRN_MMCR0); |