diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 13:01:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-15 13:01:14 -0800 |
| commit | 1b59be2a6cdcb5a12e18d8315c07c94a624de48f (patch) | |
| tree | 5cf48d9f94d85e9b1f984610b6868ad100ca1916 /mm/slab.c | |
| parent | f9ee7f60d6f37ae0184812b4c59b3869f875768b (diff) | |
| parent | 2ed1c5257b5d669df2a64bd53e61dc19c7d936cd (diff) | |
Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6
* 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
Update Pekka's email address in MAINTAINERS
mm/slab.c: make local symbols static
slub: Avoid use of slub_lock in show_slab_objects()
memory hotplug: one more lock on memory hotplug
Diffstat (limited to 'mm/slab.c')
| -rw-r--r-- | mm/slab.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/slab.c b/mm/slab.c index 264037449f0..37961d1f584 100644 --- a/mm/slab.c +++ b/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; |