diff options
author | Jan Beulich <JBeulich@suse.com> | 2013-03-11 06:06:12 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-03-11 10:07:56 -0400 |
commit | ec7fd34425f6536ed4b3548e7aa712ee2718189c (patch) | |
tree | a62c70bb2a8013a1d4ef9dd1a3bc09a057b36449 | |
parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) |
x86: Drop always empty .text..page_aligned section
Commit e44b7b7 ("x86: move suspend wakeup code to C") didn't
care to also eliminate the side effects that the earlier 4c49156
("x86: make arch/x86/kernel/acpi/wakeup_32.S use a separate")
had, thus leaving a now pointless, almost page size gap at the
beginning of .text.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Pavel Machek <pavel@ucw.cz>
Link: http://lkml.kernel.org/r/513DBAA402000078000C4896@nat28.tlf.novell.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | arch/x86/kernel/acpi/wakeup_32.S | 2 | ||||
-rw-r--r-- | arch/x86/kernel/vmlinux.lds.S | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_32.S b/arch/x86/kernel/acpi/wakeup_32.S index 13ab720573e3..ced4638c8341 100644 --- a/arch/x86/kernel/acpi/wakeup_32.S +++ b/arch/x86/kernel/acpi/wakeup_32.S | |||
@@ -1,4 +1,4 @@ | |||
1 | .section .text..page_aligned | 1 | .text |
2 | #include <linux/linkage.h> | 2 | #include <linux/linkage.h> |
3 | #include <asm/segment.h> | 3 | #include <asm/segment.h> |
4 | #include <asm/page_types.h> | 4 | #include <asm/page_types.h> |
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 22a1530146a8..10c4f3006afd 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S | |||
@@ -94,10 +94,6 @@ SECTIONS | |||
94 | _text = .; | 94 | _text = .; |
95 | /* bootstrapping code */ | 95 | /* bootstrapping code */ |
96 | HEAD_TEXT | 96 | HEAD_TEXT |
97 | #ifdef CONFIG_X86_32 | ||
98 | . = ALIGN(PAGE_SIZE); | ||
99 | *(.text..page_aligned) | ||
100 | #endif | ||
101 | . = ALIGN(8); | 97 | . = ALIGN(8); |
102 | _stext = .; | 98 | _stext = .; |
103 | TEXT_TEXT | 99 | TEXT_TEXT |