diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-02-21 07:39:30 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-02-26 06:55:56 -0500 |
commit | d4afe414189b098d56bcd24280c018aa2ac9a990 (patch) | |
tree | 06967c4f7dca2f843c153a2b849a3e9a68a10776 | |
parent | 88f3aec7afd9ae3e6f6d221801996b69aad1e3a4 (diff) |
x86: rename KERNEL_TEXT_SIZE => KERNEL_IMAGE_SIZE
The KERNEL_TEXT_SIZE constant was mis-named, as we not only map the kernel
text but data, bss and init sections as well.
That name led me on the wrong path with the KERNEL_TEXT_SIZE regression,
because i knew how big of _text_ my images have and i knew about the 40 MB
"text" limit so i wrongly thought to be on the safe side of the 40 MB limit
with my 29 MB of text, while the total image size was slightly above 40 MB.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/head_64.S | 2 | ||||
-rw-r--r-- | include/asm-x86/page_64.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index b037b15be7f8..a007454133a3 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
@@ -393,7 +393,7 @@ NEXT_PAGE(level2_kernel_pgt) | |||
393 | * too.) | 393 | * too.) |
394 | */ | 394 | */ |
395 | PMDS(0, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, | 395 | PMDS(0, __PAGE_KERNEL_LARGE_EXEC|_PAGE_GLOBAL, |
396 | KERNEL_TEXT_SIZE/PMD_SIZE) | 396 | KERNEL_IMAGE_SIZE/PMD_SIZE) |
397 | 397 | ||
398 | NEXT_PAGE(level2_spare_pgt) | 398 | NEXT_PAGE(level2_spare_pgt) |
399 | .fill 512, 8, 0 | 399 | .fill 512, 8, 0 |
diff --git a/include/asm-x86/page_64.h b/include/asm-x86/page_64.h index 3e2e3ca63048..143546073b95 100644 --- a/include/asm-x86/page_64.h +++ b/include/asm-x86/page_64.h | |||
@@ -51,8 +51,8 @@ | |||
51 | * Kernel image size is limited to 128 MB (see level2_kernel_pgt in | 51 | * Kernel image size is limited to 128 MB (see level2_kernel_pgt in |
52 | * arch/x86/kernel/head_64.S), and it is mapped here: | 52 | * arch/x86/kernel/head_64.S), and it is mapped here: |
53 | */ | 53 | */ |
54 | #define KERNEL_TEXT_SIZE (128*1024*1024) | 54 | #define KERNEL_IMAGE_SIZE (128*1024*1024) |
55 | #define KERNEL_TEXT_START _AC(0xffffffff80000000, UL) | 55 | #define KERNEL_IMAGE_START _AC(0xffffffff80000000, UL) |
56 | 56 | ||
57 | #ifndef __ASSEMBLY__ | 57 | #ifndef __ASSEMBLY__ |
58 | void clear_page(void *page); | 58 | void clear_page(void *page); |