Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ba89f59ab825d4c9dee652ce0ca53e033a05d5ec
Commit: ba89f59ab825d4c9dee652ce0ca53e033a05d5ec
Parent: cec6dc5d732c649e5f477c21c93d99eb25edae1e
Author: David S. Miller <[EMAIL PROTECTED]>
AuthorDate: Fri Nov 16 03:12:56 2007 -0800
Committer: David S. Miller <[EMAIL PROTECTED]>
CommitDate: Sat Feb 9 04:17:54 2008 -0800
[SPARC]: Merge asm-sparc{,64}/current.h
Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
include/asm-sparc/current.h | 31 +++++++++++++++++--------------
include/asm-sparc64/current.h | 9 +--------
2 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/include/asm-sparc/current.h b/include/asm-sparc/current.h
index 8fe7c82..8a1d9d6 100644
--- a/include/asm-sparc/current.h
+++ b/include/asm-sparc/current.h
@@ -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) 2002 Pete Zaitcev ([EMAIL PROTECTED])
+ * Copyright (C) 2007 David S. Miller ([EMAIL PROTECTED])
*
* Derived from "include/asm-s390/current.h" by
* Martin Schwidefsky ([EMAIL PROTECTED])
* Derived from "include/asm-i386/current.h"
- */
-#ifndef _ASM_CURRENT_H
-#define _ASM_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.
- */
+*/
+#ifndef _SPARC_CURRENT_H
+#define _SPARC_CURRENT_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. */
-/* We also obfuscate get_current() to check if anyone used that by mistake. */
+#ifdef CONFIG_SPARC32
+/* 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)
{
return current_thread_info()->task;
}
#define current __get_current()
+#endif
-#endif /* !(_ASM_CURRENT_H) */
+#endif /* !(_SPARC_CURRENT_H) */
diff --git a/include/asm-sparc64/current.h b/include/asm-sparc64/current.h
index 6c21e4e..a7904a7 100644
--- a/include/asm-sparc64/current.h
+++ b/include/asm-sparc64/current.h
@@ -1,8 +1 @@
-#ifndef _SPARC64_CURRENT_H
-#define _SPARC64_CURRENT_H
-
-#include <linux/thread_info.h>
-
-register struct task_struct *current asm("g4");
-
-#endif /* !(_SPARC64_CURRENT_H) */
+#include <asm-sparc/current.h>
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
