diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:48:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-25 15:48:08 -0400 |
| commit | bf16ae250999e76aff0491a362073a552db965fc (patch) | |
| tree | 9b012f0f4e9cc146648fe8914346452563f999d9 /include/asm-x86/page.h | |
| parent | 0b79dada976198cb1a4c043068e3b44d5cab2a5a (diff) | |
| parent | 1526a756fba5b1f2eb5001b8e8de2a0ea1bd2c66 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-pat:
generic: add ioremap_wc() interface wrapper
/dev/mem: make promisc the default
pat: cleanups
x86: PAT use reserve free memtype in mmap of /dev/mem
x86: PAT phys_mem_access_prot_allowed for dev/mem mmap
x86: PAT avoid aliasing in /dev/mem read/write
devmem: add range_is_allowed() check to mmap of /dev/mem
x86: introduce /dev/mem restrictions with a config option
Diffstat (limited to 'include/asm-x86/page.h')
| -rw-r--r-- | include/asm-x86/page.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h index 6724a4bc6b7a..b381f4a5a0bd 100644 --- a/include/asm-x86/page.h +++ b/include/asm-x86/page.h | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #ifndef __ASSEMBLY__ | 47 | #ifndef __ASSEMBLY__ |
| 48 | 48 | ||
| 49 | extern int page_is_ram(unsigned long pagenr); | 49 | extern int page_is_ram(unsigned long pagenr); |
| 50 | extern int devmem_is_allowed(unsigned long pagenr); | ||
| 50 | 51 | ||
| 51 | extern unsigned long max_pfn_mapped; | 52 | extern unsigned long max_pfn_mapped; |
| 52 | 53 | ||