lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: remove TRAP_FLAG

Browse Source 
This gets rid of the local constant macro TRAP_FLAG.
It's redundant with the public constant macro X86_EFLAGS_TF.

Signed-off-by: Roland McGrath <roland@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Roland McGrath
2008-01-30 13:30:48 +01:00
committed by Ingo Molnar
parent 2608a6584a
commit 77c03dcd44
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/kernel/ptrace_32.c
View File

@@ -37,9 +37,6 @@
*/ */
#define FLAG_MASK 0x00050dd5 #define FLAG_MASK 0x00050dd5
/* set's the trap flag. */
#define TRAP_FLAG 0x100
/* /*
* Offset of eflags on child stack.. * Offset of eflags on child stack..
*/ */
@@ -235,11 +232,11 @@ static void set_singlestep(struct task_struct *child)
/* /*
* If TF was already set, don't do anything else * If TF was already set, don't do anything else
*/ */
if (regs->eflags & TRAP_FLAG) if (regs->eflags & X86_EFLAGS_TF)
return; return;
/* Set TF on the kernel stack.. */ /* Set TF on the kernel stack.. */
regs->eflags |= TRAP_FLAG; regs->eflags |= X86_EFLAGS_TF;
/* /*
* ..but if TF is changed by the instruction we will trace, * ..but if TF is changed by the instruction we will trace,
@@ -260,7 +257,7 @@ static void clear_singlestep(struct task_struct *child)
/* But touch TF only if it was set by us.. */ /* But touch TF only if it was set by us.. */
if (child->ptrace & PT_DTRACE) { if (child->ptrace & PT_DTRACE) {
struct pt_regs *regs = get_child_regs(child); struct pt_regs *regs = get_child_regs(child);
regs->eflags &= ~TRAP_FLAG; regs->eflags &= ~X86_EFLAGS_TF;
child->ptrace &= ~PT_DTRACE; child->ptrace &= ~PT_DTRACE;
} }
} }

9
arch/x86/kernel/ptrace_64.c
View File

@@ -42,9 +42,6 @@
*/ */
#define FLAG_MASK 0x54dd5UL #define FLAG_MASK 0x54dd5UL
/* set's the trap flag. */
#define TRAP_FLAG 0x100UL
/* /*
* eflags and offset of eflags on child stack.. * eflags and offset of eflags on child stack..
*/ */
@@ -187,11 +184,11 @@ static void set_singlestep(struct task_struct *child)
/* /*
* If TF was already set, don't do anything else * If TF was already set, don't do anything else
*/ */
if (regs->eflags & TRAP_FLAG) if (regs->eflags & X86_EFLAGS_TF)
return; return;
/* Set TF on the kernel stack.. */ /* Set TF on the kernel stack.. */
regs->eflags |= TRAP_FLAG; regs->eflags |= X86_EFLAGS_TF;
/* /*
* ..but if TF is changed by the instruction we will trace, * ..but if TF is changed by the instruction we will trace,
@@ -212,7 +209,7 @@ static void clear_singlestep(struct task_struct *child)
/* But touch TF only if it was set by us.. */ /* But touch TF only if it was set by us.. */
if (child->ptrace & PT_DTRACE) { if (child->ptrace & PT_DTRACE) {
struct pt_regs *regs = task_pt_regs(child); struct pt_regs *regs = task_pt_regs(child);
regs->eflags &= ~TRAP_FLAG; regs->eflags &= ~X86_EFLAGS_TF;
child->ptrace &= ~PT_DTRACE; child->ptrace &= ~PT_DTRACE;
} }
} }