Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86: Split pgtable_32.h into pgtable_32.h and pgtable_32_types.h

Signed-off-by: Jeremy Fitzhardinge <jeremy@goop.org>

authored by

Jeremy Fitzhardinge and committed by
Jeremy Fitzhardinge
f402a65f 8d19c99f

+47 -41
+1 -41
arch/x86/include/asm/pgtable_32.h
··· 1 1 #ifndef _ASM_X86_PGTABLE_32_H 2 2 #define _ASM_X86_PGTABLE_32_H 3 3 4 + #include <asm/pgtable_32_types.h> 4 5 5 6 /* 6 7 * The Linux memory management assumes a three-level page table setup. On ··· 34 33 35 34 extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); 36 35 37 - /* 38 - * The Linux x86 paging architecture is 'compile-time dual-mode', it 39 - * implements both the traditional 2-level x86 page tables and the 40 - * newer 3-level PAE-mode page tables. 41 - */ 42 - #ifdef CONFIG_X86_PAE 43 - # include <asm/pgtable-3level_types.h> 44 - # define PMD_SIZE (1UL << PMD_SHIFT) 45 - # define PMD_MASK (~(PMD_SIZE - 1)) 46 - #else 47 - # include <asm/pgtable-2level_types.h> 48 - #endif 49 - 50 - #define PGDIR_SIZE (1UL << PGDIR_SHIFT) 51 - #define PGDIR_MASK (~(PGDIR_SIZE - 1)) 52 - 53 - /* Just any arbitrary offset to the start of the vmalloc VM area: the 54 - * current 8MB value just means that there will be a 8MB "hole" after the 55 - * physical memory until the kernel virtual memory starts. That means that 56 - * any out-of-bounds memory accesses will hopefully be caught. 57 - * The vmalloc() routines leaves a hole of 4kB between each vmalloced 58 - * area for the same reason. ;) 59 - */ 60 - #define VMALLOC_OFFSET (8 * 1024 * 1024) 61 - #define VMALLOC_START ((unsigned long)high_memory + VMALLOC_OFFSET) 62 - #ifdef CONFIG_X86_PAE 63 - #define LAST_PKMAP 512 64 - #else 65 - #define LAST_PKMAP 1024 66 - #endif 67 - 68 - #define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE * (LAST_PKMAP + 1)) \ 69 - & PMD_MASK) 70 - 71 - #ifdef CONFIG_HIGHMEM 72 - # define VMALLOC_END (PKMAP_BASE - 2 * PAGE_SIZE) 73 - #else 74 - # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) 75 - #endif 76 - 77 - #define MAXMEM (VMALLOC_END - PAGE_OFFSET - __VMALLOC_RESERVE) 78 36 79 37 /* 80 38 * Define this if things work differently on an i386 and an i486:
+46
arch/x86/include/asm/pgtable_32_types.h
··· 1 + #ifndef _ASM_X86_PGTABLE_32_DEFS_H 2 + #define _ASM_X86_PGTABLE_32_DEFS_H 3 + 4 + /* 5 + * The Linux x86 paging architecture is 'compile-time dual-mode', it 6 + * implements both the traditional 2-level x86 page tables and the 7 + * newer 3-level PAE-mode page tables. 8 + */ 9 + #ifdef CONFIG_X86_PAE 10 + # include <asm/pgtable-3level_types.h> 11 + # define PMD_SIZE (1UL << PMD_SHIFT) 12 + # define PMD_MASK (~(PMD_SIZE - 1)) 13 + #else 14 + # include <asm/pgtable-2level_types.h> 15 + #endif 16 + 17 + #define PGDIR_SIZE (1UL << PGDIR_SHIFT) 18 + #define PGDIR_MASK (~(PGDIR_SIZE - 1)) 19 + 20 + /* Just any arbitrary offset to the start of the vmalloc VM area: the 21 + * current 8MB value just means that there will be a 8MB "hole" after the 22 + * physical memory until the kernel virtual memory starts. That means that 23 + * any out-of-bounds memory accesses will hopefully be caught. 24 + * The vmalloc() routines leaves a hole of 4kB between each vmalloced 25 + * area for the same reason. ;) 26 + */ 27 + #define VMALLOC_OFFSET (8 * 1024 * 1024) 28 + #define VMALLOC_START ((unsigned long)high_memory + VMALLOC_OFFSET) 29 + #ifdef CONFIG_X86_PAE 30 + #define LAST_PKMAP 512 31 + #else 32 + #define LAST_PKMAP 1024 33 + #endif 34 + 35 + #define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE * (LAST_PKMAP + 1)) \ 36 + & PMD_MASK) 37 + 38 + #ifdef CONFIG_HIGHMEM 39 + # define VMALLOC_END (PKMAP_BASE - 2 * PAGE_SIZE) 40 + #else 41 + # define VMALLOC_END (FIXADDR_START - 2 * PAGE_SIZE) 42 + #endif 43 + 44 + #define MAXMEM (VMALLOC_END - PAGE_OFFSET - __VMALLOC_RESERVE) 45 + 46 + #endif /* _ASM_X86_PGTABLE_32_DEFS_H */