[Xen-changelog] [xen-unstable] [IA64]: noreturn cannot be used if function may return

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1168613401 0
# Node ID f159e81e0b44b7e0662678748be488eec3e46458
# Parent  3efc6a135cc396c0bdb81d9418a1f4e114b2a819
[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@xxxxxxxxxxxxxxxxxxx>
---
 xen/arch/ia64/linux-xen/unaligned.c |    2 +-
 xen/arch/ia64/xen/xenmisc.c         |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 3efc6a135cc3 -r f159e81e0b44 xen/arch/ia64/linux-xen/unaligned.c
--- a/xen/arch/ia64/linux-xen/unaligned.c       Fri Jan 12 14:48:06 2007 +0000
+++ b/xen/arch/ia64/linux-xen/unaligned.c       Fri Jan 12 14:50:01 2007 +0000
@@ -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 -r 3efc6a135cc3 -r f159e81e0b44 xen/arch/ia64/xen/xenmisc.c
--- a/xen/arch/ia64/xen/xenmisc.c       Fri Jan 12 14:48:06 2007 +0000
+++ b/xen/arch/ia64/xen/xenmisc.c       Fri Jan 12 14:50:01 2007 +0000
@@ -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_
        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;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog