diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-18 18:49:40 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-18 18:56:33 +1100 |
commit | f005ba1b3739965864c61e1db67d32c7ea088133 (patch) | |
tree | f24795634189b1b730105d6586da700db264e51c /kernel | |
parent | b30cb8bde0fbe56570371a29082608bf41c0e6db (diff) | |
parent | e9d13ce0dd8c4aa17bcc652ae68b5f2c5b360650 (diff) |
Merge branch 'quilt/driver-core'
Conflicts:
drivers/base/memory.c
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/params.c | 2 | ||||
-rw-r--r-- | kernel/perf_event.c | 13 | ||||
-rw-r--r-- | kernel/sched.c | 4 |
3 files changed, 15 insertions, 4 deletions
diff --git a/kernel/params.c b/kernel/params.c index cf1b69183127..ac5de7df4d97 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -737,7 +737,7 @@ static int uevent_filter(struct kset *kset, struct kobject *kobj) return 0; } -static struct kset_uevent_ops module_uevent_ops = { +static const struct kset_uevent_ops module_uevent_ops = { .filter = uevent_filter, }; diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 27f69a04541d..faaa9e6d6692 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -5275,13 +5275,16 @@ void __init perf_event_init(void) register_cpu_notifier(&perf_cpu_nb); } -static ssize_t perf_show_reserve_percpu(struct sysdev_class *class, char *buf) +static ssize_t perf_show_reserve_percpu(struct sysdev_class *class, + struct sysdev_class_attribute *attr, + char *buf) { return sprintf(buf, "%d\n", perf_reserved_percpu); } static ssize_t perf_set_reserve_percpu(struct sysdev_class *class, + struct sysdev_class_attribute *attr, const char *buf, size_t count) { @@ -5310,13 +5313,17 @@ perf_set_reserve_percpu(struct sysdev_class *class, return count; } -static ssize_t perf_show_overcommit(struct sysdev_class *class, char *buf) +static ssize_t perf_show_overcommit(struct sysdev_class *class, + struct sysdev_class_attribute *attr, + char *buf) { return sprintf(buf, "%d\n", perf_overcommit); } static ssize_t -perf_set_overcommit(struct sysdev_class *class, const char *buf, size_t count) +perf_set_overcommit(struct sysdev_class *class, + struct sysdev_class_attribute *attr, + const char *buf, size_t count) { unsigned long val; int err; diff --git a/kernel/sched.c b/kernel/sched.c index 1d6ab3b581c0..5a310d2e88c3 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9205,11 +9205,13 @@ static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) #ifdef CONFIG_SCHED_MC static ssize_t sched_mc_power_savings_show(struct sysdev_class *class, + struct sysdev_class_attribute *attr, char *page) { return sprintf(page, "%u\n", sched_mc_power_savings); } static ssize_t sched_mc_power_savings_store(struct sysdev_class *class, + struct sysdev_class_attribute *attr, const char *buf, size_t count) { return sched_power_savings_store(buf, count, 0); @@ -9221,11 +9223,13 @@ static SYSDEV_CLASS_ATTR(sched_mc_power_savings, 0644, #ifdef CONFIG_SCHED_SMT static ssize_t sched_smt_power_savings_show(struct sysdev_class *dev, + struct sysdev_class_attribute *attr, char *page) { return sprintf(page, "%u\n", sched_smt_power_savings); } static ssize_t sched_smt_power_savings_store(struct sysdev_class *dev, + struct sysdev_class_attribute *attr, const char *buf, size_t count) { return sched_power_savings_store(buf, count, 1); |