Attachment 153278 Details for Bug 236929 – PATCH 4: Fix "hlt" instruction for i386 and x86_64

[patch] PATCH 4: Fix "hlt" instruction for i386 and x86_64

linux-2.6.9-xen-fix_halt.patch (text/plain), 1.88 KB, created by Chris Lalancette on 2007-04-23 13:09:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Lalancette

Created: 2007-04-23 13:09:15 UTC

Size: 1.88 KB

patch

obsolete

>--- linux-2.6.9/arch/i386/kernel/time-xen.c.orig
>+++ linux-2.6.9/arch/i386/kernel/time-xen.c
>@@ -874,6 +874,22 @@ void start_hz_timer(void)
> 	cpu_clear(smp_processor_id(), nohz_cpu_mask);
> }
> 
>+void safe_halt(void)
>+{
>+        stop_hz_timer();
>+        /* Blocking includes an implicit local_irq_enable(). */
>+        HYPERVISOR_block();
>+        start_hz_timer();
>+}
>+EXPORT_SYMBOL(safe_halt);
>+
>+void halt(void)
>+{
>+        if (irqs_disabled())
>+                HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL);
>+}
>+EXPORT_SYMBOL(halt);
>+
> /* No locking required. We are only CPU running, and interrupts are off. */
> void time_resume(void)
> {
>--- linux-2.6.9/arch/i386/kernel/smp-xen.c.orig
>+++ linux-2.6.9/arch/i386/kernel/smp-xen.c
>@@ -590,7 +590,7 @@ static void stop_this_cpu (void * dummy)
> 	disable_local_APIC();
> #endif
> 	if (cpu_data[smp_processor_id()].hlt_works_ok)
>-		for(;;) __asm__("hlt");
>+		for(;;) halt();
> 	for (;;);
> }
> 
>--- linux-2.6.9/arch/x86_64/kernel/smp-xen.c.orig
>+++ linux-2.6.9/arch/x86_64/kernel/smp-xen.c
>@@ -443,7 +443,7 @@ static void smp_really_stop_cpu(void *du
> {
> 	smp_stop_cpu(); 
> 	for (;;) 
>-		asm("hlt"); 
>+		halt();
> } 
> 
> void smp_send_stop(void)
>--- linux-2.6.9/include/asm-i386/mach-xen/asm/system.h.orig
>+++ linux-2.6.9/include/asm-i386/mach-xen/asm/system.h
>@@ -516,8 +516,8 @@ do {									\
> 		preempt_enable_no_resched();				\
> } while (0)
> 
>-#define safe_halt()		((void)0)
>-#define halt()			((void)0)
>+void safe_halt(void);
>+void halt(void);
> 
> #define __save_and_cli(x)						\
> do {									\
>--- linux-2.6.9/include/asm-x86_64/mach-xen/asm/system.h.orig
>+++ linux-2.6.9/include/asm-x86_64/mach-xen/asm/system.h
>@@ -398,8 +398,8 @@ do {									\
> 	preempt_enable_no_resched();					\
> 	___x; })
> 
>-#define safe_halt()		((void)0)
>-#define halt()			((void)0)
>+void safe_halt(void);
>+void halt(void);
> 
> /*
>  * disable hlt during certain critical i/o operations

Actions: View | Diff

Attachments on bug 236929: 153275 | 153276 | 153277 | 153278 | 153350 | 153821 | 153881 | 153962 | 153977