Commit 92a48831 authored by Paolo \'Blaisorblade\' Giarrusso's avatar Paolo \'Blaisorblade\' Giarrusso Committed by Linus Torvalds

[PATCH] uml: no duplicate current_thread definition

From: Paolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
      Jeff Dike <jdike@addtoit.com>

Currently there are two distinct definitions of current_thread_info (which has
its usual meaning) and current_thread (which is the same thing); so define the
second to be the first (for UML compatibility).  If needed, a search & replace
\<current_thread\> to current_thread_info and removing current_thread can be
done (that would be a separate, low-priority patch, however).

Also, since the involved headers include each other very deeply, we must fix
somehow this recursive inclusion or things won't compile.

Jeff Dike noted that this can be done easily, since the nasty chain of
includes can be broken by eliminating an include of current.h, and implemented
this.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 6a8ffa63
...@@ -8,18 +8,13 @@ ...@@ -8,18 +8,13 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct thread_info;
#include "linux/config.h"
#include "asm/page.h" #include "asm/page.h"
#include "linux/thread_info.h"
#define CURRENT_THREAD(dummy) (((unsigned long) &dummy) & \ #define current (current_thread_info()->task)
(PAGE_MASK << CONFIG_KERNEL_STACK_ORDER))
#define current_thread \
({ int dummy; ((struct thread_info *) CURRENT_THREAD(dummy)); })
#define current (current_thread->task) /*Backward compatibility - it's used inside arch/um.*/
#define current_thread current_thread_info()
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
......
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#include "linux/config.h" #include "linux/config.h"
#include "asm/current.h"
#define pt_regs pt_regs_subarch #define pt_regs pt_regs_subarch
#define show_regs show_regs_subarch #define show_regs show_regs_subarch
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/config.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/types.h> #include <asm/types.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment