lkml.org 
[lkml]   [2011]   [Feb]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 1/2] Remove KERNEL_IMAGE_SIZE for x86_32 code(no longer used)
Date
KERNEL_IMAGE_SIZE is no longer used by head_32.S for the kernel mapping, and thus
it is no longer needed.

Remove its definition from page_32_types.h, and the assert from the vmlinux.lds.S
for the 32bit executable.

Signed-off-by: Stratos Psomadakis <psomas@cslab.ece.ntua.gr>
---
arch/x86/include/asm/page_32_types.h | 5 -----
arch/x86/kernel/vmlinux.lds.S | 13 ++++---------
2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index ade619f..ec5c104 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -35,11 +35,6 @@
#define __VIRTUAL_MASK_SHIFT 32
#endif /* CONFIG_X86_PAE */

-/*
- * Kernel image size is limited to 512 MB (see in arch/x86/kernel/head_32.S)
- */
-#define KERNEL_IMAGE_SIZE (512 * 1024 * 1024)
-
#ifndef __ASSEMBLY__

/*
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index bf47007..3f8d8e7 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -362,13 +362,7 @@ SECTIONS
}


-#ifdef CONFIG_X86_32
-/*
- * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:
- */
-. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
- "kernel image bigger than KERNEL_IMAGE_SIZE");
-#else
+#ifdef CONFIG_X86_64
/*
* Per-cpu symbols which need to be offset from __per_cpu_load
* for the boot processor.
@@ -378,7 +372,8 @@ INIT_PER_CPU(gdt_page);
INIT_PER_CPU(irq_stack_union);

/*
- * Build-time check on the image size:
+ * Build-time check on the image size.
+ * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility.
*/
. = ASSERT((_end - _text <= KERNEL_IMAGE_SIZE),
"kernel image bigger than KERNEL_IMAGE_SIZE");
@@ -388,7 +383,7 @@ INIT_PER_CPU(irq_stack_union);
"irq_stack_union is not at start of per-cpu area");
#endif

-#endif /* CONFIG_X86_32 */
+#endif /* CONFIG_X86_64 */

#ifdef CONFIG_KEXEC
#include <asm/kexec.h>
--
1.7.4.1


\
 
 \ /
  Last update: 2011-02-27 22:23    [W:0.045 / U:0.132 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site