All of lore.kernel.org
 help / color / mirror / Atom feed
From: tip-bot for Paul Bolle <pebolle@tiscali.nl>
To: linux-tip-commits@vger.kernel.org
Cc: jepler@unpythonic.net, linux-kernel@vger.kernel.org,
	pebolle@tiscali.nl, hpa@zytor.com, mingo@kernel.org,
	jj@chaosbits.net, tglx@linutronix.de, hpa@linux.intel.com
Subject: [tip:x86/cleanups] x86, boot: Remove ancient, unconditionally #ifdef'd out dead code
Date: Wed, 20 Jun 2012 17:38:09 -0700	[thread overview]
Message-ID: <tip-e5a7286b5f1b0b5beb97275f2152bf10c4aa4204@git.kernel.org> (raw)
In-Reply-To: <1340230589.1773.7.camel@x61.thuisdomein>

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

  parent reply	other threads:[~2012-06-21  0:38 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-20 22:16 [PATCH] x86: boot: Remove ancient dead code Paul Bolle
2012-06-20 22:23 ` Jesper Juhl
2012-06-20 23:02 ` Jeff Epler
2012-06-21  0:38 ` tip-bot for Paul Bolle [this message]
2012-06-21  5:46 ` Ingo Molnar

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tip-e5a7286b5f1b0b5beb97275f2152bf10c4aa4204@git.kernel.org \
    --to=pebolle@tiscali.nl \
    --cc=hpa@linux.intel.com \
    --cc=hpa@zytor.com \
    --cc=jepler@unpythonic.net \
    --cc=jj@chaosbits.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.