diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-21 07:02:45 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2012-05-21 07:02:45 (GMT) |
| commit | 61f5446169046c217a5479517edac3a890c3bee7 (patch) | |
| tree | 461c02f95e69f06a0d7a2cf8c349f1b6e08105ca /arch/x86/realmode/rm/wakeup_asm.S | |
| parent | 8a3b947c40cb36100f316ac0d433f4ae554ee4cc (diff) | |
| download | linux-61f5446169046c217a5479517edac3a890c3bee7.tar.xz | |
x86, realmode: Move end signature into header.S
The end signature was defined in wakeup_asm.S as it originally came
from the ACPI wakeup code. However, we rely on the existence of the
.signature section to expand .bss, otherwise we would have to include
code to explicitly zero the .bss depending on the configuration.
Since the expanded .bss is just in .init.data anyway, it's easier to
always have it expanded.
This fixes failures when compiled without CONFIG_ACPI_SLEEP.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Jarkko Sakkinen <jarkko.sakkinen@intel.com>
Diffstat (limited to 'arch/x86/realmode/rm/wakeup_asm.S')
| -rw-r--r-- | arch/x86/realmode/rm/wakeup_asm.S | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/realmode/rm/wakeup_asm.S b/arch/x86/realmode/rm/wakeup_asm.S index 46108f0..8905166 100644 --- a/arch/x86/realmode/rm/wakeup_asm.S +++ b/arch/x86/realmode/rm/wakeup_asm.S @@ -85,7 +85,7 @@ ENTRY(wakeup_start) /* Check we really have everything... */ movl end_signature, %eax - cmpl $WAKEUP_END_SIGNATURE, %eax + cmpl $REALMODE_END_SIGNATURE, %eax jne bogus_real_magic /* Call the C code */ @@ -175,7 +175,3 @@ GLOBAL(wakeup_idt) .long 0 /* address */ .word 0 END(wakeup_idt) - - .section ".signature","a" -end_signature: - .long WAKEUP_END_SIGNATURE |