aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/vmalloc.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/vmalloc.h')
-rw-r--r--include/linux/vmalloc.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 6071e911c7f..687fb11e201 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -32,7 +32,7 @@ struct vm_struct {
32 struct page **pages; 32 struct page **pages;
33 unsigned int nr_pages; 33 unsigned int nr_pages;
34 phys_addr_t phys_addr; 34 phys_addr_t phys_addr;
35 const void *caller; 35 void *caller;
36}; 36};
37 37
38/* 38/*
@@ -62,7 +62,7 @@ extern void *vmalloc_32_user(unsigned long size);
62extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot); 62extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
63extern void *__vmalloc_node_range(unsigned long size, unsigned long align, 63extern void *__vmalloc_node_range(unsigned long size, unsigned long align,
64 unsigned long start, unsigned long end, gfp_t gfp_mask, 64 unsigned long start, unsigned long end, gfp_t gfp_mask,
65 pgprot_t prot, int node, const void *caller); 65 pgprot_t prot, int node, void *caller);
66extern void vfree(const void *addr); 66extern void vfree(const void *addr);
67 67
68extern void *vmap(struct page **pages, unsigned int count, 68extern void *vmap(struct page **pages, unsigned int count,
@@ -85,15 +85,14 @@ static inline size_t get_vm_area_size(const struct vm_struct *area)
85 85
86extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags); 86extern struct vm_struct *get_vm_area(unsigned long size, unsigned long flags);
87extern struct vm_struct *get_vm_area_caller(unsigned long size, 87extern struct vm_struct *get_vm_area_caller(unsigned long size,
88 unsigned long flags, const void *caller); 88 unsigned long flags, void *caller);
89extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags, 89extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
90 unsigned long start, unsigned long end); 90 unsigned long start, unsigned long end);
91extern struct vm_struct *__get_vm_area_caller(unsigned long size, 91extern struct vm_struct *__get_vm_area_caller(unsigned long size,
92 unsigned long flags, 92 unsigned long flags,
93 unsigned long start, unsigned long end, 93 unsigned long start, unsigned long end,
94 const void *caller); 94 void *caller);
95extern struct vm_struct *remove_vm_area(const void *addr); 95extern struct vm_struct *remove_vm_area(const void *addr);
96extern struct vm_struct *find_vm_area(const void *addr);
97 96
98extern int map_vm_area(struct vm_struct *area, pgprot_t prot, 97extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
99 struct page ***pages); 98 struct page ***pages);
@@ -120,7 +119,7 @@ unmap_kernel_range(unsigned long addr, unsigned long size)
120#endif 119#endif
121 120
122/* Allocate/destroy a 'vmalloc' VM area. */ 121/* Allocate/destroy a 'vmalloc' VM area. */
123extern struct vm_struct *alloc_vm_area(size_t size, pte_t **ptes); 122extern struct vm_struct *alloc_vm_area(size_t size);
124extern void free_vm_area(struct vm_struct *area); 123extern void free_vm_area(struct vm_struct *area);
125 124
126/* for /dev/kmem */ 125/* for /dev/kmem */
@@ -132,7 +131,6 @@ extern long vwrite(char *buf, char *addr, unsigned long count);
132 */ 131 */
133extern rwlock_t vmlist_lock; 132extern rwlock_t vmlist_lock;
134extern struct vm_struct *vmlist; 133extern struct vm_struct *vmlist;
135extern __init void vm_area_add_early(struct vm_struct *vm);
136extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); 134extern __init void vm_area_register_early(struct vm_struct *vm, size_t align);
137 135
138#ifdef CONFIG_SMP 136#ifdef CONFIG_SMP