arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl
PATCH 1/1 arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl
Nowadays, even Debian stable ships a microcode_ctl utility recent enough to no longer use this ioctl.
Signed-off-by Adrian Bunk <[email protected]>
Acked-by Tigran Aivazian <[email protected]>
---
This patch was already sent on:
- 21 Nov 2005
Documentation/ioctl-mess.txt | 4 ---- Documentation/ioctl-number.txt | 2 -- arch/i386/kernel/microcode.c | 17 ----------------- include/asm-i386/processor.h | 2 -- include/asm-x86_64/processor.h | 3 --- 5 files changed, 28 deletions(-)
arch/i386/kernel/microcode.c renamed from arch/i386/kernel/microcode.c.old +0 -17
@@ -457,26 +457,9 @@return ret; } -static int microcode_ioctl (struct inode *inode,struct file *file, -unsigned int cmd,unsigned long arg) -{ -switch (cmd) { -/* -* XXX: will be removed after microcode_ctl -* is updated to ignore failure of this ioctl() -*/ -case MICROCODE_IOCFREE : -return 0 ; -default : -return -EINVAL ; - } -return -EINVAL ; -} -static struct file_operations microcode_fops = { .owner =THIS_MODULE , .write = microcode_write, - .ioctl = microcode_ioctl, .open = microcode_open, };
Documentation/ioctl-mess.txt renamed from Documentation/ioctl-mess.txt.old +0 -4
@@ -2599,10 +2599,6 @@ I: (int) arg O: - -N: MICROCODE_IOCFREE -I: - -O: - - N: MMTIMER_GETBITS I: - O: -
Documentation/ioctl-number.txt renamed from Documentation/ioctl-number.txt.old +0 -2
@@ -78,8 +78,6 @@ '#' 00-3F IEEE 1394 Subsystem Block for the entire subsystem '1' 00-1F <linux/timepps.h> PPS kit from Ulrich Windl <ftp://ftp.de.kernel.org/pub/linux/daemons/ntp/PPS/> -'6' 00-10 <asm-i386/processor.h> Intel IA32 microcode update driver - <mailto:[email protected]> '8' all SNP8023 advanced NIC card <mailto:[email protected]> 'A' 00-1F linux/apm_bios.h
include/asm-i386/processor.h renamed from include/asm-i386/processor.h.old +0 -2
@@ -602,8 +602,6 @@unsigned int reserved[3 ];struct extended_signature sigs[0 ]; }; -/* '6' because it used to be for P6 only (but now covers Pentium 4 as well) */ -#define MICROCODE_IOCFREE _IO('6',0)/* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */ static inline void rep_nop (void )
include/asm-x86_64/processor.h renamed from include/asm-x86_64/processor.h.old +0 -3
@@ -357,9 +357,6 @@struct extended_signature sigs[0 ]; }; -/* '6' because it used to be for P6 only (but now covers Pentium 4 as well) */ -#define MICROCODE_IOCFREE _IO('6',0) -#define ASM_NOP1 K8_NOP1#define ASM_NOP2 K8_NOP2