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

[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

include/asm-ppc64/current.h→include/asm-powerpc/current.h

+18 −7
Original line number Diff line number Diff line 
#ifndef _PPC64_CURRENT_H

#define _PPC64_CURRENT_H



#include <asm/paca.h>

#ifndef _ASM_POWERPC_CURRENT_H

#define _ASM_POWERPC_CURRENT_H



/*

 * This program is free software; you can redistribute it and/or
@@ -10,7 +8,20 @@ 
 * 2 of the License, or (at your option) any later version.

 */



#define get_current()   (get_paca()->__current)

#define current         get_current()

struct task_struct;



#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 */

include/asm-ppc/current.h

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE