projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Fix build breakage with CONFIG_X86_VSMP
[powerpc.git]
/
arch
/
ia64
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/ia64/kernel/vmlinux.lds.S
b/arch/ia64/kernel/vmlinux.lds.S
index
632d65c
..
b3b2e38
100644
(file)
--- a/
arch/ia64/kernel/vmlinux.lds.S
+++ b/
arch/ia64/kernel/vmlinux.lds.S
@@
-1,4
+1,3
@@
-#include <linux/config.h>
#include <asm/cache.h>
#include <asm/ptrace.h>
#include <asm/cache.h>
#include <asm/ptrace.h>
@@
-70,6
+69,15
@@
SECTIONS
__stop___ex_table = .;
}
__stop___ex_table = .;
}
+ /* MCA table */
+ . = ALIGN(16);
+ __mca_table : AT(ADDR(__mca_table) - LOAD_OFFSET)
+ {
+ __start___mca_table = .;
+ *(__mca_table)
+ __stop___mca_table = .;
+ }
+
/* Global data */
_data = .;
/* Global data */
_data = .;
@@
-176,7
+184,9
@@
SECTIONS
*(.data.gate)
__stop_gate_section = .;
}
*(.data.gate)
__stop_gate_section = .;
}
- . = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose kernel data */
+ . = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose
+ * kernel data
+ */
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
{ *(.data.read_mostly) }
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
{ *(.data.read_mostly) }
@@
-194,7
+204,9
@@
SECTIONS
*(.data.percpu)
__per_cpu_end = .;
}
*(.data.percpu)
__per_cpu_end = .;
}
- . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits into percpu page size */
+ . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
+ * into percpu page size
+ */
data : { } :data
.data : AT(ADDR(.data) - LOAD_OFFSET)
data : { } :data
.data : AT(ADDR(.data) - LOAD_OFFSET)