* [RFC: 2.6 patch] arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl
@ 2005-11-20 23:31 Adrian Bunk
2005-11-21 2:04 ` Adrian Bunk
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Bunk @ 2005-11-20 23:31 UTC (permalink / raw)
To: tigran; +Cc: linux-kernel
Nowadays, even Debian stable ships a microcode_ctl utility recent enough
to no longer use this ioctl.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
arch/i386/kernel/microcode.c | 17 -----------------
1 file changed, 17 deletions(-)
--- linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c.old 2005-11-20 21:30:59.000000000 +0100
+++ linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c 2005-11-20 21:31:24.000000000 +0100
@@ -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,
};
^ permalink raw reply [flat|nested] 3+ messages in thread* [RFC: 2.6 patch] arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl 2005-11-20 23:31 [RFC: 2.6 patch] arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl Adrian Bunk @ 2005-11-21 2:04 ` Adrian Bunk 2005-11-21 10:26 ` Tigran Aivazian 0 siblings, 1 reply; 3+ messages in thread From: Adrian Bunk @ 2005-11-21 2:04 UTC (permalink / raw) To: tigran; +Cc: linux-kernel [ grmbl, wrong version of the patch sent... ] Nowadays, even Debian stable ships a microcode_ctl utility recent enough to no longer use this ioctl. Signed-off-by: Adrian Bunk <bunk@stusta.de> --- 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(-) --- linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c.old 2005-11-20 21:30:59.000000000 +0100 +++ linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c 2005-11-20 21:31:24.000000000 +0100 @@ -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, }; --- linux-2.6.15-rc1-mm2-full/Documentation/ioctl-mess.txt.old 2005-11-21 00:38:33.000000000 +0100 +++ linux-2.6.15-rc1-mm2-full/Documentation/ioctl-mess.txt 2005-11-21 00:38:44.000000000 +0100 @@ -2599,10 +2599,6 @@ I: (int) arg O: - -N: MICROCODE_IOCFREE -I: - -O: - - N: MMTIMER_GETBITS I: - O: - --- linux-2.6.15-rc1-mm2-full/Documentation/ioctl-number.txt.old 2005-11-21 00:39:05.000000000 +0100 +++ linux-2.6.15-rc1-mm2-full/Documentation/ioctl-number.txt 2005-11-21 00:39:28.000000000 +0100 @@ -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:tigran@veritas.com> '8' all SNP8023 advanced NIC card <mailto:mcr@solidum.com> 'A' 00-1F linux/apm_bios.h --- linux-2.6.15-rc1-mm2-full/include/asm-i386/processor.h.old 2005-11-21 00:39:41.000000000 +0100 +++ linux-2.6.15-rc1-mm2-full/include/asm-i386/processor.h 2005-11-21 00:40:33.000000000 +0100 @@ -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) --- linux-2.6.15-rc1-mm2-full/include/asm-x86_64/processor.h.old 2005-11-21 00:40:37.000000000 +0100 +++ linux-2.6.15-rc1-mm2-full/include/asm-x86_64/processor.h 2005-11-21 00:40:42.000000000 +0100 @@ -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 ^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [RFC: 2.6 patch] arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl 2005-11-21 2:04 ` Adrian Bunk @ 2005-11-21 10:26 ` Tigran Aivazian 0 siblings, 0 replies; 3+ messages in thread From: Tigran Aivazian @ 2005-11-21 10:26 UTC (permalink / raw) To: Adrian Bunk; +Cc: linux-kernel Hi Adrian, I agree, let's drop that ioctl. Please forward the patch to Andrew as appropriate. Kind regards Tigran On Mon, 21 Nov 2005, Adrian Bunk wrote: > [ grmbl, wrong version of the patch sent... ] > > Nowadays, even Debian stable ships a microcode_ctl utility recent enough > to no longer use this ioctl. > > > Signed-off-by: Adrian Bunk <bunk@stusta.de> > > --- > > 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(-) > > --- linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c.old 2005-11-20 21:30:59.000000000 +0100 > +++ linux-2.6.15-rc1-mm2-full/arch/i386/kernel/microcode.c 2005-11-20 21:31:24.000000000 +0100 > @@ -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, > }; > > --- linux-2.6.15-rc1-mm2-full/Documentation/ioctl-mess.txt.old 2005-11-21 00:38:33.000000000 +0100 > +++ linux-2.6.15-rc1-mm2-full/Documentation/ioctl-mess.txt 2005-11-21 00:38:44.000000000 +0100 > @@ -2599,10 +2599,6 @@ > I: (int) arg > O: - > > -N: MICROCODE_IOCFREE > -I: - > -O: - > - > N: MMTIMER_GETBITS > I: - > O: - > --- linux-2.6.15-rc1-mm2-full/Documentation/ioctl-number.txt.old 2005-11-21 00:39:05.000000000 +0100 > +++ linux-2.6.15-rc1-mm2-full/Documentation/ioctl-number.txt 2005-11-21 00:39:28.000000000 +0100 > @@ -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:tigran@veritas.com> > '8' all SNP8023 advanced NIC card > <mailto:mcr@solidum.com> > 'A' 00-1F linux/apm_bios.h > --- linux-2.6.15-rc1-mm2-full/include/asm-i386/processor.h.old 2005-11-21 00:39:41.000000000 +0100 > +++ linux-2.6.15-rc1-mm2-full/include/asm-i386/processor.h 2005-11-21 00:40:33.000000000 +0100 > @@ -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) > --- linux-2.6.15-rc1-mm2-full/include/asm-x86_64/processor.h.old 2005-11-21 00:40:37.000000000 +0100 > +++ linux-2.6.15-rc1-mm2-full/include/asm-x86_64/processor.h 2005-11-21 00:40:42.000000000 +0100 > @@ -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 > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2005-11-21 10:25 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2005-11-20 23:31 [RFC: 2.6 patch] arch/i386/kernel/microcode.c: remove the obsolete microcode_ioctl Adrian Bunk 2005-11-21 2:04 ` Adrian Bunk 2005-11-21 10:26 ` Tigran Aivazian
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox