diff options
| author | Kumar Gala <galak@freescale.com> | 2005-09-09 16:02:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-09-18 19:38:49 -0400 |
| commit | 5f7c690728ace1404f72d74972dcc261674c0dd4 (patch) | |
| tree | d2fea77e39c2103be9ae41b9b849dce949cd9efd /include/asm-ppc64/page.h | |
| parent | 0a1e1222b77b9b02457d8126f598e3713559d5c7 (diff) | |
[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 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/config.h> | 13 | #include <linux/config.h> |
| 14 | 14 | #include <asm/ppc_asm.h> /* for ASM_CONST */ | |
| 15 | #ifdef __ASSEMBLY__ | ||
| 16 | #define ASM_CONST(x) x | ||
| 17 | #else | ||
| 18 | #define __ASM_CONST(x) x##UL | ||
| 19 | #define ASM_CONST(x) __ASM_CONST(x) | ||
| 20 | #endif | ||
| 21 | 15 | ||
| 22 | /* PAGE_SHIFT determines the page size */ | 16 | /* PAGE_SHIFT determines the page size */ |
| 23 | #define PAGE_SHIFT 12 | 17 | #define PAGE_SHIFT 12 |