diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 05:45:22 -0500 |
| commit | a140feab42d1cfd811930ab76104559c19dfc4b0 (patch) | |
| tree | 41fd871990e888dd5616a6bf1891a1ff307221df /arch/x86/include/asm/page.h | |
| parent | 1075414b06109a99b0e87601e84c74a95bd45681 (diff) | |
| parent | fec6c6fec3e20637bee5d276fb61dd8b49a3f9cc (diff) | |
Merge commit 'v2.6.29-rc7' into core/locking
Diffstat (limited to 'arch/x86/include/asm/page.h')
| -rw-r--r-- | arch/x86/include/asm/page.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index e9873a2e8695..776579119a00 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h | |||
| @@ -57,7 +57,6 @@ typedef struct { pgdval_t pgd; } pgd_t; | |||
| 57 | typedef struct { pgprotval_t pgprot; } pgprot_t; | 57 | typedef struct { pgprotval_t pgprot; } pgprot_t; |
| 58 | 58 | ||
| 59 | extern int page_is_ram(unsigned long pagenr); | 59 | extern int page_is_ram(unsigned long pagenr); |
| 60 | extern int pagerange_is_ram(unsigned long start, unsigned long end); | ||
| 61 | extern int devmem_is_allowed(unsigned long pagenr); | 60 | extern int devmem_is_allowed(unsigned long pagenr); |
| 62 | extern void map_devmem(unsigned long pfn, unsigned long size, | 61 | extern void map_devmem(unsigned long pfn, unsigned long size, |
| 63 | pgprot_t vma_prot); | 62 | pgprot_t vma_prot); |