]> git.baikalelectronics.ru Git - kernel.git/commit
x86: unify include/asm/floppy_32/64.h
authorThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:24:56 +0000 (20:24 +0200)
committerThomas Gleixner <tglx@inhelltoy.tec.linutronix.de>
Wed, 17 Oct 2007 18:24:56 +0000 (20:24 +0200)
commitb38a8890271e573e5f99ebe3a3f34cbd3b978cd3
treea2f54256a757a0ca272b59b3751dedbfd202ea60
parentfbcd4515e85168cd6b9a36bcca71b6de8fbc7ca7
x86: unify include/asm/floppy_32/64.h

Same file, except for whitespace, comment formatting and:

32-bit: if((unsigned int) addr >= (unsigned int) high_memory)
64-bit: if((unsigned long) addr >= (unsigned long) high_memory)

where the latter can be used safely for both.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:
include/asm-x86/floppy_32.h
include/asm-x86/floppy_64.h
include/asm-x86/floppy.h
include/asm-x86/floppy_32.h [deleted file]
include/asm-x86/floppy_64.h [deleted file]