diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:45 +0100 |
| commit | 0edcf8d6926f4038443dbc24e319530177ca0353 (patch) | |
| tree | 6010af62f73d01ab673d5106f310eaf4f4228e32 /include/linux/vmalloc.h | |
| parent | 87b203079ed949de52f0d92aeae20e5e0116c12f (diff) | |
| parent | 40150d37be7f7949b2ec07d511244da856647d84 (diff) | |
| download | lwn-0edcf8d6926f4038443dbc24e319530177ca0353.tar.gz lwn-0edcf8d6926f4038443dbc24e319530177ca0353.zip | |
Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu
Conflicts:
arch/x86/include/asm/pgtable.h
Diffstat (limited to 'include/linux/vmalloc.h')
| -rw-r--r-- | include/linux/vmalloc.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h index 9c0890c7a06a..a43ebec3a7b9 100644 --- a/include/linux/vmalloc.h +++ b/include/linux/vmalloc.h @@ -95,6 +95,9 @@ extern struct vm_struct *remove_vm_area(const void *addr); extern int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages); +extern int map_kernel_range_noflush(unsigned long start, unsigned long size, + pgprot_t prot, struct page **pages); +extern void unmap_kernel_range_noflush(unsigned long addr, unsigned long size); extern void unmap_kernel_range(unsigned long addr, unsigned long size); /* Allocate/destroy a 'vmalloc' VM area. */ @@ -110,5 +113,6 @@ extern long vwrite(char *buf, char *addr, unsigned long count); */ extern rwlock_t vmlist_lock; extern struct vm_struct *vmlist; +extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); #endif /* _LINUX_VMALLOC_H */ |