ia64/xen-unstable

changeset 13410:f159e81e0b44

[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>
author kfraser@localhost.localdomain
date Fri Jan 12 14:50:01 2007 +0000 (2007-01-12)
parents 3efc6a135cc3
children 6a53d3abe7f8
files xen/arch/ia64/linux-xen/unaligned.c xen/arch/ia64/xen/xenmisc.c
line diff
     1.1 --- a/xen/arch/ia64/linux-xen/unaligned.c	Fri Jan 12 14:48:06 2007 +0000
     1.2 +++ b/xen/arch/ia64/linux-xen/unaligned.c	Fri Jan 12 14:50:01 2007 +0000
     1.3 @@ -24,7 +24,7 @@
     1.4  #include <asm/uaccess.h>
     1.5  #include <asm/unaligned.h>
     1.6  
     1.7 -extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
     1.8 +extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
     1.9  
    1.10  #undef DEBUG_UNALIGNED_TRAP
    1.11  
     2.1 --- a/xen/arch/ia64/xen/xenmisc.c	Fri Jan 12 14:48:06 2007 +0000
     2.2 +++ b/xen/arch/ia64/xen/xenmisc.c	Fri Jan 12 14:50:01 2007 +0000
     2.3 @@ -77,7 +77,7 @@ void console_print(char *msg)
     2.4  // called from unaligned.c
     2.5  ////////////////////////////////////
     2.6  
     2.7 -void die_if_kernel(char *str, struct pt_regs *regs, long err) /* __attribute__ ((noreturn)) */
     2.8 +void die_if_kernel(char *str, struct pt_regs *regs, long err)
     2.9  {
    2.10  	if (user_mode(regs))
    2.11  		return;
    2.12 @@ -88,7 +88,7 @@ void die_if_kernel(char *str, struct pt_
    2.13  	domain_crash_synchronous();
    2.14  }
    2.15  
    2.16 -void vmx_die_if_kernel(char *str, struct pt_regs *regs, long err) /* __attribute__ ((noreturn)) */
    2.17 +void vmx_die_if_kernel(char *str, struct pt_regs *regs, long err)
    2.18  {
    2.19  	if (vmx_user_mode(regs))
    2.20  		return;