Merge branch 'busybox' into merge

45 files changed, 75 insertions, 118 deletions

diff --git a/util-linux/fallocate.c b/util-linux/fallocate.c
index 1a02a322f..8542586dc 100644
--- a/util-linux/fallocate.c
+++ b/util-linux/fallocate.c
@@ -4,7 +4,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config FALLOCATE
 //config:       bool "fallocate (5 kb)"
 //config:       default y
diff --git a/util-linux/fsfreeze.c b/util-linux/fsfreeze.c
index 2e2257337..c485810aa 100644
--- a/util-linux/fsfreeze.c
+++ b/util-linux/fsfreeze.c
@@ -4,7 +4,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config FSFREEZE
 //config:       bool "fsfreeze (3.6 kb)"
 //config:       default y
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 4acfa567a..205d1e42b 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -7,7 +7,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config FSTRIM
 //config:       bool "fstrim (5.5 kb)"
 //config:       default y
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 8acc4d21d..4b4eeafba 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -7,7 +7,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config MDEV
 //config:       bool "mdev (16 kb)"
 //config:       default y
diff --git a/util-linux/mesg.c b/util-linux/mesg.c
index 91c05317e..35c4ec13d 100644
--- a/util-linux/mesg.c
+++ b/util-linux/mesg.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config MESG
 //config:       bool "mesg (1.2 kb)"
 //config:       default y
diff --git a/util-linux/nsenter.c b/util-linux/nsenter.c
index d91b0b509..c6933c8d5 100644
--- a/util-linux/nsenter.c
+++ b/util-linux/nsenter.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config NSENTER
 //config:       bool "nsenter (8.6 kb)"
 //config:       default y
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 7eb7413a8..97279ce61 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -6,7 +6,6 @@
  *   Grant Erickson <gerickson@nuovations.com>
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
- *
  */
 //config:config RDEV
 //config:       bool "rdev (1.4 kb)"
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 12ab1bd66..af079fae8 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -173,14 +173,14 @@ static void set_ambient_caps(char *string)
 
         cap = strtok(string, ",");
         while (cap) {
-                unsigned index;
+                unsigned idx;
 
-                index = parse_cap(cap);
+                idx = parse_cap(cap);
                 if (cap[0] == '+') {
-                        if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, index, 0, 0) < 0)
+                        if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_RAISE, idx, 0, 0) < 0)
                                 bb_perror_msg("cap_ambient_raise");
                 } else {
-                        if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, index, 0, 0) < 0)
+                        if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, idx, 0, 0) < 0)
                                 bb_perror_msg("cap_ambient_lower");
                 }
                 cap = strtok(NULL, ",");
diff --git a/util-linux/taskset.c b/util-linux/taskset.c
index 401a1bcb7..67df1cb73 100644
--- a/util-linux/taskset.c
+++ b/util-linux/taskset.c
@@ -5,7 +5,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config TASKSET
 //config:       bool "taskset (4.1 kb)"
 //config:       default y
@@ -23,6 +22,7 @@
 //config:       in this case. Otherwise, it is limited to sizeof(long).
 
 //applet:IF_TASKSET(APPLET_NOEXEC(taskset, taskset, BB_DIR_USR_BIN, BB_SUID_DROP, taskset))
+
 //kbuild:lib-$(CONFIG_TASKSET) += taskset.o
 
 //usage:#define taskset_trivial_usage
diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index 334a341c3..085c158db 100644
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@@ -7,14 +7,13 @@
  * Based on code fragments from bcache-tools by Kent Overstreet:
  * http://evilpiepirate.org/git/bcache-tools.git
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
-
 //config:config FEATURE_VOLUMEID_BCACHE
 //config:       bool "bcache filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o
+
 #include "volume_id_internal.h"
 
 #define SB_LABEL_SIZE      32
diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index 338a48762..a3ddf9782 100644
--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@@ -18,14 +18,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
-
 //config:config FEATURE_VOLUMEID_BTRFS
 //config:       bool "btrfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o
+
 #include "volume_id_internal.h"
 
 #define BTRFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index c63223e2b..3468a5005 100644
--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
-
 //config:config FEATURE_VOLUMEID_CRAMFS
 //config:       bool "cramfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o
