git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
[safe/jmp/linux-2.6]
/
arch
/
x86
/
kernel
/
vmlinux.lds.S
diff --git
a/arch/x86/kernel/vmlinux.lds.S
b/arch/x86/kernel/vmlinux.lds.S
index
f3d77d7
..
d0bb522
100644
(file)
--- a/
arch/x86/kernel/vmlinux.lds.S
+++ b/
arch/x86/kernel/vmlinux.lds.S
@@
-291,8
+291,8
@@
SECTIONS
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
__smp_locks = .;
*(.smp_locks)
- __smp_locks_end = .;
. = ALIGN(PAGE_SIZE);
. = ALIGN(PAGE_SIZE);
+ __smp_locks_end = .;
}
#ifdef CONFIG_X86_64
}
#ifdef CONFIG_X86_64
@@
-341,7
+341,7
@@
SECTIONS
* Per-cpu symbols which need to be offset from __per_cpu_load
* for the boot processor.
*/
* Per-cpu symbols which need to be offset from __per_cpu_load
* for the boot processor.
*/
-#define INIT_PER_CPU(x) init_per_cpu__##x =
per_cpu__##
x + __per_cpu_load
+#define INIT_PER_CPU(x) init_per_cpu__##x = x + __per_cpu_load
INIT_PER_CPU(gdt_page);
INIT_PER_CPU(irq_stack_union);
INIT_PER_CPU(gdt_page);
INIT_PER_CPU(irq_stack_union);
@@
-352,7
+352,7
@@
INIT_PER_CPU(irq_stack_union);
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
"kernel image bigger than KERNEL_IMAGE_SIZE");
#ifdef CONFIG_SMP
-. = ASSERT((
per_cpu__
irq_stack_union == 0),
+. = ASSERT((irq_stack_union == 0),
"irq_stack_union is not at start of per-cpu area");
#endif
"irq_stack_union is not at start of per-cpu area");
#endif