aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-powerpc/pgtable-ppc64.h
diff options
context:
space:
mode:
authorDavid Gibson <david@gibson.dropbear.id.au>2007-06-13 00:52:56 -0400
committerPaul Mackerras <paulus@samba.org>2007-06-14 08:30:15 -0400
commit9c709f3b62ee8ee0dfadf358e361802cab7eea7a (patch)
tree56d2e624ecf851d1b7f55a03d04662a470e1373a /include/asm-powerpc/pgtable-ppc64.h
parentc0770f686cf8f464b5b9d4bd28c1ed7604c97ed4 (diff)
[POWERPC] Start factoring pgtable-ppc32.h and pgtable-ppc64.h
This factors some things defined in both pgtable-ppc32.h and pgtable-ppc64.h into the common part of asm-powerpc/pgtable.h. These are all things which have essentially identical definitions, and which by their nature are very unlikely ever to need different definitions in the two cases. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/pgtable-ppc64.h')
-rw-r--r--include/asm-powerpc/pgtable-ppc64.h29
1 files changed, 0 insertions, 29 deletions
diff --git a/include/asm-powerpc/pgtable-ppc64.h b/include/asm-powerpc/pgtable-ppc64.h
index 9b0f51ccad05..d61178dea670 100644
--- a/include/asm-powerpc/pgtable-ppc64.h
+++ b/include/asm-powerpc/pgtable-ppc64.h
@@ -7,11 +7,7 @@
7 7
8#ifndef __ASSEMBLY__ 8#ifndef __ASSEMBLY__
9#include <linux/stddef.h> 9#include <linux/stddef.h>
10#include <asm/processor.h> /* For TASK_SIZE */
11#include <asm/mmu.h>
12#include <asm/page.h>
13#include <asm/tlbflush.h> 10#include <asm/tlbflush.h>
14struct mm_struct;
15#endif /* __ASSEMBLY__ */ 11#endif /* __ASSEMBLY__ */
16 12
17#ifdef CONFIG_PPC_64K_PAGES 13#ifdef CONFIG_PPC_64K_PAGES
@@ -143,16 +139,6 @@ struct mm_struct;
143#define __S110 PAGE_SHARED_X 139#define __S110 PAGE_SHARED_X
144#define __S111 PAGE_SHARED_X 140#define __S111 PAGE_SHARED_X
145 141
146#ifndef __ASSEMBLY__
147
148/*
149 * ZERO_PAGE is a global shared page that is always zero: used
150 * for zero-mapped memory areas etc..
151 */
152extern unsigned long empty_zero_page[PAGE_SIZE/sizeof(unsigned long)];
153#define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
154#endif /* __ASSEMBLY__ */
155
156#ifdef CONFIG_HUGETLB_PAGE 142#ifdef CONFIG_HUGETLB_PAGE
157 143
158#define HAVE_ARCH_UNMAPPED_AREA 144#define HAVE_ARCH_UNMAPPED_AREA
@@ -447,10 +433,6 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn,
447#define pgd_ERROR(e) \ 433#define pgd_ERROR(e) \
448 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) 434 printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
449 435
450extern pgd_t swapper_pg_dir[];
451
452extern void paging_init(void);
453
454/* Encode and de-code a swap entry */ 436/* Encode and de-code a swap entry */
455#define __swp_type(entry) (((entry).val >> 1) & 0x3f) 437#define __swp_type(entry) (((entry).val >> 1) & 0x3f)
456#define __swp_offset(entry) ((entry).val >> 8) 438#define __swp_offset(entry) ((entry).val >> 8)
@@ -461,17 +443,6 @@ extern void paging_init(void);
461#define pgoff_to_pte(off) ((pte_t) {((off) << PTE_RPN_SHIFT)|_PAGE_FILE}) 443#define pgoff_to_pte(off) ((pte_t) {((off) << PTE_RPN_SHIFT)|_PAGE_FILE})
462#define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_RPN_SHIFT) 444#define PTE_FILE_MAX_BITS (BITS_PER_LONG - PTE_RPN_SHIFT)
463 445
464/*
465 * kern_addr_valid is intended to indicate whether an address is a valid
466 * kernel address. Most 32-bit archs define it as always true (like this)
467 * but most 64-bit archs actually perform a test. What should we do here?
468 * The only use is in fs/ncpfs/dir.c
469 */
470#define kern_addr_valid(addr) (1)
471
472#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
473 remap_pfn_range(vma, vaddr, pfn, size, prot)
474
475void pgtable_cache_init(void); 446void pgtable_cache_init(void);
476 447
477/* 448/*