Skip to content

Commit 65fddcf

Browse files
rppttorvalds
authored andcommitted
mm: reorder includes after introduction of linux/pgtable.h
The replacement of <asm/pgrable.h> with <linux/pgtable.h> made the include of the latter in the middle of asm includes. Fix this up with the aid of the below script and manual adjustments here and there. import sys import re if len(sys.argv) is not 3: print "USAGE: %s <file> <header>" % (sys.argv[0]) sys.exit(1) hdr_to_move="#include <linux/%s>" % sys.argv[2] moved = False in_hdrs = False with open(sys.argv[1], "r") as f: lines = f.readlines() for _line in lines: line = _line.rstrip(' ') if line == hdr_to_move: continue if line.startswith("#include <linux/"): in_hdrs = True elif not moved and in_hdrs: moved = True print hdr_to_move print line Signed-off-by: Mike Rapoport <rppt@linux.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Cain <bcain@codeaurora.org> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Ungerer <gerg@linux-m68k.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Guo Ren <guoren@kernel.org> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Helge Deller <deller@gmx.de> Cc: Ingo Molnar <mingo@redhat.com> Cc: Ley Foon Tan <ley.foon.tan@intel.com> Cc: Mark Salter <msalter@redhat.com> Cc: Matthew Wilcox <willy@infradead.org> Cc: Matt Turner <mattst88@gmail.com> Cc: Max Filippov <jcmvbkbc@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Nick Hu <nickhu@andestech.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Stafford Horne <shorne@gmail.com> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vincent Chen <deanbo422@gmail.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Will Deacon <will@kernel.org> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Link: http://lkml.kernel.org/r/20200514170327.31389-4-rppt@kernel.org Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent ca5999f commit 65fddcf

File tree

265 files changed

+255
-268
lines changed

Some content is hidden

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

265 files changed

+255
-268
lines changed

arch/alpha/kernel/proto.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#include <linux/interrupt.h>
33
#include <linux/io.h>
44

5-
#include <linux/pgtable.h>
6-
75
/* Prototypes of functions used across modules here in this directory. */
86

97
#define vucp volatile unsigned char *

arch/arc/mm/highmem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include <linux/memblock.h>
77
#include <linux/export.h>
88
#include <linux/highmem.h>
9-
#include <asm/processor.h>
109
#include <linux/pgtable.h>
10+
#include <asm/processor.h>
1111
#include <asm/pgalloc.h>
1212
#include <asm/tlbflush.h>
1313

arch/arc/mm/tlbex.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
*/
3434

3535
#include <linux/linkage.h>
36+
#include <linux/pgtable.h>
3637
#include <asm/entry.h>
3738
#include <asm/mmu.h>
38-
#include <linux/pgtable.h>
3939
#include <asm/arcregs.h>
4040
#include <asm/cache.h>
4141
#include <asm/processor.h>

arch/arm/include/asm/efi.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <asm/highmem.h>
1414
#include <asm/mach/map.h>
1515
#include <asm/mmu_context.h>
16-
#include <linux/pgtable.h>
1716
#include <asm/ptrace.h>
1817

1918
#ifdef CONFIG_EFI

arch/arm/include/asm/fixmap.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#define FIXADDR_END 0xfff00000UL
77
#define FIXADDR_TOP (FIXADDR_END - PAGE_SIZE)
88

9-
#include <asm/kmap_types.h>
109
#include <linux/pgtable.h>
10+
#include <asm/kmap_types.h>
1111

1212
enum fixed_addresses {
1313
FIX_EARLYCON_MEM_BASE,

arch/arm/kernel/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*/
1111
#include <linux/linkage.h>
1212
#include <linux/init.h>
13+
#include <linux/pgtable.h>
1314

1415
#include <asm/assembler.h>
1516
#include <asm/cp15.h>
@@ -18,7 +19,6 @@
1819
#include <asm/asm-offsets.h>
1920
#include <asm/memory.h>
2021
#include <asm/thread_info.h>
21-
#include <linux/pgtable.h>
2222

2323
#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_SEMIHOSTING)
2424
#include CONFIG_DEBUG_LL_INCLUDE

arch/arm/kernel/suspend.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
#include <linux/init.h>
33
#include <linux/slab.h>
44
#include <linux/mm_types.h>
5+
#include <linux/pgtable.h>
56

67
#include <asm/bugs.h>
78
#include <asm/cacheflush.h>
89
#include <asm/idmap.h>
910
#include <asm/pgalloc.h>
10-
#include <linux/pgtable.h>
1111
#include <asm/memory.h>
1212
#include <asm/smp_plat.h>
1313
#include <asm/suspend.h>

arch/arm/kernel/vmlinux.lds.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
#include "vmlinux-xip.lds.S"
99
#else
1010

11+
#include <linux/pgtable.h>
1112
#include <asm-generic/vmlinux.lds.h>
1213
#include <asm/cache.h>
1314
#include <asm/thread_info.h>
1415
#include <asm/memory.h>
1516
#include <asm/mpu.h>
1617
#include <asm/page.h>
17-
#include <linux/pgtable.h>
1818

1919
#include "vmlinux.lds.h"
2020

arch/arm/mach-integrator/core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
#include <linux/stat.h>
2222
#include <linux/of.h>
2323
#include <linux/of_address.h>
24+
#include <linux/pgtable.h>
2425

2526
#include <asm/mach-types.h>
2627
#include <asm/mach/time.h>
27-
#include <linux/pgtable.h>
2828

2929
#include "hardware.h"
3030
#include "cm.h"

arch/arm/mach-keystone/platsmp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#include <linux/init.h>
1313
#include <linux/smp.h>
1414
#include <linux/io.h>
15+
#include <linux/pgtable.h>
1516

1617
#include <asm/smp_plat.h>
1718
#include <asm/prom.h>
1819
#include <asm/tlbflush.h>
19-
#include <linux/pgtable.h>
2020

2121
#include "keystone.h"
2222

0 commit comments

Comments
 (0)