From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: dhowells@redhat.com
Cc: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
linux-next@vger.kernel.org,
Paul Gortmaker <paul.gortmaker@windriver.com>,
Paul Mundt <lethal@linux-sh.org>
Subject: [PATCH 07/11] sh: fix several build failures from system.h fallout
Date: Sun, 1 Apr 2012 16:38:43 -0400 [thread overview]
Message-ID: <1333312727-11428-8-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1333312727-11428-1-git-send-email-paul.gortmaker@windriver.com>
commit e839ca528718e68cad32a307dc9aabf01ef3eb05
"Disintegrate asm/system.h for SH"
created the new file asm/cache_insns.h but it didn't add
an include for all the users of it.
The failure on fpu.c (also seen below) showed up roughly
at the same time, and since the fix is trivial (include traps.h)
I did not bother to bisect to 100% confirm it was caused by
the system.h disintegration.
arch/sh/mm/flush-sh4.c:16:2: error: implicit declaration of function 'register_align' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:23:3: error: implicit declaration of function '__ocbwb' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:57:3: error: implicit declaration of function '__ocbp' [-Werror=implicit-function-declaration]
arch/sh/mm/flush-sh4.c:87:3: error: implicit declaration of function '__ocbi' [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[2]: *** [arch/sh/mm/flush-sh4.o] Error 1
arch/sh/mm/cache-sh4.c:70:3: error: implicit declaration of function '__ocbwb' [-Werror=implicit-function-declaration]
cc1: all warnings being treated as errors
make[2]: *** [arch/sh/mm/cache-sh4.o] Error 1
arch/sh/kernel/cpu/fpu.c:81:2: error: 'TRAP_HANDLER_DECL' undeclared (first use in this function)
arch/sh/kernel/cpu/fpu.c:83:20: error: 'regs' undeclared (first use in this function)
arch/sh/kernel/cpu/fpu.c:83:19: error: called object 'fpu_state_restore' is not a function
make[3]: *** [arch/sh/kernel/cpu/fpu.o] Error 1
arch/sh/kernel/cpu/sh4/fpu.c:407:2: error: 'TRAP_HANDLER_DECL' undeclared (first use in this function)
arch/sh/kernel/cpu/sh4/fpu.c:409:20: error: 'regs' undeclared (first use in this function)
make[4]: *** [arch/sh/kernel/cpu/sh4/fpu.o] Error 1
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
arch/sh/kernel/cpu/fpu.c | 1 +
arch/sh/kernel/cpu/sh4/fpu.c | 1 +
arch/sh/mm/cache-sh4.c | 1 +
arch/sh/mm/flush-sh4.c | 1 +
4 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/sh/kernel/cpu/fpu.c b/arch/sh/kernel/cpu/fpu.c
index 7f1b70c..07fb02f 100644
--- a/arch/sh/kernel/cpu/fpu.c
+++ b/arch/sh/kernel/cpu/fpu.c
@@ -1,6 +1,7 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <asm/processor.h>
+#include <asm/traps.h>
#include <asm/fpu.h>
int init_fpu(struct task_struct *tsk)
diff --git a/arch/sh/kernel/cpu/sh4/fpu.c b/arch/sh/kernel/cpu/sh4/fpu.c
index e74cd6c..36538ff 100644
--- a/arch/sh/kernel/cpu/sh4/fpu.c
+++ b/arch/sh/kernel/cpu/sh4/fpu.c
@@ -15,6 +15,7 @@
#include <linux/io.h>
#include <cpu/fpu.h>
#include <asm/processor.h>
+#include <asm/traps.h>
#include <asm/fpu.h>
/* The PR (precision) bit in the FP Status Register must be clear when
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c
index 112fea1..c9667d9 100644
--- a/arch/sh/mm/cache-sh4.c
+++ b/arch/sh/mm/cache-sh4.c
@@ -19,6 +19,7 @@
#include <asm/pgtable.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
+#include <asm/cache_insns.h>
/*
* The maximum number of pages we support up to when doing ranged dcache
diff --git a/arch/sh/mm/flush-sh4.c b/arch/sh/mm/flush-sh4.c
index 75a17f5..59acd8a 100644
--- a/arch/sh/mm/flush-sh4.c
+++ b/arch/sh/mm/flush-sh4.c
@@ -1,6 +1,7 @@
#include <linux/mm.h>
#include <asm/mmu_context.h>
#include <asm/cacheflush.h>
+#include <asm/cache_insns.h>
#include <asm/traps.h>
/*
--
1.7.9.1
next prev parent reply other threads:[~2012-04-01 20:39 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-01 20:38 [PATCH 00/11] Fix up more asm/system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split Paul Gortmaker
2012-04-01 20:38 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout Paul Gortmaker
2012-04-02 21:16 ` David Brown
2012-04-01 20:38 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up Paul Gortmaker
2012-04-01 20:38 ` [PATCH 04/11] avr32: fix build failures from mis-naming of atmel_nand.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout Paul Gortmaker
2012-04-01 20:38 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split Paul Gortmaker
2012-04-01 20:38 ` Paul Gortmaker [this message]
2012-04-02 1:00 ` [PATCH 07/11] sh: fix several build failures from system.h fallout Paul Mundt
2012-04-02 18:15 ` Paul Gortmaker
2012-04-02 23:57 ` Stephen Rothwell
2012-04-05 2:46 ` Paul Gortmaker
2012-04-05 2:49 ` Paul Gortmaker
2012-04-05 15:15 ` Paul Mundt
2012-04-06 6:40 ` linux-next: sh tree (Was:Re: [PATCH 07/11] sh: fix several build failures from system.h fallout) Stephen Rothwell
2012-04-01 20:38 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL Paul Gortmaker
2012-04-01 20:38 ` [PATCH 09/11] firewire: restore the device.h include in linux/firewire.h Paul Gortmaker
2012-04-01 20:38 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle Paul Gortmaker
2012-04-01 20:38 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h Paul Gortmaker
2012-04-06 6:28 ` Jonas Bonn
2012-04-02 0:03 ` [PATCH 00/11] Fix up more asm/system.h fallout Stephen Rothwell
2012-04-02 5:30 ` David Howells
2012-04-02 5:43 ` [PATCH 08/11] frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL David Howells
2012-04-02 5:44 ` [PATCH 02/11] ARM: mach-msm: fix compile fail from system.h fallout David Howells
2012-04-02 5:45 ` [PATCH 01/11] irq_work: fix compile failure on MIPS from system.h split David Howells
2012-04-02 5:47 ` [PATCH 03/11] avr32: fix nop compile fails from system.h split up David Howells
2012-04-02 19:11 ` Paul Gortmaker
2012-04-02 5:49 ` [PATCH 05/11] blackfin: fix cmpxchg build fails from system.h fallout David Howells
2012-04-02 5:50 ` [PATCH 06/11] parisc: fix missing cmpxchg file error from system.h split David Howells
2012-04-02 5:52 ` [PATCH 10/11] tile: fix multiple build failures from system.h dismantle David Howells
2012-04-02 15:59 ` Chris Metcalf
2012-04-02 18:05 ` Paul Gortmaker
2012-04-02 5:53 ` [PATCH 11/11] asm-generic: add linux/types.h to cmpxchg.h David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1333312727-11428-8-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=dhowells@redhat.com \
--cc=lethal@linux-sh.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).