| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 22 Jul 2012 19:25:47 +0000 (12:25 -0700) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 22 Jul 2012 19:25:47 +0000 (12:25 -0700) | ||
| commit | d5d96ed2d89ea228bdc27980b8ee4c94422ddef5 | |
| tree | 378860da8a2b7209905fb8856746a7ce95fbca4c | tree | snapshot (tar.xz tar.gz zip) |
| parent | bd3e57f9132ac55e2848aa10cf50341de2508e1d | commit | diff |
| parent | 9751d7627582fc1cc64625d63bde9528c14f1544 | commit | diff |
Merge branch 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/reboot changes from Ingo Molnar:
"Now that the revampted x86 real-mode trampoline code is upstream and
seems to be working well, we can extend the 64-bit reboot code to be
as capable as the 32-bit one."
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, reboot: Be more paranoid in 64-bit reboot=bios
x86, reboot: Drop redundant write of reboot_mode
x86-64, reboot: Allow reboot=bios and reboot-cpu override on x86-64
Pull x86/reboot changes from Ingo Molnar:
"Now that the revampted x86 real-mode trampoline code is upstream and
seems to be working well, we can extend the 64-bit reboot code to be
as capable as the 32-bit one."
* 'x86-reboot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86-64, reboot: Be more paranoid in 64-bit reboot=bios
x86, reboot: Drop redundant write of reboot_mode
x86-64, reboot: Allow reboot=bios and reboot-cpu override on x86-64
| arch/x86/kernel/reboot.c | diff1 | | diff2 | | blob | history |