From: Stratos Psomadakis <psomas@cslab.ece.ntua.gr>
To: linux-kernel@vger.kernel.org
Cc: Stratos Psomadakis <psomas@cslab.ece.ntua.gr>
Subject: [PATCH 1/2] Remove KERNEL_IMAGE_SIZE for x86_32 code(no longer used)
Date: Sun, 27 Feb 2011 23:21:37 +0200 [thread overview]
Message-ID: <1298841698-31823-2-git-send-email-psomas@cslab.ece.ntua.gr> (raw)
In-Reply-To: <1298841698-31823-1-git-send-email-psomas@cslab.ece.ntua.gr>
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
next prev parent reply other threads:[~2011-02-27 21:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-27 21:21 [PATCH 0/2] x86_32 cleanup: KERNEL_IMAGE_SIZE Stratos Psomadakis
2011-02-27 21:21 ` Stratos Psomadakis [this message]
2011-02-27 21:21 ` [PATCH 2/2] head_32.S: Update the comments for the initial kernel mapping(KERNEL_IMAGE_SIZE no longer used) Stratos Psomadakis
2011-02-28 19:58 ` [PATCH 0/2] x86_32 cleanup: KERNEL_IMAGE_SIZE Stratos Psomadakis
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298841698-31823-2-git-send-email-psomas@cslab.ece.ntua.gr \
--to=psomas@cslab.ece.ntua.gr \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome