From: Heiko Carstens <heiko.carstens@de.ibm.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>
Cc: Jakub Jelinek <jakub@redhat.com>, Dave Jones <davej@redhat.com>,
drepper@redhat.com, mingo@redhat.com, tglx@redhat.com,
linux-kernel@vger.kernel.org, Roland McGrath <roland@redhat.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Subject: [PATCH] Fix compile breakage caused by asmlinkage_protect
Date: Fri, 11 Apr 2008 13:46:54 +0200 [thread overview]
Message-ID: <20080411114654.GA12270@osiris.boeblingen.de.ibm.com> (raw)
In-Reply-To: <20080410223738.80A8326F992@magilla.localdomain>
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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
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>
---
include/linux/linkage.h | 2 ++
1 file changed, 2 insertions(+)
Index: linux-2.6/include/linux/linkage.h
===================================================================
--- linux-2.6.orig/include/linux/linkage.h
+++ linux-2.6/include/linux/linkage.h
@@ -30,9 +30,11 @@
* protection to work (ie no more work that the compiler might
* end up needing stack temporaries for).
*/
+#ifndef __ASSEMBLY__
#ifndef asmlinkage_protect
# define asmlinkage_protect(n, ret, args...) do { } while (0)
#endif
+#endif
#ifndef __ALIGN
#define __ALIGN .align 4,0x90
next prev parent reply other threads:[~2008-04-11 11:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20080410155940.GA11721@redhat.com>
[not found] ` <alpine.LFD.1.00.0804100906470.3143@woody.linux-foundation.org>
[not found] ` <20080410165244.GV20478@devserv.devel.redhat.com>
[not found] ` <alpine.LFD.1.00.0804101009420.3143@woody.linux-foundation.org>
[not found] ` <alpine.LFD.1.00.0804101415450.3143@woody.linux-foundation.org>
[not found] ` <20080410214114.GY20478@devserv.devel.redhat.com>
[not found] ` <alpine.LFD.1.00.0804101447240.3143@woody.linux-foundation.org>
2008-04-10 22:37 ` [PATCH 1/2] asmlinkage_protect replaces prevent_tail_call Roland McGrath
2008-04-11 11:46 ` Heiko Carstens [this message]
2008-04-11 14:46 ` [PATCH] Fix compile breakage caused by asmlinkage_protect Linus Torvalds
2008-04-11 15:06 ` Jakub Jelinek
2008-04-11 15:11 ` Al Viro
2008-04-11 15:25 ` Linus Torvalds
2008-04-11 15:37 ` Kyle McMartin
2008-04-11 16:03 ` Martin Schwidefsky
2008-04-11 17:09 ` Adrian Bunk
2008-04-10 22:38 ` [PATCH 2/2] asmlinkage_protect sys_io_getevents Roland McGrath
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080411114654.GA12270@osiris.boeblingen.de.ibm.com \
--to=heiko.carstens@de.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=davej@redhat.com \
--cc=drepper@redhat.com \
--cc=jakub@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=roland@redhat.com \
--cc=schwidefsky@de.ibm.com \
--cc=tglx@redhat.com \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®