Commit 0d81d922 authored by Albert Herranz's avatar Albert Herranz Committed by Linus Torvalds

[PATCH] ppc32: perfctl-ppc: fix duplicate mmcr0 define

Fix a compilation warning due to a duplicate definition of MMCR0_PMXE.

The definition comes in perfctr-ppc.patch, but was recently introduced too
in Linus tree.
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 11fe36dd
...@@ -333,7 +333,6 @@ ...@@ -333,7 +333,6 @@
#define MMCR0_PMC2_CYCLES 0x1 #define MMCR0_PMC2_CYCLES 0x1
#define MMCR0_PMC2_ITLB 0x7 #define MMCR0_PMC2_ITLB 0x7
#define MMCR0_PMC2_LOADMISSTIME 0x5 #define MMCR0_PMC2_LOADMISSTIME 0x5
#define MMCR0_PMXE (1 << 26)
/* Short-hand versions for a number of the above SPRNs */ /* Short-hand versions for a number of the above SPRNs */
#define CTR SPRN_CTR /* Counter Register */ #define CTR SPRN_CTR /* Counter Register */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment