diff options
author | 2024-02-14 10:45:07 +0100 | |
---|---|---|
committer | 2024-02-14 10:45:07 +0100 | |
commit | 03c11eb3b16dc0058589751dfd91f254be2be613 (patch) | |
tree | e5f2889212fec0bb0babdce9abd781ab487e246a /arch/x86/entry/vdso/vdso32-setup.c | |
parent | x86/percpu: Use %RIP-relative address in untagged_addr() (diff) | |
parent | Linux 6.8-rc4 (diff) | |
download | linux-03c11eb3b16dc0058589751dfd91f254be2be613.tar.gz linux-03c11eb3b16dc0058589751dfd91f254be2be613.tar.bz2 linux-03c11eb3b16dc0058589751dfd91f254be2be613.zip |
Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch
Conflicts:
arch/x86/include/asm/percpu.h
arch/x86/include/asm/text-patching.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry/vdso/vdso32-setup.c')
-rw-r--r-- | arch/x86/entry/vdso/vdso32-setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c index f3b3cacbcbb0..76e4e74f35b5 100644 --- a/arch/x86/entry/vdso/vdso32-setup.c +++ b/arch/x86/entry/vdso/vdso32-setup.c @@ -67,7 +67,6 @@ static struct ctl_table abi_table2[] = { .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, - {} }; static __init int ia32_binfmt_init(void) |