tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
authored by
Greg Ungerer
and committed by
Geert Uytterhoeven
138ff346
b0860c1d
+56
-94
+47
-3
arch/m68k/include/asm/page.h
+47
-3
arch/m68k/include/asm/page.h
···
1
-
#ifdef __uClinux__
2
-
#include "page_no.h"
1
+
#ifndef _M68K_PAGE_H
2
+
#define _M68K_PAGE_H
3
+
4
+
#include <linux/const.h>
5
+
#include <asm/setup.h>
6
+
#include <asm/page_offset.h>
7
+
8
+
/* PAGE_SHIFT determines the page size */
9
+
#ifndef CONFIG_SUN3
10
+
#define PAGE_SHIFT (12)
3
11
#else
4
-
#include "page_mm.h"
12
+
#define PAGE_SHIFT (13)
5
13
#endif
14
+
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
15
+
#define PAGE_MASK (~(PAGE_SIZE-1))
16
+
#define PAGE_OFFSET (PAGE_OFFSET_RAW)
17
+
18
+
#ifndef __ASSEMBLY__
19
+
20
+
/*
21
+
* These are used to make use of C type-checking..
22
+
*/
23
+
typedef struct { unsigned long pte; } pte_t;
24
+
typedef struct { unsigned long pmd[16]; } pmd_t;
25
+
typedef struct { unsigned long pgd; } pgd_t;
26
+
typedef struct { unsigned long pgprot; } pgprot_t;
27
+
typedef struct page *pgtable_t;
28
+
29
+
#define pte_val(x) ((x).pte)
30
+
#define pmd_val(x) ((&x)->pmd[0])
31
+
#define pgd_val(x) ((x).pgd)
32
+
#define pgprot_val(x) ((x).pgprot)
33
+
34
+
#define __pte(x) ((pte_t) { (x) } )
35
+
#define __pmd(x) ((pmd_t) { (x) } )
36
+
#define __pgd(x) ((pgd_t) { (x) } )
37
+
#define __pgprot(x) ((pgprot_t) { (x) } )
38
+
39
+
#endif /* !__ASSEMBLY__ */
40
+
41
+
#ifdef CONFIG_MMU
42
+
#include "page_mm.h"
43
+
#else
44
+
#include "page_no.h"
45
+
#endif
46
+
47
+
#include <asm-generic/getorder.h>
48
+
49
+
#endif /* _M68K_PAGE_H */
+3
-46
arch/m68k/include/asm/page_mm.h
+3
-46
arch/m68k/include/asm/page_mm.h
···
1
-
#ifndef _M68K_PAGE_H
2
-
#define _M68K_PAGE_H
3
-
4
-
#include <linux/const.h>
5
-
6
-
/* PAGE_SHIFT determines the page size */
7
-
#ifndef CONFIG_SUN3
8
-
#define PAGE_SHIFT (12)
9
-
#else
10
-
#define PAGE_SHIFT (13)
11
-
#endif
12
-
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
13
-
#define PAGE_MASK (~(PAGE_SIZE-1))
14
-
15
-
#include <asm/setup.h>
1
+
#ifndef _M68K_PAGE_MM_H
2
+
#define _M68K_PAGE_MM_H
16
3
17
4
#ifndef __ASSEMBLY__
18
5
19
6
#include <linux/compiler.h>
20
-
21
7
#include <asm/module.h>
22
8
23
9
#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
···
63
77
do { copy_page(to, from); \
64
78
flush_dcache_page(page); \
65
79
} while (0)
66
-
67
-
/*
68
-
* These are used to make use of C type-checking..
69
-
*/
70
-
typedef struct { unsigned long pte; } pte_t;
71
-
typedef struct { unsigned long pmd[16]; } pmd_t;
72
-
typedef struct { unsigned long pgd; } pgd_t;
73
-
typedef struct { unsigned long pgprot; } pgprot_t;
74
-
typedef struct page *pgtable_t;
75
-
76
-
#define pte_val(x) ((x).pte)
77
-
#define pmd_val(x) ((&x)->pmd[0])
78
-
#define pgd_val(x) ((x).pgd)
79
-
#define pgprot_val(x) ((x).pgprot)
80
-
81
-
#define __pte(x) ((pte_t) { (x) } )
82
-
#define __pmd(x) ((pmd_t) { (x) } )
83
-
#define __pgd(x) ((pgd_t) { (x) } )
84
-
#define __pgprot(x) ((pgprot_t) { (x) } )
85
-
86
-
#endif /* !__ASSEMBLY__ */
87
-
88
-
#include <asm/page_offset.h>
89
-
90
-
#define PAGE_OFFSET (PAGE_OFFSET_RAW)
91
-
92
-
#ifndef __ASSEMBLY__
93
80
94
81
extern unsigned long m68k_memoffset;
95
82
···
176
217
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
177
218
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
178
219
179
-
#include <asm-generic/getorder.h>
180
-
181
-
#endif /* _M68K_PAGE_H */
220
+
#endif /* _M68K_PAGE_MM_H */
+6
-45
arch/m68k/include/asm/page_no.h
+6
-45
arch/m68k/include/asm/page_no.h
···
1
-
#ifndef _M68KNOMMU_PAGE_H
2
-
#define _M68KNOMMU_PAGE_H
3
-
4
-
#include <linux/const.h>
5
-
6
-
/* PAGE_SHIFT determines the page size */
7
-
8
-
#define PAGE_SHIFT (12)
9
-
#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
10
-
#define PAGE_MASK (~(PAGE_SIZE-1))
11
-
12
-
#include <asm/setup.h>
1
+
#ifndef _M68K_PAGE_NO_H
2
+
#define _M68K_PAGE_NO_H
13
3
14
4
#ifndef __ASSEMBLY__
15
5
6
+
extern unsigned long memory_start;
7
+
extern unsigned long memory_end;
8
+
16
9
#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
17
10
#define free_user_page(page, addr) free_page(addr)
18
11
···
18
25
#define __alloc_zeroed_user_highpage(movableflags, vma, vaddr) \
19
26
alloc_page_vma(GFP_HIGHUSER | __GFP_ZERO | movableflags, vma, vaddr)
20
27
#define __HAVE_ARCH_ALLOC_ZEROED_USER_HIGHPAGE
21
-
22
-
/*
23
-
* These are used to make use of C type-checking..
24
-
*/
25
-
typedef struct { unsigned long pte; } pte_t;
26
-
typedef struct { unsigned long pmd[16]; } pmd_t;
27
-
typedef struct { unsigned long pgd; } pgd_t;
28
-
typedef struct { unsigned long pgprot; } pgprot_t;
29
-
typedef struct page *pgtable_t;
30
-
31
-
#define pte_val(x) ((x).pte)
32
-
#define pmd_val(x) ((&x)->pmd[0])
33
-
#define pgd_val(x) ((x).pgd)
34
-
#define pgprot_val(x) ((x).pgprot)
35
-
36
-
#define __pte(x) ((pte_t) { (x) } )
37
-
#define __pmd(x) ((pmd_t) { (x) } )
38
-
#define __pgd(x) ((pgd_t) { (x) } )
39
-
#define __pgprot(x) ((pgprot_t) { (x) } )
40
-
41
-
extern unsigned long memory_start;
42
-
extern unsigned long memory_end;
43
-
44
-
#endif /* !__ASSEMBLY__ */
45
-
46
-
#include <asm/page_offset.h>
47
-
48
-
#define PAGE_OFFSET (PAGE_OFFSET_RAW)
49
-
50
-
#ifndef __ASSEMBLY__
51
28
52
29
#define __pa(vaddr) ((unsigned long)(vaddr))
53
30
#define __va(paddr) ((void *)(paddr))
···
37
74
38
75
#endif /* __ASSEMBLY__ */
39
76
40
-
#include <asm-generic/getorder.h>
41
-
42
-
#endif /* _M68KNOMMU_PAGE_H */
77
+
#endif /* _M68K_PAGE_NO_H */