From f2c7c7bba98b99a6d3df2056ebb5830913e1d088 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Nov 2007 19:04:24 -0800
Subject: [PATCH] --- yaml --- r: 73921 b: refs/heads/master c:
 09cfd929860532f95c9944d39abbb043b8082f36 h: refs/heads/master i:   73919:
 810689b5d3b54ff089a5811ba798d1d55973a508 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/x86/Makefile | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3ceb1195b189..d0beb002cf12 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cb41c65b3fc547da4050721445d07277768aa37
+refs/heads/master: 09cfd929860532f95c9944d39abbb043b8082f36
diff --git a/trunk/arch/x86/Makefile b/trunk/arch/x86/Makefile
index 116b03a45636..7aa1dc6d67c8 100644
--- a/trunk/arch/x86/Makefile
+++ b/trunk/arch/x86/Makefile
@@ -11,10 +11,9 @@ endif
 $(srctree)/arch/x86/Makefile%: ;
 
 ifeq ($(CONFIG_X86_32),y)
+        UTS_MACHINE := i386
         include $(srctree)/arch/x86/Makefile_32
 else
+        UTS_MACHINE := x86_64
         include $(srctree)/arch/x86/Makefile_64
 endif
-
-
-