From: Adrian Bunk This patch makes the needlessly global md_print_devices() static. Signed-off-by: Adrian Bunk Signed-off-by: Neil Brown Signed-off-by: Andrew Morton --- drivers/md/md.c | 7 +++++-- include/linux/raid/md.h | 4 ---- 2 files changed, 5 insertions(+), 6 deletions(-) diff -puN drivers/md/md.c~md-make-md_print_devices-static drivers/md/md.c --- devel/drivers/md/md.c~md-make-md_print_devices-static 2006-05-17 13:10:21.000000000 -0700 +++ devel-akpm/drivers/md/md.c 2006-05-17 13:10:21.000000000 -0700 @@ -73,6 +73,10 @@ static void autostart_arrays (int part); static LIST_HEAD(pers_list); static DEFINE_SPINLOCK(pers_lock); +static void md_print_devices(void); + +#define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); } + /* * Current RAID-1,4,5 parallel reconstruction 'guaranteed speed limit' * is 1000 KB/sec, so the extra system load does not show up that much. @@ -1513,7 +1517,7 @@ static void print_rdev(mdk_rdev_t *rdev) printk(KERN_INFO "md: no rdev superblock!\n"); } -void md_print_devices(void) +static void md_print_devices(void) { struct list_head *tmp, *tmp2; mdk_rdev_t *rdev; @@ -5334,7 +5338,6 @@ EXPORT_SYMBOL(md_write_end); EXPORT_SYMBOL(md_register_thread); EXPORT_SYMBOL(md_unregister_thread); EXPORT_SYMBOL(md_wakeup_thread); -EXPORT_SYMBOL(md_print_devices); EXPORT_SYMBOL(md_check_recovery); MODULE_LICENSE("GPL"); MODULE_ALIAS("md"); diff -puN include/linux/raid/md.h~md-make-md_print_devices-static include/linux/raid/md.h --- devel/include/linux/raid/md.h~md-make-md_print_devices-static 2006-05-17 13:10:21.000000000 -0700 +++ devel-akpm/include/linux/raid/md.h 2006-05-17 13:10:21.000000000 -0700 @@ -85,8 +85,6 @@ extern void md_done_sync(mddev_t *mddev, extern void md_error (mddev_t *mddev, mdk_rdev_t *rdev); extern void md_unplug_mddev(mddev_t *mddev); -extern void md_print_devices (void); - extern void md_super_write(mddev_t *mddev, mdk_rdev_t *rdev, sector_t sector, int size, struct page *page); extern void md_super_wait(mddev_t *mddev); @@ -97,7 +95,5 @@ extern void md_new_event(mddev_t *mddev) extern void md_update_sb(mddev_t * mddev); -#define MD_BUG(x...) { printk("md: bug in file %s, line %d\n", __FILE__, __LINE__); md_print_devices(); } - #endif _