Merge redhat.com:/md0/linus-2.5 into redhat.com:/md0/aio-2.5

4 files changed, 18 insertions, 16 deletions

diff --git a/include/asm-alpha/pal.h b/include/asm-alpha/pal.h
index 510d13326de4..9b4ba0d6f00b 100644
--- a/include/asm-alpha/pal.h
+++ b/include/asm-alpha/pal.h
@@ -45,7 +45,7 @@
 #define PAL_wrperfmon	57
 #define PAL_rdusp	58
 #define PAL_whami	60
-#define PAL_rtsys	61
+#define PAL_retsys	61
 #define PAL_rti		63
 
 #endif /* __ALPHA_PAL_H */
diff --git a/include/asm-alpha/unistd.h b/include/asm-alpha/unistd.h
index 363f1477ac16..e35f02b4713b 100644
--- a/include/asm-alpha/unistd.h
+++ b/include/asm-alpha/unistd.h
@@ -331,19 +331,19 @@
 #define __NR_removexattr		391
 #define __NR_lremovexattr		392
 #define __NR_fremovexattr		393
-#define __NR_futex		394
-#define __NR_sched_setaffinity	395     
-#define __NR_sched_getaffinity	396
-#define __NR_tuxcall		397
-#define __NR_io_setup		398
-#define __NR_io_destroy		399
-#define __NR_io_getevents	400
-#define __NR_io_submit		401
-#define __NR_io_cancel		402
-#define __NR_alloc_hugepages	403
-#define __NR_free_hugepages	404
-#define __NR_exit_group		405
-
+#define __NR_futex			394
+#define __NR_sched_setaffinity		395     
+#define __NR_sched_getaffinity		396
+#define __NR_tuxcall			397
+#define __NR_io_setup			398
+#define __NR_io_destroy			399
+#define __NR_io_getevents		400
+#define __NR_io_submit			401
+#define __NR_io_cancel			402
+#define __NR_alloc_hugepages		403
+#define __NR_free_hugepages		404
+#define __NR_exit_group			405
+#define NR_SYSCALLS			406
 
 #if defined(__GNUC__)
 
@@ -598,7 +598,7 @@ static inline pid_t waitpid(int pid, int * wait_stat, int flags)
 	return sys_wait4(pid, wait_stat, flags, NULL);
 }
 
-#endif
+#endif /* __KERNEL_SYSCALLS__ */
 
 /*
  * "Conditional" syscalls
diff --git a/include/asm-generic/siginfo.h b/include/asm-generic/siginfo.h
index dcca9fc715a8..8e6f81b7a524 100644
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
@@ -91,7 +91,7 @@ typedef struct siginfo {
 #define __SI_FAULT	(3 << 16)
 #define __SI_CHLD	(4 << 16)
 #define __SI_RT		(5 << 16)
-#define __SI_CODE(T,N)	((T) << 16 | ((N) & 0xffff))
+#define __SI_CODE(T,N)	((T) | ((N) & 0xffff))
 #else
 #define __SI_KILL	0
 #define __SI_TIMER	0
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 0655a585300f..44cb38c00b96 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -794,6 +794,7 @@ typedef struct ide_drive_s {
 	int		lun;		/* logical unit */
 	int		crc_count;	/* crc counter to reduce drive speed */
 	struct list_head list;
+	struct device	gendev;
 	struct gendisk *disk;
 } ide_drive_t;
 
@@ -1199,6 +1200,7 @@ typedef struct ide_driver_s {
 	int		(*attach)(ide_drive_t *);
 	void		(*ata_prebuilder)(ide_drive_t *);
 	void		(*atapi_prebuilder)(ide_drive_t *);
+	struct device_driver	gen_driver;
 	struct list_head drives;
 	struct list_head drivers;
 } ide_driver_t;