]> err.no Git - linux-2.6/commit
Fix "$(AS) -traditional" compile breakage caused by asmlinkage_protect
authorHeiko Carstens <heiko.carstens@de.ibm.com>
Fri, 11 Apr 2008 11:46:54 +0000 (13:46 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 11 Apr 2008 15:29:13 +0000 (08:29 -0700)
commitb0fac02370cffad956ff3de5e8ed4df7e7b875d7
treef7db1d196a065398bfa3376a15ced67cda3f6a8c
parent099ce8f4712dcff975ed7619f831b4df95aac773
Fix "$(AS) -traditional" compile breakage caused by asmlinkage_protect

git commit 54a015104136974262afa4b8ddd943ea70dec8a2 ("asmlinkage_protect
replaces prevent_tail_call") causes this build failure on s390:

    AS      arch/s390/kernel/entry64.o
  In file included from arch/s390/kernel/entry64.S:14:
  include/linux/linkage.h:34: error: syntax error in macro parameter list
  make[1]: *** [arch/s390/kernel/entry64.o] Error 1
  make: *** [arch/s390/kernel] Error 2

and some other architectures.  The reason is that some architectures add
the "-traditional" flag to the invocation of $(AS), which disables
variadic macro argument support.

So just surround the new define with an #ifndef __ASSEMBLY__ to prevent
any side effects on asm code.

Cc: Roland McGrath <roland@redhat.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
include/linux/linkage.h