# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1200996652 0
# Node ID 346ab9d4d2acd135630c316e8d244c63066900ca
# Parent 17a1a39df56523f3825fe37588059687e79cdc6d
xen/x86: make set_ldt() more consistent with native
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
arch/i386/mm/hypervisor.c | 6 +++---
include/asm-i386/mach-xen/asm/desc.h | 4 ++--
include/asm-i386/mach-xen/asm/hypervisor.h | 2 +-
include/asm-x86_64/mach-xen/asm/desc.h | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff -r 17a1a39df565 -r 346ab9d4d2ac arch/i386/mm/hypervisor.c
--- a/arch/i386/mm/hypervisor.c Tue Jan 22 10:09:52 2008 +0000
+++ b/arch/i386/mm/hypervisor.c Tue Jan 22 10:10:52 2008 +0000
@@ -181,12 +181,12 @@ void xen_pgd_unpin(unsigned long ptr)
BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
}
-void xen_set_ldt(unsigned long ptr, unsigned long len)
+void xen_set_ldt(const void *ptr, unsigned int ents)
{
struct mmuext_op op;
op.cmd = MMUEXT_SET_LDT;
- op.arg1.linear_addr = ptr;
- op.arg2.nr_ents = len;
+ op.arg1.linear_addr = (unsigned long)ptr;
+ op.arg2.nr_ents = ents;
BUG_ON(HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF) < 0);
}
diff -r 17a1a39df565 -r 346ab9d4d2ac include/asm-i386/mach-xen/asm/desc.h
--- a/include/asm-i386/mach-xen/asm/desc.h Tue Jan 22 10:09:52 2008 +0000
+++ b/include/asm-i386/mach-xen/asm/desc.h Tue Jan 22 10:10:52 2008 +0000
@@ -127,7 +127,7 @@ static inline void clear_LDT(void)
* it slows down context switching. Noone uses it anyway.
*/
cpu = cpu; /* XXX avoid compiler warning */
- xen_set_ldt(0UL, 0);
+ xen_set_ldt(NULL, 0);
put_cpu();
}
@@ -142,7 +142,7 @@ static inline void load_LDT_nolock(mm_co
if (likely(!count))
segments = NULL;
- xen_set_ldt((unsigned long)segments, count);
+ xen_set_ldt(segments, count);
}
static inline void load_LDT(mm_context_t *pc)
diff -r 17a1a39df565 -r 346ab9d4d2ac include/asm-i386/mach-xen/asm/hypervisor.h
--- a/include/asm-i386/mach-xen/asm/hypervisor.h Tue Jan 22 10:09:52
2008 +0000
+++ b/include/asm-i386/mach-xen/asm/hypervisor.h Tue Jan 22 10:10:52
2008 +0000
@@ -105,7 +105,7 @@ void xen_pgd_pin(unsigned long ptr);
void xen_pgd_pin(unsigned long ptr);
void xen_pgd_unpin(unsigned long ptr);
-void xen_set_ldt(unsigned long ptr, unsigned long bytes);
+void xen_set_ldt(const void *ptr, unsigned int ents);
#ifdef CONFIG_SMP
#include <linux/cpumask.h>
diff -r 17a1a39df565 -r 346ab9d4d2ac include/asm-x86_64/mach-xen/asm/desc.h
--- a/include/asm-x86_64/mach-xen/asm/desc.h Tue Jan 22 10:09:52 2008 +0000
+++ b/include/asm-x86_64/mach-xen/asm/desc.h Tue Jan 22 10:10:52 2008 +0000
@@ -81,7 +81,7 @@ static inline void clear_LDT(void)
* it slows down context switching. Noone uses it anyway.
*/
cpu = cpu; /* XXX avoid compiler warning */
- xen_set_ldt(0UL, 0);
+ xen_set_ldt(NULL, 0);
put_cpu();
}
@@ -248,7 +248,7 @@ static inline void load_LDT_nolock (mm_c
if (likely(!count))
segments = NULL;
- xen_set_ldt((unsigned long)segments, count);
+ xen_set_ldt(segments, count);
}
static inline void load_LDT(mm_context_t *pc)
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home