diff options
-rw-r--r-- | arch/x86/boot/compressed/kaslr.c | 2 | ||||
-rw-r--r-- | arch/x86/boot/early_serial_console.c | 4 | ||||
-rw-r--r-- | arch/x86/mm/ident_map.c | 5 |
3 files changed, 10 insertions, 1 deletions
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index f5a138c3fe96..f15d7b8d1b16 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c | |||
@@ -163,7 +163,7 @@ static bool mem_overlaps(struct mem_vector *one, struct mem_vector *two) | |||
163 | * memory ranges lead to really hard to debug boot failures. | 163 | * memory ranges lead to really hard to debug boot failures. |
164 | * | 164 | * |
165 | * The initrd, cmdline, and boot_params are trivial to identify for | 165 | * The initrd, cmdline, and boot_params are trivial to identify for |
166 | * avoiding. The are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and | 166 | * avoiding. They are MEM_AVOID_INITRD, MEM_AVOID_CMDLINE, and |
167 | * MEM_AVOID_BOOTPARAMS respectively below. | 167 | * MEM_AVOID_BOOTPARAMS respectively below. |
168 | * | 168 | * |
169 | * What is not obvious how to avoid is the range of memory that is used | 169 | * What is not obvious how to avoid is the range of memory that is used |
diff --git a/arch/x86/boot/early_serial_console.c b/arch/x86/boot/early_serial_console.c index 45a07684bbab..f0b8d6d93164 100644 --- a/arch/x86/boot/early_serial_console.c +++ b/arch/x86/boot/early_serial_console.c | |||
@@ -1,3 +1,7 @@ | |||
1 | /* | ||
2 | * Serial port routines for use during early boot reporting. This code is | ||
3 | * included from both the compressed kernel and the regular kernel. | ||
4 | */ | ||
1 | #include "boot.h" | 5 | #include "boot.h" |
2 | 6 | ||
3 | #define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */ | 7 | #define DEFAULT_SERIAL_PORT 0x3f8 /* ttyS0 */ |
diff --git a/arch/x86/mm/ident_map.c b/arch/x86/mm/ident_map.c index 751ca920773a..ec21796ac5fd 100644 --- a/arch/x86/mm/ident_map.c +++ b/arch/x86/mm/ident_map.c | |||
@@ -1,3 +1,7 @@ | |||
1 | /* | ||
2 | * Helper routines for building identity mapping page tables. This is | ||
3 | * included by both the compressed kernel and the regular kernel. | ||
4 | */ | ||
1 | 5 | ||
2 | static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page, | 6 | static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page, |
3 | unsigned long addr, unsigned long end) | 7 | unsigned long addr, unsigned long end) |
@@ -10,6 +14,7 @@ static void ident_pmd_init(unsigned long pmd_flag, pmd_t *pmd_page, | |||
10 | set_pmd(pmd, __pmd(addr | pmd_flag)); | 14 | set_pmd(pmd, __pmd(addr | pmd_flag)); |
11 | } | 15 | } |
12 | } | 16 | } |
17 | |||
13 | static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, | 18 | static int ident_pud_init(struct x86_mapping_info *info, pud_t *pud_page, |
14 | unsigned long addr, unsigned long end) | 19 | unsigned long addr, unsigned long end) |
15 | { | 20 | { |