Skip to content

Commit

Permalink
powerpc: Fix build warnings introduced by PMC support on 32-bit
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kumar Gala committed Sep 18, 2008
1 parent c2fe594 commit 33a7f12
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/kernel/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@ void ppc_enable_pmcs(void)
}
EXPORT_SYMBOL(ppc_enable_pmcs);

#if defined(CONFIG_6xx) || defined(CONFIG_PPC64)
/* XXX convert to rusty's on_one_cpu */
static unsigned long run_on_cpu(unsigned long cpu,
unsigned long (*func)(unsigned long),
Expand All @@ -152,6 +153,7 @@ static unsigned long run_on_cpu(unsigned long cpu,

return ret;
}
#endif

#define SYSFS_PMCSETUP(NAME, ADDRESS) \
static unsigned long read_##NAME(unsigned long junk) \
Expand Down Expand Up @@ -190,11 +192,11 @@ static ssize_t __used \
* that are implemented on the current processor
*/

#ifdef CONFIG_PPC64
#if defined(CONFIG_PPC64)
#define HAS_PPC_PMC_CLASSIC 1
#define HAS_PPC_PMC_IBM 1
#define HAS_PPC_PMC_PA6T 1
#elif CONFIG_6xx
#elif defined(CONFIG_6xx)
#define HAS_PPC_PMC_CLASSIC 1
#define HAS_PPC_PMC_IBM 1
#define HAS_PPC_PMC_G4 1
Expand Down

0 comments on commit 33a7f12

Please sign in to comment.