lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Fix build warnings introduced by PMC support on 32-bit

Browse Source 
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>
This commit is contained in:
Kumar Gala
2008-09-18 17:50:42 -05:00
parent c2fe59444e
commit 33a7f12274
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/sysfs.c
View File

@@ -134,6 +134,7 @@ void ppc_enable_pmcs(void)
} }
EXPORT_SYMBOL(ppc_enable_pmcs); EXPORT_SYMBOL(ppc_enable_pmcs);
#if defined(CONFIG_6xx) || defined(CONFIG_PPC64)
/* XXX convert to rusty's on_one_cpu */ /* XXX convert to rusty's on_one_cpu */
static unsigned long run_on_cpu(unsigned long cpu, static unsigned long run_on_cpu(unsigned long cpu,
unsigned long (*func)(unsigned long), unsigned long (*func)(unsigned long),
@@ -152,6 +153,7 @@ static unsigned long run_on_cpu(unsigned long cpu,
return ret; return ret;
} }
#endif
#define SYSFS_PMCSETUP(NAME, ADDRESS) \ #define SYSFS_PMCSETUP(NAME, ADDRESS) \
static unsigned long read_##NAME(unsigned long junk) \ static unsigned long read_##NAME(unsigned long junk) \
@@ -190,11 +192,11 @@ static ssize_t __used \
* that are implemented on the current processor * that are implemented on the current processor
*/ */
#ifdef CONFIG_PPC64 #if defined(CONFIG_PPC64)
#define HAS_PPC_PMC_CLASSIC 1 #define HAS_PPC_PMC_CLASSIC 1
#define HAS_PPC_PMC_IBM 1 #define HAS_PPC_PMC_IBM 1
#define HAS_PPC_PMC_PA6T 1 #define HAS_PPC_PMC_PA6T 1
#elif CONFIG_6xx #elif defined(CONFIG_6xx)
#define HAS_PPC_PMC_CLASSIC 1 #define HAS_PPC_PMC_CLASSIC 1
#define HAS_PPC_PMC_IBM 1 #define HAS_PPC_PMC_IBM 1
#define HAS_PPC_PMC_G4 1 #define HAS_PPC_PMC_G4 1