Attachment 302774 Details for Bug 437358 – 0001-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch

[patch] 0001-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch

0001-ia32entry.S-Replace-cli-sti-cases-with-DISABLE_INTE.patch (text/plain), 2.01 KB, created by Mark McLoughlin on 2008-04-17 17:49:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark McLoughlin

Created: 2008-04-17 17:49:57 UTC

Size: 2.01 KB

patch

obsolete

>From fb0f790919ada3f54fff50e7d92b59689965d71c Mon Sep 17 00:00:00 2001
>From: Eduardo Habkost <ehabkost@redhat.com>
>Date: Thu, 20 Mar 2008 18:44:54 -0300
>Subject: [PATCH] ia32entry.S: Replace cli/sti cases with DISABLE_INTERRUPTS/DISABLE_INTERRUPTS
>
>Replace almost all cases of cli/sti, except one more complicated case
>involving sysexit.
>
>Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>---
> arch/x86/ia32/ia32entry.S |   10 +++++-----
> 1 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
>index 8022d3c..376b7ba 100644
>--- a/arch/x86/ia32/ia32entry.S
>+++ b/arch/x86/ia32/ia32entry.S
>@@ -92,7 +92,7 @@ ENTRY(ia32_sysenter_target)
> 	 * No need to follow this irqs on/off section: the syscall
> 	 * disabled irqs, here we enable it straight after entry:
> 	 */
>-	sti	
>+	ENABLE_INTERRUPTS(CLBR_NONE)
>  	movl	%ebp,%ebp		/* zero extension */
> 	pushq	$__USER32_DS
> 	CFI_ADJUST_CFA_OFFSET 8
>@@ -134,7 +134,7 @@ sysenter_do_call:
> 	call	*ia32_sys_call_table(,%rax,8)
> 	movq	%rax,RAX-ARGOFFSET(%rsp)
> 	GET_THREAD_INFO(%r10)
>-	cli
>+	DISABLE_INTERRUPTS(CLBR_NONE)
> 	TRACE_IRQS_OFF
> 	testl	$_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
> 	jnz	int_ret_from_sys_call
>@@ -206,7 +206,7 @@ ENTRY(ia32_cstar_target)
> 	 * No need to follow this irqs on/off section: the syscall
> 	 * disabled irqs and here we enable it straight after entry:
> 	 */
>-	sti
>+	ENABLE_INTERRUPTS(CLBR_NONE)
> 	SAVE_ARGS 8,1,1
> 	movl 	%eax,%eax	/* zero extension */
> 	movq	%rax,ORIG_RAX-ARGOFFSET(%rsp)
>@@ -239,7 +239,7 @@ cstar_do_call:
> 	call *ia32_sys_call_table(,%rax,8)
> 	movq %rax,RAX-ARGOFFSET(%rsp)
> 	GET_THREAD_INFO(%r10)
>-	cli
>+	DISABLE_INTERRUPTS(CLBR_NONE)
> 	TRACE_IRQS_OFF
> 	testl $_TIF_ALLWORK_MASK,threadinfo_flags(%r10)
> 	jnz  int_ret_from_sys_call
>@@ -311,7 +311,7 @@ ENTRY(ia32_syscall)
> 	 * No need to follow this irqs on/off section: the syscall
> 	 * disabled irqs and here we enable it straight after entry:
> 	 */
>-	sti
>+	ENABLE_INTERRUPTS(CLBR_NONE)
> 	movl %eax,%eax
> 	pushq %rax
> 	CFI_ADJUST_CFA_OFFSET 8
>-- 
>1.5.4.1
>

Actions: View | Diff

Attachments on bug 437358: 302774 | 302775 | 302776 | 302777 | 302778