These are still needed in p5:
--- linux/fs/smbfs/file.c.orig Sat Feb 28 21:07:49 1998
+++ linux/fs/smbfs/file.c Sat Feb 28 21:23:35 1998
@@ -102,8 +102,9 @@
}
int
-smb_readpage(struct dentry *dentry, struct page *page)
+smb_readpage(struct file *file, struct page *page)
{
+ struct dentry *dentry = file->f_dentry;
int error;
pr_debug("SMB: smb_readpage %08lx\n", page_address(page));
@@ -177,8 +178,9 @@
* (for now), and we currently do this synchronously only.
*/
static int
-smb_writepage(struct dentry *dentry, struct page *page)
+smb_writepage(struct file *file, struct page *page)
{
+ struct dentry *dentry = file->f_dentry;
int result;
#ifdef SMBFS_PARANOIA
@@ -193,9 +195,10 @@
}
static int
-smb_updatepage(struct dentry *dentry, struct page *page, const char *buffer,
+smb_updatepage(struct file *file, struct page *page, const char *buffer,
unsigned long offset, unsigned int count, int sync)
{
+ struct dentry *dentry = file->f_dentry;
unsigned long page_addr = page_address(page);
int result;
--- linux/arch/i386/kernel/irq.c.orig Sat Feb 28 18:20:04 1998
+++ linux/arch/i386/kernel/irq.c Sat Feb 28 20:41:50 1998
@@ -174,12 +174,16 @@
void unmask_generic_irq(unsigned int irq)
{
+#ifdef __SMP__
if (IO_APIC_IRQ(irq))
enable_IO_APIC_irq(irq);
else {
+#endif
cached_irq_mask &= ~(1 << irq);
set_8259A_irq_mask(irq);
+#ifdef __SMP__
}
+#endif
}
/*
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu