diff -u --recursive --new-file linux-2.1.97/drivers/char/lp.c linux/drivers/char/lp.c
--- linux-2.1.97/drivers/char/lp.c Fri Apr 17 23:57:16 1998
+++ linux/drivers/char/lp.c Sat Apr 18 20:28:25 1998
@@ -658,7 +658,7 @@
#else
-static int parport[LP_NO] __initdata = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
+static int parport_nr[LP_NO] __initdata = { [0 ... LP_NO-1] = LP_PARPORT_UNSPEC };
static int reset __initdata = 0;
static int parport_ptr = 0;
@@ -668,21 +668,21 @@
if (!str) {
if (ints[0] == 0 || ints[1] == 0) {
/* disable driver on "lp=" or "lp=0" */
- parport[0] = LP_PARPORT_OFF;
+ parport_nr[0] = LP_PARPORT_OFF;
} else {
printk(KERN_WARNING "warning: 'lp=0x%x' is deprecated, ignored\n", ints[1]);
}
} else if (!strncmp(str, "parport", 7)) {
int n = simple_strtoul(str+7, NULL, 10);
if (parport_ptr < LP_NO)
- parport[parport_ptr++] = n;
+ parport_nr[parport_ptr++] = n;
else
printk(KERN_INFO "lp: too many ports, %s ignored.\n",
str);
} else if (!strcmp(str, "auto")) {
- parport[0] = LP_PARPORT_AUTO;
+ parport_nr[0] = LP_PARPORT_AUTO;
} else if (!strcmp(str, "none")) {
- parport[parport_ptr++] = LP_PARPORT_NONE;
+ parport_nr[parport_ptr++] = LP_PARPORT_NONE;
} else if (!strcmp(str, "reset")) {
reset = 1;
}
diff -u --recursive --new-file linux-2.1.97/include/asm-i386/system.h linux/include/asm-i386/system.h
--- linux-2.1.97/include/asm-i386/system.h Wed Apr 15 14:33:44 1998
+++ linux/include/asm-i386/system.h Sat Apr 18 20:27:35 1998
@@ -293,7 +293,7 @@
"movb $0,6(%2)\n\t" \
"movb %%ah,7(%2)\n\t" \
"rorl $16,%%eax" \
- : "=m"(*(n)) : "a" (addr), "r"(n), "g"(limit), "i"(type))
+ : "=m"(*(n)) : "a" (addr), "r"(n), "ir"(limit), "i"(type))
#define set_tss_desc(n,addr) \
_set_tssldt_desc(((char *) (n)),((int)(addr)),235,0x89)
diff -u --recursive --new-file linux-2.1.97/kernel/kmod.c linux/kernel/kmod.c
--- linux-2.1.97/kernel/kmod.c Mon Apr 13 20:11:38 1998
+++ linux/kernel/kmod.c Sat Apr 18 20:41:05 1998
@@ -113,7 +113,7 @@
* CLONE_FILES just saves some space (we don't need any
* new file descriptors). Ditto for CLONE_SIGHAND.
*/
- kernel_thread(kmod_thread, NULL, CLONE_FILES | CLONE_FS | CLONE_SIGHAND);
+ kernel_thread(kmod_thread, NULL, CLONE_FILES | CLONE_FS | CLONE_SIGHAND);
kmod_unload_timer.next = NULL;
kmod_unload_timer.prev = NULL;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu