diff --git a/[refs] b/[refs] index eeec382a8a79..a75bbcc467e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9fbf09a09e8aa50c56e2c6dfacc27eff93ff4c93 +refs/heads/master: 3ca12ee549f7837b8a685dddc9515f9fc28434ee diff --git a/trunk/include/linux/slab.h b/trunk/include/linux/slab.h index 71829efc40ba..5dbc0bae26e3 100644 --- a/trunk/include/linux/slab.h +++ b/trunk/include/linux/slab.h @@ -233,9 +233,6 @@ 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 */ diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h index 5e4364644ed1..8d81a60518e4 100644 --- a/trunk/include/linux/slab_def.h +++ b/trunk/include/linux/slab_def.h @@ -109,4 +109,7 @@ static inline void *kmalloc_node(size_t size, gfp_t flags, int node) #endif /* CONFIG_NUMA */ +extern const struct seq_operations slabinfo_op; +ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *); + #endif /* _LINUX_SLAB_DEF_H */