The patch titled
percpu_alloc: correct function prototypes
has been added to the -mm tree. Its filename is
cpu-hotplug-compatible-alloc_percpu-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: percpu_alloc: correct function prototypes
From: Martin Peschke <mp3@xxxxxxxxxx>
Correct a couple of inconsistencies regarding percpu_*() function
prototypes (type and name of parameters), which didn't cause any harm,
though.
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
Acked-by: Paul Jackson <pj@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
diff -puN include/linux/percpu.h~cpu-hotplug-compatible-alloc_percpu-fix include/linux/percpu.h
--- a/include/linux/percpu.h~cpu-hotplug-compatible-alloc_percpu-fix
+++ a/include/linux/percpu.h
@@ -41,7 +41,7 @@ extern void percpu_depopulate(void *__pd
extern int percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
cpumask_t mask);
extern void percpu_depopulate_mask(void *__pdata, cpumask_t mask);
-extern void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t map);
+extern void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t mask);
extern void percpu_free(void *__pdata);
#else /* CONFIG_SMP */
@@ -63,12 +63,12 @@ static inline void *percpu_populate(void
}
static inline int percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
- int cpu)
+ cpumask_t mask)
{
return 0;
}
-static inline void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t map)
+static inline void *percpu_alloc_mask(size_t size, gfp_t gfp, cpumask_t mask)
{
return kzalloc(size, gfp);
}
_
Patches currently in -mm which might be from mp3@xxxxxxxxxx are
cpu-hotplug-compatible-alloc_percpu.patch
cpu-hotplug-compatible-alloc_percpu-fix.patch
statistics-infrastructure-prerequisite-list.patch
statistics-infrastructure-prerequisite-parser.patch
statistics-infrastructure-prerequisite-timestamp.patch
statistics-infrastructure-prerequisite-timestamp-fix.patch
statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch
statistics-infrastructure-documentation.patch
statistics-infrastructure.patch
statistics-infrastructure-update-9.patch
statistics-use-the-enhanced-percpu-interface.patch
statistics-replace-inode-ugeneric_ip-with-i_private.patch
statistics-infrastructure-exploitation-zfcp.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
