summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/md/dm.c2
-rw-r--r--fs/bio.c2
-rw-r--r--include/asm-alpha/smp.h2
-rw-r--r--mm/slab.c1
4 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 37a9501c5813..76cd0ed50788 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -79,7 +79,7 @@ static __init int local_init(void)
int r;
/* allocate a slab for the dm_ios */
- _io_cache = kmem_cache_create("dm io",
+ _io_cache = kmem_cache_create("dm_io",
sizeof(struct dm_io), 0, 0, NULL, NULL);
if (!_io_cache)
return -ENOMEM;
diff --git a/fs/bio.c b/fs/bio.c
index 2463163c6eeb..390d862325b9 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -564,7 +564,7 @@ void bio_set_pages_dirty(struct bio *bio)
}
}
-void bio_release_pages(struct bio *bio)
+static void bio_release_pages(struct bio *bio)
{
struct bio_vec *bvec = bio->bi_io_vec;
int i;
diff --git a/include/asm-alpha/smp.h b/include/asm-alpha/smp.h
index 093fcb435747..0283901c468c 100644
--- a/include/asm-alpha/smp.h
+++ b/include/asm-alpha/smp.h
@@ -46,7 +46,7 @@ extern struct cpuinfo_alpha cpu_data[NR_CPUS];
#define smp_processor_id() (current_thread_info()->cpu)
extern cpumask_t cpu_present_mask;
-extern cpumask_t long cpu_online_map;
+extern cpumask_t cpu_online_map;
extern int smp_num_cpus;
#define cpu_possible(cpu) cpu_isset(cpu, cpu_present_mask)
diff --git a/mm/slab.c b/mm/slab.c
index 2f73bad2c440..d6d1a5e5af1a 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1042,6 +1042,7 @@ kmem_cache_create (const char *name, size_t size, size_t offset,
BUG();
#if DEBUG
+ WARN_ON(strchr(name, ' ')); /* It confuses parsers */
if ((flags & SLAB_DEBUG_INITIAL) && !ctor) {
/* No constructor, but inital state check requested */
printk("%sNo con, but init state check requested - %s\n", func_nm, name);