OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f36462f
)
[PATCH] ppc: fix stupid thinko in oprofile fix
author
Benjamin Herrenschmidt
<benh@kernel.crashing.org>
Wed, 28 Sep 2005 04:45:35 +0000
(21:45 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Wed, 28 Sep 2005 14:46:41 +0000
(07:46 -0700)
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>
arch/ppc/kernel/perfmon.c
patch
|
blob
|
history
diff --git
a/arch/ppc/kernel/perfmon.c
b/arch/ppc/kernel/perfmon.c
index
04c1878
..
22df9a5
100644
(file)
--- a/
arch/ppc/kernel/perfmon.c
+++ b/
arch/ppc/kernel/perfmon.c
@@
-45,9
+45,8
@@
static void dummy_perf(struct pt_regs *regs)
mtpmr(PMRN_PMGC0, pmgc0);
}
-#elif
CONFIG_6xx
+#elif
defined(CONFIG_6xx)
/* Ensure exceptions are disabled */
-
static void dummy_perf(struct pt_regs *regs)
{
unsigned int mmcr0 = mfspr(SPRN_MMCR0);