From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Fri, 12 Jan 2007 14:50:01 +0000 (+0000)
Subject: [IA64]: noreturn cannot be used if function may return
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15405^2~21
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e04e1175e896d45aca60522d89149c51fe947c5f;p=xen.git

[IA64]: noreturn cannot be used if function may return

The functions die_if_kernel and vmx_die_if_kernel can certainly
return.  This disqualifies them from using the noreturn keyword
which is reserved for functions that never return.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/xen/arch/ia64/linux-xen/unaligned.c b/xen/arch/ia64/linux-xen/unaligned.c
index 86ecbd9374..2cf6e806dc 100644
--- a/xen/arch/ia64/linux-xen/unaligned.c
+++ b/xen/arch/ia64/linux-xen/unaligned.c
@@ -24,7 +24,7 @@
 #include <asm/uaccess.h>
 #include <asm/unaligned.h>
 
-extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
+extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
 
 #undef DEBUG_UNALIGNED_TRAP
 
diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c
index 532d812910..db4d14975b 100644
--- a/xen/arch/ia64/xen/xenmisc.c
+++ b/xen/arch/ia64/xen/xenmisc.c
@@ -77,7 +77,7 @@ void console_print(char *msg)
 // called from unaligned.c
 ////////////////////////////////////
 
-void die_if_kernel(char *str, struct pt_regs *regs, long err) /* __attribute__ ((noreturn)) */
+void die_if_kernel(char *str, struct pt_regs *regs, long err)
 {
 	if (user_mode(regs))
 		return;
@@ -88,7 +88,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) /* __attribute__ (
 	domain_crash_synchronous();
 }
 
-void vmx_die_if_kernel(char *str, struct pt_regs *regs, long err) /* __attribute__ ((noreturn)) */
+void vmx_die_if_kernel(char *str, struct pt_regs *regs, long err)
 {
 	if (vmx_user_mode(regs))
 		return;