]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c539ab7)
uml: kill x86_64 STACK_TOP_MAX
authorJeff Dike <jdike@addtoit.com>
Sat, 16 Jun 2007 17:16:10 +0000 (10:16 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 16 Jun 2007 20:16:16 +0000 (13:16 -0700)
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>
include/asm-um/a.out.h patch | blob | history

diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h
index 50cee7b296f44693a65cea7751253844e12df7df..7016b893ac9d7feef84533d30475998902e53735 100644 (file)
--- 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;
 
Linux 2.6 source tree