aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Lameter <clameter@sgi.com>2008-02-05 01:28:32 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-05 12:44:14 -0500
commitb3bdda02aa547a0753b4fdbc105e86ef9046b30b (patch)
tree969557274d94bd0a8e3c638b796c0a13f3e3afd2
parent48667e7a43c1a1e0ba743f93ae946f8cb34ff2f9 (diff)
vmalloc: add const to void* parameters
Make vmalloc functions work the same way as kfree() and friends that take a const void * argument. [akpm@linux-foundation.org: fix consts, coding-style] Signed-off-by: Christoph Lameter <clameter@sgi.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/mm.h4
-rw-r--r--include/linux/vmalloc.h6
-rw-r--r--mm/nommu.c8
-rw-r--r--mm/vmalloc.c16
4 files changed, 17 insertions, 17 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1961056b1af7..a862a96952e0 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -232,8 +232,8 @@ static inline int get_page_unless_zero(struct page *page)
232} 232}
233 233
234/* Support for virtually mapped pages */ 234/* Support for virtually mapped pages */
235struct page *vmalloc_to_page(void *addr); 235struct page *vmalloc_to_page(const void *addr);
236unsigned long vmalloc_to_pfn(void *addr); 236unsigned long vmalloc_to_pfn(const void *addr);
237 237
238static inline struct page *compound_head(struct page *page) 238static inline struct page *compound_head(struct page *page)
239{ 239{
diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index 89338b468d0d..ce8e7da05807 100644
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -45,11 +45,11 @@ extern void *vmalloc_32_user(unsigned long size);
45extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot); 45extern void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot);
46extern void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask, 46extern void *__vmalloc_area(struct vm_struct *area, gfp_t gfp_mask,
47 pgprot_t prot); 47 pgprot_t prot);
48extern void vfree(void *addr); 48extern void vfree(const void *addr);
49 49
50extern void *vmap(struct page **pages, unsigned int count, 50extern void *vmap(struct page **pages, unsigned int count,
51 unsigned long flags, pgprot_t prot); 51 unsigned long flags, pgprot_t prot);
52extern void vunmap(void *addr); 52extern void vunmap(const void *addr);
53 53
54extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr, 54extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
55 unsigned long pgoff); 55 unsigned long pgoff);
@@ -71,7 +71,7 @@ extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
71extern struct vm_struct *get_vm_area_node(unsigned long size, 71extern struct vm_struct *get_vm_area_node(unsigned long size,
72 unsigned long flags, int node, 72 unsigned long flags, int node,
73 gfp_t gfp_mask); 73 gfp_t gfp_mask);
74extern struct vm_struct *remove_vm_area(void *addr); 74extern struct vm_struct *remove_vm_area(const void *addr);
75 75
76extern int map_vm_area(struct vm_struct *area, pgprot_t prot, 76extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
77 struct page ***pages); 77 struct page ***pages);
diff --git a/mm/nommu.c b/mm/nommu.c
index b989cb928a7c..f3bfd015c40b 100644
--- a/mm/nommu.c
+++ b/mm/nommu.c
@@ -167,7 +167,7 @@ EXPORT_SYMBOL(get_user_pages);
167DEFINE_RWLOCK(vmlist_lock); 167DEFINE_RWLOCK(vmlist_lock);
168struct vm_struct *vmlist; 168struct vm_struct *vmlist;
169 169
170void vfree(void *addr) 170void vfree(const void *addr)
171{ 171{
172 kfree(addr); 172 kfree(addr);
173} 173}
@@ -183,13 +183,13 @@ void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot)
183} 183}
184EXPORT_SYMBOL(__vmalloc); 184EXPORT_SYMBOL(__vmalloc);
185 185
186struct page * vmalloc_to_page(void *addr) 186struct page *vmalloc_to_page(const void *addr)
187{ 187{
188 return virt_to_page(addr); 188 return virt_to_page(addr);
189} 189}
190EXPORT_SYMBOL(vmalloc_to_page); 190EXPORT_SYMBOL(vmalloc_to_page);
191 191
192unsigned long vmalloc_to_pfn(void *addr) 192unsigned long vmalloc_to_pfn(const void *addr)
193{ 193{
194 return page_to_pfn(virt_to_page(addr)); 194 return page_to_pfn(virt_to_page(addr));
195} 195}
@@ -267,7 +267,7 @@ void *vmap(struct page **pages, unsigned int count, unsigned long flags, pgprot_
267} 267}
268EXPORT_SYMBOL(vmap); 268EXPORT_SYMBOL(vmap);
269 269
270void vunmap(void *addr) 270void vunmap(const void *addr)
271{ 271{
272 BUG(); 272 BUG();
273} 273}
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index e4c59a30835b..21abac2c3941 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -169,7 +169,7 @@ EXPORT_SYMBOL_GPL(map_vm_area);
169/* 169/*
170 * Map a vmalloc()-space virtual address to the physical page. 170 * Map a vmalloc()-space virtual address to the physical page.
171 */ 171 */
172struct page *vmalloc_to_page(void *vmalloc_addr) 172struct page *vmalloc_to_page(const void *vmalloc_addr)
173{ 173{
174 unsigned long addr = (unsigned long) vmalloc_addr; 174 unsigned long addr = (unsigned long) vmalloc_addr;
175 struct page *page = NULL; 175 struct page *page = NULL;
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(vmalloc_to_page);
198/* 198/*
199 * Map a vmalloc()-space virtual address to the physical page frame number. 199 * Map a vmalloc()-space virtual address to the physical page frame number.
200 */ 200 */
201unsigned long vmalloc_to_pfn(void *vmalloc_addr) 201unsigned long vmalloc_to_pfn(const void *vmalloc_addr)
202{ 202{
203 return page_to_pfn(vmalloc_to_page(vmalloc_addr)); 203 return page_to_pfn(vmalloc_to_page(vmalloc_addr));
204} 204}
@@ -306,7 +306,7 @@ struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags,
306} 306}
307 307
308/* Caller must hold vmlist_lock */ 308/* Caller must hold vmlist_lock */
309static struct vm_struct *__find_vm_area(void *addr) 309static struct vm_struct *__find_vm_area(const void *addr)
310{ 310{
311 struct vm_struct *tmp; 311 struct vm_struct *tmp;
312 312
@@ -319,7 +319,7 @@ static struct vm_struct *__find_vm_area(void *addr)
319} 319}
320 320
321/* Caller must hold vmlist_lock */ 321/* Caller must hold vmlist_lock */
322static struct vm_struct *__remove_vm_area(void *addr) 322static struct vm_struct *__remove_vm_area(const void *addr)
323{ 323{
324 struct vm_struct **p, *tmp; 324 struct vm_struct **p, *tmp;
325 325
@@ -348,7 +348,7 @@ found:
348 * This function returns the found VM area, but using it is NOT safe 348 * This function returns the found VM area, but using it is NOT safe
349 * on SMP machines, except for its size or flags. 349 * on SMP machines, except for its size or flags.
350 */ 350 */
351struct vm_struct *remove_vm_area(void *addr) 351struct vm_struct *remove_vm_area(const void *addr)
352{ 352{
353 struct vm_struct *v; 353 struct vm_struct *v;
354 write_lock(&vmlist_lock); 354 write_lock(&vmlist_lock);
@@ -357,7 +357,7 @@ struct vm_struct *remove_vm_area(void *addr)
357 return v; 357 return v;
358} 358}
359 359
360static void __vunmap(void *addr, int deallocate_pages) 360static void __vunmap(const void *addr, int deallocate_pages)
361{ 361{
362 struct vm_struct *area; 362 struct vm_struct *area;
363 363
@@ -408,7 +408,7 @@ static void __vunmap(void *addr, int deallocate_pages)
408 * 408 *
409 * Must not be called in interrupt context. 409 * Must not be called in interrupt context.
410 */ 410 */
411void vfree(void *addr) 411void vfree(const void *addr)
412{ 412{
413 BUG_ON(in_interrupt()); 413 BUG_ON(in_interrupt());
414 __vunmap(addr, 1); 414 __vunmap(addr, 1);
@@ -424,7 +424,7 @@ EXPORT_SYMBOL(vfree);
424 * 424 *
425 * Must not be called in interrupt context. 425 * Must not be called in interrupt context.
426 */ 426 */
427void vunmap(void *addr) 427void vunmap(const void *addr)
428{ 428{
429 BUG_ON(in_interrupt()); 429 BUG_ON(in_interrupt());
430 __vunmap(addr, 0); 430 __vunmap(addr, 0);