[Bluetooth] Fix compat ioctl for BNEP, CMTP and HIDP

[pandora-kernel.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 9bcc7e2..5423941 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -29,7 +29,6 @@
  * essentially no allocation space overhead.
  */
 
-#include <linux/config.h>
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/cache.h>
@@ -271,10 +270,9 @@ struct kmem_cache *kmem_cache_create(const char *name, size_t size,
 }
 EXPORT_SYMBOL(kmem_cache_create);
 
-int kmem_cache_destroy(struct kmem_cache *c)
+void kmem_cache_destroy(struct kmem_cache *c)
 {
        slob_free(c, sizeof(struct kmem_cache));
-       return 0;
 }
 EXPORT_SYMBOL(kmem_cache_destroy);
 
@@ -340,56 +338,3 @@ void kmem_cache_init(void)
 
        mod_timer(&slob_timer, jiffies + HZ);
 }
-
-atomic_t slab_reclaim_pages = ATOMIC_INIT(0);
-EXPORT_SYMBOL(slab_reclaim_pages);
-
-#ifdef CONFIG_SMP
-
-void *__alloc_percpu(size_t size)
-{
-       int i;
-       struct percpu_data *pdata = kmalloc(sizeof (*pdata), GFP_KERNEL);
-
-       if (!pdata)
-               return NULL;
-
-       for (i = 0; i < NR_CPUS; i++) {
-               if (!cpu_possible(i))
-                       continue;
-               pdata->ptrs[i] = kmalloc(size, GFP_KERNEL);
-               if (!pdata->ptrs[i])
-                       goto unwind_oom;
-               memset(pdata->ptrs[i], 0, size);
-       }
-
-       /* Catch derefs w/o wrappers */
-       return (void *) (~(unsigned long) pdata);
-
-unwind_oom:
-       while (--i >= 0) {
-               if (!cpu_possible(i))
-                       continue;
-               kfree(pdata->ptrs[i]);
-       }
-       kfree(pdata);
-       return NULL;
-}
-EXPORT_SYMBOL(__alloc_percpu);
-
-void
-free_percpu(const void *objp)
-{
-       int i;
-       struct percpu_data *p = (struct percpu_data *) (~(unsigned long) objp);
-
-       for (i = 0; i < NR_CPUS; i++) {
-               if (!cpu_possible(i))
-                       continue;
-               kfree(p->ptrs[i]);
-       }
-       kfree(p);
-}
-EXPORT_SYMBOL(free_percpu);
-
-#endif