The patch titled proper prototype for kernel/sched.c:migration_init() has been removed from the -mm tree. Its filename was proper-prototype-for-kernel-schedcmigration_init.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: proper prototype for kernel/sched.c:migration_init() From: Adrian Bunk <bunk@xxxxxxxxxx> This patch adds a proper prototype for migration_init() in include/linux/sched.h Since there's no point in always returning 0 to a caller that doesn't check the return value it also changes the function to return void. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/linux/sched.h | 8 ++++++++ init/main.c | 4 +--- kernel/sched.c | 4 +--- 3 files changed, 10 insertions(+), 6 deletions(-) diff -puN include/linux/sched.h~proper-prototype-for-kernel-schedcmigration_init include/linux/sched.h --- a/include/linux/sched.h~proper-prototype-for-kernel-schedcmigration_init +++ a/include/linux/sched.h @@ -1978,6 +1978,14 @@ static inline void inc_syscw(struct task } #endif +#ifdef CONFIG_SMP +void migration_init(void); +#else +static inline void migration_init(void) +{ +} +#endif + #endif /* __KERNEL__ */ #endif diff -puN init/main.c~proper-prototype-for-kernel-schedcmigration_init init/main.c --- a/init/main.c~proper-prototype-for-kernel-schedcmigration_init +++ a/init/main.c @@ -56,6 +56,7 @@ #include <linux/pid_namespace.h> #include <linux/device.h> #include <linux/kthread.h> +#include <linux/sched.h> #include <asm/io.h> #include <asm/bugs.h> @@ -747,11 +748,8 @@ __setup("nosoftlockup", nosoftlockup_set static void __init do_pre_smp_initcalls(void) { extern int spawn_ksoftirqd(void); -#ifdef CONFIG_SMP - extern int migration_init(void); migration_init(); -#endif spawn_ksoftirqd(); if (!nosoftlockup) spawn_softlockup_task(); diff -puN kernel/sched.c~proper-prototype-for-kernel-schedcmigration_init kernel/sched.c --- a/kernel/sched.c~proper-prototype-for-kernel-schedcmigration_init +++ a/kernel/sched.c @@ -5621,7 +5621,7 @@ static struct notifier_block __cpuinitda .priority = 10 }; -int __init migration_init(void) +void __init migration_init(void) { void *cpu = (void *)(long)smp_processor_id(); int err; @@ -5631,8 +5631,6 @@ int __init migration_init(void) BUG_ON(err == NOTIFY_BAD); migration_call(&migration_notifier, CPU_ONLINE, cpu); register_cpu_notifier(&migration_notifier); - - return 0; } #endif _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are origin.patch lguest_userc-fix-memory-leak.patch video-sis-fix-negative-array-index.patch mm-hugetlbc-make-a-function-static.patch git-avr32.patch git-dvb.patch remove-saa7134-oss.patch git-hwmon.patch git-gfs2-nmw.patch git-libata-all.patch blk_dev_idecd-help-remove-outdated-note.patch git-mtd.patch make-sunrpc-xprtsockcxs_setup_udptcp-static.patch remove-references-to-net-modulestxt.patch git-netdev-all.patch drivers-net-chelsio-if-0-unused-functions.patch drivers-bluetooth-bpa10xc-fix-memleak.patch drivers-bluetooth-btsdioc-fix-double-free.patch git-nfs-make-nfs_wb_page_priority-static.patch fs-nfs-dirc-should-include-internalh.patch always-export-pci_scan_single_device.patch remove-additional-pci_scan_child_bus-prototype.patch git-scsi-misc.patch scsi-advansysc-make-3-functions-static.patch scsi-qla2xxx-possible-cleanups.patch usb-mon-mon_binc-cleanups.patch git-x86.patch xtensa-iss_net_setup-must-be-__init.patch xtensa-kernel-setupc-remove-dead-code.patch sunrpc-xprtrdma-transportc-fix-use-after-free.patch fix-mm-utilckrealloc.patch fuse_file_alloc-fix-null-dereferences.patch pidns-place-under-config_experimental.patch pidns-place-under-config_experimental-checkpatch-fixes.patch feature-removal-schedule-remove-sa_-flags-entry.patch kernel-taskstatsc-fix-bogus-nlmsg_free.patch mm-page-writebackc-make-a-function-static.patch make-__vmalloc_area_node-static.patch blackfin-remove-dump_thread.patch kernel-power-diskc-make-code-static.patch make-kernel_shutdown_prepare-static.patch kernel-power-move-function-prototypes-to-header.patch kill-udffs_dateversion.patch make-ipc-utilcsysvipc_find_ipc-static.patch cleanup-after-apus-removal.patch remove-mm_ptovvtop.patch remove-__attribute_used__.patch remove-__attribute_used__-checkpatch-fixes.patch proper-show_interrupts-prototype.patch scheduled-oss-driver-removal.patch linux-inith-simplify-__meminitexit-dependencies.patch proper-prototype-for-signals_init.patch kernel-ptracec-should-include-linux-syscallsh.patch make-srcu_readers_active-static.patch kernel-notifierc-should-include-linux-rebooth.patch proper-prototype-for-get_filesystem_list.patch fs-utimesc-should-include-linux-syscallsh.patch fs-signalfdc-should-include-linux-syscallsh.patch fs-eventfdc-should-include-linux-syscallsh.patch proper-prototype-for-vty_init.patch drivers-misc-lkdtmc-cleanups.patch power_supply_ledssysfsc-should-include-power_supplyh.patch fs-ecryptfs-possible-cleanups.patch make-video-geode-lxfb_corecgeode_modedb-static.patch video-hpfbc-section-fix.patch ext4-superc-fix-ifdefs.patch make-jbd-journalc__journal_abort_hard-static.patch move-edactxt-two-levels-up.patch remove-documentation-smptxt.patch kernel-cgroupc-remove-dead-code.patch kernel-cgroupc-make-2-functions-static.patch memory-controller-add-per-container-lru-and-reclaim-v7.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7.patch fix-m32r-__xchg.patch reiser4.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html