commit c34d85aca91729596f876604e147892b81ecbbe9
author Mark Rustad <mark.d.rustad@intel.com> Mon Oct 13 15:54:07 2014 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Oct 14 02:18:22 2014 +0200
tree 16ebaa1b5eae5ab9cc8e3fd34b3ccb8a7b5dfe6a
parent 906e36c5c717cc99e622350f533876feed9bffe0

init/initramfs.c: resolve shadow warnings

Resolve shadow warnings that are produced in W=2 builds by renaming a
global with a too-generic name and renaming a formal parameter.

[akpm@linux-foundation.org: coding-style fixes]
Signed-off-by: Mark Rustad <mark.d.rustad@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>