Skip to content

Commit 589ee62

Browse files
author
Ingo Molnar
committed
sched/headers: Prepare to remove the <linux/mm_types.h> dependency from <linux/sched.h>
Update code that relied on sched.h including various MM types for them. This will allow us to remove the <linux/mm_types.h> include from <linux/sched.h>. Acked-by: Linus Torvalds <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 2e58f17 commit 589ee62

File tree

89 files changed

+125
-25
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+125
-25
lines changed

‎arch/alpha/include/asm/a.out-core.h

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#ifdef __KERNEL__
1616

1717
#include <linux/user.h>
18+
#include <linux/mm_types.h>
1819

1920
/*
2021
* Fill in the user structure for an ECOFF core dump.

‎arch/alpha/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
* Copyright (C) 1996, Linus Torvalds
88
*/
99

10+
#include <linux/mm_types.h>
11+
1012
#include <asm/machvec.h>
1113
#include <asm/compiler.h>
1214
#include <asm-generic/mm_hooks.h>

‎arch/arc/mm/tlb.c

+2
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@
5353

5454
#include <linux/module.h>
5555
#include <linux/bug.h>
56+
#include <linux/mm_types.h>
57+
5658
#include <asm/arcregs.h>
5759
#include <asm/setup.h>
5860
#include <asm/mmu_context.h>

‎arch/arm/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@
1515

1616
#include <linux/compiler.h>
1717
#include <linux/sched.h>
18+
#include <linux/mm_types.h>
1819
#include <linux/preempt.h>
20+
1921
#include <asm/cacheflush.h>
2022
#include <asm/cachetype.h>
2123
#include <asm/proc-fns.h>

‎arch/arm/include/asm/tlbflush.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
#ifndef _ASMARM_TLBFLUSH_H
1111
#define _ASMARM_TLBFLUSH_H
1212

13+
#ifndef __ASSEMBLY__
14+
# include <linux/mm_types.h>
15+
#endif
16+
1317
#ifdef CONFIG_MMU
1418

1519
#include <asm/glue.h>
@@ -644,9 +648,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
644648
#elif defined(CONFIG_SMP) /* !CONFIG_MMU */
645649

646650
#ifndef __ASSEMBLY__
647-
648-
#include <linux/mm_types.h>
649-
650651
static inline void local_flush_tlb_all(void) { }
651652
static inline void local_flush_tlb_mm(struct mm_struct *mm) { }
652653
static inline void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr) { }

‎arch/arm/kernel/suspend.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <linux/init.h>
22
#include <linux/slab.h>
3+
#include <linux/mm_types.h>
34

45
#include <asm/cacheflush.h>
56
#include <asm/idmap.h>

‎arch/arm/kernel/swp_emulate.c

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#include <linux/proc_fs.h>
2424
#include <linux/seq_file.h>
2525
#include <linux/sched.h>
26+
#include <linux/sched/mm.h>
2627
#include <linux/syscalls.h>
2728
#include <linux/perf_event.h>
2829

‎arch/arm/mm/idmap.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#include <linux/module.h>
22
#include <linux/kernel.h>
33
#include <linux/slab.h>
4+
#include <linux/mm_types.h>
45

56
#include <asm/cputype.h>
67
#include <asm/idmap.h>

‎arch/arm64/include/asm/mmu_context.h

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <linux/compiler.h>
2727
#include <linux/sched.h>
2828
#include <linux/sched/hotplug.h>
29+
#include <linux/mm_types.h>
2930

3031
#include <asm/cacheflush.h>
3132
#include <asm/cpufeature.h>

‎arch/arm64/kernel/traps.c

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <linux/sched/debug.h>
3434
#include <linux/sched/task_stack.h>
3535
#include <linux/syscalls.h>
36+
#include <linux/mm_types.h>
3637

3738
#include <asm/atomic.h>
3839
#include <asm/bug.h>

‎arch/avr32/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef __ASM_AVR32_MMU_CONTEXT_H
1313
#define __ASM_AVR32_MMU_CONTEXT_H
1414

15+
#include <linux/mm_types.h>
16+
1517
#include <asm/tlbflush.h>
1618
#include <asm/sysreg.h>
1719
#include <asm-generic/mm_hooks.h>

‎arch/blackfin/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
#include <linux/slab.h>
1111
#include <linux/sched.h>
12+
#include <linux/mm_types.h>
13+
1214
#include <asm/setup.h>
1315
#include <asm/page.h>
1416
#include <asm/pgalloc.h>

‎arch/blackfin/kernel/flat.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
#include <linux/module.h>
88
#include <linux/sched.h>
9+
#include <linux/mm_types.h>
910
#include <linux/flat.h>
1011

1112
#define FLAT_BFIN_RELOC_TYPE_16_BIT 0

‎arch/blackfin/kernel/process.c

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include <linux/sched/debug.h>
1616
#include <linux/sched/task.h>
1717
#include <linux/sched/task_stack.h>
18+
#include <linux/mm_types.h>
1819
#include <linux/tick.h>
1920
#include <linux/fs.h>
2021
#include <linux/err.h>

