m68k: merge the mmu and non-mmu versions of current.h
Trivial merge of the mmu and non-mmu versions of current.h Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
d20f5aa338
commit
2844b66035
|
@ -1,5 +1,28 @@
|
|||
#ifdef __uClinux__
|
||||
#include "current_no.h"
|
||||
#ifndef _M68K_CURRENT_H
|
||||
#define _M68K_CURRENT_H
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
|
||||
register struct task_struct *current __asm__("%a2");
|
||||
|
||||
#else
|
||||
#include "current_mm.h"
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Rather than dedicate a register (as the m68k source does), we
|
||||
* just keep a global, we should probably just change it all to be
|
||||
* current and lose _current_task.
|
||||
*/
|
||||
#include <linux/thread_info.h>
|
||||
|
||||
struct task_struct;
|
||||
|
||||
static inline struct task_struct *get_current(void)
|
||||
{
|
||||
return(current_thread_info()->task);
|
||||
}
|
||||
|
||||
#define current get_current()
|
||||
|
||||
#endif /* CONFNIG_MMU */
|
||||
|
||||
#endif /* !(_M68K_CURRENT_H) */
|
||||
|
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _M68K_CURRENT_H
|
||||
#define _M68K_CURRENT_H
|
||||
|
||||
register struct task_struct *current __asm__("%a2");
|
||||
|
||||
#endif /* !(_M68K_CURRENT_H) */
|
|
@ -1,24 +0,0 @@
|
|||
#ifndef _M68KNOMMU_CURRENT_H
|
||||
#define _M68KNOMMU_CURRENT_H
|
||||
/*
|
||||
* current.h
|
||||
* (C) Copyright 2000, Lineo, David McCullough <davidm@uclinux.org>
|
||||
* (C) Copyright 2002, Greg Ungerer (gerg@snapgear.com)
|
||||
*
|
||||
* rather than dedicate a register (as the m68k source does), we
|
||||
* just keep a global, we should probably just change it all to be
|
||||
* current and lose _current_task.
|
||||
*/
|
||||
|
||||
#include <linux/thread_info.h>
|
||||
|
||||
struct task_struct;
|
||||
|
||||
static inline struct task_struct *get_current(void)
|
||||
{
|
||||
return(current_thread_info()->task);
|
||||
}
|
||||
|
||||
#define current get_current()
|
||||
|
||||
#endif /* _M68KNOMMU_CURRENT_H */
|
Loading…
Reference in a new issue