diff -urN microcode_ctl-1.06-orig/microcode_ctl.8 microcode_ctl-1.06/microcode_ctl.8 --- microcode_ctl-1.06-orig/microcode_ctl.8 2001-04-14 23:18:13.000000000 +0100 +++ microcode_ctl-1.06/microcode_ctl.8 2003-09-01 17:53:17.000000000 +0100 @@ -4,7 +4,7 @@ microcode_ctl \- microcode utility for Intel IA32 processors .SH SYNOPSIS .B microcode_ctl -[\fI\-h\fR] [\fI\-i\fR] [\fI\-u\fR [\fI\-q\fR]] [\fI\-Q\fR] [\fI\-f microcode\fR] +[\fI\-h\fR] [\fI\-u\fR [\fI\-q\fR]] [\fI\-Q\fR] [\fI\-f microcode\fR] .br .SH DESCRIPTION ." Add any additional description here @@ -31,9 +31,6 @@ \fB\-h\fR display usage and exit .TP -\fB\-i\fR -release any buffers held in microcode driver -.TP \fB\-u\fR upload microcode (from default filename) .TP @@ -48,8 +45,8 @@ .PD .SH EXAMPLE .TP -microcode_ctl -iu -Upload and free kernel buffers +microcode_ctl -u +Upload microcode .SH FILES .TP /etc/microcode.dat diff -urN microcode_ctl-1.06-orig/microcode_ctl.c microcode_ctl-1.06/microcode_ctl.c --- microcode_ctl-1.06-orig/microcode_ctl.c 2001-04-14 23:18:13.000000000 +0100 +++ microcode_ctl-1.06/microcode_ctl.c 2003-09-01 17:53:31.000000000 +0100 @@ -39,11 +39,6 @@ #define MICROCODE_DEVICE_DEFAULT "/dev/cpu/microcode" #define MICROCODE_FILE_DEFAULT "/etc/microcode.dat" -/* yuck */ -#ifndef MICROCODE_IOCFREE -#define MICROCODE_IOCFREE _IO('6',0) -#endif - static void usage(void) { @@ -54,37 +49,10 @@ " -h this usage message\n" " -q run silently when successful\n" " -Q run silently even on failure\n" - " -i release any buffers held in microcode driver\n" " -u upload microcode (default filename:\"%s\"\n" " -f upload microcode from named Intel formatted file\n\n", progname, MICROCODE_FILE_DEFAULT); } -static int do_ioctl(char *device, int cmd) -{ - int fd; - int error = 0; - - fd = open(device, O_RDONLY); - if (fd == -1) { - if(print_error_messages) - fprintf(stderr, "%s: open(%s), errno=%d (%s)\n", - progname, device, errno, strerror(errno)); - - return errno; - } - if (ioctl(fd, cmd, 0) == -1) { - if(print_error_messages) - fprintf(stderr, "%s: ioctl(cmd=%d), errno=%d (%s)\n", - progname, cmd, errno, strerror(errno)); - error = 2; - } - (void)close(fd); - if(!error && print_normal_messages) - fprintf(stderr, "%s: microcode buffers released\n", progname); - - return error; -} - /* * The update has two stages; * a) read in the Intel microcode file and convert it into a format suitable @@ -167,7 +135,7 @@ int c; static char device[2048]; static char filename[2048]; - int upload=0, freeflag=0; + int upload=0; int return_code; progname = argv[0]; @@ -199,10 +167,6 @@ strcpy(device, optarg); break; - case 'i': /* send the ioctl to free the buffers */ - freeflag++; - break; - case 'u': /* do a microcode upload */ upload++; break; @@ -222,10 +186,7 @@ if((return_code = do_update(device, filename))) exit(return_code); - if (freeflag) - exit(do_ioctl(device, MICROCODE_IOCFREE)); - - if(!upload && !freeflag) + if(!upload) usage(); return 0; diff -urN microcode_ctl-1.06-orig/microcode_ctl.start microcode_ctl-1.06/microcode_ctl.start --- microcode_ctl-1.06-orig/microcode_ctl.start 2001-06-11 15:34:08.000000000 +0100 +++ microcode_ctl-1.06/microcode_ctl.start 2003-09-01 17:53:58.000000000 +0100 @@ -12,7 +12,7 @@ # VERBOSE put yes/no (case sensitive) to verbose or to be quiet DEVICE=/dev/cpu/microcode -ARGUMENTS=-Qui +ARGUMENTS=-Qu RETVAL=0 # Sort out the executable to run.