From: Bastian Blank <waldi@debian.org>
To: xen-devel@lists.xensource.com
Subject: [PATCH] Fix asmlinkage functions
Date: Tue, 19 Jun 2012 21:12:53 +0200 [thread overview]
Message-ID: <20120619191253.GA22807@wavehammer.waldi.eu.org> (raw)
According to gcc-4.7, "void bla(void)" is incompatible with "asmlinkage
void bla(void)". As asmlinkage expands to __attribute__((regparm(0))),
it is correct.
The patch adds the missing asmlinkage to function declarations affected.
It is needed for 4.1 and 4.2.
Signed-off-by: Bastian Blank <waldi@debian.org>
---
Origin: debian
Forwarded: no
Last-Update: 2012-06-15
--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/arch/x86/i8259.c
+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/arch/x86/i8259.c
@@ -62,7 +62,7 @@
IRQ(x,8), IRQ(x,9), IRQ(x,a), IRQ(x,b), \
IRQ(x,c), IRQ(x,d), IRQ(x,e), IRQ(x,f)
- static void (*interrupt[])(void) = {
+ static void (*asmlinkage interrupt[])(void) = {
IRQLIST_16(0x0), IRQLIST_16(0x1), IRQLIST_16(0x2), IRQLIST_16(0x3),
IRQLIST_16(0x4), IRQLIST_16(0x5), IRQLIST_16(0x6), IRQLIST_16(0x7),
IRQLIST_16(0x8), IRQLIST_16(0x9), IRQLIST_16(0xa), IRQLIST_16(0xb),
--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/svm/intr.h
+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/svm/intr.h
@@ -21,6 +21,8 @@
#ifndef __ASM_X86_HVM_SVM_INTR_H__
#define __ASM_X86_HVM_SVM_INTR_H__
-void svm_intr_assist(void);
+#include <asm/config.h>
+
+asmlinkage void svm_intr_assist(void);
#endif /* __ASM_X86_HVM_SVM_INTR_H__ */
--- xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2.orig/xen/include/asm-x86/hvm/vmx/vmx.h
+++ xen-4.1.3~rc1+hg-20120614.a9c0a89c08f2/xen/include/asm-x86/hvm/vmx/vmx.h
@@ -63,7 +63,7 @@
void vmx_asm_vmexit_handler(struct cpu_user_regs);
void vmx_asm_do_vmentry(void);
-void vmx_intr_assist(void);
+asmlinkage void vmx_intr_assist(void);
void vmx_do_resume(struct vcpu *);
void vmx_vlapic_msr_changed(struct vcpu *v);
void vmx_realmode(struct cpu_user_regs *regs);
--
There is a multi-legged creature crawling on your shoulder.
-- Spock, "A Taste of Armageddon", stardate 3193.9
next reply other threads:[~2012-06-19 19:12 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-19 19:12 Bastian Blank [this message]
2012-06-20 7:59 ` [PATCH] Fix asmlinkage functions Jan Beulich
2012-06-20 8:12 ` Bastian Blank
2012-06-20 8:42 ` Keir Fraser
2012-06-20 8:28 ` M A Young
2012-06-20 8:43 ` Keir Fraser
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=20120619191253.GA22807@wavehammer.waldi.eu.org \
--to=waldi@debian.org \
--cc=xen-devel@lists.xensource.com \
/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;
as well as URLs for NNTP newsgroup(s).