50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
Index: 2008-01-07/xen/arch/x86/traps.c
|
|
===================================================================
|
|
--- 2008-01-07.orig/xen/arch/x86/traps.c 2008-01-07 12:02:51.000000000 +0100
|
|
+++ 2008-01-07/xen/arch/x86/traps.c 2008-01-07 12:11:52.000000000 +0100
|
|
@@ -49,6 +49,7 @@
|
|
#include <xen/trace.h>
|
|
#include <asm/paging.h>
|
|
#include <asm/system.h>
|
|
+#include <asm/hypercall.h>
|
|
#include <asm/io.h>
|
|
#include <asm/atomic.h>
|
|
#include <asm/desc.h>
|
|
@@ -2812,7 +2813,7 @@ long unregister_guest_nmi_callback(void)
|
|
return 0;
|
|
}
|
|
|
|
-long do_set_trap_table(XEN_GUEST_HANDLE(trap_info_t) traps)
|
|
+long do_set_trap_table(XEN_GUEST_HANDLE(const_trap_info_t) traps)
|
|
{
|
|
struct trap_info cur;
|
|
struct vcpu *curr = current;
|
|
Index: 2008-01-07/xen/include/asm-x86/hypercall.h
|
|
===================================================================
|
|
--- 2008-01-07.orig/xen/include/asm-x86/hypercall.h 2007-06-04 08:35:36.000000000 +0200
|
|
+++ 2008-01-07/xen/include/asm-x86/hypercall.h 2008-01-07 12:11:52.000000000 +0100
|
|
@@ -32,9 +32,10 @@ extern long
|
|
do_physdev_op_compat(
|
|
XEN_GUEST_HANDLE(physdev_op_t) uop);
|
|
|
|
+__DEFINE_XEN_GUEST_HANDLE(const_trap_info_t, const trap_info_t);
|
|
extern long
|
|
do_set_trap_table(
|
|
- XEN_GUEST_HANDLE(trap_info_t) traps);
|
|
+ XEN_GUEST_HANDLE(const_trap_info_t) traps);
|
|
|
|
extern int
|
|
do_mmu_update(
|
|
Index: 2008-01-07/xen/include/public/arch-x86/xen.h
|
|
===================================================================
|
|
--- 2008-01-07.orig/xen/include/public/arch-x86/xen.h 2008-01-07 12:11:43.000000000 +0100
|
|
+++ 2008-01-07/xen/include/public/arch-x86/xen.h 2008-01-07 12:11:52.000000000 +0100
|
|
@@ -98,7 +98,6 @@ struct trap_info {
|
|
unsigned long address; /* code offset */
|
|
};
|
|
typedef struct trap_info trap_info_t;
|
|
-DEFINE_XEN_GUEST_HANDLE(trap_info_t);
|
|
|
|
typedef uint64_t tsc_timestamp_t; /* RDTSC timestamp */
|
|
|