Index: linux-2.6.15/arch/um/sys-i386/tls.c
===================================================================
--- linux-2.6.15.orig/arch/um/sys-i386/tls.c
+++ linux-2.6.15/arch/um/sys-i386/tls.c
@@ -30,14 +30,16 @@ static int indirect_set_thread_area_tt(s
 	BUG_ON(os_getpid() != tracing_pid);
 	return os_set_thread_area(info, current->thread.mode.tt.extern_pid);
 }
+#endif
 
 static inline int indirect_set_thread_area(struct user_desc *info) {
+#ifdef CONFIG_MODE_TT
 	if (mode_tt)
 		return indirect_set_thread_area_tt(info);
 	else
-		BUG();
-}
 #endif
+	BUG();
+}
 
 #ifdef CONFIG_MODE_SKAS
 int do_set_thread_area_skas(struct user_desc *info)
