--- linux-2.6.20-xen-r6.orig/arch/i386/kernel/fixup.c	2007-10-15 16:07:58.000000000 -0700
+++ linux-2.6.20-xen-r6/arch/i386/kernel/fixup.c	2007-10-15 16:15:01.000000000 -0700
@@ -60,10 +60,9 @@
 	DP("** WARNING: Currently emulating unsupported memory accesses  **");
 	DP("**          in /lib/tls glibc libraries. The emulation is    **");
 	DP("**          slow. To ensure full performance you should      **");
-	DP("**          install a 'xen-friendly' (nosegneg) version of   **");
-	DP("**          the library, or disable tls support by executing **");
-	DP("**          the following as root:                           **");
-	DP("**          mv /lib/tls /lib/tls.disabled                    **");
+	DP("**          add -mno-tls-direct-seg-refs to your CFLAGS and  **");
+	DP("**          re-emerge glibc and any staticly linked programs **");
+	DP("**          or emerge -e world to catch everything.          **");
 	DP("** Offending process: %-38.38s **", info);
 	DP("***************************************************************");
 	DP("***************************************************************");