From: Andrew Morton : commit b52c36a95ed8026b6925fe8595ebcab6921ae62d : Author: Arjan van de Ven : Date: Sun Jul 20 13:07:09 2008 -0700 : : fastboot: make the raid autodetect code wait for all devices to init init/do_mounts_md.c: In function `md_run_setup': init/do_mounts_md.c:282: warning: ISO C90 forbids mixed declarations and code How did this happen? Cc: Arjan van de Ven Cc: Ingo Molnar Signed-off-by: Andrew Morton --- init/do_mounts_md.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff -puN init/do_mounts_md.c~fix-fastboot-make-the-raid-autodetect-code-wait-for-all-devices-to-init init/do_mounts_md.c --- a/init/do_mounts_md.c~fix-fastboot-make-the-raid-autodetect-code-wait-for-all-devices-to-init +++ a/init/do_mounts_md.c @@ -271,6 +271,8 @@ void __init md_run_setup(void) if (raid_noautodetect) printk(KERN_INFO "md: Skipping autodetection of RAID arrays. (raid=noautodetect)\n"); else { + int fd; + /* * Since we don't want to detect and use half a raid array, we need to * wait for the known devices to complete their probing @@ -279,7 +281,7 @@ void __init md_run_setup(void) printk(KERN_INFO "md: If you don't use raid, use raid=noautodetect\n"); while (driver_probe_done() < 0) msleep(100); - int fd = sys_open("/dev/md0", 0, 0); + fd = sys_open("/dev/md0", 0, 0); if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); _