aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authorKumar Gala <galak@kernel.crashing.org>2008-09-18 18:50:42 -0400
committerKumar Gala <galak@kernel.crashing.org>2008-09-18 18:57:50 -0400
commit33a7f122740bd820a029faf450a9a0caa9458426 (patch)
tree2b11aea9f7f9d91ee122fbe8d1bfa7f7550d126b /arch/powerpc
parentc2fe59444e1827ecd2713a1e6ecfd1ab1fc548ae (diff)
powerpc: Fix build warnings introduced by PMC support on 32-bit
arch/powerpc/kernel/sysfs.c:197:7: warning: "CONFIG_6xx" is not defined arch/powerpc/kernel/sysfs.c:141: warning: 'run_on_cpu' defined but not used Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc')
-rw-r--r--arch/powerpc/kernel/sysfs.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c
index ef2ad92a417f..86a2ffccef25 100644
--- a/arch/powerpc/kernel/sysfs.c
+++ b/arch/powerpc/kernel/sysfs.c
@@ -134,6 +134,7 @@ void ppc_enable_pmcs(void)
134} 134}
135EXPORT_SYMBOL(ppc_enable_pmcs); 135EXPORT_SYMBOL(ppc_enable_pmcs);
136 136
137#if defined(CONFIG_6xx) || defined(CONFIG_PPC64)
137/* XXX convert to rusty's on_one_cpu */ 138/* XXX convert to rusty's on_one_cpu */
138static unsigned long run_on_cpu(unsigned long cpu, 139static unsigned long run_on_cpu(unsigned long cpu,
139 unsigned long (*func)(unsigned long), 140 unsigned long (*func)(unsigned long),
@@ -152,6 +153,7 @@ static unsigned long run_on_cpu(unsigned long cpu,
152 153
153 return ret; 154 return ret;
154} 155}
156#endif
155 157
156#define SYSFS_PMCSETUP(NAME, ADDRESS) \ 158#define SYSFS_PMCSETUP(NAME, ADDRESS) \
157static unsigned long read_##NAME(unsigned long junk) \ 159static unsigned long read_##NAME(unsigned long junk) \
@@ -190,11 +192,11 @@ static ssize_t __used \
190 * that are implemented on the current processor 192 * that are implemented on the current processor
191 */ 193 */
192 194
193#ifdef CONFIG_PPC64 195#if defined(CONFIG_PPC64)
194#define HAS_PPC_PMC_CLASSIC 1 196#define HAS_PPC_PMC_CLASSIC 1
195#define HAS_PPC_PMC_IBM 1 197#define HAS_PPC_PMC_IBM 1
196#define HAS_PPC_PMC_PA6T 1 198#define HAS_PPC_PMC_PA6T 1
197#elif CONFIG_6xx 199#elif defined(CONFIG_6xx)
198#define HAS_PPC_PMC_CLASSIC 1 200#define HAS_PPC_PMC_CLASSIC 1
199#define HAS_PPC_PMC_IBM 1 201#define HAS_PPC_PMC_IBM 1
200#define HAS_PPC_PMC_G4 1 202#define HAS_PPC_PMC_G4 1