From 6a9e9d080b563959c67816172904fa8b6237dda3 Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Sun, 6 May 2007 14:49:12 -0700 Subject: [PATCH] --- yaml --- r: 54179 b: refs/heads/master c: ac267728f13c55017ed5ee243c9c3166e27ab929 h: refs/heads/master i: 54177: eed27a0a8f01e370f079e6b39349e3675a72ce2a 54175: 35d4a7730189b80b4fb513c7d37054d99d18c56f v: v3 --- [refs] | 2 +- trunk/fs/proc/proc_misc.c | 2 -- trunk/include/linux/slab.h | 3 +++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5ca293bb00bc..d6975d1ae7d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 411f0f3edc141a582190d3605cadd1d993abb6df +refs/heads/master: ac267728f13c55017ed5ee243c9c3166e27ab929 diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c index e2c4c0a5c90d..75ec6523d29a 100644 --- a/trunk/fs/proc/proc_misc.c +++ b/trunk/fs/proc/proc_misc.c @@ -398,8 +398,6 @@ static const struct file_operations proc_modules_operations = { #endif #ifdef CONFIG_SLAB -extern struct seq_operations slabinfo_op; -extern ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *); static int slabinfo_open(struct inode *inode, struct file *file) { return seq_open(file, &slabinfo_op); diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 2f8f60ff294a..f9ed9346bfd6 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -219,6 +219,9 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *); #endif /* DEBUG_SLAB */ +extern const struct seq_operations slabinfo_op; +ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *); + #endif /* __KERNEL__ */ #endif /* _LINUX_SLAB_H */