diff options
| author | Jan Beulich <JBeulich@suse.com> | 2013-03-11 10:06:12 +0000 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-03-11 15:07:56 +0100 |
| commit | ec7fd34425f6536ed4b3548e7aa712ee2718189c (patch) | |
| tree | a62c70bb2a8013a1d4ef9dd1a3bc09a057b36449 | |
| parent | f6161aa153581da4a3867a2d1a7caf4be19b6ec9 (diff) | |
| download | linux-stable-ec7fd34425f6536ed4b3548e7aa712ee2718189c.tar.gz linux-stable-ec7fd34425f6536ed4b3548e7aa712ee2718189c.tar.bz2 linux-stable-ec7fd34425f6536ed4b3548e7aa712ee2718189c.zip | |
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 @@ - .section .text..page_aligned + .text #include <linux/linkage.h> #include <asm/segment.h> #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 _text = .; /* bootstrapping code */ HEAD_TEXT -#ifdef CONFIG_X86_32 - . = ALIGN(PAGE_SIZE); - *(.text..page_aligned) -#endif . = ALIGN(8); _stext = .; TEXT_TEXT |