Commit 584224e4 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras

[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: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent c5ff7001
#ifndef _PPC64_CURRENT_H #ifndef _ASM_POWERPC_CURRENT_H
#define _PPC64_CURRENT_H #define _ASM_POWERPC_CURRENT_H
#include <asm/paca.h>
/* /*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -10,7 +8,20 @@ ...@@ -10,7 +8,20 @@
* 2 of the License, or (at your option) any later version. * 2 of the License, or (at your option) any later version.
*/ */
#define get_current() (get_paca()->__current) struct task_struct;
#define current get_current()
#ifdef __powerpc64__
#include <asm/paca.h>
#define current (get_paca()->__current)
#else
/*
* We keep `current' in r2 for speed.
*/
register struct task_struct *current asm ("r2");
#endif
#endif /* !(_PPC64_CURRENT_H) */ #endif /* _ASM_POWERPC_CURRENT_H */
#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__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment