linux-next: build failure after merge of the final tree (acpi treerelated)

From: Stephen Rothwell
Date: Mon Feb 11 2013 - 02:34:23 EST


Hi all,

After merging the final tree, today's linux-next build (sparc64 defconfig)
failed like this:

arch/sparc/include/asm/processor.h: Assembler messages:
arch/sparc/include/asm/processor.h:10: Error: Unknown opcode: `extern'

Caused by commit 3a242f58a5f4 ("sparc idle: rename pm_idle to
sparc_idle") from the acpi tree.

I have applied this patch for today:

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Mon, 11 Feb 2013 18:30:19 +1100
Subject: [PATCH] sparc idle: protect variable declarations against the assembler

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
arch/sparc/include/asm/processor.h | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/sparc/include/asm/processor.h b/arch/sparc/include/asm/processor.h
index 34baa35..622cfa5 100644
--- a/arch/sparc/include/asm/processor.h
+++ b/arch/sparc/include/asm/processor.h
@@ -7,6 +7,8 @@
#endif

#define nop() __asm__ __volatile__ ("nop")
+#ifndef __ASSEMBLY__
extern void (*sparc_idle)(void);
+#endif

#endif
--
1.8.1

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature