c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-05-03 23:42:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Constify memory management functions

Browse Source 
This prevents warnings in ZFS that were caused by changes necessary to
support PaX patched kernels. When debugging is enabled, these warnings
become build failures.

Signed-off-by: Richard Yao <ryao@cs.stonybrook.edu>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #131
This commit is contained in:
Richard Yao 2012-06-25 13:22:21 -04:00 committed by Brian Behlendorf
parent 33f507c0f3
commit 973e8269bd
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sys/kmem.h
View File

@ -214,9 +214,9 @@ extern unsigned long long vmem_alloc_max;
# define vmem_free(ptr, sz) vmem_free_track((ptr), (sz)) # define vmem_free(ptr, sz) vmem_free_track((ptr), (sz))
extern void *kmem_alloc_track(size_t, int, const char *, int, int, int); extern void *kmem_alloc_track(size_t, int, const char *, int, int, int);
extern void kmem_free_track(void *, size_t); extern void kmem_free_track(const void *, size_t);
extern void *vmem_alloc_track(size_t, int, const char *, int); extern void *vmem_alloc_track(size_t, int, const char *, int);
extern void vmem_free_track(void *, size_t); extern void vmem_free_track(const void *, size_t);
# else /* DEBUG_KMEM_TRACKING */ # else /* DEBUG_KMEM_TRACKING */
/* /*
@ -243,9 +243,9 @@ extern void vmem_free_track(void *, size_t);
# define vmem_free(ptr, sz) vmem_free_debug((ptr), (sz)) # define vmem_free(ptr, sz) vmem_free_debug((ptr), (sz))
extern void *kmem_alloc_debug(size_t, int, const char *, int, int, int); extern void *kmem_alloc_debug(size_t, int, const char *, int, int, int);
extern void kmem_free_debug(void *, size_t); extern void kmem_free_debug(const void *, size_t);
extern void *vmem_alloc_debug(size_t, int, const char *, int); extern void *vmem_alloc_debug(size_t, int, const char *, int);
extern void vmem_free_debug(void *, size_t); extern void vmem_free_debug(const void *, size_t);
# endif /* DEBUG_KMEM_TRACKING */ # endif /* DEBUG_KMEM_TRACKING */
#else /* DEBUG_KMEM */ #else /* DEBUG_KMEM */

10
module/spl/spl-kmem.c
View File

@ -385,7 +385,7 @@ EXPORT_SYMBOL(vmem_table);
EXPORT_SYMBOL(vmem_list); EXPORT_SYMBOL(vmem_list);
static kmem_debug_t * static kmem_debug_t *
kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, void *addr) kmem_del_init(spinlock_t *lock, struct hlist_head *table, int bits, const void *addr)
{ {
struct hlist_head *head; struct hlist_head *head;
struct hlist_node *node; struct hlist_node *node;
@ -504,7 +504,7 @@ out:
EXPORT_SYMBOL(kmem_alloc_track); EXPORT_SYMBOL(kmem_alloc_track);
void void
kmem_free_track(void *ptr, size_t size) kmem_free_track(const void *ptr, size_t size)
{ {
kmem_debug_t *dptr; kmem_debug_t *dptr;
SENTRY; SENTRY;
@ -619,7 +619,7 @@ out:
EXPORT_SYMBOL(vmem_alloc_track); EXPORT_SYMBOL(vmem_alloc_track);
void void
vmem_free_track(void *ptr, size_t size) vmem_free_track(const void *ptr, size_t size)
{ {
kmem_debug_t *dptr; kmem_debug_t *dptr;
SENTRY; SENTRY;
@ -706,7 +706,7 @@ kmem_alloc_debug(size_t size, int flags, const char *func, int line,
EXPORT_SYMBOL(kmem_alloc_debug); EXPORT_SYMBOL(kmem_alloc_debug);
void void
kmem_free_debug(void *ptr, size_t size) kmem_free_debug(const void *ptr, size_t size)
{ {
SENTRY; SENTRY;
@ -758,7 +758,7 @@ vmem_alloc_debug(size_t size, int flags, const char *func, int line)
EXPORT_SYMBOL(vmem_alloc_debug); EXPORT_SYMBOL(vmem_alloc_debug);
void void
vmem_free_debug(void *ptr, size_t size) vmem_free_debug(const void *ptr, size_t size)
{ {
SENTRY; SENTRY;