Commit 104a81337683 for kernel

commit 104a813376837da3b9651457d6fdc99596257fba
Merge: 3b4128b9f374 92e785d887a8
Author: Linus Torvalds <torvalds@linux-foundation.org>
Date:   Tue Aug 18 16:56:25 2026 -0700

    Merge tag 'timers-vdso-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

    Pull VDSO updates from Thomas Gleixner:

     - Consolidate the VDSO datastore further and provide support for
       mlock_all() and prefaulting.

     - Provide 32-bit legacy time related functionality only if
       CONFIG_COMPAT_32BIT_TIME is enabled. The config switch exists,
       but architecture code still exposes the legacy functionality even
       disabled.

       Clean this up by adding the missing guards and validating at build
       time that the VDSO is legacy free if disabled.

     - Consolidate the VDSO related config options in core and drivers,
       which removes some non-sensical dependencies and quite an amount of
       #ifdeffery.

     - Clean up the PAGE_SIZE definition maze

    * tag 'timers-vdso-2026-08-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (30 commits)
      random: vDSO: Drop custom PAGE_SIZE definitions
      LoongArch: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
      clocksource/drivers/timer-riscv: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
      clocksource/drivers/arm_arch_timer: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
      clocksource/drivers/mips-gic-timer: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
      MIPS: csrc-r4k: Remove CONFIG_GENERIC_GETTIMEOFDAY ifdeffery
      vDSO: Make clockmode constants available without CONFIG_GENERIC_GETTIMEOFDAY
      kbuild: Support generated asm-headers in subdirectories
      vdso: Rename HAVE_GENERIC_VDSO to VDSO_DATASTORE
      vdso: Drop HAVE_GENERIC_VDSO from architecture kconfig files
      vdso: Automatically select HAVE_GENERIC_VDSO if necessary
      MIPS: vdso: Stop using CONFIG_HAVE_GENERIC_VDSO
      vdso: Remove the dependency on HAVE_GENERIC_VDSO from ARCH_HAS_VDSO_ARCH_DATA
      futex: Remove dependency on HAVE_GENERIC_VDSO from FUTEX_ROBUST_UNLOCK
      vdso/gettimeofday: Verify COMPAT_32BIT_TIME interactions
      sparc: vdso: Respect COMPAT_32BIT_TIME
      MIPS: VDSO: Respect COMPAT_32BIT_TIME
      powerpc/vdso: Respect COMPAT_32BIT_TIME
      ARM: VDSO: Respect COMPAT_32BIT_TIME
      arm64: vdso32: Respect COMPAT_32BIT_TIME
      ...

diff --cc kernel/time/time.c
index d1a7efd80bf5,f836a31751f4..079ab34f61db
--- a/kernel/time/time.c
+++ b/kernel/time/time.c
@@@ -42,8 -42,13 +42,14 @@@

  #include <generated/timeconst.h>
  #include "timekeeping.h"
 +#include "timekeeping_internal.h"

+ #if defined(CONFIG_64BIT) || defined(CONFIG_COMPAT_32BIT_TIME)
+ #define __WANT_OLD_TIME_TYPE_SYSCALL 1
+ #endif
+
+ static_assert(sizeof(__kernel_old_time_t) == 8 ? IS_ENABLED(__WANT_OLD_TIME_TYPE_SYSCALL) : true);
+
  /*
   * The timezone where the local system is located.  Used as a default by some
   * programs who obtain this value by using gettimeofday.