diff options
| author | Alexei Starovoitov <ast@kernel.org> | 2025-10-11 18:27:47 -0700 |
|---|---|---|
| committer | Alexei Starovoitov <ast@kernel.org> | 2025-10-11 18:27:47 -0700 |
| commit | 39e9d5f63075f4d54e3b59b8238478c32af92755 (patch) | |
| tree | 98546f7b1170336f4e8ce01b320eccec0ed2de1c /include/linux/init.h | |
| parent | 4c97c4b149a019a3b318dc6ea3dc96efe0ee1f39 (diff) | |
| parent | 67029a49db6c1f21106a1b5fcdd0ea234a6e0711 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf before 6.18-rc1
Cross-merge BPF and other fixes after downstream PR.
No conflicts.
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index a60d32d227ee..17c1bc712e23 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -7,13 +7,6 @@ #include <linux/stringify.h> #include <linux/types.h> -/* Built-in __init functions needn't be compiled with retpoline */ -#if defined(__noretpoline) && !defined(MODULE) -#define __noinitretpoline __noretpoline -#else -#define __noinitretpoline -#endif - /* These macros are used to mark some functions or * initialized data (doesn't apply to uninitialized data) * as `initialization' functions. The kernel can take this @@ -50,7 +43,6 @@ /* These are for everybody (although not all archs will actually discard it in modules) */ #define __init __section(".init.text") __cold __latent_entropy \ - __noinitretpoline \ __no_kstack_erase #define __initdata __section(".init.data") #define __initconst __section(".init.rodata") |