Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

um: move asm-offsets generation into a single file

There's nothing subarch dependent here, and it's odd
that includes need to be done in the subarch, and then
entries defined in the common file.

Simplify the whole thing from three files into one.

Link: https://patch.msgid.link/20251007071452.367989-4-johannes@sipsolutions.net
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

+43 -49
-30
arch/um/include/shared/common-offsets.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - /* for use by sys-$SUBARCH/kernel-offsets.c */ 3 - 4 - DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE); 5 - 6 - DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); 7 - DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); 8 - DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); 9 - 10 - DEFINE(UM_GFP_KERNEL, GFP_KERNEL); 11 - DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC); 12 - 13 - DEFINE(UM_THREAD_SIZE, THREAD_SIZE); 14 - 15 - DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); 16 - DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC); 17 - 18 - DEFINE(UM_KERN_GDT_ENTRY_TLS_ENTRIES, GDT_ENTRY_TLS_ENTRIES); 19 - 20 - DEFINE(UM_SECCOMP_ARCH_NATIVE, SECCOMP_ARCH_NATIVE); 21 - 22 - DEFINE(HOSTFS_ATTR_MODE, ATTR_MODE); 23 - DEFINE(HOSTFS_ATTR_UID, ATTR_UID); 24 - DEFINE(HOSTFS_ATTR_GID, ATTR_GID); 25 - DEFINE(HOSTFS_ATTR_SIZE, ATTR_SIZE); 26 - DEFINE(HOSTFS_ATTR_ATIME, ATTR_ATIME); 27 - DEFINE(HOSTFS_ATTR_MTIME, ATTR_MTIME); 28 - DEFINE(HOSTFS_ATTR_CTIME, ATTR_CTIME); 29 - DEFINE(HOSTFS_ATTR_ATIME_SET, ATTR_ATIME_SET); 30 - DEFINE(HOSTFS_ATTR_MTIME_SET, ATTR_MTIME_SET);
+43 -1
arch/um/kernel/asm-offsets.c
··· 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #define COMPILE_OFFSETS 3 + #include <linux/stddef.h> 4 + #include <linux/sched.h> 5 + #include <linux/elf.h> 6 + #include <linux/crypto.h> 7 + #include <linux/kbuild.h> 8 + #include <linux/audit.h> 9 + #include <linux/fs.h> 10 + #include <asm/mman.h> 11 + #include <asm/seccomp.h> 2 12 3 - #include <sysdep/kernel-offsets.h> 13 + /* workaround for a warning with -Wmissing-prototypes */ 14 + void foo(void); 15 + 16 + void foo(void) 17 + { 18 + DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE); 19 + 20 + DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE); 21 + DEFINE(UM_KERN_PAGE_MASK, PAGE_MASK); 22 + DEFINE(UM_KERN_PAGE_SHIFT, PAGE_SHIFT); 23 + 24 + DEFINE(UM_GFP_KERNEL, GFP_KERNEL); 25 + DEFINE(UM_GFP_ATOMIC, GFP_ATOMIC); 26 + 27 + DEFINE(UM_THREAD_SIZE, THREAD_SIZE); 28 + 29 + DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); 30 + DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC); 31 + 32 + DEFINE(UM_KERN_GDT_ENTRY_TLS_ENTRIES, GDT_ENTRY_TLS_ENTRIES); 33 + 34 + DEFINE(UM_SECCOMP_ARCH_NATIVE, SECCOMP_ARCH_NATIVE); 35 + 36 + DEFINE(HOSTFS_ATTR_MODE, ATTR_MODE); 37 + DEFINE(HOSTFS_ATTR_UID, ATTR_UID); 38 + DEFINE(HOSTFS_ATTR_GID, ATTR_GID); 39 + DEFINE(HOSTFS_ATTR_SIZE, ATTR_SIZE); 40 + DEFINE(HOSTFS_ATTR_ATIME, ATTR_ATIME); 41 + DEFINE(HOSTFS_ATTR_MTIME, ATTR_MTIME); 42 + DEFINE(HOSTFS_ATTR_CTIME, ATTR_CTIME); 43 + DEFINE(HOSTFS_ATTR_ATIME_SET, ATTR_ATIME_SET); 44 + DEFINE(HOSTFS_ATTR_MTIME_SET, ATTR_MTIME_SET); 45 + }
-18
arch/x86/um/shared/sysdep/kernel-offsets.h
··· 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 - #include <linux/stddef.h> 3 - #include <linux/sched.h> 4 - #include <linux/elf.h> 5 - #include <linux/crypto.h> 6 - #include <linux/kbuild.h> 7 - #include <linux/audit.h> 8 - #include <linux/fs.h> 9 - #include <asm/mman.h> 10 - #include <asm/seccomp.h> 11 - 12 - /* workaround for a warning with -Wmissing-prototypes */ 13 - void foo(void); 14 - 15 - void foo(void) 16 - { 17 - #include <common-offsets.h> 18 - }