From: Adrian Bunk Nowadays, even Debian stable ships a microcode_ctl utility recent enough to no longer use this ioctl. Signed-off-by: Adrian Bunk Acked-by: Tigran Aivazian Signed-off-by: Andrew Morton --- 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(-) diff -puN arch/i386/kernel/microcode.c~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl arch/i386/kernel/microcode.c --- devel/arch/i386/kernel/microcode.c~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl 2005-12-22 05:10:24.000000000 -0800 +++ devel-akpm/arch/i386/kernel/microcode.c 2005-12-22 05:10:24.000000000 -0800 @@ -457,26 +457,9 @@ static ssize_t microcode_write (struct f 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, }; diff -puN Documentation/ioctl-mess.txt~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl Documentation/ioctl-mess.txt --- devel/Documentation/ioctl-mess.txt~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl 2005-12-22 05:10:24.000000000 -0800 +++ devel-akpm/Documentation/ioctl-mess.txt 2005-12-22 05:10:24.000000000 -0800 @@ -2599,10 +2599,6 @@ N: MGSL_IOCTXENABLE I: (int) arg O: - -N: MICROCODE_IOCFREE -I: - -O: - - N: MMTIMER_GETBITS I: - O: - diff -puN Documentation/ioctl-number.txt~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl Documentation/ioctl-number.txt --- devel/Documentation/ioctl-number.txt~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl 2005-12-22 05:10:24.000000000 -0800 +++ devel-akpm/Documentation/ioctl-number.txt 2005-12-22 05:10:24.000000000 -0800 @@ -78,8 +78,6 @@ Code Seq# Include File Comments '#' 00-3F IEEE 1394 Subsystem Block for the entire subsystem '1' 00-1F PPS kit from Ulrich Windl -'6' 00-10 Intel IA32 microcode update driver - '8' all SNP8023 advanced NIC card 'A' 00-1F linux/apm_bios.h diff -puN include/asm-i386/processor.h~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl include/asm-i386/processor.h --- devel/include/asm-i386/processor.h~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl 2005-12-22 05:10:24.000000000 -0800 +++ devel-akpm/include/asm-i386/processor.h 2005-12-22 05:10:24.000000000 -0800 @@ -604,8 +604,6 @@ struct extended_sigtable { 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) diff -puN include/asm-x86_64/processor.h~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl include/asm-x86_64/processor.h --- devel/include/asm-x86_64/processor.h~arch-i386-kernel-microcodec-remove-the-obsolete-microcode_ioctl 2005-12-22 05:10:24.000000000 -0800 +++ devel-akpm/include/asm-x86_64/processor.h 2005-12-22 05:10:24.000000000 -0800 @@ -361,9 +361,6 @@ struct extended_sigtable { 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 _