ia64/xen-unstable

changeset 9822:2b37b17cca09

Don't BUG_ON() if we cannot register an NMI callback since it is not a fatal
problem.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian.Campbell@xensource.com
date Fri Apr 21 18:06:06 2006 +0100 (2006-04-21)
parents 5159bd543353
children 8db5ac82c20f
files linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h	Fri Apr 21 17:51:30 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h	Fri Apr 21 18:06:06 2006 +0100
     1.3 @@ -60,9 +60,8 @@ static void __init machine_specific_arch
     1.4  		struct xennmi_callback cb;
     1.5  
     1.6  		cb.handler_address = nmi_cb.address.eip;
     1.7 -		ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
     1.8 +		HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
     1.9  	}
    1.10 -	BUG_ON(ret);
    1.11  
    1.12  	if (HYPERVISOR_xen_version(XENVER_platform_parameters,
    1.13  				   &pp) == 0)
     2.1 --- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h	Fri Apr 21 17:51:30 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h	Fri Apr 21 18:06:06 2006 +0100
     2.3 @@ -52,8 +52,7 @@ static void __init machine_specific_arch
     2.4  		struct xennmi_callback cb;
     2.5  
     2.6  		cb.handler_address = nmi_cb.address;
     2.7 -		ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
     2.8 +		HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
     2.9  	}
    2.10 -	BUG_ON(ret);
    2.11  #endif
    2.12  }