Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bbcce5d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timers and timekeeping updates from Thomas Gleixner:

 - Core infrastucture work for Y2038 to address the COMPAT interfaces:

     + Add a new Y2038 safe __kernel_timespec and use it in the core
       code

     + Introduce config switches which allow to control the various
       compat mechanisms

     + Use the new config switch in the posix timer code to control the
       32bit compat syscall implementation.

 - Prevent bogus selection of CPU local clocksources which causes an
   endless reselection loop

 - Remove the extra kthread in the clocksource code which has no value
   and just adds another level of indirection

 - The usual bunch of trivial updates, cleanups and fixlets all over the
   place

 - More SPDX conversions

* 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
  clocksource/drivers/mxs_timer: Switch to SPDX identifier
  clocksource/drivers/timer-imx-tpm: Switch to SPDX identifier
  clocksource/drivers/timer-imx-gpt: Switch to SPDX identifier
  clocksource/drivers/timer-imx-gpt: Remove outdated file path
  clocksource/drivers/arc_timer: Add comments about locking while read GFRC
  clocksource/drivers/mips-gic-timer: Add pr_fmt and reword pr_* messages
  clocksource/drivers/sprd: Fix Kconfig dependency
  clocksource: Move inline keyword to the beginning of function declarations
  timer_list: Remove unused function pointer typedef
  timers: Adjust a kernel-doc comment
  tick: Prefer a lower rating device only if it's CPU local device
  clocksource: Remove kthread
  time: Change nanosleep to safe __kernel_* types
  time: Change types to new y2038 safe __kernel_* types
  time: Fix get_timespec64() for y2038 safe compat interfaces
  time: Add new y2038 safe __kernel_timespec
  posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME
  time: Introduce CONFIG_COMPAT_32BIT_TIME
  time: Introduce CONFIG_64BIT_TIME in architectures
  compat: Enable compat_get/put_timespec64 always
  ...
parents 0ef283d4 e45e778f

arch/Kconfig

+15 −0
Original line number Diff line number Diff line
@@ -871,6 +871,21 @@ config OLD_SIGACTION 
config COMPAT_OLD_SIGACTION

	bool



config 64BIT_TIME

	def_bool ARCH_HAS_64BIT_TIME

	help

	  This should be selected by all architectures that need to support

	  new system calls with a 64-bit time_t. This is relevant on all 32-bit

	  architectures, and 64-bit architectures as part of compat syscall

	  handling.



config COMPAT_32BIT_TIME

	def_bool (!64BIT && 64BIT_TIME) || COMPAT

	help

	  This enables 32 bit time_t support in addition to 64 bit time_t support.

	  This is relevant on all 32-bit architectures, and 64-bit architectures

	  as part of compat syscall handling.



config ARCH_NO_COHERENT_DMA_MMAP

	bool

arch/alpha/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0





generic-y += compat.h

generic-y += exec.h

generic-y += export.h

generic-y += fb.h

arch/arc/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += bugs.h

generic-y += compat.h

generic-y += device.h

generic-y += div64.h

generic-y += dma-mapping.h

arch/arm/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line 
generic-y += compat.h

generic-y += current.h

generic-y += early_ioremap.h

generic-y += emergency-restart.h

arch/arm64/include/asm/compat.h

+0 −11
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 


typedef u32		compat_size_t;

typedef s32		compat_ssize_t;

typedef s32		compat_time_t;

typedef s32		compat_clock_t;

typedef s32		compat_pid_t;

typedef u16		__compat_uid_t;
@@ -66,16 +65,6 @@ typedef u32 compat_ulong_t; 
typedef u64		compat_u64;

typedef u32		compat_uptr_t;



struct compat_timespec {

	compat_time_t	tv_sec;

	s32		tv_nsec;

};



struct compat_timeval {

	compat_time_t	tv_sec;

	s32		tv_usec;

};



struct compat_stat {

#ifdef __AARCH64EB__

	short		st_dev;