소스 검색

cpumask: fix seq_bitmap_*() functions.

1) seq_bitmap_list() should take a const.
2) All the seq_bitmap should use cpumask_bits().

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Rusty Russell 16 년 전
부모
커밋
af76aba00f
2개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      fs/seq_file.c
  2. 5 4
      include/linux/seq_file.h

+ 1 - 1
fs/seq_file.c

@@ -513,7 +513,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits,
 }
 }
 EXPORT_SYMBOL(seq_bitmap);
 EXPORT_SYMBOL(seq_bitmap);
 
 
-int seq_bitmap_list(struct seq_file *m, unsigned long *bits,
+int seq_bitmap_list(struct seq_file *m, const unsigned long *bits,
 		unsigned int nr_bits)
 		unsigned int nr_bits)
 {
 {
 	if (m->count < m->size) {
 	if (m->count < m->size) {

+ 5 - 4
include/linux/seq_file.h

@@ -55,7 +55,7 @@ int seq_bitmap(struct seq_file *m, const unsigned long *bits,
 				   unsigned int nr_bits);
 				   unsigned int nr_bits);
 static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
 static inline int seq_cpumask(struct seq_file *m, const struct cpumask *mask)
 {
 {
-	return seq_bitmap(m, mask->bits, nr_cpu_ids);
+	return seq_bitmap(m, cpumask_bits(mask), nr_cpu_ids);
 }
 }
 
 
 static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
 static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
@@ -63,12 +63,13 @@ static inline int seq_nodemask(struct seq_file *m, nodemask_t *mask)
 	return seq_bitmap(m, mask->bits, MAX_NUMNODES);
 	return seq_bitmap(m, mask->bits, MAX_NUMNODES);
 }
 }
 
 
-int seq_bitmap_list(struct seq_file *m, unsigned long *bits,
+int seq_bitmap_list(struct seq_file *m, const unsigned long *bits,
 		unsigned int nr_bits);
 		unsigned int nr_bits);
 
 
-static inline int seq_cpumask_list(struct seq_file *m, cpumask_t *mask)
+static inline int seq_cpumask_list(struct seq_file *m,
+				   const struct cpumask *mask)
 {
 {
-	return seq_bitmap_list(m, mask->bits, NR_CPUS);
+	return seq_bitmap_list(m, cpumask_bits(mask), nr_cpu_ids);
 }
 }
 
 
 static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)
 static inline int seq_nodemask_list(struct seq_file *m, nodemask_t *mask)