summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorJeff Dike2007-06-16 19:16:10 +0200
committerLinus Torvalds2007-06-16 22:16:16 +0200
commit39a279026609c205d331ec39fea11b2fd470a054 (patch)
treea5b5e0c261c7a8ffd429e8b19d5a27e659f04fda /include/asm-um
parentuml: remove PAGE_SIZE from libc code (diff)
downloadkernel-qcow2-linux-39a279026609c205d331ec39fea11b2fd470a054.tar.gz
kernel-qcow2-linux-39a279026609c205d331ec39fea11b2fd470a054.tar.xz
kernel-qcow2-linux-39a279026609c205d331ec39fea11b2fd470a054.zip
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>
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/a.out.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-um/a.out.h b/include/asm-um/a.out.h
index 50cee7b296f4..7016b893ac9d 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;