+
 #include "volume_id_internal.h"
 
 struct cramfs_super {
diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index 14bf9d691..952b027d9 100644
--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@@ -17,9 +17,6 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
-
 //config:config FEATURE_VOLUMEID_EXFAT
 //config:       bool "exFAT filesystem"
 //config:       default y
@@ -29,6 +26,8 @@
 //config:       for flash drives. It has many features from NTFS, but with less
 //config:       overhead. exFAT is used on most SDXC cards for consumer electronics.
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o
+
 #include "volume_id_internal.h"
 
 #define EXFAT_SB_OFFSET         0
diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index 473b3229a..f17faddb6 100644
--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
-
 //config:config FEATURE_VOLUMEID_EXT
 //config:       bool "Ext filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o
+
 #include "volume_id_internal.h"
 #include "bb_e2fs_defs.h"
 
diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index 3027f178e..e6100aec2 100644
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@@ -5,9 +5,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
-
 //config:config FEATURE_VOLUMEID_F2FS
 //config:       bool "f2fs filesystem"
 //config:       default y
@@ -18,6 +15,8 @@
 //config:       known issues of the older log structured file systems, such as high
 //config:       cleaning overhead.
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o
+
 #include "volume_id_internal.h"
 
 #define F2FS_MAGIC              0xF2F52010      // F2FS Magic Number
diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index bc3433daf..b24ed098e 100644
--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
-
 //config:config FEATURE_VOLUMEID_FAT
 //config:       bool "fat filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o
+
 #include "volume_id_internal.h"
 
 /* linux/msdos_fs.h says: */
diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 78dae0790..05d16db34 100644
--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
-
 //config:config FEATURE_VOLUMEID_HFS
 //config:       bool "hfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o
+
 #include "volume_id_internal.h"
 
 struct hfs_finder_info{
diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 23072f87c..c771b01f5 100644
--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
-
 //config:config FEATURE_VOLUMEID_ISO9660
 //config:       bool "iso9660 filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o
+
 #include "volume_id_internal.h"
 
 #define ISO_SUPERBLOCK_OFFSET           0x8000
diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index 543d90fe5..5e523e236 100644
--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
-
 //config:config FEATURE_VOLUMEID_JFS
 //config:       bool "jfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o
+
 #include "volume_id_internal.h"
 
 struct jfs_super_block {
diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index 0db6e8662..db6209a4d 100644
--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
-
 //config:config FEATURE_VOLUMEID_LINUXRAID
 //config:       bool "linuxraid"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o
+
 #include "volume_id_internal.h"
 
 struct mdp_super_block {
diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index a35769dfc..78b339cf0 100644
--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
-
 //config:config FEATURE_VOLUMEID_LINUXSWAP
 //config:       bool "linux swap filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o
+
 #include "volume_id_internal.h"
 
 struct swap_header_v1_2 {
diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 4b80b7a6d..8e634d4ee 100644
--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
-
 //config:config FEATURE_VOLUMEID_LUKS
 //config:       bool "luks filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o
+
 #include "volume_id_internal.h"
 
 #define LUKS_MAGIC_L             6
diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index 9d6c57fba..7a8b798df 100644
--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@@ -18,9 +18,6 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
-
 //config:config FEATURE_VOLUMEID_NILFS
 //config:       bool "nilfs filesystem"
 //config:       default y
@@ -37,6 +34,8 @@
 //config:       filesystem for Linux desktop environment, or as a basis of advanced
 //config:       storage appliances.
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o
+
 #include "volume_id_internal.h"
 
 #define NILFS_UUID_SIZE 16
diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index bf85f7ed3..22dd77fc7 100644
--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
-
 //config:config FEATURE_VOLUMEID_NTFS
 //config:       bool "ntfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o
+
 #include "volume_id_internal.h"
 
 struct ntfs_super_block {
diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 2dedac98b..235968b88 100644
--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
-
 //config:config FEATURE_VOLUMEID_OCFS2
 //config:       bool "ocfs2 filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o
+
 #include "volume_id_internal.h"
 
 /* All these values are taken from ocfs2-tools's ocfs2_fs.h */
diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 369d4d9bb..d9fd8944d 100644
--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@@ -18,14 +18,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
-
 //config:config FEATURE_VOLUMEID_REISERFS
 //config:       bool "Reiser filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o
+
 #include "volume_id_internal.h"
 
 struct reiserfs_super_block {
diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 95a65f9ef..bd74fda8d 100644
--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
-
 //config:config FEATURE_VOLUMEID_ROMFS
 //config:       bool "romfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o
+
 #include "volume_id_internal.h"
 
 struct romfs_super {
diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index e3ffce35e..4b65afd8b 100644
--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@@ -5,9 +5,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
-
 //config:config FEATURE_VOLUMEID_SQUASHFS
 //config:       bool "SquashFS filesystem"
 //config:       default y
@@ -18,6 +15,8 @@
 //config:       device/memory systems (e.g. embedded systems) where low overhead is
 //config:       needed.
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o
+
 #include "volume_id_internal.h"
 
 struct squashfs_superblock {
diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index cd4cd906b..be41f8048 100644
--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
-
 //config:config FEATURE_VOLUMEID_SYSV
 //config:       bool "sysv filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o
+
 #include "volume_id_internal.h"
 
 #define SYSV_NICINOD                    100
diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 7512b84b0..aee53f9dd 100644
--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@@ -5,9 +5,6 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
-
 //config:config FEATURE_VOLUMEID_UBIFS
 //config:       bool "UBIFS filesystem"
 //config:       default y
@@ -16,6 +13,8 @@
 //config:       UBIFS (Unsorted Block Image File System) is a file
 //config:       system for use with raw flash memory media.
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o
+
 #include "volume_id_internal.h"
 
 #define UBIFS_NODE_MAGIC  0x06101831
diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index fa5dccee7..0df4a86df 100644
--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
-
 //config:config FEATURE_VOLUMEID_UDF
 //config:       bool "udf filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o
+
 #include "volume_id_internal.h"
 
 struct volume_descriptor {
diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 4afa6d927..1d5ceb787 100644
--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
-
 //config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
 //config:###    bool "highpoint raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o
+
 #include "volume_id_internal.h"
 
 struct hpt37x_meta {
diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index 3e16dedbd..26fefd415 100644
--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
-
 //config:### config FEATURE_VOLUMEID_HPFS
 //config:###    bool "hpfs filesystem"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o
+
 #include "volume_id_internal.h"
 
 struct hpfs_super {
diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index fba99be58..f7b3eec74 100644
--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
-
 //config:### config FEATURE_VOLUMEID_ISWRAID
 //config:###    bool "intel raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o
+
 #include "volume_id_internal.h"
 
 struct isw_meta {
diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 9dd2b409c..12dabea87 100644
--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
-
 //config:### config FEATURE_VOLUMEID_LSIRAID
 //config:###    bool "lsi raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o
+
 #include "volume_id_internal.h"
 
 struct lsi_meta {
diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 5ad6d585c..649306c85 100644
--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
-
 //config:### config FEATURE_VOLUMEID_LVM
 //config:###    bool "lvm"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o
+
 #include "volume_id_internal.h"
 
 struct lvm1_super_block {
diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index 997d330a4..a0d253e92 100644
--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
-
 //config:### config FEATURE_VOLUMEID_MAC
 //config:###    bool "mac filesystem"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o
+
 #include "volume_id_internal.h"
 
 struct mac_driver_desc {
diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index f84c0f06f..baa14c552 100644
--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
-
 //config:### config FEATURE_VOLUMEID_MSDOS
 //config:###    bool "msdos filesystem"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o
+
 #include "volume_id_internal.h"
 
 struct msdos_partition_entry {
diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index dfb54fa9d..e8217b402 100644
--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
-
 //config:### config FEATURE_VOLUMEID_NVIDIARAID
 //config:###    bool "nvidia raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o
+
 #include "volume_id_internal.h"
 
 struct nvidia_meta {
diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index d594de39c..c4a6f502a 100644
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
-
 //config:### config FEATURE_VOLUMEID_PROMISERAID
 //config:###    bool "promise raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
+
 #include "volume_id_internal.h"
 
 struct promise_meta {
diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 886721b61..ea96dc98a 100644
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
-
 //config:### config FEATURE_VOLUMEID_SILICONRAID
 //config:###    bool "silicon raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
+
 #include "volume_id_internal.h"
 
 struct silicon_meta {
diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index 78ef26ad4..c36793a68 100644
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
-
 //config:### config FEATURE_VOLUMEID_UFS
 //config:###    bool "ufs filesystem"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
+
 #include "volume_id_internal.h"
 
 struct ufs_super_block {
diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index f82626655..c77c8393c 100644
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
-
 //config:### config FEATURE_VOLUMEID_VIARAID
 //config:###    bool "via raid"
 //config:###    default y
 //config:###    depends on VOLUMEID
 
+//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
+
 #include "volume_id_internal.h"
 
 struct via_meta {
diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 656d5bfcf..f98b66a53 100644
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -17,14 +17,13 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-
-//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
-
 //config:config FEATURE_VOLUMEID_XFS
 //config:       bool "xfs filesystem"
 //config:       default y
 //config:       depends on VOLUMEID
 
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
+
 #include "volume_id_internal.h"
 
 struct xfs_super_block {
diff --git a/util-linux/wall.c b/util-linux/wall.c
index e214d8c3f..939736592 100644
--- a/util-linux/wall.c
+++ b/util-linux/wall.c
@@ -5,7 +5,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 //config:config WALL
 //config:       bool "wall (2.5 kb)"
 //config:       default y