From d29098865fff13b39d27d826ba988402ac948728 Mon Sep 17 00:00:00 2001 From: Thomas Schwinge Date: Wed, 25 Apr 2007 13:11:51 +0000 Subject: 2007-04-25 Thomas Schwinge * linux/pcmcia-cs/glue/ds.c (kmalloc, kfree): Call `linux_kmalloc', respective `linux_kfree' instead. --- linux/pcmcia-cs/glue/ds.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'linux/pcmcia-cs') diff --git a/linux/pcmcia-cs/glue/ds.c b/linux/pcmcia-cs/glue/ds.c index d0ecac9..733e4b6 100644 --- a/linux/pcmcia-cs/glue/ds.c +++ b/linux/pcmcia-cs/glue/ds.c @@ -26,7 +26,13 @@ /* * Prepare the namespace for inclusion of Mach header files. */ + #undef PAGE_SHIFT + +/* + * This is really ugly. But this is glue code, so... It's about the `kfree' + * symbols in and . + */ #undef kfree /* @@ -120,11 +126,11 @@ device_deallocate(void *p) { *link = user->next; user->user_magic = 0; - kfree(user); + linux_kfree(user); } /* now finally reap the device */ - kfree(device); + linux_kfree(device); } /* @@ -179,7 +185,7 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, io_return_t err = D_SUCCESS; struct mach_device *dev; - dev = kmalloc(sizeof(struct mach_socket_device), GFP_KERNEL); + dev = linux_kmalloc(sizeof(struct mach_socket_device), GFP_KERNEL); if(! dev) { err = D_NO_MEMORY; @@ -203,7 +209,7 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, s->state |= SOCKET_BUSY; } - user_info_t *user = kmalloc(sizeof(user_info_t), GFP_KERNEL); + user_info_t *user = linux_kmalloc(sizeof(user_info_t), GFP_KERNEL); if(! user) { err = D_NO_MEMORY; @@ -254,7 +260,7 @@ device_open (ipc_port_t reply_port, mach_msg_type_name_t reply_port_type, ipc_port_dealloc_kernel(dev->port); } - kfree(dev); + linux_kfree(dev); dev = NULL; } } -- cgit v1.2.3