diff options
-rw-r--r-- | kernel/cpuset.c | 2 | ||||
-rw-r--r-- | kernel/sched.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/kernel/cpuset.c b/kernel/cpuset.c index 05727dcaa80d..7146793b5c11 100644 --- a/kernel/cpuset.c +++ b/kernel/cpuset.c | |||
@@ -2118,7 +2118,7 @@ static void scan_for_empty_cpusets(struct cpuset *root) | |||
2118 | * Called within get_online_cpus(). Needs to call cgroup_lock() | 2118 | * Called within get_online_cpus(). Needs to call cgroup_lock() |
2119 | * before calling generate_sched_domains(). | 2119 | * before calling generate_sched_domains(). |
2120 | */ | 2120 | */ |
2121 | void __cpuexit cpuset_update_active_cpus(void) | 2121 | void cpuset_update_active_cpus(void) |
2122 | { | 2122 | { |
2123 | struct sched_domain_attr *attr; | 2123 | struct sched_domain_attr *attr; |
2124 | cpumask_var_t *doms; | 2124 | cpumask_var_t *doms; |
diff --git a/kernel/sched.c b/kernel/sched.c index b4427cc70acd..9064e7d6ad65 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -7477,8 +7477,8 @@ int __init sched_create_sysfs_power_savings_entries(struct sysdev_class *cls) | |||
7477 | * disabled, cpuset_update_active_cpus() becomes a simple wrapper | 7477 | * disabled, cpuset_update_active_cpus() becomes a simple wrapper |
7478 | * around partition_sched_domains(). | 7478 | * around partition_sched_domains(). |
7479 | */ | 7479 | */ |
7480 | static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb, | 7480 | static int cpuset_cpu_active(struct notifier_block *nfb, unsigned long action, |
7481 | unsigned long action, void *hcpu) | 7481 | void *hcpu) |
7482 | { | 7482 | { |
7483 | switch (action & ~CPU_TASKS_FROZEN) { | 7483 | switch (action & ~CPU_TASKS_FROZEN) { |
7484 | case CPU_ONLINE: | 7484 | case CPU_ONLINE: |
@@ -7490,8 +7490,8 @@ static int __cpuexit cpuset_cpu_active(struct notifier_block *nfb, | |||
7490 | } | 7490 | } |
7491 | } | 7491 | } |
7492 | 7492 | ||
7493 | static int __cpuexit cpuset_cpu_inactive(struct notifier_block *nfb, | 7493 | static int cpuset_cpu_inactive(struct notifier_block *nfb, unsigned long action, |
7494 | unsigned long action, void *hcpu) | 7494 | void *hcpu) |
7495 | { | 7495 | { |
7496 | switch (action & ~CPU_TASKS_FROZEN) { | 7496 | switch (action & ~CPU_TASKS_FROZEN) { |
7497 | case CPU_DOWN_PREPARE: | 7497 | case CPU_DOWN_PREPARE: |