[Xen-changelog] Don't BUG_ON() if we cannot register an NMI callback since it is not a fatal

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

# HG changeset patch
# User Ian.Campbell@xxxxxxxxxxxxx
# Node ID 2b37b17cca09505bcfe8904dc8695c3b9640d1c1
# Parent  5159bd5433536fc4aaae01a0f6101a6fc9c0e015
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@xxxxxxxxxxxxx>

diff -r 5159bd543353 -r 2b37b17cca09 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Fri Apr 
21 17:51:30 2006 +0100
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h  Fri Apr 
21 18:06:06 2006 +0100
@@ -60,9 +60,8 @@ static void __init machine_specific_arch
                struct xennmi_callback cb;
 
                cb.handler_address = nmi_cb.address.eip;
-               ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
+               HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
        }
-       BUG_ON(ret);
 
        if (HYPERVISOR_xen_version(XENVER_platform_parameters,
                                   &pp) == 0)
diff -r 5159bd543353 -r 2b37b17cca09 
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h        
Fri Apr 21 17:51:30 2006 +0100
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h        
Fri Apr 21 18:06:06 2006 +0100
@@ -52,8 +52,7 @@ static void __init machine_specific_arch
                struct xennmi_callback cb;
 
                cb.handler_address = nmi_cb.address;
-               ret = HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
+               HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
        }
-       BUG_ON(ret);
 #endif
 }

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