From: Jeff Dike <jdike@addtoit.com>
Date: Sat, 16 Jun 2007 17:16:10 +0000 (-0700)
Subject: uml: kill x86_64 STACK_TOP_MAX
X-Git-Tag: v2.6.22-rc5~7
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=39a279026609c205d331ec39fea11b2fd470a054;p=linux-2.6-omap-h63xx.git

uml: kill x86_64 STACK_TOP_MAX

The x86_64 a.out.h got a definition of STACK_TOP_MAX, which interferes with
the UML version.  So, just undef it like STACK_TOP.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h
index 50cee7b296f..7016b893ac9 100644
--- a/include/asm-um/a.out.h
+++ b/include/asm-um/a.out.h
@@ -5,6 +5,7 @@
 #include "choose-mode.h"
 
 #undef STACK_TOP
+#undef STACK_TOP_MAX
 
 extern unsigned long stacksizelim;