diff options
-rw-r--r-- | kernel/sched.c | 7 | ||||
-rw-r--r-- | mm/page-writeback.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index b8deddb7833a..3e57712aefdf 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -4734,8 +4734,9 @@ static void migrate_dead_tasks(unsigned int dead_cpu) | |||
4734 | * migration_call - callback that gets triggered when a CPU is added. | 4734 | * migration_call - callback that gets triggered when a CPU is added. |
4735 | * Here we can start up the necessary migration thread for the new CPU. | 4735 | * Here we can start up the necessary migration thread for the new CPU. |
4736 | */ | 4736 | */ |
4737 | static int migration_call(struct notifier_block *nfb, unsigned long action, | 4737 | static int __cpuinit migration_call(struct notifier_block *nfb, |
4738 | void *hcpu) | 4738 | unsigned long action, |
4739 | void *hcpu) | ||
4739 | { | 4740 | { |
4740 | int cpu = (long)hcpu; | 4741 | int cpu = (long)hcpu; |
4741 | struct task_struct *p; | 4742 | struct task_struct *p; |
@@ -4805,7 +4806,7 @@ static int migration_call(struct notifier_block *nfb, unsigned long action, | |||
4805 | /* Register at highest priority so that task migration (migrate_all_tasks) | 4806 | /* Register at highest priority so that task migration (migrate_all_tasks) |
4806 | * happens before everything else. | 4807 | * happens before everything else. |
4807 | */ | 4808 | */ |
4808 | static struct notifier_block __devinitdata migration_notifier = { | 4809 | static struct notifier_block __cpuinitdata migration_notifier = { |
4809 | .notifier_call = migration_call, | 4810 | .notifier_call = migration_call, |
4810 | .priority = 10 | 4811 | .priority = 10 |
4811 | }; | 4812 | }; |
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 8ac6bfb40073..4ec7026c7bab 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c | |||
@@ -516,7 +516,7 @@ static void set_ratelimit(void) | |||
516 | ratelimit_pages = (4096 * 1024) / PAGE_CACHE_SIZE; | 516 | ratelimit_pages = (4096 * 1024) / PAGE_CACHE_SIZE; |
517 | } | 517 | } |
518 | 518 | ||
519 | static int | 519 | static int __cpuinit |
520 | ratelimit_handler(struct notifier_block *self, unsigned long u, void *v) | 520 | ratelimit_handler(struct notifier_block *self, unsigned long u, void *v) |
521 | { | 521 | { |
522 | set_ratelimit(); | 522 | set_ratelimit(); |