diff mbox

[RFC,06/12] ARM: Work around OMAPs arch_decomp_setup()

Message ID 20120715024609.826903502@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Domenico Andreoli July 15, 2012, 2:44 a.m. UTC 
From: Domenico Andreoli <domenico.andreoli@linux.com>

This patch is required to not break OMAP, which wants arch_id but doesn't
use it. Separate fix has been already mailed but not yet merged hence
the hack.

Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
---
 arch/arm/boot/compressed/misc.c |    4 ++++
 1 file changed, 4 insertions(+)
diff mbox

Patch

Index: b/arch/arm/boot/compressed/misc.c
===================================================================
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -105,6 +105,10 @@  void fallback_arch_error(char *x)
 
 void fallback_arch_setup(void)
 {
+	unsigned int arch_id;
+
+	/* hack around plat-omap using arch_id instead of __machine_arch_type */
+	arch_id = __machine_arch_type;
 	arch_decomp_setup();
 }