diff -urN x86-64-ref/MAINTAINERS x86-64/MAINTAINERS
--- x86-64-ref/MAINTAINERS	Tue Mar 12 08:29:04 2002
+++ x86-64/MAINTAINERS	Tue Mar 12 08:29:29 2002
@@ -1825,6 +1825,13 @@
 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 -urN x86-64-ref/include/linux/auto_fs.h x86-64/include/linux/auto_fs.h
--- x86-64-ref/include/linux/auto_fs.h	Tue Mar 12 08:02:18 2002
+++ x86-64/include/linux/auto_fs.h	Tue Mar 12 08:29:54 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 -urN x86-64-ref/include/linux/brlock.h x86-64/include/linux/brlock.h
--- x86-64-ref/include/linux/brlock.h	Tue Mar 12 03:36:05 2002
+++ x86-64/include/linux/brlock.h	Tue Mar 12 08:29:29 2002
@@ -45,7 +45,7 @@
 #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 -urN x86-64-ref/include/linux/kernel.h x86-64/include/linux/kernel.h
--- x86-64-ref/include/linux/kernel.h	Tue Mar 12 08:29:03 2002
+++ x86-64/include/linux/kernel.h	Tue Mar 12 08:29:29 2002
@@ -184,4 +184,6 @@
 	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)
+
 #endif
diff -urN x86-64-ref/kernel/printk.c x86-64/kernel/printk.c
--- x86-64-ref/kernel/printk.c	Tue Mar 12 00:07:22 2002
+++ x86-64/kernel/printk.c	Tue Mar 12 08:29:29 2002
@@ -27,6 +27,10 @@
 #include <linux/interrupt.h>			/* For in_interrupt() */
 #include <linux/config.h>
 
+#ifdef CONFIG_EARLY_PRINTK
+#define printk real_printk
+#endif
+
 #include <asm/uaccess.h>
 
 #if defined(CONFIG_MULTIQUAD) || defined(CONFIG_IA64)