Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f45e4656 authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] 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: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarTigran Aivazian <tigran_aivazian@symantec.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 50fc9999

Documentation/ioctl-number.txt

+0 −2
Original line number Diff line number Diff line
@@ -78,8 +78,6 @@ Code Seq# Include File Comments 
'#'	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

arch/i386/kernel/microcode.c

+0 −17
Original line number Diff line number Diff line
@@ -459,26 +459,9 @@ static ssize_t microcode_write (struct file *file, const char __user *buf, size_ 
	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,

};

include/asm-i386/processor.h

+0 −2
Original line number Diff line number Diff line
@@ -621,8 +621,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)

include/asm-x86_64/processor.h

+0 −3
Original line number Diff line number Diff line
@@ -358,9 +358,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