aboutsummaryrefslogtreecommitdiff
path: root/include/asm-ppc64/page.h
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-09-09 15:02:25 -0500
committerPaul Mackerras <paulus@samba.org>2005-09-19 09:38:49 +1000
commit5f7c690728ace1404f72d74972dcc261674c0dd4 (patch)
treed2fea77e39c2103be9ae41b9b849dce949cd9efd /include/asm-ppc64/page.h
parent0a1e1222b77b9b02457d8126f598e3713559d5c7 (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.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/include/asm-ppc64/page.h b/include/asm-ppc64/page.h
index a15422bcf30..d404431f0a9 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