diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-18 11:48:48 -0700 |
| commit | a0a6a39ecb11cefe0d7e6e07997306fb5ab2b07e (patch) | |
| tree | 35dfe4099b54dbc6971ef115c2e4d39cefd24413 /arch/powerpc/kernel/sysfs.c | |
| parent | bab58350e565756df9e45daafe8301a309b35e7e (diff) | |
| parent | 83dac59409387789b88bed40b1be86a8abc572be (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
Pull powerpc fixes from Benjamin Herrenschmidt:
"Here are a handful of powerpc related fixes."
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
cpuidle/powerpc: Fix snooze state problem in the cpuidle design on pseries.
cpuidle/powerpc: Fix smt_snooze_delay functionality.
cpuidle/powerpc: Fix target residency initialisation in pseries cpuidle
powerpc: Build fix for powerpc KVM
Revert "powerpc/perf: Use pmc_overflow() to detect rolled back events"
Diffstat (limited to 'arch/powerpc/kernel/sysfs.c')
| -rw-r--r-- | arch/powerpc/kernel/sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/sysfs.c b/arch/powerpc/kernel/sysfs.c index 8302af64921..cf357a059dd 100644 --- a/arch/powerpc/kernel/sysfs.c +++ b/arch/powerpc/kernel/sysfs.c @@ -50,7 +50,7 @@ static ssize_t store_smt_snooze_delay(struct device *dev, return -EINVAL; per_cpu(smt_snooze_delay, cpu->dev.id) = snooze; - update_smt_snooze_delay(snooze); + update_smt_snooze_delay(cpu->dev.id, snooze); return count; } |