diff options
| author | Kumar Gala | 2005-09-09 22:02:25 +0200 |
|---|---|---|
| committer | Paul Mackerras | 2005-09-19 01:38:49 +0200 |
| commit | 5f7c690728ace1404f72d74972dcc261674c0dd4 (patch) | |
| tree | d2fea77e39c2103be9ae41b9b849dce949cd9efd /include/asm-ppc64/page.h | |
| parent | [PATCH] powerpc: Merge kmap_types.h (diff) | |
| download | kernel-qcow2-linux-5f7c690728ace1404f72d74972dcc261674c0dd4.tar.gz kernel-qcow2-linux-5f7c690728ace1404f72d74972dcc261674c0dd4.tar.xz kernel-qcow2-linux-5f7c690728ace1404f72d74972dcc261674c0dd4.zip | |
[PATCH] powerpc: Merged ppc_asm.h
Merged ppc_asm.h between ppc32 & ppc64. The majority of the file is
common between the two architectures excluding how a single GPR is
saved/restored and which GPRs are non-volatile.
Additionally, moved the ASM_CONST macro used on ppc64 into ppc_asm.h.
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64/page.h')
| -rw-r--r-- | include/asm-ppc64/page.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h index a15422bcf30d..d404431f0a9a 100644 --- a/include/asm-ppc64/page.h +++ b/include/asm-ppc64/page.h @@ -11,13 +11,7 @@ */ #include <linux/config.h> - -#ifdef __ASSEMBLY__ - #define ASM_CONST(x) x -#else - #define __ASM_CONST(x) x##UL - #define ASM_CONST(x) __ASM_CONST(x) -#endif +#include <asm/ppc_asm.h> /* for ASM_CONST */ /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 |