[SPARC]: Merge asm-sparc{,64}/current.h

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2007-11-16 03:12:56 -08:00 committed by David S. Miller
parent cec6dc5d73
commit ba89f59ab8
2 changed files with 18 additions and 22 deletions

View file

@ -1,31 +1,34 @@
/* /* include/asm-sparc/current.h
* include/asm-sparc/current.h
* *
* Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation * Copyright (C) 1999 IBM Deutschland Entwicklung GmbH, IBM Corporation
* Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com) * Copyright (C) 2002 Pete Zaitcev (zaitcev@yahoo.com)
* Copyright (C) 2007 David S. Miller (davem@davemloft.net)
* *
* Derived from "include/asm-s390/current.h" by * Derived from "include/asm-s390/current.h" by
* Martin Schwidefsky (schwidefsky@de.ibm.com) * Martin Schwidefsky (schwidefsky@de.ibm.com)
* Derived from "include/asm-i386/current.h" * Derived from "include/asm-i386/current.h"
*/ */
#ifndef _ASM_CURRENT_H #ifndef _SPARC_CURRENT_H
#define _ASM_CURRENT_H #define _SPARC_CURRENT_H
/*
* At the sparc64 DaveM keeps current_thread_info in %g4.
* We might want to consider doing the same to shave a few cycles.
*/
#include <linux/thread_info.h> #include <linux/thread_info.h>
struct task_struct; #ifdef CONFIG_SPARC64
register struct task_struct *current asm("g4");
#endif
/* Two stage process (inline + #define) for type-checking. */ #ifdef CONFIG_SPARC32
/* We also obfuscate get_current() to check if anyone used that by mistake. */ /* We might want to consider using %g4 like sparc64 to shave a few cycles.
*
* Two stage process (inline + #define) for type-checking.
* We also obfuscate get_current() to check if anyone used that by mistake.
*/
struct task_struct;
static inline struct task_struct *__get_current(void) static inline struct task_struct *__get_current(void)
{ {
return current_thread_info()->task; return current_thread_info()->task;
} }
#define current __get_current() #define current __get_current()
#endif
#endif /* !(_ASM_CURRENT_H) */ #endif /* !(_SPARC_CURRENT_H) */

View file

@ -1,8 +1 @@
#ifndef _SPARC64_CURRENT_H #include <asm-sparc/current.h>
#define _SPARC64_CURRENT_H
#include <linux/thread_info.h>
register struct task_struct *current asm("g4");
#endif /* !(_SPARC64_CURRENT_H) */