lkml.org 
[lkml]   [2012]   [Jun]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:x86/cleanups] x86, boot: Remove ancient, unconditionally #ifdef'd out dead code
Commit-ID:  e5a7286b5f1b0b5beb97275f2152bf10c4aa4204
Gitweb: http://git.kernel.org/tip/e5a7286b5f1b0b5beb97275f2152bf10c4aa4204
Author: Paul Bolle <pebolle@tiscali.nl>
AuthorDate: Thu, 21 Jun 2012 00:16:29 +0200
Committer: H. Peter Anvin <hpa@linux.intel.com>
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@craie.inetnebr.com

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Link: http://lkml.kernel.org/r/1340230589.1773.7.camel@x61.thuisdomein
Acked-by: Jeff Epler <jepler@unpythonic.net>
Acked-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
---
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

\
 
 \ /
  Last update: 2012-06-21 03:21    [W:0.059 / U:0.148 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site