diff -urNp ref/drivers/scsi/ips.c 2.4.20pre5aa1/drivers/scsi/ips.c
--- ref/drivers/scsi/ips.c	Thu Aug 29 02:13:15 2002
+++ 2.4.20pre5aa1/drivers/scsi/ips.c	Fri Aug 30 02:59:15 2002
@@ -210,7 +210,7 @@ struct proc_dir_entry proc_scsi_ips = {
 };
 #endif
 
-#if !defined(__i386__) && !defined(__ia64__)
+#if !defined(__i386__) && !defined(__ia64__) && !defined(__x86_64__)
    #error "This driver has only been tested on the x86/ia64 platforms"
 #endif
 
diff -urNp ref/include/linux/brlock.h 2.4.20pre5aa1/include/linux/brlock.h
--- ref/include/linux/brlock.h	Thu Aug 29 02:13:20 2002
+++ 2.4.20pre5aa1/include/linux/brlock.h	Fri Aug 30 02:59:15 2002
@@ -45,7 +45,7 @@ enum brlock_indices {
 #include <linux/cache.h>
 #include <linux/spinlock.h>
 
-#if defined(__i386__) || defined(__ia64__) || defined(__x86_64__)
+#if defined(__i386__) || defined(__ia64__)
 #define __BRLOCK_USE_ATOMICS
 #else
 #undef __BRLOCK_USE_ATOMICS
diff -urNp ref/include/linux/kernel.h 2.4.20pre5aa1/include/linux/kernel.h
--- ref/include/linux/kernel.h	Fri Aug 30 02:59:09 2002
+++ 2.4.20pre5aa1/include/linux/kernel.h	Fri Aug 30 02:59:15 2002
@@ -194,6 +194,8 @@ struct sysinfo {
 	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
 };
 
+#define warn_if_not_ulong(x) do { unsigned long foo; (void) (&(x) == &foo); } while (0)
+
 #define BUG_ON(condition) do { if (unlikely((condition)!=0)) BUG(); } while(0)
 
 #endif /* _LINUX_KERNEL_H */
diff -urNp ref/init/main.c 2.4.20pre5aa1/init/main.c
--- ref/init/main.c	Fri Aug 30 02:59:09 2002
+++ 2.4.20pre5aa1/init/main.c	Fri Aug 30 02:59:15 2002
@@ -288,6 +288,7 @@ static void __init parse_options(char *l
 
 extern void setup_arch(char **);
 extern void cpu_idle(void);
+extern void disable_early_printk(void);
 
 #ifndef CONFIG_SMP
 
@@ -359,6 +360,9 @@ asmlinkage void __init start_kernel(void
 	 * we've done PCI setups etc, and console_init() must be aware of
 	 * this. But we do want output early, in case something goes wrong.
 	 */
+#ifdef CONFIG_EARLY_PRINTK
+	disable_early_printk(); 
+#endif
 	console_init();
 #ifdef CONFIG_MODULES
 	init_modules();