Merge with 2.4.0-test1.

9 files changed, 93 insertions, 9 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index d147dfe1c..e40c8fe2d 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -871,7 +871,6 @@ extern int unregister_blkdev(unsigned int, const char *);
 extern struct block_device *bdget(dev_t);
 extern void bdput(struct block_device *);
 extern int blkdev_open(struct inode *, struct file *);
-extern int blkdev_close(struct inode * inode, struct file * filp);
 extern struct file_operations def_blk_fops;
 extern struct file_operations def_fifo_fops;
 extern int ioctl_by_bdev(struct block_device *, unsigned, unsigned long);
@@ -953,6 +952,21 @@ extern void FASTCALL(mark_buffer_dirty(struct buffer_head *bh, int flag));
 
 #define atomic_set_buffer_dirty(bh) test_and_set_bit(BH_Dirty, &(bh)->b_state)
 
+/*
+ * If an error happens during the make_request, this function
+ * has to be recalled. It marks the buffer as clean and not
+ * uptodate, and it notifys the upper layer about the end
+ * of the I/O.
+ */
+static inline void buffer_IO_error(struct buffer_head * bh)
+{
+	mark_buffer_clean(bh);
+	/*
+	 * b_end_io has to clear the BH_Uptodate bitflag in the error case!
+	 */
+	bh->b_end_io(bh, 0);
+}
+
 extern void balance_dirty(kdev_t);
 extern int check_disk_change(kdev_t);
 extern int invalidate_inodes(struct super_block *);
@@ -1090,7 +1104,6 @@ typedef int (get_block_t)(struct inode*,long,struct buffer_head*,int);
 
 /* Generic buffer handling for block filesystems.. */
 extern int block_flushpage(struct page *, unsigned long);
-extern int block_fsync(struct file *filp, struct dentry *dentry);
 extern int block_symlink(struct inode *, const char *, int);
 extern int block_write_full_page(struct page*, get_block_t*);
 extern int block_read_full_page(struct page*, get_block_t*);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 11a85411f..a8d79a50e 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -44,7 +44,6 @@
 #define FASTCALL(x)	x
 #endif
 
-extern void math_error(void);
 extern struct notifier_block *panic_notifier_list;
 NORET_TYPE void panic(const char * fmt, ...)
 	__attribute__ ((NORET_AND format (printf, 1, 2)));
diff --git a/include/linux/lvm.h b/include/linux/lvm.h
index 7afbc1178..2600a75a1 100644
--- a/include/linux/lvm.h
+++ b/include/linux/lvm.h
@@ -65,7 +65,7 @@
 #define	LVM_TOTAL_RESET
 
 #define LVM_GET_INODE
-#define	LVM_HD_NAME
+#undef	LVM_HD_NAME
 
 /* lots of debugging output (see driver source)
    #define DEBUG_LVM_GET_INFO
@@ -263,8 +263,8 @@
 #define	LVM_MAX_STRIPES		128	/* max # of stripes */
 #define	LVM_MAX_SIZE            ( 1024LU * 1024 * 1024 * 2)	/* 1TB[sectors] */
 #define	LVM_MAX_MIRRORS    	2	/* future use */
-#define	LVM_MIN_READ_AHEAD	2	/* minimum read ahead sectors */
-#define	LVM_MAX_READ_AHEAD	120	/* maximum read ahead sectors */
+#define	LVM_MIN_READ_AHEAD	0	/* minimum read ahead sectors */
+#define	LVM_MAX_READ_AHEAD	256	/* maximum read ahead sectors */
 #define	LVM_MAX_LV_IO_TIMEOUT	60	/* seconds I/O timeout (future use) */
 #define	LVM_PARTITION           0xfe	/* LVM partition id */
 #define	LVM_NEW_PARTITION       0x8e	/* new LVM partition id (10/09/1999) */
@@ -592,6 +592,7 @@ typedef struct lv_v2
     struct lv_v2 *lv_snapshot_prev;
     struct lv_v2 *lv_snapshot_next;
     lv_block_exception_t *lv_block_exception;
+    uint8_t __unused;
     uint32_t lv_remap_ptr;
     uint32_t lv_remap_end;
     uint32_t lv_chunk_size;
@@ -788,7 +789,6 @@ pv_status_req_t, pv_change_req_t;
 typedef struct
   {
     char pv_name[NAME_LEN];
-    kdev_t pv_dev;
   }
 pv_flush_req_t;
 
diff --git a/include/linux/major.h b/include/linux/major.h
index 0338e266a..0a6e120d6 100644
--- a/include/linux/major.h
+++ b/include/linux/major.h
@@ -136,6 +136,9 @@
 #define UNIX98_PTY_MAJOR_COUNT	8
 #define UNIX98_PTY_SLAVE_MAJOR	(UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
 
+#define MSR_MAJOR		202
+#define CPUID_MAJOR		203
+
 /*
  * Tests for SCSI devices.
  */
diff --git a/include/linux/nfs_flushd.h b/include/linux/nfs_flushd.h
index 015a3c032..ff235df97 100644
--- a/include/linux/nfs_flushd.h
+++ b/include/linux/nfs_flushd.h
@@ -4,6 +4,7 @@
 
 
 #ifdef __KERNEL__
