diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/x86/kernel/acpi/wakeup_rm.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/x86/kernel/acpi/wakeup_rm.S')
| -rw-r--r-- | arch/x86/kernel/acpi/wakeup_rm.S | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/arch/x86/kernel/acpi/wakeup_rm.S b/arch/x86/kernel/acpi/wakeup_rm.S index 6ff3b5730575..63b8ab524f2c 100644 --- a/arch/x86/kernel/acpi/wakeup_rm.S +++ b/arch/x86/kernel/acpi/wakeup_rm.S | |||
| @@ -2,9 +2,11 @@ | |||
| 2 | * Wrapper script for the realmode binary as a transport object | 2 | * Wrapper script for the realmode binary as a transport object |
| 3 | * before copying to low memory. | 3 | * before copying to low memory. |
| 4 | */ | 4 | */ |
| 5 | .section ".rodata","a" | 5 | #include <asm/page_types.h> |
| 6 | .globl wakeup_code_start, wakeup_code_end | 6 | |
| 7 | wakeup_code_start: | 7 | .section ".x86_trampoline","a" |
| 8 | .balign PAGE_SIZE | ||
| 9 | .globl acpi_wakeup_code | ||
| 10 | acpi_wakeup_code: | ||
| 8 | .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" | 11 | .incbin "arch/x86/kernel/acpi/realmode/wakeup.bin" |
| 9 | wakeup_code_end: | 12 | .size acpi_wakeup_code, .-acpi_wakeup_code |
| 10 | .size wakeup_code_start, .-wakeup_code_start | ||