[PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

[PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

[Laurent Fasnacht]

initrd_start is defined in init/do_mounts_initrd.c, which is only
included in kernel if CONFIG_BLK_DEV_INITRD=y.

Signed-off-by: Laurent Fasnacht <l@libres.ch>
---
 arch/mips/ath79/prom.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
index e1fe630..597899a 100644
--- a/arch/mips/ath79/prom.c
+++ b/arch/mips/ath79/prom.c
@@ -1,6 +1,7 @@
 /*
  *  Atheros AR71XX/AR724X/AR913X specific prom routines
  *
+ *  Copyright (C) 2015 Laurent Fasnacht <l@libres.ch>
  *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
@@ -25,12 +26,14 @@ void __init prom_init(void)
 {
 	fw_init_cmdline();
 +#ifdef CONFIG_BLK_DEV_INITRD
 	/* Read the initrd address from the firmware environment */
 	initrd_start = fw_getenvl("initrd_start");
 	if (initrd_start) {
 		initrd_start = KSEG0ADDR(initrd_start);
 		initrd_end = initrd_start + fw_getenvl("initrd_size");
 	}
+#endif
 }
  void __init prom_free_prom_memory(void)
-- 
2.0.4

Re: [PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

[Ralf Baechle]

On Wed, May 27, 2015 at 07:50:00PM +0200, Laurent Fasnacht wrote:

> initrd_start is defined in init/do_mounts_initrd.c, which is only
> included in kernel if CONFIG_BLK_DEV_INITRD=y.
> 
> Signed-off-by: Laurent Fasnacht <l@libres.ch>
> ---
>  arch/mips/ath79/prom.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/arch/mips/ath79/prom.c b/arch/mips/ath79/prom.c
> index e1fe630..597899a 100644
> --- a/arch/mips/ath79/prom.c
> +++ b/arch/mips/ath79/prom.c
> @@ -1,6 +1,7 @@
>  /*
>   *  Atheros AR71XX/AR724X/AR913X specific prom routines
>   *
> + *  Copyright (C) 2015 Laurent Fasnacht <l@libres.ch>
>   *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
>   *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
>   *
> @@ -25,12 +26,14 @@ void __init prom_init(void)
>  {
>  	fw_init_cmdline();
XXX
>  +#ifdef CONFIG_BLK_DEV_INITRD
>  	/* Read the initrd address from the firmware environment */
>  	initrd_start = fw_getenvl("initrd_start");
>  	if (initrd_start) {
>  		initrd_start = KSEG0ADDR(initrd_start);
>  		initrd_end = initrd_start + fw_getenvl("initrd_size");
>  	}
> +#endif
>  }
XXX
>   void __init prom_free_prom_memory(void)

This patch is corrupt.  Please check how you send out your patches.
The lines which I marked with XXX should be blank lines containing just
one space character.  Instead the lines were removed and the space
inserted into the following line.  Because this patch is trivial I
fix that manually but please sort our your patch submission process
for the future.

Also note that adding two lines in most jurisdictions doesn't constitute
something copyrightable, adding a copyright notice or not.

Thanks,

  Ralf

Re: [PATCH] MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

[Laurent Fasnacht]

On 28. 05. 15 17:38, Ralf Baechle wrote:
> On Wed, May 27, 2015 at 07:50:00PM +0200, Laurent Fasnacht wrote:
>> [...]
> This patch is corrupt.  Please check how you send out your patches.
> The lines which I marked with XXX should be blank lines containing just
> one space character.  Instead the lines were removed and the space
> inserted into the following line.  Because this patch is trivial I
> fix that manually but please sort our your patch submission process
> for the future.

Thank you very much. My apologies for the inconvenience, next time I'll
do better.

> Also note that adding two lines in most jurisdictions doesn't constitute
> something copyrightable, adding a copyright notice or not.

I fully agree.

Laurent