Commit df2b6b2c authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Linus Torvalds

[PATCH] mips: fixed MIPS Makefile

The MIPS Makefile was changed so that the offset of data section may not be
dependent on a specific machine header file.
Signed-off-by: default avatarYoichi Yuasa <yuasa@hh.iij4u.or.jp>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dca27dbf
......@@ -527,6 +527,7 @@ cflags-$(CONFIG_SGI_IP27) += -Iinclude/asm-mips/mach-ip27
#load-$(CONFIG_SGI_IP27) += 0xa80000000001c000
ifdef CONFIG_MAPPED_KERNEL
load-$(CONFIG_SGI_IP27) += 0xc001c000
dataoffset-$(CONFIG_SGI_IP27) += 0x01000000
else
load-$(CONFIG_SGI_IP27) += 0x8001c000
endif
......@@ -644,7 +645,7 @@ endif
CPPFLAGS_vmlinux.lds := \
-D"LOADADDR=$(load-y)" \
-D"JIFFIES=$(JIFFIES)" \
-imacros $(srctree)/include/asm-$(ARCH)/sn/mapped_kernel.h
-D"DATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)"
AFLAGS += $(cflags-y)
CFLAGS += $(cflags-y)
......
......@@ -49,7 +49,7 @@ SECTIONS
/* writeable */
.data : { /* Data */
. = . + MAPPED_OFFSET; /* for CONFIG_MAPPED_KERNEL */
. = . + DATAOFFSET; /* for CONFIG_MAPPED_KERNEL */
*(.data.init_task)
*(.data)
......
......@@ -39,13 +39,11 @@
#define MAPPED_KERN_RW_TO_PHYS(x) \
((unsigned long)MAPPED_ADDR_RW_TO_PHYS(x) | \
MAPPED_KERN_RW_PHYSBASE(get_compact_nodeid()))
#define MAPPED_OFFSET 16777216
#else /* CONFIG_MAPPED_KERNEL */
#define MAPPED_KERN_RO_TO_PHYS(x) (x - CKSEG0)
#define MAPPED_KERN_RW_TO_PHYS(x) (x - CKSEG0)
#define MAPPED_OFFSET 0
#endif /* CONFIG_MAPPED_KERNEL */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment