Messages in this thread Patch in this message | | | Date | Wed, 2 Feb 2005 23:47:02 -0500 | From | Dave Jones <> | Subject | ppc32 MMCR0_PMXE saga. |
| |
I'm at a loss to explain whats been happening with this symbol.
ChangeSet 1.2370, 2005/01/11 17:41:32-08:00, tglx@linutronix.de
[PATCH] ppc: remove duplicate define
The MMCR0_PMXE is already defined in reg.h, so no need to redefine it here.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
ChangeSet 1.2514, 2005/01/12 09:02:21-08:00, dwmw2@infradead.org
[PATCH] ppc: fix removed MMCR0_PMXE define
In ChangeSet 1.2370, 2005/01/11 17:41:32-08:00, tglx@linutronix.de wrote: > > [PATCH] ppc: remove duplicate define > > The MMCR0_PMXE is already defined in reg.h...
Er, no it's not. But perhaps it should be...
ChangeSet 1.1992.2.33, 2005/02/02 08:36:04-08:00, albert_herranz@yahoo.es
[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: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Clearly it *is* needed, as without it, this happens ..
arch/ppc/kernel/perfmon.c:55: error: `MMCR0_PMXE' undeclared (first use in this function)
grep shows no occurances of MMCR0_PMXE in include/asm-ppc that I can see, so that last changeset is very confusing.
Dave
Unbreak ppc32 perfctr build.
Signed-off-by: Dave Jones <davej@redhat.com>
--- linux-2.6.10/include/asm-ppc/reg.h~ 2005-02-02 23:28:14.000000000 -0500 +++ linux-2.6.10/include/asm-ppc/reg.h 2005-02-02 23:28:36.000000000 -0500 @@ -333,6 +333,7 @@ #define MMCR0_PMC2_CYCLES 0x1 #define MMCR0_PMC2_ITLB 0x7 #define MMCR0_PMC2_LOADMISSTIME 0x5 +#define MMCR0_PMXE (1 << 26) /* Short-hand versions for a number of the above SPRNs */ #define CTR SPRN_CTR /* Counter Register */ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |