[PATCH] x86: kgdb build fix

[PATCH] x86: kgdb build fix

[Harvey Harrison]

TF_MASK is no longer defined, use X86_EFLAGS_TF.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
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

Re: [PATCH] x86: kgdb build fix

[Cyrill Gorcunov]

[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 <harvey.harrison@gmail.com>
| ---
| 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 -

Re: [PATCH] x86: kgdb build fix

[Cyrill Gorcunov]

[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 <harvey.harrison@gmail.com>
| ---
| 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 -

Re: [PATCH] x86: kgdb build fix

[Ingo Molnar]

* Harvey Harrison <harvey.harrison@gmail.com> wrote:

> TF_MASK is no longer defined, use X86_EFLAGS_TF.
> 
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>

Acked-by: Ingo Molnar <mingo@elte.hu>

	Ingo

[patch] x86: KGDB build fix

[Ingo Molnar]

latest -git 64-bit allyesconfig needs the build fix below.

	Ingo

----------->
Subject: x86: KGDB build fix
From: Ingo Molnar <mingo@elte.hu>

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 arch/x86/kernel/kgdb.c |    6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Index: linux-x86.q/arch/x86/kernel/kgdb.c
===================================================================
--- linux-x86.q.orig/arch/x86/kernel/kgdb.c
+++ linux-x86.q/arch/x86/kernel/kgdb.c
@@ -46,11 +46,7 @@
 #include <asm/apicdef.h>
 #include <asm/system.h>
 
-#ifdef CONFIG_X86_32
-# include <mach_ipi.h>
-#else
-# include <asm/mach_apic.h>
-#endif
+#include <mach_ipi.h>
 
 /*
  * Put the error code here just in case the user cares: