# git rev-parse -q --verify 97d6e2b636c6e07b99965f3db9f20950d7de2ecc^{commit} 97d6e2b636c6e07b99965f3db9f20950d7de2ecc already have revision, skipping fetch # git checkout -q -f -B kisskb 97d6e2b636c6e07b99965f3db9f20950d7de2ecc # git clean -qxdf # git log -1 commit 97d6e2b636c6e07b99965f3db9f20950d7de2ecc Merge: 7558009 0fd972a Author: Linus Torvalds Date: Wed Jul 15 11:16:35 2015 -0700 Merge tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux Pull final init.h/module.h code relocation from Paul Gortmaker: "With the release of 4.2-rc2 done, we should not be seeing any new code added that gets upset by this small code move, and we've banked yet another complete week of testing with this move in place on top of 4.2-rc1 via linux-next to ensure that remained true. Given that, I'd like to put it in now so that people formulating new work for 4.3-rc1 will be exposed to the ever so slightly stricter (but sensible) requirements wrt. whether they are needing init.h vs. module.h macros, even if they are not using linux-next. The diffstat of the move is slightly asymmetrical due to needing to leave behind a couple #ifdef in the old location and add the same ones to the new location, but other than that, it is a 1:1 move, complete with the module_init/exit trailing semicolon that we can't fix. That is, until/unless someone does a tree-wide sed fix of all the approximately 800 currently in tree users relying on it" * tag 'module-final-v4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: module: relocate module_init from init.h to module.h # < /opt/cross/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 97d6e2b636c6e07b99965f3db9f20950d7de2ecc # < make -j 240 ARCH=powerpc O=/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- allnoconfig # make -j 240 ARCH=powerpc O=/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc CROSS_COMPILE=/opt/cross/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- make[1]: Entering directory `/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig make[1]: Leaving directory `/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc' make[1]: Entering directory `/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc' CHK include/config/kernel.release GEN ./Makefile WRAP arch/powerpc/include/generated/asm/clkdev.h WRAP arch/powerpc/include/generated/asm/div64.h WRAP arch/powerpc/include/generated/asm/irq_regs.h WRAP arch/powerpc/include/generated/asm/irq_work.h WRAP arch/powerpc/include/generated/asm/local64.h WRAP arch/powerpc/include/generated/asm/preempt.h WRAP arch/powerpc/include/generated/asm/mcs_spinlock.h WRAP arch/powerpc/include/generated/asm/rwsem.h WRAP arch/powerpc/include/generated/asm/trace_clock.h WRAP arch/powerpc/include/generated/asm/vtime.h CHK include/generated/uapi/linux/version.h UPD include/generated/uapi/linux/version.h UPD include/config/kernel.release Using /home/kisskb/slave/src as source for kernel CHK include/generated/utsrelease.h UPD include/generated/utsrelease.h HOSTCC scripts/dtc/dtc.o CC scripts/mod/empty.o HOSTCC scripts/dtc/flattree.o HOSTCC scripts/mod/mk_elfconfig CC scripts/mod/devicetable-offsets.s HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/dtc/treesource.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/util.o SHIPPED scripts/dtc/dtc-lexer.lex.c SHIPPED scripts/dtc/dtc-parser.tab.h SHIPPED scripts/dtc/dtc-parser.tab.c HOSTCC scripts/dtc/dtc-parser.tab.o HOSTCC scripts/dtc/dtc-lexer.lex.o CHK include/generated/timeconst.h CC kernel/bounds.s UPD include/generated/timeconst.h GEN scripts/mod/devicetable-offsets.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/powerpc/kernel/asm-offsets.s MKELF scripts/mod/elfconfig.h HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.o HOSTCC scripts/mod/sumversion.o CHK include/generated/asm-offsets.h UPD include/generated/asm-offsets.h CALL /home/kisskb/slave/src/scripts/checksyscalls.sh HOSTLD scripts/dtc/dtc HOSTLD scripts/mod/modpost LD usr/built-in.o CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o CC init/noinitramfs.o CC init/init_task.o CC arch/powerpc/mm/fault.o CC arch/powerpc/mm/mem.o LD arch/powerpc/sysdev/built-in.o CC arch/powerpc/mm/pgtable.o UPD include/generated/compile.h AS arch/powerpc/lib/string.o CC arch/powerpc/mm/mmap.o CC arch/powerpc/mm/init_32.o CC arch/powerpc/lib/alloc.o LD arch/powerpc/platforms/built-in.o AS arch/powerpc/lib/crtsavres.o CC arch/powerpc/mm/pgtable_32.o CC arch/powerpc/lib/ppc_ksyms.o CC arch/powerpc/mm/ppc_mmu_32.o AS arch/powerpc/mm/hash_low_32.o CC arch/powerpc/mm/tlb_hash32.o CC init/version.o CC arch/powerpc/lib/code-patching.o CC arch/powerpc/mm/mmu_context_hash32.o LD arch/powerpc/math-emu/built-in.o CC arch/powerpc/lib/feature-fixups.o CC arch/powerpc/mm/hugetlbpage.o AS arch/powerpc/lib/div64.o AS arch/powerpc/lib/copy_32.o AS arch/powerpc/lib/checksum_32.o CC arch/powerpc/kernel/cputable.o CC arch/powerpc/kernel/ptrace.o LD arch/powerpc/crypto/built-in.o CC arch/powerpc/kernel/syscalls.o CC arch/powerpc/kernel/irq.o CC arch/powerpc/kernel/align.o CC arch/powerpc/kernel/signal_32.o LD arch/powerpc/net/built-in.o CC arch/powerpc/kernel/pmc.o CC arch/powerpc/kernel/vdso.o CC arch/powerpc/kernel/process.o CPP arch/powerpc/kernel/systbl_chk.i CC arch/powerpc/kernel/idle.o CC arch/powerpc/kernel/signal.o CC arch/powerpc/kernel/sysfs.o CC arch/powerpc/kernel/cacheinfo.o CC arch/powerpc/kernel/time.o CC arch/powerpc/kernel/prom.o LD ipc/built-in.o CC arch/powerpc/kernel/traps.o CC arch/powerpc/kernel/setup-common.o CC arch/powerpc/kernel/udbg.o CC security/commoncap.o AS arch/powerpc/kernel/misc.o CC security/min_addr.o CC arch/powerpc/kernel/io.o CC arch/powerpc/kernel/dma.o AS arch/powerpc/kernel/misc_32.o CC arch/powerpc/kernel/of_platform.o CC arch/powerpc/kernel/prom_parse.o AS arch/powerpc/kernel/idle_6xx.o AS arch/powerpc/kernel/l2cr_6xx.o LD crypto/built-in.o AS arch/powerpc/kernel/cpu_setup_6xx.o AS arch/powerpc/kernel/entry_32.o CC arch/powerpc/kernel/pci_32.o CC arch/powerpc/kernel/setup_32.o CC arch/powerpc/kernel/pci-common.o CC arch/powerpc/kernel/pci_of_scan.o CC arch/powerpc/kernel/iomap.o LD block/built-in.o AS arch/powerpc/kernel/head_32.o LDS arch/powerpc/kernel/vmlinux.lds AS arch/powerpc/kernel/fpu.o CC kernel/fork.o CALL /home/kisskb/slave/src/arch/powerpc/kernel/systbl_chk.sh CC kernel/exec_domain.o CC mm/filemap.o CC kernel/panic.o CC mm/mempool.o CC kernel/cpu.o LD sound/built-in.o LDS arch/powerpc/kernel/vdso32/vdso32.lds VDSO32A arch/powerpc/kernel/vdso32/sigtramp.o CC mm/maccess.o CC kernel/exit.o CC mm/oom_kill.o AS arch/powerpc/kernel/systbl.o VDSO32A arch/powerpc/kernel/vdso32/gettimeofday.o CC kernel/softirq.o CC mm/page_alloc.o VDSO32A arch/powerpc/kernel/vdso32/datapage.o CC mm/page-writeback.o VDSO32A arch/powerpc/kernel/vdso32/cacheflush.o CC kernel/resource.o VDSO32A arch/powerpc/kernel/vdso32/note.o CC mm/readahead.o CC kernel/sysctl.o CC kernel/sysctl_binary.o CC fs/open.o CC fs/read_write.o LD firmware/built-in.o CC fs/file_table.o CC mm/swap.o CC fs/super.o CC kernel/capability.o CC fs/char_dev.o CC mm/truncate.o CC kernel/ptrace.o CC fs/stat.o CC mm/vmscan.o CC kernel/user.o LD net/built-in.o CC fs/exec.o CC kernel/signal.o CC mm/shmem.o CC fs/pipe.o CC kernel/sys.o CC kernel/kmod.o CC mm/util.o CC mm/mmzone.o CC kernel/workqueue.o CC fs/namei.o CC mm/vmstat.o CC kernel/pid.o CC mm/backing-dev.o CC fs/fcntl.o CC kernel/task_work.o CC mm/mm_init.o CC kernel/extable.o CC fs/ioctl.o CC kernel/params.o CC mm/mmu_context.o VDSO32L arch/powerpc/kernel/vdso32/vdso32.so.dbg CC fs/readdir.o CC kernel/kthread.o CC fs/select.o CC kernel/sys_ni.o CC fs/dcache.o CC fs/inode.o CC mm/slab_common.o CC kernel/nsproxy.o CC fs/attr.o CC mm/compaction.o CC kernel/ksysfs.o CC kernel/notifier.o CC fs/bad_inode.o CC mm/percpu.o OBJCOPY arch/powerpc/kernel/vdso32/vdso32.so CC kernel/cred.o CC fs/file.o CC mm/vmacache.o CC mm/interval_tree.o AS arch/powerpc/kernel/vdso32/vdso32_wrapper.o CC kernel/reboot.o CC kernel/async.o CC mm/list_lru.o CC mm/workingset.o CC fs/filesystems.o CC kernel/range.o CC fs/seq_file.o CC kernel/smpboot.o CC fs/namespace.o CC mm/debug.o CC mm/gup.o CC fs/xattr.o CC mm/highmem.o LD kernel/livepatch/built-in.o CC kernel/dma.o CC fs/fs-writeback.o CC fs/libfs.o CC mm/memory.o LD arch/powerpc/lib/built-in.o CC kernel/power/qos.o CC mm/mincore.o CC kernel/locking/mutex.o CC fs/pnode.o CC kernel/locking/semaphore.o CC kernel/rcu/update.o CC kernel/rcu/tiny.o CC mm/mlock.o CC kernel/printk/printk.o CC fs/splice.o CC kernel/up.o CC kernel/locking/rwsem.o CC mm/mmap.o CC fs/sync.o CC kernel/elfcore.o CC kernel/locking/rwsem-xadd.o CC mm/mprotect.o CC fs/utimes.o LD arch/powerpc/kernel/vdso32/built-in.o CC fs/stack.o CC mm/mremap.o CC fs/fs_struct.o CC mm/msync.o CC fs/statfs.o CC kernel/irq/irqdesc.o CC mm/rmap.o CC kernel/irq/handle.o CC fs/fs_pin.o CC kernel/irq/manage.o CC mm/vmalloc.o CC fs/nsfs.o CC kernel/sched/core.o CC kernel/irq/spurious.o CC fs/no-block.o CC kernel/sched/loadavg.o CC mm/pagewalk.o CC kernel/sched/clock.o CC kernel/irq/resend.o CC mm/pgtable-generic.o CC kernel/irq/chip.o CC lib/lockref.o CC lib/bcd.o LD fs/devpts/built-in.o CC mm/init-mm.o CC kernel/sched/cputime.o CC mm/nobootmem.o LD fs/exofs/built-in.o CC lib/div64.o CC kernel/irq/dummychip.o CC kernel/time/time.o CC mm/memblock.o CC lib/sort.o LD fs/quota/built-in.o CC kernel/sched/idle_task.o CC fs/binfmt_elf.o CC kernel/irq/devres.o CC kernel/sched/fair.o CC kernel/time/timer.o CC lib/parser.o CC mm/dmapool.o CC mm/slub.o CC kernel/irq/irqdomain.o CC kernel/sched/rt.o CC kernel/time/hrtimer.o CC kernel/sched/deadline.o CC lib/halfmd4.o CC kernel/time/itimer.o CC kernel/sched/stop_task.o CC lib/debug_locks.o CC lib/random32.o CC kernel/sched/wait.o CC fs/ramfs/inode.o CC kernel/time/posix-timers.o CC fs/ramfs/file-mmu.o CC kernel/time/posix-cpu-timers.o CC lib/bust_spinlocks.o CC kernel/sched/completion.o CC lib/kasprintf.o CC kernel/time/timekeeping.o CC kernel/sched/idle.o CC kernel/time/ntp.o LD fs/notify/fanotify/built-in.o CC kernel/time/clocksource.o CC lib/bitmap.o LD fs/notify/dnotify/built-in.o LD drivers/amba/built-in.o LD drivers/auxdisplay/built-in.o LD fs/notify/inotify/built-in.o CC kernel/time/jiffies.o CC lib/scatterlist.o LD drivers/bus/built-in.o LD drivers/block/built-in.o CC kernel/time/timer_list.o LD drivers/cdrom/built-in.o CC lib/gcd.o LD drivers/clocksource/built-in.o LD drivers/clk/built-in.o CC kernel/time/timeconv.o LD drivers/firewire/built-in.o LD fs/notify/built-in.o CC kernel/time/timecounter.o CC lib/lcm.o CC kernel/time/posix-clock.o CC lib/list_sort.o CC kernel/time/alarmtimer.o LD drivers/gpio/built-in.o CC lib/uuid.o CC kernel/time/clockevents.o LD drivers/idle/built-in.o CC lib/flex_array.o CC kernel/time/tick-common.o CC lib/iov_iter.o CC drivers/char/mem.o LD drivers/macintosh/built-in.o LD drivers/leds/built-in.o CC drivers/char/random.o CC drivers/irqchip/irqchip.o LD drivers/mfd/built-in.o LD drivers/gpu/vga/built-in.o LD drivers/lguest/built-in.o CC drivers/char/misc.o CC lib/clz_ctz.o LD drivers/mmc/built-in.o LD drivers/net/built-in.o LD drivers/hsi/controllers/built-in.o CC lib/bsearch.o LD drivers/nfc/built-in.o LD arch/powerpc/mm/built-in.o LD drivers/platform/built-in.o LD drivers/firmware/broadcom/built-in.o LD drivers/char/agp/built-in.o LD drivers/hsi/clients/built-in.o CC lib/llist.o LD drivers/soc/built-in.o CC lib/find_bit.o LD drivers/pwm/built-in.o CC lib/memweight.o CC lib/kfifo.o LD drivers/i2c/algos/built-in.o LD drivers/i2c/busses/built-in.o CC lib/percpu_ida.o CC lib/percpu-refcount.o LD drivers/hsi/built-in.o LD drivers/firmware/built-in.o LD drivers/i2c/muxes/built-in.o CC lib/rhashtable.o LD drivers/misc/eeprom/built-in.o LD drivers/gpu/drm/bridge/built-in.o LD drivers/usb/host/built-in.o LD drivers/gpu/drm/i2c/built-in.o LD drivers/gpu/drm/panel/built-in.o CC lib/reciprocal_div.o LD drivers/misc/cb710/built-in.o LD drivers/pinctrl/freescale/built-in.o LD drivers/pinctrl/nomadik/built-in.o LD drivers/i2c/built-in.o CC lib/string_helpers.o LD drivers/misc/ti-st/built-in.o LD drivers/misc/lis3lv02d/built-in.o LD drivers/tty/ipwireless/built-in.o LD drivers/gpu/drm/tilcdc/built-in.o CC lib/hexdump.o CC drivers/of/base.o LD drivers/tty/serial/built-in.o LD drivers/usb/built-in.o CC lib/kstrtox.o LD drivers/video/backlight/built-in.o LD drivers/pinctrl/built-in.o CC drivers/of/device.o CC drivers/base/component.o CC lib/pci_iomap.o CC drivers/of/platform.o CC drivers/base/core.o LD drivers/misc/mic/bus/built-in.o LD drivers/gpu/drm/built-in.o CC lib/iomap_copy.o LD drivers/tty/vt/built-in.o CC lib/devres.o CC drivers/of/fdt.o CC drivers/base/bus.o CC drivers/base/dd.o CC lib/hweight.o LD drivers/tty/built-in.o CC drivers/of/fdt_address.o CC lib/bitrev.o CC drivers/of/address.o CC drivers/base/syscore.o LD drivers/misc/mic/built-in.o HOSTCC lib/gen_crc32table LD drivers/media/firewire/built-in.o CC drivers/base/driver.o CC drivers/video/fbdev/core/fb_notify.o CC drivers/base/class.o CC lib/syscall.o CC drivers/of/irq.o CC drivers/of/of_pci.o CC drivers/base/platform.o LD drivers/media/tuners/built-in.o CC drivers/pci/access.o CC drivers/pci/bus.o CC lib/atomic64.o LD drivers/misc/built-in.o LD drivers/gpu/built-in.o CC drivers/of/of_pci_irq.o CC drivers/base/cpu.o LD drivers/video/fbdev/omap2/displays-new/built-in.o CC drivers/pci/probe.o CC lib/strncpy_from_user.o LD drivers/media/mmc/siano/built-in.o CC drivers/of/of_reserved_mem.o CC drivers/pci/host-bridge.o CC lib/strnlen_user.o LD drivers/media/platform/omap/built-in.o CC drivers/base/firmware.o LD drivers/video/fbdev/omap2/dss/built-in.o CC lib/argv_split.o LD drivers/media/i2c/soc_camera/built-in.o CC drivers/pci/remove.o LD drivers/media/rc/keymaps/built-in.o CC drivers/base/init.o LD drivers/media/mmc/built-in.o CC drivers/pci/pci.o CC lib/cmdline.o LD drivers/media/common/b2c2/built-in.o LD drivers/media/common/saa7146/built-in.o CC drivers/base/map.o LD drivers/media/platform/built-in.o LD drivers/media/common/siano/built-in.o CC drivers/pci/pci-driver.o CC lib/ctype.o LD drivers/media/i2c/built-in.o CC lib/dec_and_lock.o CC drivers/base/devres.o LD drivers/video/fbdev/omap2/built-in.o CC lib/decompress.o CC drivers/pci/search.o LD drivers/media/rc/built-in.o CC drivers/base/attribute_container.o CC lib/dump_stack.o CC drivers/pci/pci-sysfs.o LD drivers/media/common/built-in.o CC drivers/base/transport_class.o CC lib/earlycpio.o CC drivers/base/topology.o CC drivers/pci/rom.o CC drivers/base/container.o CC lib/extable.o CC drivers/base/property.o CC drivers/pci/setup-res.o CC drivers/base/cacheinfo.o CC drivers/pci/irq.o CC lib/fdt.o CC drivers/base/dma-mapping.o CC lib/fdt_empty_tree.o CC drivers/pci/vpd.o LD drivers/base/power/built-in.o CC drivers/pci/setup-bus.o CC lib/fdt_ro.o CC drivers/pci/vc.o LD drivers/irqchip/built-in.o CC lib/fdt_rw.o CC drivers/pci/syscall.o CC drivers/pci/of.o CC lib/fdt_strerror.o CC lib/fdt_sw.o CC lib/fdt_wip.o LD drivers/pci/host/built-in.o CC lib/flex_proportions.o LD drivers/media/pci/b2c2/built-in.o LD drivers/media/usb/dvb-usb-v2/built-in.o LD drivers/media/usb/dvb-usb/built-in.o LD drivers/media/usb/b2c2/built-in.o CC lib/idr.o LD drivers/media/usb/s2255/built-in.o LD drivers/media/pci/ddbridge/built-in.o CC lib/int_sqrt.o CC lib/ioremap.o LD drivers/media/pci/dm1105/built-in.o LD drivers/media/usb/stkwebcam/built-in.o LD drivers/media/pci/pt1/built-in.o LD drivers/media/usb/siano/built-in.o LD drivers/media/pci/mantis/built-in.o LD drivers/media/pci/saa7146/built-in.o CC lib/irq_regs.o LD drivers/media/pci/ttpci/built-in.o LD drivers/media/usb/ttusb-budget/built-in.o LD drivers/media/pci/pluto2/built-in.o CC lib/is_single_threaded.o LD drivers/media/pci/pt3/built-in.o LD drivers/media/pci/ngene/built-in.o LD drivers/media/usb/zr364xx/built-in.o LD drivers/media/pci/smipcie/built-in.o LD drivers/media/usb/ttusb-dec/built-in.o CC lib/klist.o CC lib/kobject.o CC lib/kobject_uevent.o LD drivers/media/usb/built-in.o LD drivers/media/pci/built-in.o CC lib/md5.o CC lib/plist.o CC lib/proportions.o CC lib/radix-tree.o CC lib/ratelimit.o CC lib/rbtree.o CC lib/seq_buf.o CC lib/sha1.o CC lib/show_mem.o CC lib/string.o CC lib/timerqueue.o LD kernel/rcu/built-in.o LD init/mounts.o CC lib/vsprintf.o GEN lib/crc32table.h LD security/built-in.o LD init/built-in.o LD drivers/media/built-in.o CC lib/crc32.o LD kernel/locking/built-in.o LD drivers/video/fbdev/core/built-in.o LD drivers/video/fbdev/built-in.o LD kernel/power/built-in.o LD drivers/video/built-in.o LD fs/ramfs/ramfs.o LD fs/ramfs/built-in.o LD kernel/printk/built-in.o LD arch/powerpc/kernel/built-in.o LD kernel/irq/built-in.o LD drivers/char/built-in.o LD drivers/of/built-in.o LD drivers/base/built-in.o LD kernel/time/built-in.o LD lib/built-in.o LD kernel/sched/built-in.o LD kernel/built-in.o LD drivers/pci/built-in.o LD drivers/built-in.o AR lib/lib.a LD mm/built-in.o LD fs/built-in.o LINK vmlinux LD vmlinux.o MODPOST vmlinux.o GEN .version CHK include/generated/compile.h UPD include/generated/compile.h CC init/version.o LD init/built-in.o LD vmlinux SYSMAP System.map /opt/cross/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-strip -s -R .comment vmlinux -o arch/powerpc/boot/vmlinux.strip make[1]: Leaving directory `/home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc' Completed OK # rm -rf /home/kisskb/slave/build/linus_powerpc-allnoconfig_powerpc # Build took: 0:00:21.035982