From d0b95aaa22ec6c0458141ab24218031e25a5c4af Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 30 Dec 2008 09:05:14 +1030 Subject: [PATCH] --- yaml --- r: 125665 b: refs/heads/master c: cb78a0ce69fad2026825f957e24e2d9cda1ec9f1 h: refs/heads/master i: 125663: 04237c005b89bc5fc7cfb038fe6c2db0923950c2 v: v3 --- [refs] | 2 +- trunk/fs/seq_file.c | 3 ++- trunk/include/linux/seq_file.h | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d978afdf0949..b4b1cd9e6c91 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b0bc0bca83f3fb7cf920e2ec80684c15d2269c0 +refs/heads/master: cb78a0ce69fad2026825f957e24e2d9cda1ec9f1 diff --git a/trunk/fs/seq_file.c b/trunk/fs/seq_file.c index 16c211558c22..c99358a52176 100644 --- a/trunk/fs/seq_file.c +++ b/trunk/fs/seq_file.c @@ -462,7 +462,8 @@ int seq_dentry(struct seq_file *m, struct dentry *dentry, char *esc) return -1; } -int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits) +int seq_bitmap(struct seq_file *m, const unsigned long *bits, + unsigned int nr_bits) { if (m->count < m->size) { int len = bitmap_scnprintf(m->buf + m->count, diff --git a/trunk/include/linux/seq_file.h b/trunk/include/linux/seq_file.h index b3dfa72f13b9..952e0187ba16 100644 --- a/trunk/include/linux/seq_file.h +++ b/trunk/include/linux/seq_file.h @@ -50,8 +50,9 @@ int seq_path(struct seq_file *, struct path *, char *); int seq_dentry(struct seq_file *, struct dentry *, char *); int seq_path_root(struct seq_file *m, struct path *path, struct path *root, char *esc); -int seq_bitmap(struct seq_file *m, unsigned long *bits, unsigned int nr_bits); -static inline int seq_cpumask(struct seq_file *m, cpumask_t *mask) +int seq_bitmap(struct seq_file *m, const unsigned long *bits, + unsigned int nr_bits); +static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask) { return seq_bitmap(m, mask->bits, NR_CPUS); }