Skip to contentSkip to conversation

MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

PATCH In review Laurent Fasnacht 2 participants 3 messages May 27, 2015 – May 29, 2015 MIPS

lore
Share & tools
lore

Laurent Fasnacht

author
#0 lore raw

PATCH 1/1 MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set

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 <[email protected]>
---
 arch/mips/ath79/prom.c | 3 +++
 1 file changed, 3 insertions(+)
arch/mips/ath79/prom.c +2 -0
index e1fe630..597899a 100644
@@ -1,6 +1,7 @@
 /*
  *  Atheros AR71XX/AR724X/AR913X specific prom routines
  *
+ *  Copyright (C) 2015 Laurent Fasnacht <[email protected]>
  *  Copyright (C) 2008-2010 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *

@@ -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)
Signature · 1 line
2.0.4
#1 lore raw
Quoted 21 lines · 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 <[email protected]>
---
 arch/mips/ath79/prom.c | 3 +++
 1 file changed, 3 insertions(+)
arch/mips/ath79/prom.c +1 -0
index e1fe630..597899a 100644
@@ -1,6 +1,7 @@
 /*
  *  Atheros AR71XX/AR724X/AR913X specific prom routines
  *
+ *  Copyright (C) 2015 Laurent Fasnacht <[email protected]>
  *  Copyright (C) 2008-2010 Gabor Juhos <[email protected]>
  *  Copyright (C) 2008 Imre Kaloz <[email protected]>
  *

arch/mips/ath79/prom.c void __init prom_init(void) · line 27

Quoted 2 lines
arch/mips/ath79/prom.c +0 -0
@@ -25,12 +26,14 @@ void __init prom_init(void)
 {
 	fw_init_cmdline();

XXX

arch/mips/ath79/prom.c void __init prom_init(void) · line 36

Quoted 9 lines
arch/mips/ath79/prom.c +1 -0
 +#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

arch/mips/ath79/prom.c void __init prom_init(void) · line 37

Quoted 1 line
arch/mips/ath79/prom.c +0 -0
  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

author
#2 lore raw
Quoted 8 lines · Ralf Baechle
Quoted 1 line · Laurent Fasnacht

[...]

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.

Quoted 2 lines

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

I fully agree.

Laurent