mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Dave Jones <davej@redhat.com>
To: tglx@linutronix.de, akpm@osdl.org, torvalds@osdl.org,
	dwmw2@infradead.org, albert_herranz@yahoo.es
Cc: linux-kernel@vger.kernel.org
Subject: ppc32 MMCR0_PMXE saga.
Date: Wed, 2 Feb 2005 23:47:02 -0500	[thread overview]
Message-ID: <20050203044702.GA1089@redhat.com> (raw)

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 */

             reply	other threads:[~2005-02-03  4:48 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-02-03  4:47 Dave Jones [this message]
2005-02-03  6:58 ` Thomas Gleixner
2005-02-03 10:42   ` Mikael Pettersson
2005-02-03 10:51     ` Andrew Morton
2005-02-03  8:50 ` Albert Herranz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20050203044702.GA1089@redhat.com \
    --to=davej@redhat.com \
    --cc=akpm@osdl.org \
    --cc=albert_herranz@yahoo.es \
    --cc=dwmw2@infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@osdl.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®