Steven Rostedt
2007-Apr-18 13:02 UTC
[RFC/PATCH PV_OPS X86_64 16/17] paravirt_ops - touch ups
plain text document attachment (xx-paravirt-touchups.patch) Some miscellaneous clean ups. Signed-off-by: Steven Rostedt srostedt@redhat.com Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com> Index: clean-start/arch/x86_64/ia32/syscall32.c ==================================================================--- clean-start.orig/arch/x86_64/ia32/syscall32.c +++ clean-start/arch/x86_64/ia32/syscall32.c @@ -119,5 +119,5 @@ void syscall32_cpu_init(void) checking_wrmsrl(MSR_IA32_SYSENTER_ESP, 0ULL); checking_wrmsrl(MSR_IA32_SYSENTER_EIP, (u64)ia32_sysenter_target); - wrmsrl(MSR_CSTAR, ia32_cstar_target); + wrmsrl(MSR_CSTAR, (u64)ia32_cstar_target); } Index: clean-start/arch/x86_64/mm/pageattr.c ==================================================================--- clean-start.orig/arch/x86_64/mm/pageattr.c +++ clean-start/arch/x86_64/mm/pageattr.c @@ -81,7 +81,7 @@ static void flush_kernel_map(void *arg) void *adr = page_address(pg); if (cpu_has_clflush) cache_flush_page(adr); - __flush_tlb_one(adr); + __flush_tlb_one((u64)adr); } } Index: clean-start/include/linux/irqflags.h ==================================================================--- clean-start.orig/include/linux/irqflags.h +++ clean-start/include/linux/irqflags.h @@ -74,11 +74,11 @@ #endif /* CONFIG_TRACE_IRQFLAGS_SUPPORT */ #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT -static inline void safe_halt(void) -{ - trace_hardirqs_on(); - raw_safe_halt(); -} +#define safe_halt() \ + do { \ + trace_hardirqs_on(); \ + raw_safe_halt(); \ + } while (0) #define local_save_flags(flags) raw_local_save_flags(flags) --