Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 39a279026609c205d331ec39fea11b2fd470a054

Authored by Jeff Dike
Committed by Linus Torvalds
1 parent c539ab7307
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 1 changed file with 1 additions and 0 deletions Side-by-side Diff

include/asm-um/a.out.h
Diff comments   View file @ 39a2790
... ... @@ -5,6 +5,7 @@
5 5 #include "choose-mode.h"
6 6  
7 7 #undef STACK_TOP
  8 +#undef STACK_TOP_MAX
8 9  
9 10 extern unsigned long stacksizelim;
10 11