From f783713c44e62129a443471c47ad0c64dad7ddb2 Mon Sep 17 00:00:00 2001 From: H Hartley Sweeten Date: Tue, 11 Jan 2011 17:49:32 -0600 Subject: [PATCH] --- yaml --- r: 231503 b: refs/heads/master c: 68a1b1955957e222d890f550d2a44ae598db3de9 h: refs/heads/master i: 231501: 8dec24816ac6c36d297da74cbd7944eb180df685 231499: 192b47773f38290f4ff240ea0811097a46cdb667 231495: aae7c1511bf7bd22ecabe39484f23a6179e354ca 231487: 418d581ace8d65e236f856904ce627eaa586b84d v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4c926e02287a..98e75c1ab8e6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 597fb188cbee2d371246e1669bbc6051bb666aa9 +refs/heads/master: 68a1b1955957e222d890f550d2a44ae598db3de9 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 264037449f08..37961d1f584f 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -284,7 +284,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ #define NUM_INIT_LISTS (3 * MAX_NUMNODES) -struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS]; +static struct kmem_list3 __initdata initkmem_list3[NUM_INIT_LISTS]; #define CACHE_CACHE 0 #define SIZE_AC MAX_NUMNODES #define SIZE_L3 (2 * MAX_NUMNODES) @@ -4053,7 +4053,7 @@ static int enable_cpucache(struct kmem_cache *cachep, gfp_t gfp) * necessary. Note that the l3 listlock also protects the array_cache * if drain_array() is used on the shared array. */ -void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3, +static void drain_array(struct kmem_cache *cachep, struct kmem_list3 *l3, struct array_cache *ac, int force, int node) { int tofree; @@ -4317,7 +4317,7 @@ static const struct seq_operations slabinfo_op = { * @count: data length * @ppos: unused */ -ssize_t slabinfo_write(struct file *file, const char __user * buffer, +static ssize_t slabinfo_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) { char kbuf[MAX_SLABINFO_WRITE + 1], *tmp;