Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 138ff346 authored by Greg Ungerer's avatar Greg Ungerer Committed by Geert Uytterhoeven
Browse files

m68k/m68knommu: clean up page.h 



There is a lot of common defines in the MMU and non-MMU variants of
page.h. Factor out the common stuff into the master page.h. It still
includes the underlying page_mm.h or page_no.h, but they only contain
the real differences now.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent b0860c1d

arch/m68k/include/asm/page.h

+46 −2
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "page_no.h"

#ifndef _M68K_PAGE_H

#define _M68K_PAGE_H



#include <linux/const.h>

#include <asm/setup.h>

#include <asm/page_offset.h>



/* PAGE_SHIFT determines the page size */

#ifndef CONFIG_SUN3

#define PAGE_SHIFT	(12)

#else

#define PAGE_SHIFT	(13)

#endif

#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE-1))

#define PAGE_OFFSET	(PAGE_OFFSET_RAW)



#ifndef __ASSEMBLY__



/*

 * These are used to make use of C type-checking..

 */

typedef struct { unsigned long pte; } pte_t;

typedef struct { unsigned long pmd[16]; } pmd_t;

typedef struct { unsigned long pgd; } pgd_t;

typedef struct { unsigned long pgprot; } pgprot_t;

typedef struct page *pgtable_t;



#define pte_val(x)	((x).pte)

#define pmd_val(x)	((&x)->pmd[0])

#define pgd_val(x)	((x).pgd)

#define pgprot_val(x)	((x).pgprot)



#define __pte(x)	((pte_t) { (x) } )

#define __pmd(x)	((pmd_t) { (x) } )

#define __pgd(x)	((pgd_t) { (x) } )

#define __pgprot(x)	((pgprot_t) { (x) } )



#endif /* !__ASSEMBLY__ */



#ifdef CONFIG_MMU

#include "page_mm.h"

#else

#include "page_no.h"

#endif



#include <asm-generic/getorder.h>



#endif /* _M68K_PAGE_H */

arch/m68k/include/asm/page_mm.h

+3 −46
Original line number Diff line number Diff line 
#ifndef _M68K_PAGE_H

#define _M68K_PAGE_H



#include <linux/const.h>



/* PAGE_SHIFT determines the page size */

#ifndef CONFIG_SUN3

#define PAGE_SHIFT	(12)

#else

#define PAGE_SHIFT	(13)

#endif

#define PAGE_SIZE	(_AC(1, UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE-1))



#include <asm/setup.h>

#ifndef _M68K_PAGE_MM_H

#define _M68K_PAGE_MM_H



#ifndef __ASSEMBLY__



#include <linux/compiler.h>



#include <asm/module.h>



#define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)
@@ -78,33 +64,6 @@ static inline void clear_page(void *page) 
		flush_dcache_page(page);	\

	} while (0)



/*

 * These are used to make use of C type-checking..

 */

typedef struct { unsigned long pte; } pte_t;

typedef struct { unsigned long pmd[16]; } pmd_t;

typedef struct { unsigned long pgd; } pgd_t;

typedef struct { unsigned long pgprot; } pgprot_t;

typedef struct page *pgtable_t;



#define pte_val(x)	((x).pte)

#define pmd_val(x)	((&x)->pmd[0])

#define pgd_val(x)	((x).pgd)

#define pgprot_val(x)	((x).pgprot)



#define __pte(x)	((pte_t) { (x) } )

#define __pmd(x)	((pmd_t) { (x) } )

#define __pgd(x)	((pgd_t) { (x) } )

#define __pgprot(x)	((pgprot_t) { (x) } )



#endif /* !__ASSEMBLY__ */



#include <asm/page_offset.h>



#define PAGE_OFFSET		(PAGE_OFFSET_RAW)



#ifndef __ASSEMBLY__



extern unsigned long m68k_memoffset;



#ifndef CONFIG_SUN3
@@ -217,6 +176,4 @@ static inline __attribute_const__ int __virt_to_node_shift(void) 
#define VM_DATA_DEFAULT_FLAGS	(VM_READ | VM_WRITE | VM_EXEC | \

				 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)



#include <asm-generic/getorder.h>



#endif /* _M68K_PAGE_H */
 
#endif /* _M68K_PAGE_MM_H */

arch/m68k/include/asm/page_no.h

+6 −45
Original line number Diff line number Diff line 
#ifndef _M68KNOMMU_PAGE_H

#define _M68KNOMMU_PAGE_H



#include <linux/const.h>



/* PAGE_SHIFT determines the page size */



#define PAGE_SHIFT	(12)

#define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)

#define PAGE_MASK	(~(PAGE_SIZE-1))



#include <asm/setup.h>

#ifndef _M68K_PAGE_NO_H

#define _M68K_PAGE_NO_H



#ifndef __ASSEMBLY__

 

extern unsigned long memory_start;

extern unsigned long memory_end;



#define get_user_page(vaddr)		__get_free_page(GFP_KERNEL)

#define free_user_page(page, addr)	free_page(addr)
@@ -26,36 +19,6 @@ 
	alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)

#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE



/*

 * These are used to make use of C type-checking..

 */

typedef struct { unsigned long pte; } pte_t;

typedef struct { unsigned long pmd[16]; } pmd_t;

typedef struct { unsigned long pgd; } pgd_t;

typedef struct { unsigned long pgprot; } pgprot_t;

typedef struct page *pgtable_t;



#define pte_val(x)	((x).pte)

#define pmd_val(x)	((&x)->pmd[0])

#define pgd_val(x)	((x).pgd)

#define pgprot_val(x)	((x).pgprot)



#define __pte(x)	((pte_t) { (x) } )

#define __pmd(x)	((pmd_t) { (x) } )

#define __pgd(x)	((pgd_t) { (x) } )

#define __pgprot(x)	((pgprot_t) { (x) } )



extern unsigned long memory_start;

extern unsigned long memory_end;



#endif /* !__ASSEMBLY__ */



#include <asm/page_offset.h>



#define PAGE_OFFSET		(PAGE_OFFSET_RAW)



#ifndef __ASSEMBLY__



#define __pa(vaddr)		((unsigned long)(vaddr))

#define __va(paddr)		((void *)(paddr))
@@ -74,6 +37,4 @@ extern unsigned long memory_end; 


#endif /* __ASSEMBLY__ */



#include <asm-generic/getorder.h>



#endif /* _M68KNOMMU_PAGE_H */
 
#endif /* _M68K_PAGE_NO_H */