diff options
| -rw-r--r-- | kernel/resource.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/kernel/resource.c b/kernel/resource.c index 1d003a50ee17..7797dae85b50 100644 --- a/kernel/resource.c +++ b/kernel/resource.c | |||
| @@ -38,10 +38,6 @@ EXPORT_SYMBOL(iomem_resource); | |||
| 38 | 38 | ||
| 39 | static DEFINE_RWLOCK(resource_lock); | 39 | static DEFINE_RWLOCK(resource_lock); |
| 40 | 40 | ||
| 41 | #ifdef CONFIG_PROC_FS | ||
| 42 | |||
| 43 | enum { MAX_IORES_LEVEL = 5 }; | ||
| 44 | |||
| 45 | static void *r_next(struct seq_file *m, void *v, loff_t *pos) | 41 | static void *r_next(struct seq_file *m, void *v, loff_t *pos) |
| 46 | { | 42 | { |
| 47 | struct resource *p = v; | 43 | struct resource *p = v; |
| @@ -53,6 +49,10 @@ static void *r_next(struct seq_file *m, void *v, loff_t *pos) | |||
| 53 | return p->sibling; | 49 | return p->sibling; |
| 54 | } | 50 | } |
| 55 | 51 | ||
| 52 | #ifdef CONFIG_PROC_FS | ||
| 53 | |||
| 54 | enum { MAX_IORES_LEVEL = 5 }; | ||
| 55 | |||
| 56 | static void *r_start(struct seq_file *m, loff_t *pos) | 56 | static void *r_start(struct seq_file *m, loff_t *pos) |
| 57 | __acquires(resource_lock) | 57 | __acquires(resource_lock) |
| 58 | { | 58 | { |
| @@ -852,7 +852,11 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size) | |||
| 852 | continue; | 852 | continue; |
| 853 | printk(KERN_WARNING "resource map sanity check conflict: " | 853 | printk(KERN_WARNING "resource map sanity check conflict: " |
| 854 | "0x%llx 0x%llx 0x%llx 0x%llx %s\n", | 854 | "0x%llx 0x%llx 0x%llx 0x%llx %s\n", |
| 855 | addr, addr + size - 1, p->start, p->end, p->name); | 855 | (unsigned long long)addr, |
| 856 | (unsigned long long)(addr + size - 1), | ||
| 857 | (unsigned long long)p->start, | ||
| 858 | (unsigned long long)p->end, | ||
| 859 | p->name); | ||
| 856 | err = -1; | 860 | err = -1; |
| 857 | break; | 861 | break; |
| 858 | } | 862 | } |
