diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:51 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 11:25:51 -0400 |
| commit | 9e9abecfc0ff3a9ad2ead954b37bbfcb863c775e (patch) | |
| tree | 0c3ffda953b82750638a06507591ad587b565ff2 /arch/x86/boot/video-bios.c | |
| parent | d7bb545d86825e635cab33a1dd81ca0ad7b92887 (diff) | |
| parent | 77ad386e596c6b0930cc2e09e3cce485e3ee7f72 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (613 commits)
x86: standalone trampoline code
x86: move suspend wakeup code to C
x86: coding style fixes to arch/x86/kernel/acpi/sleep.c
x86: setup_trampoline() - fix section mismatch warning
x86: section mismatch fixes, #1
x86: fix paranoia about using BIOS quickboot mechanism.
x86: print out buggy mptable
x86: use cpu_online()
x86: use cpumask_of_cpu()
x86: remove unnecessary tmp local variable
x86: remove unnecessary memset()
x86: use ioapic_read_entry() and ioapic_write_entry()
x86: avoid redundant loop in io_apic_level_ack_pending()
x86: remove superfluous initialisation in boot code.
x86: merge mpparse_{32,64}.c
x86: unify mp_register_gsi
x86: unify mp_config_acpi_legacy_irqs
x86: unify mp_register_ioapic
x86: unify uniq_io_apic_id
x86: unify smp_scan_config
...
Diffstat (limited to 'arch/x86/boot/video-bios.c')
| -rw-r--r-- | arch/x86/boot/video-bios.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/boot/video-bios.c b/arch/x86/boot/video-bios.c index ff664a117096..39e247e96172 100644 --- a/arch/x86/boot/video-bios.c +++ b/arch/x86/boot/video-bios.c | |||
| @@ -50,6 +50,7 @@ static int set_bios_mode(u8 mode) | |||
| 50 | if (new_mode == mode) | 50 | if (new_mode == mode) |
| 51 | return 0; /* Mode change OK */ | 51 | return 0; /* Mode change OK */ |
| 52 | 52 | ||
| 53 | #ifndef _WAKEUP | ||
| 53 | if (new_mode != boot_params.screen_info.orig_video_mode) { | 54 | if (new_mode != boot_params.screen_info.orig_video_mode) { |
| 54 | /* Mode setting failed, but we didn't end up where we | 55 | /* Mode setting failed, but we didn't end up where we |
| 55 | started. That's bad. Try to revert to the original | 56 | started. That's bad. Try to revert to the original |
| @@ -59,13 +60,18 @@ static int set_bios_mode(u8 mode) | |||
| 59 | : "+a" (ax) | 60 | : "+a" (ax) |
| 60 | : : "ebx", "ecx", "edx", "esi", "edi"); | 61 | : : "ebx", "ecx", "edx", "esi", "edi"); |
| 61 | } | 62 | } |
| 63 | #endif | ||
| 62 | return -1; | 64 | return -1; |
| 63 | } | 65 | } |
| 64 | 66 | ||
| 65 | static int bios_probe(void) | 67 | static int bios_probe(void) |
| 66 | { | 68 | { |
| 67 | u8 mode; | 69 | u8 mode; |
| 70 | #ifdef _WAKEUP | ||
| 71 | u8 saved_mode = 0x03; | ||
| 72 | #else | ||
| 68 | u8 saved_mode = boot_params.screen_info.orig_video_mode; | 73 | u8 saved_mode = boot_params.screen_info.orig_video_mode; |
| 74 | #endif | ||
| 69 | u16 crtc; | 75 | u16 crtc; |
| 70 | struct mode_info *mi; | 76 | struct mode_info *mi; |
| 71 | int nmodes = 0; | 77 | int nmodes = 0; |