# git rev-parse -q --verify b923f1247b72fc100b87792fd2129d026bb10e66^{commit} b923f1247b72fc100b87792fd2129d026bb10e66 already have revision, skipping fetch # git checkout -q -f -B kisskb b923f1247b72fc100b87792fd2129d026bb10e66 # git clean -qxdf # < git log -1 # commit b923f1247b72fc100b87792fd2129d026bb10e66 # Merge: b6b178e38f40 b0294f30256b # Author: Linus Torvalds # Date: Fri Aug 14 14:26:08 2020 -0700 # # Merge tag 'timers-urgent-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip # # Pull timekeeping updates from Thomas Gleixner: # "A set of timekeeping/VDSO updates: # # - Preparatory work to allow S390 to switch over to the generic VDSO # implementation. # # S390 requires that the VDSO data pointer is handed in to the # counter read function when time namespace support is enabled. # Adding the pointer is a NOOP for all other architectures because # the compiler is supposed to optimize that out when it is unused in # the architecture specific inline. The change also solved a similar # problem for MIPS which fortunately has time namespaces not yet # enabled. # # S390 needs to update clock related VDSO data independent of the # timekeeping updates. This was solved so far with yet another # sequence counter in the S390 implementation. A better solution is # to utilize the already existing VDSO sequence count for this. The # core code now exposes helper functions which allow to serialize # against the timekeeper code and against concurrent readers. # # S390 needs extra data for their clock readout function. The initial # common VDSO data structure did not provide a way to add that. It # now has an embedded architecture specific struct embedded which # defaults to an empty struct. # # Doing this now avoids tree dependencies and conflicts post rc1 and # allows all other architectures which work on generic VDSO support # to work from a common upstream base. # # - A trivial comment fix" # # * tag 'timers-urgent-2020-08-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: # time: Delete repeated words in comments # lib/vdso: Allow to add architecture-specific vdso data # timekeeping/vsyscall: Provide vdso_update_begin/end() # vdso/treewide: Add vdso_data pointer argument to __arch_get_hw_counter() # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux-ld --version # < git log --format=%s --max-count=1 b923f1247b72fc100b87792fd2129d026bb10e66 # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- mpc85xx_defconfig # < make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- help # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- olddefconfig # make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- In file included from /kisskb/src/include/linux/kernel.h:11:0, from /kisskb/src/include/linux/list.h:9, from /kisskb/src/include/linux/module.h:12, from /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:15: /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c: In function 'allocate_bd': /kisskb/src/include/linux/err.h:22:49: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) ^ /kisskb/src/include/linux/compiler.h:78:42: note: in definition of macro 'unlikely' # define unlikely(x) __builtin_expect(!!(x), 0) ^ /kisskb/src/drivers/net/ethernet/freescale/fs_enet/mac-scc.c:139:6: note: in expansion of macro 'IS_ERR_VALUE' if (IS_ERR_VALUE(fep->ring_mem_addr)) ^ cc1: fatal error: opening output file arch/powerpc/boot/dts/fsl/.mpc8540ads.dtb.dts.tmp: No such file or directory compilation terminated. make[2]: *** [scripts/Makefile.lib:326: arch/powerpc/boot/dts/fsl/mpc8540ads.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [arch/powerpc/Makefile:295: zImage] Error 2 make[1]: *** Waiting for unfinished jobs.... make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 24 ARCH=powerpc O=/kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-4.9.4-nolibc/powerpc64-linux/bin/powerpc64-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mpc85xx_defconfig_powerpc-gcc4.9 # Build took: 0:02:30.221015