# git rev-parse -q --verify fc2b63a9f49581ffe8ca27a0b0e2205f76ebc31c^{commit} fc2b63a9f49581ffe8ca27a0b0e2205f76ebc31c already have revision, skipping fetch # git checkout -q -f -B kisskb fc2b63a9f49581ffe8ca27a0b0e2205f76ebc31c # git clean -qxdf # git log -1 commit fc2b63a9f49581ffe8ca27a0b0e2205f76ebc31c Author: Benjamin Herrenschmidt Date: Mon Jun 27 21:29:36 2016 +1000 powerpc: Merge 32-bit and 64-bit setup_arch() There is little enough differences now. Use a few __weak stubs for functions that may not be around in order to avoid too many ifdefs. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Michael Ellerman # < /opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux-gcc --version # < git log --format=%s --max-count=1 fc2b63a9f49581ffe8ca27a0b0e2205f76ebc31c # < make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- 40x/makalu_defconfig # make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- make[1]: Entering directory '/home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc' GEN ./Makefile scripts/kconfig/conf --silentoldconfig Kconfig 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/mcs_spinlock.h WRAP arch/powerpc/include/generated/asm/preempt.h WRAP arch/powerpc/include/generated/asm/rwsem.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 HOSTCC scripts/dtc/flattree.o HOSTCC scripts/dtc/fstree.o HOSTCC scripts/dtc/data.o HOSTCC scripts/dtc/livetree.o HOSTCC scripts/kallsyms HOSTCC scripts/dtc/treesource.o CC scripts/mod/empty.o HOSTCC scripts/dtc/srcpos.o HOSTCC scripts/mod/mk_elfconfig HOSTCC scripts/dtc/checks.o HOSTCC scripts/dtc/util.o CC scripts/mod/devicetable-offsets.s MKELF scripts/mod/elfconfig.h GEN scripts/mod/devicetable-offsets.h HOSTCC scripts/mod/sumversion.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-lexer.lex.o HOSTCC scripts/dtc/dtc-parser.tab.o CHK include/generated/timeconst.h CC kernel/bounds.s UPD include/generated/timeconst.h CHK include/generated/bounds.h UPD include/generated/bounds.h CC arch/powerpc/kernel/asm-offsets.s HOSTCC scripts/mod/modpost.o HOSTCC scripts/mod/file2alias.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 HOSTCC usr/gen_init_cpio CC init/main.o CHK include/generated/compile.h CC init/do_mounts.o CC init/do_mounts_rd.o CC init/do_mounts_initrd.o CC init/initramfs.o CC arch/powerpc/mm/fault.o UPD include/generated/compile.h AS arch/powerpc/lib/string.o CC arch/powerpc/mm/mem.o CC arch/powerpc/kernel/cputable.o CC arch/powerpc/lib/alloc.o GEN usr/initramfs_data.cpio.gz AS arch/powerpc/lib/crtsavres.o CC arch/powerpc/kernel/ptrace.o CC arch/powerpc/lib/ppc_ksyms.o AS usr/initramfs_data.o LD usr/built-in.o CC arch/powerpc/mm/pgtable.o CC init/init_task.o CC arch/powerpc/mm/mmap.o CC arch/powerpc/lib/code-patching.o CC arch/powerpc/mm/init_32.o CC arch/powerpc/mm/pgtable_32.o CC arch/powerpc/mm/mmu_context_nohash.o CC arch/powerpc/kernel/syscalls.o CC arch/powerpc/mm/tlb_nohash.o AS arch/powerpc/sysdev/dcr-low.o CC arch/powerpc/lib/feature-fixups.o CC arch/powerpc/kernel/irq.o CC arch/powerpc/sysdev/indirect_pci.o CC init/version.o AS arch/powerpc/mm/tlb_nohash_low.o LD init/mounts.o CC arch/powerpc/kernel/align.o AS arch/powerpc/lib/div64.o CC arch/powerpc/mm/40x_mmu.o CC arch/powerpc/kernel/signal_32.o AS arch/powerpc/lib/copy_32.o AS arch/powerpc/lib/checksum_32.o CC arch/powerpc/lib/checksum_wrappers.o CC arch/powerpc/sysdev/uic.o LD init/built-in.o CC arch/powerpc/platforms/40x/ppc40x_simple.o CC arch/powerpc/kernel/pmc.o CC arch/powerpc/kernel/vdso.o CC arch/powerpc/kernel/process.o CC arch/powerpc/sysdev/ppc4xx_soc.o CPP arch/powerpc/kernel/systbl_chk.i LD arch/powerpc/lib/built-in.o CC arch/powerpc/kernel/idle.o LD arch/powerpc/math-emu/built-in.o CC arch/powerpc/kernel/signal.o CC arch/powerpc/mm/hugetlbpage.o CC arch/powerpc/kernel/sysfs.o CC arch/powerpc/mm/dma-noncoherent.o LD arch/powerpc/platforms/40x/built-in.o LD arch/powerpc/platforms/built-in.o LD arch/powerpc/crypto/built-in.o CC arch/powerpc/kernel/cacheinfo.o LD arch/powerpc/net/built-in.o CC arch/powerpc/sysdev/ppc4xx_pci.o CC kernel/fork.o CC kernel/exec_domain.o CC kernel/panic.o CC arch/powerpc/kernel/time.o CC arch/powerpc/sysdev/ppc4xx_cpm.o CC arch/powerpc/kernel/prom.o CC arch/powerpc/kernel/traps.o LD arch/powerpc/mm/built-in.o CC arch/powerpc/kernel/setup-common.o LD certs/built-in.o CC kernel/cpu.o CC mm/filemap.o CC arch/powerpc/kernel/udbg.o AS arch/powerpc/kernel/misc.o CC arch/powerpc/kernel/io.o CC arch/powerpc/kernel/dma.o AS arch/powerpc/kernel/misc_32.o In file included from /home/kisskb/slave/src/arch/powerpc/include/asm/kvm_ppc.h:35:0, from /home/kisskb/slave/src/arch/powerpc/kernel/setup-common.c:66: /home/kisskb/slave/src/arch/powerpc/include/asm/kvm_booke.h: In function 'kvmppc_get_fault_dar': /home/kisskb/slave/src/arch/powerpc/include/asm/kvm_booke.h:105:19: error: 'struct kvm_vcpu_arch' has no member named 'fault_dear' CC arch/powerpc/kernel/of_platform.o /home/kisskb/slave/src/scripts/Makefile.build:289: recipe for target 'arch/powerpc/kernel/setup-common.o' failed make[2]: *** [arch/powerpc/kernel/setup-common.o] Error 1 make[2]: *** Waiting for unfinished jobs.... CC arch/powerpc/sysdev/dcr.o CC kernel/exit.o CC kernel/softirq.o CC kernel/resource.o CC kernel/sysctl.o LD arch/powerpc/sysdev/built-in.o CC mm/mempool.o CC fs/open.o CC fs/read_write.o /home/kisskb/slave/src/Makefile:985: recipe for target 'arch/powerpc/kernel' failed make[1]: *** [arch/powerpc/kernel] Error 2 make[1]: *** Waiting for unfinished jobs.... CC fs/file_table.o CC fs/super.o CC fs/char_dev.o CC kernel/sysctl_binary.o CC fs/stat.o CC fs/exec.o CC mm/oom_kill.o CC mm/maccess.o CC mm/page_alloc.o CC kernel/capability.o CC kernel/ptrace.o CC mm/page-writeback.o CC kernel/user.o CC fs/pipe.o CC mm/readahead.o CC kernel/signal.o CC kernel/sys.o CC kernel/kmod.o CC mm/swap.o CC kernel/workqueue.o CC kernel/pid.o CC kernel/task_work.o CC fs/namei.o CC mm/truncate.o CC kernel/extable.o CC kernel/params.o CC mm/vmscan.o CC fs/fcntl.o CC fs/ioctl.o CC fs/readdir.o CC mm/shmem.o CC mm/util.o /home/kisskb/slave/src/mm/page_alloc.c: In function 'free_area_init_node': /home/kisskb/slave/src/mm/page_alloc.c:5798:17: warning: 'zone_start_pfn' may be used uninitialized in this function [-Wuninitialized] CC kernel/kthread.o CC fs/select.o CC mm/mmzone.o CC kernel/sys_ni.o CC kernel/nsproxy.o CC kernel/notifier.o CC kernel/ksysfs.o CC fs/dcache.o CC fs/inode.o CC mm/vmstat.o CC mm/backing-dev.o CC mm/mm_init.o CC kernel/cred.o CC mm/mmu_context.o CC kernel/reboot.o CC kernel/async.o CC kernel/range.o CC mm/percpu.o CC mm/slab_common.o CC mm/compaction.o CC kernel/smpboot.o CC mm/vmacache.o CC mm/interval_tree.o CC mm/list_lru.o CC fs/attr.o CC kernel/groups.o CC mm/workingset.o CC kernel/bpf/core.o CC mm/debug.o CC kernel/irq/irqdesc.o CC kernel/irq/handle.o CC kernel/irq/manage.o CC fs/bad_inode.o CC mm/gup.o LD kernel/livepatch/built-in.o CC kernel/locking/mutex.o CC fs/file.o CC kernel/locking/semaphore.o CC kernel/locking/rwsem.o CC kernel/locking/percpu-rwsem.o CC fs/filesystems.o CC kernel/irq/spurious.o CC kernel/locking/rtmutex.o CC kernel/locking/rwsem-xadd.o CC kernel/irq/resend.o CC kernel/irq/chip.o CC kernel/irq/dummychip.o CC kernel/irq/devres.o CC fs/namespace.o CC mm/highmem.o CC kernel/irq/irqdomain.o CC fs/seq_file.o LD kernel/bpf/built-in.o CC kernel/power/qos.o CC kernel/irq/proc.o CC kernel/irq/pm.o CC mm/memory.o LD kernel/locking/built-in.o CC kernel/printk/printk.o CC kernel/power/main.o CC mm/mincore.o CC kernel/rcu/update.o CC kernel/sched/core.o LD kernel/irq/built-in.o CC kernel/power/process.o CC kernel/power/suspend.o CC kernel/rcu/sync.o CC kernel/power/poweroff.o CC kernel/rcu/srcu.o CC kernel/rcu/tiny.o CC fs/xattr.o CC kernel/time/time.o CC fs/libfs.o CC fs/fs-writeback.o LD kernel/power/built-in.o CC fs/pnode.o LD kernel/rcu/built-in.o CC kernel/freezer.o CC fs/splice.o CC fs/sync.o LD kernel/printk/built-in.o CC fs/utimes.o CC kernel/futex.o CC kernel/dma.o CC kernel/time/timer.o CC mm/mlock.o CC kernel/up.o CC kernel/module.o CC kernel/time/hrtimer.o CC kernel/time/itimer.o CC fs/stack.o CC kernel/sched/loadavg.o CC fs/fs_struct.o CC fs/statfs.o CC kernel/time/posix-timers.o CC kernel/sched/clock.o CC mm/mmap.o CC mm/mprotect.o CC mm/mremap.o CC fs/fs_pin.o CC kernel/sched/cputime.o CC fs/nsfs.o CC kernel/time/posix-cpu-timers.o CC fs/buffer.o CC fs/block_dev.o CC fs/direct-io.o CC fs/mpage.o CC kernel/sched/idle_task.o CC kernel/sched/fair.o CC kernel/sched/rt.o CC mm/msync.o CC kernel/time/timekeeping.o CC kernel/kallsyms.o CC kernel/sched/deadline.o CC kernel/sched/stop_task.o CC mm/rmap.o CC mm/vmalloc.o CC kernel/sched/wait.o CC mm/pagewalk.o CC kernel/sched/swait.o CC kernel/hung_task.o CC kernel/seccomp.o CC kernel/utsname_sysctl.o CC mm/pgtable-generic.o CC kernel/sched/completion.o CC kernel/elfcore.o CC mm/process_vm_access.o CC kernel/irq_work.o CC kernel/sched/idle.o CC mm/init-mm.o CC mm/nobootmem.o CC kernel/membarrier.o CC kernel/memremap.o CC mm/fadvise.o CC mm/madvise.o CC mm/memblock.o CC mm/page_io.o CC kernel/sched/debug.o CC kernel/time/ntp.o CC mm/swap_state.o CC mm/swapfile.o CC mm/dmapool.o CC fs/proc_namespace.o CC mm/slub.o CC mm/migrate.o CC kernel/time/clocksource.o CC fs/cramfs/inode.o CC fs/debugfs/inode.o CC fs/devpts/inode.o CC kernel/time/jiffies.o CC kernel/time/timer_list.o LD kernel/sched/built-in.o CC fs/cramfs/uncompress.o CC fs/debugfs/file.o CC kernel/time/timeconv.o LD fs/devpts/devpts.o LD fs/devpts/built-in.o LD fs/cramfs/cramfs.o CC kernel/time/timecounter.o LD fs/cramfs/built-in.o LD fs/exofs/built-in.o CC fs/exportfs/expfs.o CC kernel/time/posix-clock.o CC fs/ext2/balloc.o CC kernel/time/alarmtimer.o CC fs/ext2/dir.o CC fs/kernfs/mount.o CC fs/lockd/clntlock.o LD fs/exportfs/exportfs.o LD fs/exportfs/built-in.o CC fs/lockd/clntproc.o CC fs/nfs/client.o LD fs/debugfs/debugfs.o LD fs/debugfs/built-in.o CC fs/lockd/clntxdr.o CC kernel/time/clockevents.o CC kernel/time/tick-common.o CC fs/kernfs/inode.o CC fs/nfs_common/grace.o CC fs/ext2/file.o CC fs/notify/fsnotify.o CC fs/notify/notification.o CC fs/kernfs/dir.o CC kernel/time/timekeeping_debug.o CC fs/ext2/ialloc.o CC fs/ext2/inode.o LD fs/nfs_common/built-in.o CC fs/lockd/host.o LD mm/built-in.o CC fs/notify/group.o LD kernel/time/built-in.o LD kernel/built-in.o CC fs/kernfs/file.o CC fs/proc/task_mmu.o CC fs/proc/inode.o CC fs/kernfs/symlink.o CC fs/nfs/dir.o CC fs/notify/inode_mark.o CC fs/nfs/file.o CC fs/notify/mark.o CC fs/lockd/svc.o CC fs/proc/root.o LD fs/kernfs/built-in.o CC fs/proc/base.o CC fs/proc/generic.o CC fs/proc/array.o CC fs/ext2/ioctl.o CC fs/notify/vfsmount_mark.o CC fs/notify/fdinfo.o CC fs/notify/dnotify/dnotify.o CC fs/ext2/namei.o CC fs/ext2/super.o LD fs/quota/built-in.o CC fs/lockd/svclock.o CC fs/ramfs/inode.o CC fs/sysfs/file.o CC fs/proc/fd.o LD fs/notify/dnotify/built-in.o LD fs/notify/fanotify/built-in.o CC fs/notify/inotify/inotify_fsnotify.o CC fs/proc/proc_tty.o CC fs/ext2/symlink.o CC fs/notify/inotify/inotify_user.o CC fs/nfs/getroot.o CC fs/sysfs/dir.o CC fs/proc/cmdline.o CC fs/ramfs/file-mmu.o CC fs/proc/consoles.o CC fs/proc/cpuinfo.o CC fs/proc/devices.o CC fs/proc/interrupts.o CC fs/sysfs/symlink.o CC fs/eventpoll.o LD fs/ramfs/ramfs.o LD fs/ramfs/built-in.o CC fs/anon_inodes.o CC fs/proc/loadavg.o CC fs/lockd/svcshare.o CC fs/proc/meminfo.o LD fs/ext2/ext2.o LD fs/ext2/built-in.o CC fs/proc/stat.o LD fs/notify/inotify/built-in.o LD fs/notify/built-in.o CC fs/lockd/svcproc.o CC fs/lockd/svcsubs.o CC fs/signalfd.o CC fs/nfs/inode.o CC fs/sysfs/mount.o CC fs/lockd/mon.o CC fs/lockd/xdr.o CC fs/proc/uptime.o CC fs/sysfs/group.o CC fs/timerfd.o CC fs/eventfd.o CC fs/proc/version.o CC fs/aio.o LD fs/sysfs/built-in.o CC fs/locks.o CC fs/lockd/clnt4xdr.o CC fs/lockd/xdr4.o CC fs/lockd/svc4proc.o CC fs/proc/softirqs.o CC fs/proc/namespaces.o CC fs/proc/self.o CC fs/proc/thread_self.o CC fs/proc/proc_sysctl.o CC fs/lockd/procfs.o CC fs/nfs/super.o CC fs/proc/proc_net.o CC fs/nfs/direct.o CC fs/nfs/pagelist.o CC fs/nfs/read.o CC fs/binfmt_script.o CC fs/binfmt_elf.o LD fs/lockd/lockd.o CC fs/coredump.o LD fs/lockd/built-in.o CC fs/drop_caches.o CC fs/fhandle.o CC fs/nfs/symlink.o CC fs/proc/kcore.o CC fs/nfs/unlink.o CC fs/nfs/write.o CC fs/nfs/namespace.o CC fs/nfs/mount_clnt.o CC fs/proc/kmsg.o CC fs/proc/page.o CC fs/nfs/nfstrace.o CC fs/nfs/nfsroot.o CC fs/nfs/sysctl.o CC fs/nfs/nfs2super.o CC fs/nfs/proc.o CC fs/nfs/nfs2xdr.o LD fs/proc/proc.o LD fs/proc/built-in.o CC fs/nfs/nfs3super.o CC fs/nfs/nfs3client.o CC fs/nfs/nfs3proc.o CC fs/nfs/nfs3xdr.o LD fs/nfs/nfsv2.o LD fs/nfs/nfs.o LD fs/nfs/nfsv3.o LD fs/nfs/built-in.o LD fs/built-in.o make[1]: Leaving directory '/home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc' Makefile:150: recipe for target 'sub-make' failed make: *** [sub-make] Error 2 Command 'make -j 10 ARCH=powerpc O=/home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc CROSS_COMPILE=/opt/cross/kisskb/gcc-4.6.3-nolibc/powerpc-linux/bin/powerpc-linux- ' returned non-zero exit status 2 # rm -rf /home/kisskb/slave/build/mpe_40x_makalu_defconfig_powerpc # Build took: 0:00:25.970657