Build failures on Linus's tree for cris

From 87a249d1f35f82e11ffc7c78f0d9ef2399a2ec82 Mon Sep 17 00:00:00 2001

28 jul 2014 kl. 19:56 skrev "Sam Ravnborg" <[email protected]>:

From 87a249d1f35f82e11ffc7c78f0d9ef2399a2ec82 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <[email protected]>
Date: Sun, 13 Jul 2014 23:40:44 +0200
Subject: [PATCH 1/8] cris: fix headers_install

Fix headers_install by adjusting the path to arch files.
And delete unused Kbuild file.
Drop special handling of cris in the headers.sh script as a nice side-effect.

Signed-off-by Sam Ravnborg <[email protected]>

Cc Mikael Starvik <[email protected]>

Cc Jesper Nilsson <[email protected]>

---

I had already cooked this patch up as part of another serie. Jesper - can you take care this hits mainline this week?

Sam

arch/cris/include/asm/Kbuild      | 5 -----
arch/cris/include/uapi/asm/Kbuild | 4 ++--
scripts/headers.sh                | 2 --
3 files changed, 2 insertions(+), 9 deletions(-)

arch/cris/include/asm/Kbuild +0 -5

index afff510..35574f5 100644
@@ -1,8 +1,3 @@
-
-header-y += arch-v10/
-header-y += arch-v32/
-
-

generic-y += barrier.h
generic-y += clkdev.h
generic-y += cputime.h

arch/cris/include/uapi/asm/Kbuild +0 -0

index 7d47b36..01f66b8 100644
@@ -1,8 +1,8 @@
 # UAPI Header export list

include include/uapi/asm-generic/Kbuild.asm

arch/cris/include/uapi/asm/Kbuild +2 -2

-header-y += arch-v10/
-header-y += arch-v32/
+header-y += ../arch-v10/arch/
+header-y += ../arch-v32/arch/

header-y += auxvec.h
header-y += bitsperlong.h
header-y += byteorder.h

scripts/headers.sh +0 -2

index 95ece06..d4dc4de 100755
@@ -19,8 +19,6 @@ for arch in ${archs}; do
   case ${arch} in
   um)        # no userspace export
       ;;
-    cris)      # headers export are known broken
-        ;;
   *)
       if [ -d ${srctree}/arch/${arch} ]; then
           do_command $1 ${arch}

Signature · 1 line

1.9.3

Jesper is on a rather long vacation/parental leave. I'll try to make something of it before Jesper returns.

I'll try to make something of it before Jesper returns.