Commit-ID: e5a7286b5f1b0b5beb97275f2152bf10c4aa4204 Gitweb: http://git.kernel.org/tip/e5a7286b5f1b0b5beb97275f2152bf10c4aa4204 Author: Paul Bolle <pebolle@xxxxxxxxxx> AuthorDate: Thu, 21 Jun 2012 00:16:29 +0200 Committer: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> CommitDate: Wed, 20 Jun 2012 17:28:56 -0700 x86, boot: Remove ancient, unconditionally #ifdef'd out dead code Release v1.3.82 wrapped a few lines of code in an "#ifdef SAFE_RESET_DISK_CONTROLLER" and "#endif" pair. Since SAFE_RESET_DISK_CONTROLLER was never defined anywhere that was basically a verbose "#ifdef 0" and "#endif" pair. These dead lines have been in the tree for sixteen years but now the time has come to remove them. I guess the main lesson here is that if you want your dead code in the tree for a very long time you'd better be creative. A plain old "#ifdef 0" and "#endif" pair just doesn't cut it! See: http://lkml.kernel.org/r/199603301718.LAA00178@xxxxxxxxxxxxxxxxxx Signed-off-by: Paul Bolle <pebolle@xxxxxxxxxx> Link: http://lkml.kernel.org/r/1340230589.1773.7.camel@x61.thuisdomein Acked-by: Jeff Epler <jepler@xxxxxxxxxxxxxx> Acked-by: Jesper Juhl <jj@xxxxxxxxxxxxx> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxxxxxxxx> --- arch/x86/boot/header.S | 7 ------- 1 files changed, 0 insertions(+), 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 -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|