[GIT PULL] x86/cleanups for v3.6

Ingo Molnar
2012-07-25T14:42:21Z

Linus,

Please pull the latest x86-cleanups-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus

HEAD: e5a7286b5f1b0b5beb97275f2152bf10c4aa4204 x86, boot: Remove ancient, unconditionally #ifdef'd out dead code

Just a single cleanup.

Thanks,

Ingo

------------------>
Paul Bolle (1):
x86, boot: Remove ancient, unconditionally #ifdef'd out dead code

arch/x86/boot/header.S | 7 -------
1 file changed, 7 deletions(-)

diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 8bbea6a..fde5bde 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -386,13 +386,6 @@ init_size: .long INIT_SIZE # kernel initialization size

.section ".entrytext", "ax"
start_of_setup:
-#ifdef SAFE_RESET_DISK_CONTROLLER
-# Reset the disk controller.
- movw $0x0000, %ax # Reset disk controller
- movb $0x80, %dl # All disks
- int $0x13
-#endif
-
# Force %es = %ds
movw %ds, %ax
movw %ax, %es