Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 279530
b: refs/heads/master
c: 595fe91
h: refs/heads/master
v: v3
  • Loading branch information
Ananth N Mavinakayanahalli authored and Benjamin Herrenschmidt committed Nov 25, 2011
1 parent 2b94d21 commit 6d8688a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 184cd4a3b962a4769889615430eaf40076b97969
refs/heads/master: 595fe91447b03cb72c97f45bc5db30fd73b66b38
8 changes: 8 additions & 0 deletions trunk/arch/powerpc/kernel/sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -177,11 +177,13 @@ SYSFS_PMCSETUP(mmcra, SPRN_MMCRA);
SYSFS_PMCSETUP(purr, SPRN_PURR);
SYSFS_PMCSETUP(spurr, SPRN_SPURR);
SYSFS_PMCSETUP(dscr, SPRN_DSCR);
SYSFS_PMCSETUP(pir, SPRN_PIR);

static SYSDEV_ATTR(mmcra, 0600, show_mmcra, store_mmcra);
static SYSDEV_ATTR(spurr, 0600, show_spurr, NULL);
static SYSDEV_ATTR(dscr, 0600, show_dscr, store_dscr);
static SYSDEV_ATTR(purr, 0600, show_purr, store_purr);
static SYSDEV_ATTR(pir, 0400, show_pir, NULL);

unsigned long dscr_default = 0;
EXPORT_SYMBOL(dscr_default);
Expand Down Expand Up @@ -392,6 +394,9 @@ static void __cpuinit register_cpu_online(unsigned int cpu)

if (cpu_has_feature(CPU_FTR_DSCR))
sysdev_create_file(s, &attr_dscr);

if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
sysdev_create_file(s, &attr_pir);
#endif /* CONFIG_PPC64 */

cacheinfo_cpu_online(cpu);
Expand Down Expand Up @@ -462,6 +467,9 @@ static void unregister_cpu_online(unsigned int cpu)

if (cpu_has_feature(CPU_FTR_DSCR))
sysdev_remove_file(s, &attr_dscr);

if (cpu_has_feature(CPU_FTR_PPCAS_ARCH_V2))
sysdev_remove_file(s, &attr_pir);
#endif /* CONFIG_PPC64 */

cacheinfo_cpu_offline(cpu);
Expand Down

0 comments on commit 6d8688a

Please sign in to comment.