# 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-8.1.0-nolibc/m68k-linux/bin/m68k-linux-gcc --version # < /opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux-ld --version # < git log --format=%s --max-count=1 b923f1247b72fc100b87792fd2129d026bb10e66 # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- sun3_defconfig WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] # < make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- help # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- olddefconfig WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] WARNING: unmet direct dependencies detected for NEED_MULTIPLE_NODES Depends on [n]: DISCONTIGMEM [=n] || NUMA Selected by [y]: - SINGLE_MEMORY_CHUNK [=y] && MMU [=y] # make -s -j 32 ARCH=m68k O=/kisskb/build/linus_sun3_defconfig_m68k-gcc8 CROSS_COMPILE=/opt/cross/kisskb/korg/gcc-8.1.0-nolibc/m68k-linux/bin/m68k-linux- In file included from /kisskb/src/arch/m68k/include/asm/atomic.h:7, from /kisskb/src/include/linux/atomic.h:7, from /kisskb/src/include/linux/cpumask.h:13, from /kisskb/src/include/linux/smp.h:13, from /kisskb/src/include/linux/lockdep.h:14, from /kisskb/src/include/linux/spinlock.h:59, from /kisskb/src/include/linux/wait.h:9, from /kisskb/src/include/linux/wait_bit.h:8, from /kisskb/src/include/linux/fs.h:6, from /kisskb/src/fs/ocfs2/file.c:13: /kisskb/src/fs/ocfs2/file.c: In function 'ocfs2_file_write_iter': /kisskb/src/arch/m68k/include/asm/cmpxchg.h:79:22: warning: value computed is not used [-Wunused-value] #define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr)))) ~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ /kisskb/src/fs/ocfs2/file.c:2419:3: note: in expansion of macro 'xchg' xchg(&iocb->ki_complete, saved_ki_complete); ^~~~ Completed OK # rm -rf /kisskb/build/linus_sun3_defconfig_m68k-gcc8 # Build took: 0:02:13.915206