sh: fix compressed kernel build

sh: fix compressed kernel build

[Manuel Lauss]

Hello,

This should probably go to Linus before he releases 2.6.25.
I'm also not sure about the sh64 bit since I don't have a working toolchain for it.

--- 

commit 54a015104136974262afa4b8ddd943ea70dec8a2 broke zImage build on sh arch:

 LD      vmlinux
  SYSMAP  System.map
  SYSMAP  .tmp_System.map
  AS      arch/sh/boot/compressed/head_32.o
In file included from /k/arch/sh/boot/compressed/head_32.S:11:
/k/include/linux/linkage.h:34: error: syntax error in macro parameter list

Fix it for both sh and sh64.

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
---
 arch/sh/boot/compressed/head_32.S |    1 -
 arch/sh/boot/compressed/head_64.S |    1 -
 2 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/sh/boot/compressed/head_32.S b/arch/sh/boot/compressed/head_32.S
index a8399b0..06ac31f 100644
--- a/arch/sh/boot/compressed/head_32.S
+++ b/arch/sh/boot/compressed/head_32.S
@@ -7,7 +7,6 @@
 
 .text
 
-#include <linux/linkage.h>
 #include <asm/page.h>
 
 	.global	startup
diff --git a/arch/sh/boot/compressed/head_64.S b/arch/sh/boot/compressed/head_64.S
index 1d4ecbf..f72c198 100644
--- a/arch/sh/boot/compressed/head_64.S
+++ b/arch/sh/boot/compressed/head_64.S
@@ -13,7 +13,6 @@
  * Modification for compressed loader:
  *   Copyright (C) 2002 Stuart Menefy (stuart.menefy@st.com)
  */
-#include <linux/linkage.h>
 #include <asm/cache.h>
 #include <asm/cpu/mmu_context.h>
 #include <asm/cpu/registers.h>
-- 
1.5.4.5

Re: sh: fix compressed kernel build

[Paul Mundt]

On Fri, Apr 11, 2008 at 08:21:44AM +0200, Manuel Lauss wrote:
> This should probably go to Linus before he releases 2.6.25.  I'm also
> not sure about the sh64 bit since I don't have a working toolchain for
> it.
> 
I'll queue it up, thanks.