diff options
| author |   Paul Mackerras <paulus@samba.org> | 2005-09-29 13:13:36 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-29 13:13:36 +1000 |
| commit | ab11d1ea281e85895369ef57c5259ad8a432fabb (patch) | |
| tree | 684147479c6a8bb2fbed21bdcf12de1dd519c730 /arch/ppc | |
| parent | Merge Stephen Rothwell's patches (diff) | |
| parent | [PATCH] Keys: Add possessor permissions to keys [try #3] (diff) | |
| download | linux-dev-ab11d1ea281e85895369ef57c5259ad8a432fabb.tar.xz linux-dev-ab11d1ea281e85895369ef57c5259ad8a432fabb.zip | |
Merge by hand from Linus' tree.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc')
| -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 f9b27d939f76..c9a38dd0cdc4 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) 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); |