Re: [PATCH v4 1/7] m68knommu: Don't hardcode the value of PAGE_SIZEin the linker script.
From: Greg Ungerer
Date: Thu Oct 29 2009 - 20:57:52 EST
Hi Tim,
This one gives me:
arch/m68knommu/kernel/vmlinux.lds.S:19:1: warning: "BSS" redefined
In file included from arch/m68knommu/kernel/vmlinux.lds.S:10:
include/asm-generic/vmlinux.lds.h:495:1: warning: this is the location
of the previous definition
A define named "BSS" is already used inside of vmlinux.lds.S.
No big deal, I just changed that internal one.
But otherwise no problems with this patch.
Regards
Greg
Tim Abbott wrote:
Signed-off-by: Tim Abbott <tabbott@xxxxxxxxxxx>
---
arch/m68knommu/kernel/vmlinux.lds.S | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/m68knommu/kernel/vmlinux.lds.S b/arch/m68knommu/kernel/vmlinux.lds.S
index 2736a5e..edc20bd 100644
--- a/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/arch/m68knommu/kernel/vmlinux.lds.S
@@ -8,6 +8,7 @@
*/
#include <asm-generic/vmlinux.lds.h>
+#include <asm/page.h>
#if defined(CONFIG_RAMKERNEL)
#define RAM_START CONFIG_KERNELBASE
@@ -155,7 +156,7 @@ SECTIONS {
} > DATA
.init : {
- . = ALIGN(4096);
+ . = ALIGN(PAGE_SIZE);
__init_begin = .;
_sinittext = .;
INIT_TEXT
@@ -180,7 +181,7 @@ SECTIONS {
*(.init.ramfs)
__initramfs_end = .;
#endif
- . = ALIGN(4096);
+ . = ALIGN(PAGE_SIZE);
__init_end = .;
} > INIT
--
------------------------------------------------------------------------
Greg Ungerer -- Principal Engineer EMAIL: gerg@xxxxxxxxxxxx
SnapGear Group, McAfee PHONE: +61 7 3435 2888
825 Stanley St, FAX: +61 7 3891 3630
Woolloongabba, QLD, 4102, Australia WEB: http://www.SnapGear.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/