 c07af4f1ce
			
		
	
	
	c07af4f1ce
	
	
	
		
			
			Core mm expects __PAGETABLE_{PUD,PMD}_FOLDED to be defined if these page
table levels folded.  Usually, these defines are provided by
<asm-generic/pgtable-nopmd.h> and <asm-generic/pgtable-nopud.h>.
But some architectures fold page table levels in a custom way.  They
need to define these macros themself.  This patch adds missing defines.
The patch fixes mm->nr_pmds underflow and eliminates dead __pmd_alloc()
and __pud_alloc() on architectures without these page table levels.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Cc: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: David Howells <dhowells@redhat.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Helge Deller <deller@gmx.de>
Cc: "James E.J. Bottomley" <jejb@parisc-linux.org>
Cc: Koichi Yasutake <yasutake.koichi@jp.panasonic.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
	
			
		
			
				
	
	
		
			75 lines
		
	
	
	
		
			2.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			75 lines
		
	
	
	
		
			2.3 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_M32R_PGTABLE_2LEVEL_H
 | |
| #define _ASM_M32R_PGTABLE_2LEVEL_H
 | |
| #ifdef __KERNEL__
 | |
| 
 | |
| /*
 | |
|  * traditional M32R two-level paging structure:
 | |
|  */
 | |
| 
 | |
| #define PGDIR_SHIFT	22
 | |
| #define PTRS_PER_PGD	1024
 | |
| 
 | |
| /*
 | |
|  * the M32R is two-level, so we don't really have any
 | |
|  * PMD directory physically.
 | |
|  */
 | |
| #define __PAGETABLE_PMD_FOLDED
 | |
| #define PMD_SHIFT	22
 | |
| #define PTRS_PER_PMD	1
 | |
| 
 | |
| #define PTRS_PER_PTE	1024
 | |
| 
 | |
| #define pte_ERROR(e) \
 | |
| 	printk("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e))
 | |
| #define pmd_ERROR(e) \
 | |
| 	printk("%s:%d: bad pmd %08lx.\n", __FILE__, __LINE__, pmd_val(e))
 | |
| #define pgd_ERROR(e) \
 | |
| 	printk("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
 | |
| 
 | |
| /*
 | |
|  * The "pgd_xxx()" functions here are trivial for a folded two-level
 | |
|  * setup: the pgd is never bad, and a pmd always exists (as it's folded
 | |
|  * into the pgd entry)
 | |
|  */
 | |
| static inline int pgd_none(pgd_t pgd)	{ return 0; }
 | |
| static inline int pgd_bad(pgd_t pgd)	{ return 0; }
 | |
| static inline int pgd_present(pgd_t pgd)	{ return 1; }
 | |
| #define pgd_clear(xp)				do { } while (0)
 | |
| 
 | |
| /*
 | |
|  * Certain architectures need to do special things when PTEs
 | |
|  * within a page table are directly modified.  Thus, the following
 | |
|  * hook is made available.
 | |
|  */
 | |
| #define set_pte(pteptr, pteval) (*(pteptr) = pteval)
 | |
| #define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval)
 | |
| 
 | |
| /*
 | |
|  * (pmds are folded into pgds so this doesn't get actually called,
 | |
|  * but the define is needed for a generic inline function.)
 | |
|  */
 | |
| #define set_pmd(pmdptr, pmdval) (*(pmdptr) = pmdval)
 | |
| #define set_pgd(pgdptr, pgdval) (*(pgdptr) = pgdval)
 | |
| 
 | |
| #define pgd_page_vaddr(pgd) \
 | |
| ((unsigned long) __va(pgd_val(pgd) & PAGE_MASK))
 | |
| 
 | |
| #ifndef CONFIG_DISCONTIGMEM
 | |
| #define pgd_page(pgd)	(mem_map + ((pgd_val(pgd) >> PAGE_SHIFT) - PFN_BASE))
 | |
| #endif /* !CONFIG_DISCONTIGMEM */
 | |
| 
 | |
| static inline pmd_t *pmd_offset(pgd_t * dir, unsigned long address)
 | |
| {
 | |
| 	return (pmd_t *) dir;
 | |
| }
 | |
| 
 | |
| #define ptep_get_and_clear(mm,addr,xp)	__pte(xchg(&(xp)->pte, 0))
 | |
| #define pte_same(a, b)		(pte_val(a) == pte_val(b))
 | |
| #define pte_page(x)		pfn_to_page(pte_pfn(x))
 | |
| #define pte_none(x)		(!pte_val(x))
 | |
| #define pte_pfn(x)		(pte_val(x) >> PAGE_SHIFT)
 | |
| #define pfn_pte(pfn, prot)	__pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 | |
| #define pfn_pmd(pfn, prot)	__pmd(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
 | |
| 
 | |
| #endif /* __KERNEL__ */
 | |
| #endif /* _ASM_M32R_PGTABLE_2LEVEL_H */
 |