‎arch/blackfin/mm/sram-alloc.c

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
#include <linux/spinlock.h>
2020
#include <linux/rtc.h>
2121
#include <linux/slab.h>
22+
#include <linux/mm_types.h>
23+
2224
#include <asm/blackfin.h>
2325
#include <asm/mem_map.h>
2426
#include "blackfin_sram.h"

‎arch/cris/arch-v10/mm/tlb.c

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*
1111
*/
1212

13+
#include <linux/mm_types.h>
14+
1315
#include <asm/tlb.h>
1416
#include <asm/mmu_context.h>
1517
#include <arch/svinto.h>

‎arch/cris/arch-v32/mm/tlb.c

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Authors: Bjorn Wesen <[email protected]>
77
* Tobias Anderberg <[email protected]>, CRISv32 port.
88
*/
9+
#include <linux/mm_types.h>
910

1011
#include <asm/tlb.h>
1112
#include <asm/mmu_context.h>

‎arch/cris/include/asm/pgtable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <asm-generic/pgtable-nopmd.h>
1010

1111
#ifndef __ASSEMBLY__
12-
#include <linux/sched.h>
12+
#include <linux/sched/mm.h>
1313
#include <asm/mmu.h>
1414
#endif
1515
#include <arch/pgtable.h>

‎arch/cris/mm/tlb.c

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99

1010
#include <linux/init.h>
1111
#include <linux/kernel.h>
12+
#include <linux/mm_types.h>
13+
1214
#include <asm/tlb.h>
1315

1416
#define D(x)

‎arch/h8300/kernel/traps.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/types.h>
1818
#include <linux/sched.h>
1919
#include <linux/sched/debug.h>
20+
#include <linux/mm_types.h>
2021
#include <linux/kernel.h>
2122
#include <linux/errno.h>
2223
#include <linux/init.h>

‎arch/hexagon/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
#ifndef _ASM_MMU_CONTEXT_H
2222
#define _ASM_MMU_CONTEXT_H
2323

24+
#include <linux/mm_types.h>
25+
2426
#include <asm/setup.h>
2527
#include <asm/page.h>
2628
#include <asm/pgalloc.h>

‎arch/hexagon/kernel/smp.c

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <linux/smp.h>
3030
#include <linux/spinlock.h>
3131
#include <linux/cpu.h>
32+
#include <linux/mm_types.h>
3233

3334
#include <asm/time.h> /* timer_interrupt */
3435
#include <asm/hexagon_vm.h>

‎arch/ia64/include/asm/mmu_context.h

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
#include <linux/compiler.h>
2727
#include <linux/percpu.h>
2828
#include <linux/sched.h>
29+
#include <linux/mm_types.h>
2930
#include <linux/spinlock.h>
3031

3132
#include <asm/processor.h>

‎arch/ia64/include/asm/pgtable.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@
147147

148148
# ifndef __ASSEMBLY__
149149

150-
#include <linux/sched.h> /* for mm_struct */
150+
#include <linux/sched/mm.h> /* for mm_struct */
151151
#include <linux/bitops.h>
152152
#include <asm/cacheflush.h>
153153
#include <asm/mmu_context.h>

‎arch/ia64/sn/kernel/sn2/sn2_smp.c

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/spinlock.h>
1414
#include <linux/threads.h>
1515
#include <linux/sched.h>
16+
#include <linux/mm_types.h>
1617
#include <linux/smp.h>
1718
#include <linux/interrupt.h>
1819
#include <linux/irq.h>

‎arch/m32r/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#ifndef __ASSEMBLY__
1313

1414
#include <linux/atomic.h>
15+
#include <linux/mm_types.h>
16+
1517
#include <asm/pgalloc.h>
1618
#include <asm/mmu.h>
1719
#include <asm/tlbflush.h>

‎arch/m68k/include/asm/a.out-core.h

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <linux/user.h>
1818
#include <linux/elfcore.h>
19+
#include <linux/mm_types.h>
1920