+#include <asm/atomic.h>
 #include <linux/nfs_fs_sb.h>
 
 /*
@@ -43,7 +44,7 @@ extern void		nfs_wake_flushd(void);
  * This is the per-mount writeback cache.
  */
 struct nfs_reqlist {
-	unsigned int		nr_requests;
+	atomic_t		nr_requests;
 	unsigned long		runat;
 	wait_queue_head_t	request_wait;
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 499afe2d6..888b5df13 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -169,6 +169,8 @@
 #define PCI_DEVICE_ID_ATI_RAGE128_RL	0x524c
 #define PCI_DEVICE_ID_ATI_RAGE128_PF	0x5046
 #define PCI_DEVICE_ID_ATI_RAGE128_PR	0x5052
+#define PCI_DEVICE_ID_ATI_RAGE128_LE	0x4c45
+#define PCI_DEVICE_ID_ATI_RAGE128_LF	0x4c46
 
 #define PCI_VENDOR_ID_VLSI		0x1004
 #define PCI_DEVICE_ID_VLSI_82C592	0x0005
@@ -246,6 +248,7 @@
 #define PCI_DEVICE_ID_IBM_TR_WAKE	0x003e
 #define PCI_DEVICE_ID_IBM_MPIC		0x0046
 #define PCI_DEVICE_ID_IBM_3780IDSP	0x007d
+#define	PCI_DEVICE_ID_IBM_405GP		0x0156
 #define PCI_DEVICE_ID_IBM_MPIC_2	0xffff
 
 #define PCI_VENDOR_ID_WD		0x101c
diff --git a/include/linux/sisfb.h b/include/linux/sisfb.h
new file mode 100644
index 000000000..cfc8ce704
--- /dev/null
+++ b/include/linux/sisfb.h
@@ -0,0 +1,35 @@
+#ifndef _LINUX_SISFB
+#define _LINUX_SISFB
+
+struct sis_memreq
+{
+    unsigned long offset;
+    unsigned long size;
+};
+
+struct video_info
+{
+    /* card parameters */
+    int    chip_id;
+    int    video_size;
+    unsigned long video_base;
+    char  *video_vbase;
+    unsigned long mmio_base;
+    char  *mmio_vbase; 
+    unsigned long vga_base;
+
+    /* mode */
+    int    video_bpp;
+    int    video_width;
+    int    video_height;
+    unsigned int  refresh_rate;
+    u8     status;
+};
+
+#ifdef __KERNEL__
+extern struct video_info ivideo;
+
+extern void sis_malloc(struct sis_memreq *req);
+extern void sis_free(unsigned long base);
+#endif
+#endif
diff --git a/include/linux/smp.h b/include/linux/smp.h
index 6b0617caf..33e2ee28a 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -84,6 +84,7 @@ extern volatile int smp_msg_id;
 #define cpu_logical_map(cpu)			0
 #define cpu_number_map(cpu)			0
 #define smp_call_function(func,info,retry,wait)	({ 0; })
+#define cpu_online_map				1
 
 #endif
 #endif
diff --git a/include/linux/ufs_fs.h b/include/linux/ufs_fs.h
index 631791186..96cb38e67 100644
--- a/include/linux/ufs_fs.h
+++ b/include/linux/ufs_fs.h
@@ -18,6 +18,10 @@
  * Niels Kristian Bech Jensen <nkbj@image.dk>.
  *
  * Write support by Daniel Pirkl <daniel.pirkl@email.cz>
+ *
+ * HP/UX hfs filesystem support added by
+ * Martin K. Petersen <mkp@mkp.net>, August 1999
+ *
  */
 
 #ifndef __LINUX_UFS_FS_H
@@ -38,6 +42,30 @@
 #define UFS_MAGIC 0x00011954
 #define UFS_CIGAM 0x54190100 /* byteswapped MAGIC */
 
+
+/* HP specific MAGIC values */
+
+#define UFS_MAGIC_LFN   0x00095014 /* fs supports filenames > 14 chars */
+#define UFS_CIGAM_LFN   0x14500900 /* srahc 41 < semanelif stroppus sf */
+
+#define UFS_MAGIC_SEC   0x00612195 /* B1 security fs */
+#define UFS_CIGAM_SEC   0x95216100
+
+#define UFS_MAGIC_FEA   0x00195612 /* fs_featurebits supported */
+#define UFS_CIGAM_FEA   0x12561900
+
+#define UFS_MAGIC_4GB   0x05231994 /* fs > 4 GB && fs_featurebits */
+#define UFS_CIGAM_4GB   0x94192305
+
+/* Seems somebody at HP goofed here. B1 and lfs are both 0x2 !?! */
+#define UFS_FSF_LFN     0x00000001 /* long file names */
+#define UFS_FSF_B1      0x00000002 /* B1 security */
+#define UFS_FSF_LFS     0x00000002 /* large files */
+#define UFS_FSF_LUID    0x00000004 /* large UIDs */
+
+/* End of HP stuff */
+
+
 #define UFS_BSIZE	8192
 #define UFS_MINBSIZE	4096
 #define UFS_FSIZE	1024
@@ -111,7 +139,7 @@
 #define UFS_MOUNT_ONERROR_UMOUNT	0x00000004
 #define UFS_MOUNT_ONERROR_REPAIR	0x00000008
 
-#define UFS_MOUNT_UFSTYPE		0x000007F0
+#define UFS_MOUNT_UFSTYPE		0x00000FF0
 #define UFS_MOUNT_UFSTYPE_OLD		0x00000010
 #define UFS_MOUNT_UFSTYPE_44BSD		0x00000020
 #define UFS_MOUNT_UFSTYPE_SUN		0x00000040
@@ -119,6 +147,7 @@
 #define UFS_MOUNT_UFSTYPE_NEXTSTEP_CD	0x00000100
 #define UFS_MOUNT_UFSTYPE_OPENSTEP	0x00000200
 #define UFS_MOUNT_UFSTYPE_SUNx86	0x00000400
+#define UFS_MOUNT_UFSTYPE_HP	        0x00000800
 
 #define ufs_clear_opt(o,opt)	o &= ~UFS_MOUNT_##opt
 #define ufs_set_opt(o,opt)	o |= UFS_MOUNT_##opt