From: Stephen Rothwell Date: Wed, 5 Oct 2011 00:43:54 +0000 (+1100) Subject: init-add-root=partuuid=uuid-partnroff=%d-support-fix X-Git-Tag: next-20111013~1^2~39 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45f0b150fe14d8f6064562795ebe8630ee93d60b;p=karo-tx-linux.git init-add-root=partuuid=uuid-partnroff=%d-support-fix After merging the akpm tree, today's linux-next build (lost of them) produced this warning: WARNING: init/mounts.o(.text+0x192): Section mismatch in reference from the function devt_from_partuuid() to the variable .init.data:root_wait The function devt_from_partuuid() references the variable __initdata root_wait. This is often because devt_from_partuuid lacks a __initdata annotation or the annotation of root_wait is wrong. Commit 185237e4cfab ("This patch makes two changes:" init-add-root=partuuid=uuid-partnroff=%d-support-update.patch) adds the reference to root_wait from the non-init function devt_from_partuuid(). The easiest thing to do is to remove __init_date from root_wait. I have applied this patch as a merge fixup for today: From: Stephen Rothwell Date: Wed, 10 Aug 2011 12:09:35 +1000 Subject: [PATCH] do_mounts: remove __init_data from root_wait as it is now used from a non init routine. Signed-off-by: Stephen Rothwell Cc: Will Drewry Signed-off-by: Andrew Morton --- diff --git a/init/do_mounts.c b/init/do_mounts.c index bcbeca7a6655..0f6e1d985a3b 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -28,7 +28,7 @@ int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */ int root_mountflags = MS_RDONLY | MS_SILENT; static char * __initdata root_device_name; static char __initdata saved_root_name[64]; -static int __initdata root_wait; +static int root_wait; dev_t ROOT_DEV;