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!
Signed-off-by: Paul Bolle <[email protected]>
Link: https://lkml.org/lkml/1996/3/30/38
Cc: Jeff Epler <[email protected]>
---
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 efe5acf..9b9c647 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -406,13 +406,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
--
1.7.7.6
On Thu, 21 Jun 2012, Paul Bolle wrote:
> 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!
>
> Signed-off-by: Paul Bolle <[email protected]>
> Link: https://lkml.org/lkml/1996/3/30/38
> Cc: Jeff Epler <[email protected]>
> ---
> 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 efe5acf..9b9c647 100644
> --- a/arch/x86/boot/header.S
> +++ b/arch/x86/boot/header.S
> @@ -406,13 +406,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
>
Looks good to me.
Not that I have much knowledge of the code, but I did dig the history a
bit and yes, this looks like long dead stuff that should just go away.
Acked-by: Jesper Juhl <[email protected]>
--
Jesper Juhl <[email protected]> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
I hope you didn't spend too much time tracking me down just to Cc me on
this proposed change.
Unfortunately, I no longer have access to the hardware that I reported
the problem on. :-P Anyway,
Acked-by: Jeff Epler <[email protected]>
Jeff
Commit-ID: e5a7286b5f1b0b5beb97275f2152bf10c4aa4204
Gitweb: http://git.kernel.org/tip/e5a7286b5f1b0b5beb97275f2152bf10c4aa4204
Author: Paul Bolle <[email protected]>
AuthorDate: Thu, 21 Jun 2012 00:16:29 +0200
Committer: H. Peter Anvin <[email protected]>
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/[email protected]
Signed-off-by: Paul Bolle <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Acked-by: Jeff Epler <[email protected]>
Acked-by: Jesper Juhl <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
---
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
* Paul Bolle <[email protected]> wrote:
> 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!
and putting it into assembly code is also key to success!
Thanks,
Ingo