diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-06 19:27:13 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-05-06 19:27:13 +0200 |
| commit | 394e4f5d5834b610ee032cceb20a1b1f45b01d28 (patch) | |
| tree | fcd316bf688c9b47d7c5e02a03630494c32982e9 | |
| parent | Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| download | linux-394e4f5d5834b610ee032cceb20a1b1f45b01d28.tar.xz linux-394e4f5d5834b610ee032cceb20a1b1f45b01d28.zip | |
initramfs: avoid "label at end of compound statement" error
Commit 17a9be317475 ("initramfs: Always do fput() and load modules after
rootfs populate") introduced an error for the
CONFIG_BLK_DEV_RAM=y
case, because even though the code looks fine, the compiler really wants
a statement after a label, or you'll get complaints:
init/initramfs.c: In function 'populate_rootfs':
init/initramfs.c:644:2: error: label at end of compound statement
That commit moved the subsequent statements to outside the compound
statement, leaving the label without any associated statements.
Reported-by: Jörg Otte <jrg.otte@gmail.com>
Fixes: 17a9be317475 ("initramfs: Always do fput() and load modules after rootfs populate")
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Stafford Horne <shorne@gmail.com>
Cc: stable@vger.kernel.org # if 17a9be317475 gets backported
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '')
| -rw-r--r-- | init/initramfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/initramfs.c b/init/initramfs.c index 3a6871597351..8daf7ac6c7e2 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -642,6 +642,7 @@ static int __init populate_rootfs(void) free_initrd(); } done: + /* empty statement */; #else printk(KERN_INFO "Unpacking initramfs...\n"); err = unpack_to_rootfs((char *)initrd_start, |