2021
/*
2122
* fill in the user structure for an a.out core dump

‎arch/m68k/include/asm/mmu_context.h

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
#define __M68K_MMU_CONTEXT_H
33

44
#include <asm-generic/mm_hooks.h>
5+
#include <linux/mm_types.h>
56

67
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
78
{

‎arch/metag/include/asm/mmu_context.h

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <asm/cacheflush.h>
1010

1111
#include <linux/io.h>
12+
#include <linux/mm_types.h>
1213

1314
static inline void enter_lazy_tlb(struct mm_struct *mm,
1415
struct task_struct *tsk)

‎arch/microblaze/include/asm/mmu_context_mm.h

+2
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#define _ASM_MICROBLAZE_MMU_CONTEXT_H
1313

1414
#include <linux/atomic.h>
15+
#include <linux/mm_types.h>
16+
1517
#include <asm/bitops.h>
1618
#include <asm/mmu.h>
1719
#include <asm-generic/mm_hooks.h>

‎arch/microblaze/mm/pgtable.c

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/types.h>
3232
#include <linux/vmalloc.h>
3333
#include <linux/init.h>
34+
#include <linux/mm_types.h>
3435

3536
#include <asm/pgtable.h>
3637
#include <asm/pgalloc.h>

‎arch/mips/include/asm/elf.h

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <linux/auxvec.h>
1212
#include <linux/fs.h>
13+
#include <linux/mm_types.h>
14+
1315
#include <uapi/linux/elf.h>
1416

1517
#include <asm/current.h>

‎arch/mips/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,10 @@
1313

1414
#include <linux/errno.h>
1515
#include <linux/sched.h>
16+
#include <linux/mm_types.h>
1617
#include <linux/smp.h>
1718
#include <linux/slab.h>
19+
1820
#include <asm/cacheflush.h>
1921
#include <asm/dsemul.h>
2022
#include <asm/hazards.h>

‎arch/mips/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <linux/export.h>
2929
#include <linux/time.h>
3030
#include <linux/timex.h>
31-
#include <linux/sched.h>
31+
#include <linux/sched/mm.h>
3232
#include <linux/cpumask.h>
3333
#include <linux/cpu.h>
3434
#include <linux/err.h>

‎arch/mips/math-emu/dsemul.c

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#include <linux/err.h>
22
#include <linux/slab.h>
3+
#include <linux/mm_types.h>
34

45
#include <asm/branch.h>
56
#include <asm/cacheflush.h>

‎arch/mips/mm/ioremap.c

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/sched.h>
1313
#include <linux/slab.h>
1414
#include <linux/vmalloc.h>
15+
#include <linux/mm_types.h>
1516
#include <asm/cacheflush.h>
1617
#include <asm/io.h>
1718
#include <asm/tlbflush.h>

‎arch/mn10300/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
#define _ASM_MMU_CONTEXT_H
2424

2525
#include <linux/atomic.h>
26+
#include <linux/mm_types.h>
27+
2628
#include <asm/pgalloc.h>
2729
#include <asm/tlbflush.h>
2830
#include <asm-generic/mm_hooks.h>

‎arch/mn10300/kernel/smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/err.h>
2222
#include <linux/kernel.h>
2323
#include <linux/delay.h>
24-
#include <linux/sched.h>
24+
#include <linux/sched/mm.h>
2525
#include <linux/sched/task.h>
2626
#include <linux/profile.h>
2727
#include <linux/smp.h>

‎arch/mn10300/mm/tlb-smp.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <linux/err.h>
2121
#include <linux/kernel.h>
2222
#include <linux/delay.h>
23-
#include <linux/sched.h>
23+
#include <linux/sched/mm.h>
2424
#include <linux/profile.h>
2525
#include <linux/smp.h>
2626
#include <asm/tlbflush.h>

‎arch/nios2/include/asm/mmu_context.h

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#ifndef _ASM_NIOS2_MMU_CONTEXT_H
1414
#define _ASM_NIOS2_MMU_CONTEXT_H
1515

16+
#include <linux/mm_types.h>
17+
1618
#include <asm-generic/mm_hooks.h>
1719

1820
extern void mmu_context_init(void);

‎arch/nios2/kernel/process.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/sched/debug.h>
1818
#include <linux/sched/task.h>
1919
#include <linux/sched/task_stack.h>
20+
#include <linux/mm_types.h>
2021
#include <linux/tick.h>
2122
#include <linux/uaccess.h>
2223

‎arch/powerpc/kernel/io-workarounds.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#undef DEBUG
1313

1414
#include <linux/kernel.h>
15-
#include <linux/sched.h> /* for init_mm */
15+
#include <linux/sched/mm.h> /* for init_mm */
1616

1717
#include <asm/io.h>
1818
#include <asm/machdep.h>

‎arch/powerpc/kvm/e500_mmu_host.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include <linux/highmem.h>
2626
#include <linux/log2.h>
2727
#include <linux/uaccess.h>
28-
#include <linux/sched.h>
28+
#include <linux/sched/mm.h>
2929
#include <linux/rwsem.h>
3030
#include <linux/vmalloc.h>
3131
#include <linux/hugetlb.h>

‎arch/powerpc/lib/feature-fixups.c

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/kernel.h>
1818
#include <linux/string.h>
1919
#include <linux/init.h>
20+
#include <linux/sched/mm.h>
2021
#include <asm/cputable.h>
2122
#include <asm/code-patching.h>
2223
#include <asm/page.h>

‎arch/powerpc/mm/hash_utils_64.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include <linux/spinlock.h>
2525
#include <linux/errno.h>
26-
#include <linux/sched.h>
26+
#include <linux/sched/mm.h>
2727
#include <linux/proc_fs.h>
2828
#include <linux/stat.h>
2929
#include <linux/sysctl.h>

0 commit comments

Comments
 (0)