Some patches for 2.1.97

Paul (PELaufer@CSUPomona.edu)
Sun, 19 Apr 1998 13:12:30 -0700

I applied three patches from this list to my 2.1.97 source, and now it
compiles and runs properly, so far. Anyway, I have put together the
lp.c (fixes parport errors), system.h (fixes the assembler bug), and
pci.c (fixes problems with /proc/bus/pci not showing up) patches into
this patch. Hope I did it right. This is my first attempt . . .

---=== Cut here ===---
diff -urN linux-2.1.97/drivers/char/lp.c linux/drivers/char/lp.c
--- linux-2.1.97/drivers/char/lp.c Sun Apr 19 11:51:15 1998
+++ linux/drivers/char/lp.c Sun Apr 19 10:37:53 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 -urN linux-2.1.97/drivers/pci/pci.c linux/drivers/pci/pci.c
--- linux-2.1.97/drivers/pci/pci.c Sun Apr 19 11:51:16 1998
+++ linux/drivers/pci/pci.c Sun Apr 19 10:44:00 1998
@@ -323,7 +323,7 @@
pci_quirks_init();
#endif

-#ifdef CONFIG_PROC
+#ifdef CONFIG_PROC_FS
pci_proc_init();
#endif
}
diff -urN linux-2.1.97/include/asm-i386/system.h
linux/include/asm-i386/system.h
--- linux-2.1.97/include/asm-i386/system.h Sun Apr 19 11:51:18 1998

+++ linux/include/asm-i386/system.h Sun Apr 19 10:31:01 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)

---=== Cut here ===---

--
Americans - Born free, taxed to death.








-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu