]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 80f15dc)
[PATCH] powerpc: oprofile cpu type names clash with other code
authorAndy Whitcroft <apw@shadowen.org>
Fri, 13 Jan 2006 12:35:49 +0000 (12:35 +0000)
committerPaul Mackerras <paulus@samba.org>
Sat, 14 Jan 2006 00:12:16 +0000 (11:12 +1100)
In 2.6.15-git6 a change was commited in the oprofile support in
the powerpc architecture.  It introduced the powerpc_oprofile_type
which contains the define G4.  This causes a name clash with the
existing wacom usb tablet driver.

      CC [M]  drivers/usb/input/wacom.o
    drivers/usb/input/wacom.c:98: error: conflicting types for `G4'
    include/asm/cputable.h:37: error: previous declaration of `G4'
      CC [M]  drivers/usb/mon/mon_text.o
    make[3]: *** [drivers/usb/input/wacom.o] Error 1
    make[2]: *** [drivers/usb/input] Error 2

The elements of an enum declared in global scope are effectivly
global identifiers themselves.  As such we need to ensure the names
are unique.  This patch updates the later oprofile support to use
unique names.

Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
arch/powerpc/kernel/cputable.c patch | blob | history
arch/powerpc/oprofile/common.c patch | blob | history
include/asm-powerpc/cputable.h patch | blob | history

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index cf1eea1a2299afdfadde57e7261c9ec20e101b43..10696456a4c616d0d3900ec0b6370b9a2cb41402 100644 (file)
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -80,7 +80,7 @@ struct cpu_spec       cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/power3",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "power3",
        },
        {       /* Power3+ */
@@ -94,7 +94,7 @@ struct cpu_spec       cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/power3",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "power3",
        },
        {       /* Northstar */
@@ -108,7 +108,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "rs64",
        },
        {       /* Pulsar */
@@ -122,7 +122,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "rs64",
        },
        {       /* I-star */
@@ -136,7 +136,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "rs64",
        },
        {       /* S-star */
@@ -150,7 +150,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power3,
                .oprofile_cpu_type      = "ppc64/rs64",
-               .oprofile_type          = RS64,
+               .oprofile_type          = PPC_OPROFILE_RS64,
                .platform               = "rs64",
        },
        {       /* Power4 */
@@ -164,7 +164,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power4",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "power4",
        },
        {       /* Power4+ */
@@ -178,7 +178,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power4",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "power4",
        },
        {       /* PPC970 */
@@ -193,7 +193,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
        },
 #endif /* CONFIG_PPC64 */
@@ -214,7 +214,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 8,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
        },
 #endif /* defined(CONFIG_PPC64) || defined(CONFIG_POWER4) */
@@ -230,7 +230,7 @@ struct cpu_spec     cpu_specs[] = {
                .dcache_bsize           = 128,
                .cpu_setup              = __setup_cpu_ppc970,
                .oprofile_cpu_type      = "ppc64/970",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "ppc970",
        },
        {       /* Power5 GR */
@@ -244,7 +244,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power5",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "power5",
        },
        {       /* Power5 GS */
@@ -258,7 +258,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_power4,
                .oprofile_cpu_type      = "ppc64/power5+",
-               .oprofile_type          = POWER4,
+               .oprofile_type          = PPC_OPROFILE_POWER4,
                .platform               = "power5+",
        },
        {       /* Cell Broadband Engine */
@@ -559,7 +559,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7450 2.1 */
@@ -573,7 +573,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7450 2.3 and newer */
@@ -587,7 +587,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 1.x */
@@ -601,7 +601,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7455 rev 2.0 */
@@ -615,7 +615,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7455 others */
@@ -629,7 +629,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.0 */
@@ -643,7 +643,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.1 */
@@ -657,7 +657,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7447/7457 Rev 1.2 and later */
@@ -671,7 +671,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7447A */
@@ -685,7 +685,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 7448 */
@@ -699,7 +699,7 @@ struct cpu_spec     cpu_specs[] = {
                .num_pmcs               = 6,
                .cpu_setup              = __setup_cpu_745x,
                .oprofile_cpu_type      = "ppc/7450",
-               .oprofile_type          = G4,
+               .oprofile_type          = PPC_OPROFILE_G4,
                .platform               = "ppc7450",
        },
        {       /* 82xx (8240, 8245, 8260 are all 603e cores) */
@@ -1056,7 +1056,7 @@ struct cpu_spec   cpu_specs[] = {
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
-               .oprofile_type          = BOOKE,
+               .oprofile_type          = PPC_OPROFILE_BOOKE,
                .platform               = "ppc8540",
        },
        {       /* e500v2 */
@@ -1073,7 +1073,7 @@ struct cpu_spec   cpu_specs[] = {
                .dcache_bsize           = 32,
                .num_pmcs               = 4,
                .oprofile_cpu_type      = "ppc/e500",
-               .oprofile_type          = BOOKE,
+               .oprofile_type          = PPC_OPROFILE_BOOKE,
                .platform               = "ppc8548",
        },
 #endif
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 71615eb70b2be53975e6c83bca0665107ed6bc48..cc2535be3a73641326f49c4bb73233729ce7d314 100644 (file)
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -140,19 +140,19 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
        switch (cur_cpu_spec->oprofile_type) {
 #ifdef CONFIG_PPC64
-               case RS64:
+               case PPC_OPROFILE_RS64:
                        model = &op_model_rs64;
                        break;
-               case POWER4:
+               case PPC_OPROFILE_POWER4:
                        model = &op_model_power4;
                        break;
 #else
-               case G4:
+               case PPC_OPROFILE_G4:
                        model = &op_model_7450;
                        break;
 #endif
 #ifdef CONFIG_FSL_BOOKE
-               case BOOKE:
+               case PPC_OPROFILE_BOOKE:
                        model = &op_model_fsl_booke;
                        break;
 #endif
diff --git a/include/asm-powerpc/cputable.h b/include/asm-powerpc/cputable.h
index 03017d90570494a18e4caca2d7f9f01d3ac77110..64210549f56b2b52cca83cddd84c489daec3c4e4 100644 (file)
--- a/include/asm-powerpc/cputable.h
+++ b/include/asm-powerpc/cputable.h
@@ -32,11 +32,11 @@ struct cpu_spec;
 typedef        void (*cpu_setup_t)(unsigned long offset, struct cpu_spec* spec);
 
 enum powerpc_oprofile_type {
-       INVALID = 0,
-       RS64 = 1,
-       POWER4 = 2,
-       G4 = 3,
-       BOOKE = 4,
+       PPC_OPROFILE_INVALID = 0,
+       PPC_OPROFILE_RS64 = 1,
+       PPC_OPROFILE_POWER4 = 2,
+       PPC_OPROFILE_G4 = 3,
+       PPC_OPROFILE_BOOKE = 4,
 };
 
 struct cpu_spec {
Linux 2.6 source tree