Commit ab68ed98 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar
Browse files

x86: entry_32.S - use flags from processor-flags.h 



By including processor-flags.h we are allowed to use predefined
macroses instead of keeping own ones

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 756a6c68

arch/x86/kernel/entry_32.S

+7 −13
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
#include <asm/desc.h>

#include <asm/percpu.h>

#include <asm/dwarf2.h>

#include <asm/processor-flags.h>

#include "irq_vectors.h"



/*
@@ -68,13 +69,6 @@ 


#define nr_syscalls ((syscall_table_size)/4)



CF_MASK		= 0x00000001

TF_MASK		= 0x00000100

IF_MASK		= 0x00000200

DF_MASK		= 0x00000400 

NT_MASK		= 0x00004000

VM_MASK		= 0x00020000



#ifdef CONFIG_PREEMPT

#define preempt_stop(clobbers)	DISABLE_INTERRUPTS(clobbers); TRACE_IRQS_OFF

#else
@@ -84,7 +78,7 @@ VM_MASK = 0x00020000 


.macro TRACE_IRQS_IRET

#ifdef CONFIG_TRACE_IRQFLAGS

	testl $IF_MASK,PT_EFLAGS(%esp)     # interrupts off?

	testl $X86_EFLAGS_IF,PT_EFLAGS(%esp)     # interrupts off?

	jz 1f

	TRACE_IRQS_ON

1:
@@ -246,7 +240,7 @@ ret_from_intr: 
check_userspace:

	movl PT_EFLAGS(%esp), %eax	# mix EFLAGS and CS

	movb PT_CS(%esp), %al

	andl $(VM_MASK | SEGMENT_RPL_MASK), %eax

	andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax

	cmpl $USER_RPL, %eax

	jb resume_kernel		# not returning to v8086 or userspace
@@ -271,7 +265,7 @@ need_resched: 
	movl TI_flags(%ebp), %ecx	# need_resched set ?

	testb $_TIF_NEED_RESCHED, %cl

	jz restore_all

	testl $IF_MASK,PT_EFLAGS(%esp)	# interrupts off (exception path) ?

	testl $X86_EFLAGS_IF,PT_EFLAGS(%esp)	# interrupts off (exception path) ?

	jz restore_all

	call preempt_schedule_irq

	jmp need_resched
@@ -388,7 +382,7 @@ syscall_exit: 
					# setting need_resched or sigpending

					# between sampling and the iret

	TRACE_IRQS_OFF

	testl $TF_MASK,PT_EFLAGS(%esp)	# If tracing set singlestep flag on exit

	testl $X86_EFLAGS_TF,PT_EFLAGS(%esp)	# If tracing set singlestep flag on exit

	jz no_singlestep

	orl $_TIF_SINGLESTEP,TI_flags(%ebp)

no_singlestep:
@@ -403,7 +397,7 @@ restore_all: 
	# See comments in process.c:copy_thread() for details.

	movb PT_OLDSS(%esp), %ah

	movb PT_CS(%esp), %al

	andl $(VM_MASK | (SEGMENT_TI_MASK << 8) | SEGMENT_RPL_MASK), %eax

	andl $(X86_EFLAGS_VM | (SEGMENT_TI_MASK << 8) | SEGMENT_RPL_MASK), %eax

	cmpl $((SEGMENT_LDT << 8) | USER_RPL), %eax

	CFI_REMEMBER_STATE

	je ldt_ss			# returning to user-space with LDT SS
@@ -490,7 +484,7 @@ work_resched: 
work_notifysig:				# deal with pending signals and

					# notify-resume requests

#ifdef CONFIG_VM86

	testl $VM_MASK, PT_EFLAGS(%esp)

	testl $X86_EFLAGS_VM, PT_EFLAGS(%esp)

	movl %esp, %eax

	jne work_notifysig_v86		# returning to kernel-space or

					# vm86-space