diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-26 19:29:06 +0000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-03-27 16:58:24 +1100 |
| commit | ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3 (patch) | |
| tree | 58281a386f6a3517c68765cdac49d36996b19275 /arch/powerpc/kernel/sysfs.c | |
| parent | efbda86098455da014be849713df6498cefc5a2a (diff) | |
| download | linux-stable-ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3.tar.gz linux-stable-ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3.tar.bz2 linux-stable-ec78c8ac16e7a5f45e21838ab2f5573200bfcdd3.zip | |
powerpc: Fix bugs introduced by sysfs changes
Rusty's patch to change our sysfs access to various registers
to use smp_call_function_single() introduced a whole bunch of
warnings. This fixes them. This version also fixes an actual
bug in here where it did mtspr instead of mfspr when reading
the files
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index e6cd6c990c25..f41aec85aa49 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -134,17 +134,15 @@ void ppc_enable_pmcs(void) } EXPORT_SYMBOL(ppc_enable_pmcs); - #define SYSFS_PMCSETUP(NAME, ADDRESS) \ static void read_##NAME(void *val) \ { \ - mtspr(ADDRESS, *(unsigned long *)val); \ + *(unsigned long *)val = mfspr(ADDRESS); \ } \ -static unsigned long write_##NAME(unsigned long val) \ +static void write_##NAME(void *val) \ { \ ppc_enable_pmcs(); \ mtspr(ADDRESS, *(unsigned long *)val); \ - return 0; \ } \ static ssize_t show_##NAME(struct sys_device *dev, \ struct sysdev_attribute *attr, \ |