On Wed, Dec 21, 2016 at 10:08:11AM -0800, David Daney wrote: > On 12/21/2016 09:10 AM, Ralf Baechle wrote: > > On Tue, Nov 22, 2016 at 01:43:54PM -0600, Steven J. Hill wrote: > > > > > Some bootloaders pass the kernel parameters in different registers. > > > Allow for platform-specific initialization of the command line. > > > > > > Signed-off-by: Steven J. Hill <Steven.Hill@xxxxxxxxxx> > > > --- > > > arch/mips/include/asm/fw/fw.h | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/arch/mips/include/asm/fw/fw.h b/arch/mips/include/asm/fw/fw.h > > > index d0ef8b4..0fcd63e 100644 > > > --- a/arch/mips/include/asm/fw/fw.h > > > +++ b/arch/mips/include/asm/fw/fw.h > > > @@ -21,7 +21,7 @@ > > > #define fw_argv(index) ((char *)(long)_fw_argv[(index)]) > > > #define fw_envp(index) ((char *)(long)_fw_envp[(index)]) > > > > > > -extern void fw_init_cmdline(void); > > > +extern void __weak fw_init_cmdline(void); > > > extern char *fw_getcmdline(void); > > > extern void fw_meminit(void); > > > extern char *fw_getenv(char *name); > > > > Nice try - expect it doesn't work. > > Ralf, Can you drop this unneeded patch, and still apply the other OCTEON > KASLR patches in this set? Already done and pushed a few minutes ago. Ralf