Re: x86: Unify current.h

[Christoph Lameter <clameter@sgi.com>]

On Tue, 6 May 2008, Ingo Molnar wrote:

> i suspect the __ASSEMBLY__ protections in the unified file are not wide 
> enough?

Duh. yes. The x86_64 __ASSEMBLY__ protection is no longer there. We could 
move the task_struct def back into the arch specific portion. Sigh.


---
 include/asm-x86/current.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: linux-2.6/include/asm-x86/current.h
===================================================================
--- linux-2.6.orig/include/asm-x86/current.h	2008-05-06 10:58:03.000000000 -0700
+++ linux-2.6/include/asm-x86/current.h	2008-05-06 10:58:40.000000000 -0700
@@ -1,12 +1,12 @@
 #ifndef _X86_CURRENT_H
 #define _X86_CURRENT_H
 
-struct task_struct;
-
 #ifdef CONFIG_X86_32
 #include <linux/compiler.h>
 #include <asm/percpu.h>
 
+struct task_struct;
+
 DECLARE_PER_CPU(struct task_struct *, current_task);
 static __always_inline struct task_struct *get_current(void)
 {
@@ -18,6 +18,8 @@ static __always_inline struct task_struc
 #ifndef __ASSEMBLY__
 #include <asm/pda.h>
 
+struct task_struct;
+
 static __always_inline struct task_struct *get_current(void)
 {
 	return read_pda(pcurrent);