diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:12:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-07-28 07:17:38 +0200 |
| commit | 5bf2f5119b9e957f773a22f226974166b58cff32 (patch) | |
| tree | e719f1a52a8c42077cc62ea39da69175d35138c7 /include/linux/module.h | |
| parent | 65f55a30176662ee37fe18b47430ee30b57bfc98 (diff) | |
| parent | 038d61fd642278bab63ee8ef722c50d10ab01e8f (diff) | |
| download | linux-next-5bf2f5119b9e957f773a22f226974166b58cff32.tar.gz linux-next-5bf2f5119b9e957f773a22f226974166b58cff32.zip | |
Merge tag 'v6.16' into x86/cpu, to resolve conflict
Resolve overlapping context conflict between this upstream fix:
d8010d4ba43e ("x86/bugs: Add a Transient Scheduler Attacks mitigation")
And this pending commit in tip:x86/cpu:
65f55a301766 ("x86/CPU/AMD: Add CPUID faulting support")
Conflicts:
arch/x86/kernel/cpu/amd.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 92e1420fccdf..5faa1fb1f4b4 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -586,11 +586,6 @@ struct module { atomic_t refcnt; #endif -#ifdef CONFIG_MITIGATION_ITS - int its_num_pages; - void **its_page_array; -#endif - #ifdef CONFIG_CONSTRUCTORS /* Constructor functions. */ ctor_fn_t *ctors; |