diff -urNp x86-64/MAINTAINERS x86-64-3/MAINTAINERS
--- x86-64/MAINTAINERS	Wed Jul 17 18:20:36 2002
+++ x86-64-3/MAINTAINERS	Wed Jul 17 18:24:51 2002
@@ -1872,6 +1872,13 @@ P:	Ingo Molnar
 M:	mingo@redhat.com
 S:	Maintained
 
+X86-64 port
+P:	Andi Kleen
+M:	ak@suse.de
+L:	discuss@x86-64.org
+W:	http://www.x86-64.org
+S:	Maintained
+
 YAM DRIVER FOR AX.25
 P:	Jean-Paul Roubelat
 M:	jpr@f6fbb.org
diff -urNp x86-64/drivers/scsi/ips.c x86-64-3/drivers/scsi/ips.c
--- x86-64/drivers/scsi/ips.c	Wed Jul 17 13:28:41 2002
+++ x86-64-3/drivers/scsi/ips.c	Wed Jul 17 18:26:22 2002
@@ -204,7 +204,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 x86-64/include/linux/auto_fs.h x86-64-3/include/linux/auto_fs.h
--- x86-64/include/linux/auto_fs.h	Wed Jul 17 13:28:50 2002
+++ x86-64-3/include/linux/auto_fs.h	Wed Jul 17 18:24:51 2002
@@ -45,7 +45,7 @@
  * If so, 32-bit user-space code should be backwards compatible.
  */
 
-#if defined(__sparc__) || defined(__mips__) || defined(__s390__)
+#if defined(__sparc__) || defined(__mips__) || defined(__s390__) || defined(__x86_64__)
 typedef unsigned int autofs_wqt_t;
 #else
 typedef unsigned long autofs_wqt_t;
diff -urNp x86-64/include/linux/brlock.h x86-64-3/include/linux/brlock.h
--- x86-64/include/linux/brlock.h	Tue Jul 16 23:56:42 2002
+++ x86-64-3/include/linux/brlock.h	Wed Jul 17 18:24:51 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 x86-64/include/linux/kernel.h x86-64-3/include/linux/kernel.h
--- x86-64/include/linux/kernel.h	Wed Jul 17 18:17:29 2002
+++ x86-64-3/include/linux/kernel.h	Wed Jul 17 18:26:22 2002
@@ -187,6 +187,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 x86-64/init/main.c x86-64-3/init/main.c
--- x86-64/init/main.c	Wed Jul 17 18:17:29 2002
+++ x86-64-3/init/main.c	Wed Jul 17 18:24:51 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();
diff -urNp x86-64/ipc/util.c x86-64-3/ipc/util.c
--- x86-64/ipc/util.c	Tue Jan 22 18:53:01 2002
+++ x86-64-3/ipc/util.c	Wed Jul 17 18:26:22 2002
@@ -325,6 +325,10 @@ void ipc64_perm_to_ipc_perm (struct ipc6
  
 int ipc_parse_version (int *cmd)
 {
+#ifdef __x86_64__
+	if (!(current->thread.flags & THREAD_IA32))
+		return IPC_64; 
+#endif
 	if (*cmd & IPC_64) {
 		*cmd ^= IPC_64;
 		return IPC_64;