diff options
author | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-06-15 06:02:23 -0400 |
commit | 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb (patch) | |
tree | 8d104ec2a459346b99413b0b77421ca7b9936c1a /include/asm-generic/page.h | |
parent | ca44d6e60f9de26281fda203f58b570e1748c015 (diff) | |
parent | 45e3e1935e2857c54783291107d33323b3ef33c8 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/scsi/fcoe/fcoe.c
net/core/drop_monitor.c
net/core/net-traces.c
Diffstat (limited to 'include/asm-generic/page.h')
-rw-r--r-- | include/asm-generic/page.h | 109 |
1 files changed, 92 insertions, 17 deletions
diff --git a/include/asm-generic/page.h b/include/asm-generic/page.h index 14db733b8e68..75fec18cdc59 100644 --- a/include/asm-generic/page.h +++ b/include/asm-generic/page.h | |||
@@ -1,24 +1,99 @@ | |||
1 | #ifndef _ASM_GENERIC_PAGE_H | 1 | #ifndef __ASM_GENERIC_PAGE_H |
2 | #define _ASM_GENERIC_PAGE_H | 2 | #define __ASM_GENERIC_PAGE_H |
3 | /* | ||
4 | * Generic page.h implementation, for NOMMU architectures. | ||
5 | * This provides the dummy definitions for the memory management. | ||
6 | */ | ||
7 | |||
8 | #ifdef CONFIG_MMU | ||
9 | #error need to prove a real asm/page.h | ||
10 | #endif | ||
11 | |||
12 | |||
13 | /* PAGE_SHIFT determines the page size */ | ||
14 | |||
15 | #define PAGE_SHIFT 12 | ||
16 | #ifdef __ASSEMBLY__ | ||
17 | #define PAGE_SIZE (1 << PAGE_SHIFT) | ||
18 | #else | ||
19 | #define PAGE_SIZE (1UL << PAGE_SHIFT) | ||
20 | #endif | ||
21 | #define PAGE_MASK (~(PAGE_SIZE-1)) | ||
22 | |||
23 | #include <asm/setup.h> | ||
24 | |||
25 | #ifndef __ASSEMBLY__ | ||
26 | |||
27 | #define get_user_page(vaddr) __get_free_page(GFP_KERNEL) | ||
28 | #define free_user_page(page, addr) free_page(addr) | ||
29 | |||
30 | #define clear_page(page) memset((page), 0, PAGE_SIZE) | ||
31 | #define copy_page(to,from) memcpy((to), (from), PAGE_SIZE) | ||
32 | |||
33 | #define clear_user_page(page, vaddr, pg) clear_page(page) | ||
34 | #define copy_user_page(to, from, vaddr, pg) copy_page(to, from) | ||
35 | |||
36 | /* | ||
37 | * These are used to make use of C type-checking.. | ||
38 | */ | ||
39 | typedef struct { | ||
40 | unsigned long pte; | ||
41 | } pte_t; | ||
42 | typedef struct { | ||
43 | unsigned long pmd[16]; | ||
44 | } pmd_t; | ||
45 | typedef struct { | ||
46 | unsigned long pgd; | ||
47 | } pgd_t; | ||
48 | typedef struct { | ||
49 | unsigned long pgprot; | ||
50 | } pgprot_t; | ||
51 | typedef struct page *pgtable_t; | ||
52 | |||
53 | #define pte_val(x) ((x).pte) | ||
54 | #define pmd_val(x) ((&x)->pmd[0]) | ||
55 | #define pgd_val(x) ((x).pgd) | ||
56 | #define pgprot_val(x) ((x).pgprot) | ||
57 | |||
58 | #define __pte(x) ((pte_t) { (x) } ) | ||
59 | #define __pmd(x) ((pmd_t) { (x) } ) | ||
60 | #define __pgd(x) ((pgd_t) { (x) } ) | ||
61 | #define __pgprot(x) ((pgprot_t) { (x) } ) | ||
62 | |||
63 | extern unsigned long memory_start; | ||
64 | extern unsigned long memory_end; | ||
65 | |||
66 | #endif /* !__ASSEMBLY__ */ | ||
67 | |||
68 | #ifdef CONFIG_KERNEL_RAM_BASE_ADDRESS | ||
69 | #define PAGE_OFFSET (CONFIG_KERNEL_RAM_BASE_ADDRESS) | ||
70 | #else | ||
71 | #define PAGE_OFFSET (0) | ||
72 | #endif | ||
3 | 73 | ||
4 | #ifndef __ASSEMBLY__ | 74 | #ifndef __ASSEMBLY__ |
5 | 75 | ||
6 | #include <linux/compiler.h> | 76 | #define __va(x) ((void *)((unsigned long)(x) + PAGE_OFFSET)) |
77 | #define __pa(x) ((unsigned long) (x) - PAGE_OFFSET) | ||
78 | |||
79 | #define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT) | ||
80 | #define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT) | ||
81 | |||
82 | #define virt_to_page(addr) (mem_map + (((unsigned long)(addr)-PAGE_OFFSET) >> PAGE_SHIFT)) | ||
83 | #define page_to_virt(page) ((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET) | ||
84 | |||
85 | #ifndef page_to_phys | ||
86 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | ||
87 | #endif | ||
88 | |||
89 | #define pfn_valid(pfn) ((pfn) < max_mapnr) | ||
7 | 90 | ||
8 | /* Pure 2^n version of get_order */ | 91 | #define virt_addr_valid(kaddr) (((void *)(kaddr) >= (void *)PAGE_OFFSET) && \ |
9 | static __inline__ __attribute_const__ int get_order(unsigned long size) | 92 | ((void *)(kaddr) < (void *)memory_end)) |
10 | { | ||
11 | int order; | ||
12 | 93 | ||
13 | size = (size - 1) >> (PAGE_SHIFT - 1); | 94 | #endif /* __ASSEMBLY__ */ |
14 | order = -1; | ||
15 | do { | ||
16 | size >>= 1; | ||
17 | order++; | ||
18 | } while (size); | ||
19 | return order; | ||
20 | } | ||
21 | 95 | ||
22 | #endif /* __ASSEMBLY__ */ | 96 | #include <asm-generic/memory_model.h> |
97 | #include <asm-generic/getorder.h> | ||
23 | 98 | ||
24 | #endif /* _ASM_GENERIC_PAGE_H */ | 99 | #endif /* __ASM_GENERIC_PAGE_H */ |