Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2844b660 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d20f5aa3

arch/m68k/include/asm/current.h

+27 −4
Original line number Diff line number Diff line 
#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) */

arch/m68k/include/asm/current_mm.h

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
#ifndef _M68K_CURRENT_H

#define _M68K_CURRENT_H



register struct task_struct *current __asm__("%a2");



#endif /* !(_M68K_CURRENT_H) */

arch/m68k/include/asm/current_no.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
#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 */