32 lines
1.3 KiB
Diff
32 lines
1.3 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User kfraser@localhost.localdomain
|
||
|
|
# Date Mon Oct 30 14:28:29 2006 +0000
|
||
|
|
# Node ID d6802cfaf5f8abb7bec33e65425f41d2086d4b04
|
||
|
|
# parent: 6f3865b4d3d3bddbd64c0ed7c21b03bd98e78a0a
|
||
|
|
[LINUX] Fix build breakage from previous patch.
|
||
|
|
Signed-off-by: Keir Fraser <keir@xensource.com>
|
||
|
|
|
||
|
|
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h Mon Oct 30 14:14:46 2006 +0000
|
||
|
|
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/setup_arch_post.h Mon Oct 30 14:28:29 2006 +0000
|
||
|
|
@@ -84,7 +84,7 @@ static void __init machine_specific_arch
|
||
|
|
#ifdef CONFIG_XEN_COMPAT_030002
|
||
|
|
if (ret == -ENOSYS) {
|
||
|
|
static struct xennmi_callback __initdata cb = {
|
||
|
|
- .handler_address = (unsigned long)nmi;
|
||
|
|
+ .handler_address = (unsigned long)nmi
|
||
|
|
};
|
||
|
|
|
||
|
|
HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
|
||
|
|
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h Mon Oct 30 14:14:46 2006 +0000
|
||
|
|
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/setup_arch_post.h Mon Oct 30 14:28:29 2006 +0000
|
||
|
|
@@ -53,7 +53,7 @@ static void __init machine_specific_arch
|
||
|
|
#ifdef CONFIG_XEN_COMPAT_030002
|
||
|
|
if (ret == -ENOSYS) {
|
||
|
|
static struct xennmi_callback __initdata cb = {
|
||
|
|
- .handler_address = (unsigned long)nmi;
|
||
|
|
+ .handler_address = (unsigned long)nmi
|
||
|
|
};
|
||
|
|
|
||
|
|
HYPERVISOR_nmi_op(XENNMI_register_callback, &cb);
|
||
|
|
|