Skip to contentSkip to conversation

x86: kgdb build fix

PATCH In review Harvey Harrison 3 participants 4 messages Apr 18, 2008 x86

lore
Share & tools
lore

Harvey Harrison

author
#0 lore raw

PATCH 1/1 x86: kgdb build fix

TF_MASK is no longer defined, use X86_EFLAGS_TF.

Signed-off-by Harvey Harrison <[email protected]>

---
In current -linus tree.

 arch/x86/kernel/kgdb.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/kgdb.c +2 -2
index 8c7e555..24362ec 100644
@@ -375,12 +375,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
 		newPC = linux_regs->ip;
 
 		/* clear the trace bit */
-		linux_regs->flags &= ~TF_MASK;
+		linux_regs->flags &= ~X86_EFLAGS_TF;
 		atomic_set(&kgdb_cpu_doing_single_step, -1);
 
 		/* set the trace bit if we're stepping */
 		if (remcomInBuffer[0] == 's') {
-			linux_regs->flags |= TF_MASK;
+			linux_regs->flags |= X86_EFLAGS_TF;
 			kgdb_single_step = 1;
 			if (kgdb_contthread) {
 				atomic_set(&kgdb_cpu_doing_single_step,
Signature · 1 line
1.5.5.144.g3e42
#1 lore raw

[Harvey Harrison - Fri, Apr 18, 2008 at 09:54:38AM -0700]

| TF_MASK is no longer defined, use X86_EFLAGS_TF.
| 
| Signed-off-by: Harvey Harrison <[email protected]>
| ---
| In current -linus tree.
| 
|  arch/x86/kernel/kgdb.c |    4 ++--
|  1 files changed, 2 insertions(+), 2 deletions(-)
| 
| diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
| index 8c7e555..24362ec 100644
| --- a/arch/x86/kernel/kgdb.c
| +++ b/arch/x86/kernel/kgdb.c
| @@ -375,12 +375,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
|  		newPC = linux_regs->ip;
|  
|  		/* clear the trace bit */
| -		linux_regs->flags &= ~TF_MASK;
| +		linux_regs->flags &= ~X86_EFLAGS_TF;
|  		atomic_set(&kgdb_cpu_doing_single_step, -1);
|  
|  		/* set the trace bit if we're stepping */
|  		if (remcomInBuffer[0] == 's') {
| -			linux_regs->flags |= TF_MASK;
| +			linux_regs->flags |= X86_EFLAGS_TF;
|  			kgdb_single_step = 1;
|  			if (kgdb_contthread) {
|  				atomic_set(&kgdb_cpu_doing_single_step,
| -- 
| 1.5.5.144.g3e42
|

It seems to be my fault, thanks a lot Harvey!

- Cyrill -

#2 lore raw
In reply to Harvey Harrison

[Harvey Harrison - Fri, Apr 18, 2008 at 09:54:38AM -0700]

| TF_MASK is no longer defined, use X86_EFLAGS_TF.
| 
| Signed-off-by: Harvey Harrison <[email protected]>
| ---
| In current -linus tree.
| 
|  arch/x86/kernel/kgdb.c |    4 ++--
|  1 files changed, 2 insertions(+), 2 deletions(-)
| 
| diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c
| index 8c7e555..24362ec 100644
| --- a/arch/x86/kernel/kgdb.c
| +++ b/arch/x86/kernel/kgdb.c
| @@ -375,12 +375,12 @@ int kgdb_arch_handle_exception(int e_vector, int signo, int err_code,
|  		newPC = linux_regs->ip;
|  
|  		/* clear the trace bit */
| -		linux_regs->flags &= ~TF_MASK;
| +		linux_regs->flags &= ~X86_EFLAGS_TF;
|  		atomic_set(&kgdb_cpu_doing_single_step, -1);
|  
|  		/* set the trace bit if we're stepping */
|  		if (remcomInBuffer[0] == 's') {
| -			linux_regs->flags |= TF_MASK;
| +			linux_regs->flags |= X86_EFLAGS_TF;
|  			kgdb_single_step = 1;
|  			if (kgdb_contthread) {
|  				atomic_set(&kgdb_cpu_doing_single_step,
| -- 
| 1.5.5.144.g3e42
|

[OT]
----

Oh, false alarm - it's not my fault. My patches are not even merged in mainline yet ;) Sorry for being flaming a bit

- Cyrill -