summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2005-11-09 13:04:06 +1100
committerPaul Mackerras <paulus@samba.org>2005-11-10 11:23:53 +1100
commit584224e4095d8abcf2bef38efacc291be9a44c20 (patch)
tree4f4e37fe772880c85c03ea08fdd2c46aab92eb08 /include/asm-ppc
parentc5ff700116a56a870ef40cc4ac6f19bf2530b466 (diff)
downloadlinux-stable-584224e4095d8abcf2bef38efacc291be9a44c20.tar.gz
linux-stable-584224e4095d8abcf2bef38efacc291be9a44c20.tar.bz2
linux-stable-584224e4095d8abcf2bef38efacc291be9a44c20.zip
[PATCH] powerpc: Merge current.h
This patch merges current.h. This is a one-big-ifdef merge, but both versions are so tiny, I think we can live with it. While we're at it, we get rid of the fairly pointless redirection through get_current() in the ppc64 version. Built and booted on POWER5 LPAR (ARCH=powerpc & ARCH=ppc64). Built for 32-bit pmac (ARCH=powerpc & ARCH=ppc). Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/current.h11
1 files changed, 0 insertions, 11 deletions
diff --git a/include/asm-ppc/current.h b/include/asm-ppc/current.h
deleted file mode 100644
index 8d41501ba10d..000000000000
--- a/include/asm-ppc/current.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifdef __KERNEL__
-#ifndef _PPC_CURRENT_H
-#define _PPC_CURRENT_H
-
-/*
- * We keep `current' in r2 for speed.
- */
-register struct task_struct *current asm ("r2");
-
-#endif /* !(_PPC_CURRENT_H) */
-#endif /* __KERNEL__ */