2.1.89-pre-3.diff

Byeong-ryeol Kim (jinbo21@soback.kornet.nm.kr)
Sat, 28 Feb 1998 01:25:16 +0900

I could compile kernel 2.1.89-pre-3 with following patch.
And, with this patch my SB32 AWE sound card(non-PnP) began
to sing agin. :-)

diff -u -r --new-file linux-2.1.89-pre-3/arch/i386/kernel/irq.c linux/arch/i386/kernel/irq.c
--- linux-2.1.89-pre-3/arch/i386/kernel/irq.c Sat Feb 28 01:04:45 1998
+++ linux/arch/i386/kernel/irq.c Fri Feb 27 21:00:58 1998
@@ -174,12 +174,17 @@

void unmask_generic_irq(unsigned int irq)
{
+#ifdef __SMP__
if (IO_APIC_IRQ(irq))
enable_IO_APIC_irq(irq);
else {
cached_irq_mask &= ~(1 << irq);
set_8259A_irq_mask(irq);
}
+#else
+ cached_irq_mask &= ~(1 << irq);
+ set_8259A_irq_mask(irq);
+#endif
}

/*
diff -u -r --new-file linux-2.1.89-pre-3/drivers/char/hfmodem/modem.c linux/drivers/char/hfmodem/modem.c
--- linux-2.1.89-pre-3/drivers/char/hfmodem/modem.c Wed Aug 6 01:48:55 1997
+++ linux/drivers/char/hfmodem/modem.c Fri Feb 27 21:10:45 1998
@@ -576,7 +576,7 @@
cnt2++;
}
restore_flags(flags);
- poll_wait(&dev->wait, wait);
+ poll_wait(file, &dev->wait, wait);
if (cnt1 || !cnt2)
return POLLIN | POLLRDNORM;
return 0;
diff -u -r --new-file linux-2.1.89-pre-3/drivers/isdn/avmb1/capi.c linux/drivers/isdn/avmb1/capi.c
--- linux-2.1.89-pre-3/drivers/isdn/avmb1/capi.c Wed Feb 11 06:07:50 1998
+++ linux/drivers/isdn/avmb1/capi.c Fri Feb 27 21:23:40 1998
@@ -207,7 +207,7 @@
return POLLERR;

cdev = &capidevs[minor];
- poll_wait(&(cdev->recv_wait), wait);
+ poll_wait(file, &(cdev->recv_wait), wait);
mask = POLLOUT | POLLWRNORM;
if (!skb_queue_empty(&cdev->recv_queue))
mask |= POLLIN | POLLRDNORM;
diff -u -r --new-file linux-2.1.89-pre-3/drivers/sound/maui.c linux/drivers/sound/maui.c
--- linux-2.1.89-pre-3/drivers/sound/maui.c Sat Feb 21 18:51:51 1998
+++ linux/drivers/sound/maui.c Fri Feb 27 19:45:00 1998
@@ -211,7 +211,7 @@
outb((0x80), HOST_CTRL_PORT); /* Leave reset */
outb((0xD0), HOST_CTRL_PORT); /* Cause interrupt */

-#ifndef __SMP__
+#ifdef __SMP__
for (i = 0; i < 1000000 && !irq_ok; i++);

if (!irq_ok)
diff -u -r --new-file linux-2.1.89-pre-3/drivers/sound/sound_firmware.c linux/drivers/sound/sound_firmware.c
--- linux-2.1.89-pre-3/drivers/sound/sound_firmware.c Sat Feb 28 01:04:46 1998
+++ linux/drivers/sound/sound_firmware.c Fri Feb 27 22:27:27 1998
@@ -5,6 +5,7 @@
#include <linux/unistd.h>
#include <asm/uaccess.h>

+static int errno;
static int do_mod_firmware_load(const char *fn, char **fp)
{
int fd;
diff -u -r --new-file linux-2.1.89-pre-3/net/netlink/netlink_dev.c linux/net/netlink/netlink_dev.c
--- linux-2.1.89-pre-3/net/netlink/netlink_dev.c Mon Dec 1 07:00:40 1997
+++ linux/net/netlink/netlink_dev.c Fri Feb 27 20:12:42 1998
@@ -42,7 +42,7 @@

if (sock->ops->poll==NULL)
return 0;
- return sock->ops->poll(sock, wait);
+ return sock->ops->poll(file, sock, wait);
}

/*

-- 
 "Where there is a will, there is a way."  jinbo21@soback.kornet.nm.kr 
                                           kbeyl@kids.kotel.co.kr      
  For the future of you and me!            hitel: jinbo21






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