From: Sam Ravnborg <sam@ravnborg.org>
To: kbuild <linux-kbuild@vger.kernel.org>,
lkml <linux-kernel@vger.kernel.org>
Cc: Sam Ravnborg <sam@ravnborg.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH 05/14] ia64: move nr-irqs.h to include/generated
Date: Sun, 18 Oct 2009 10:15:14 +0200 [thread overview]
Message-ID: <1255853723-477-5-git-send-email-sam@ravnborg.org> (raw)
In-Reply-To: <20091018080635.GA13767@merkur.ravnborg.org>
Avoid generating files in the now deprecated asm-ia64 dir
Simplified the logic in the Makefile when editing stuff in the area
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
---
arch/ia64/Makefile | 2 +-
arch/ia64/include/asm/irq.h | 2 +-
arch/ia64/kernel/Makefile | 7 ++-----
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index e7cbaa0..475e272 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -103,4 +103,4 @@ archprepare: make_nr_irqs_h FORCE
PHONY += make_nr_irqs_h FORCE
make_nr_irqs_h: FORCE
- $(Q)$(MAKE) $(build)=arch/ia64/kernel include/asm-ia64/nr-irqs.h
+ $(Q)$(MAKE) $(build)=arch/ia64/kernel include/generated/nr-irqs.h
diff --git a/arch/ia64/include/asm/irq.h b/arch/ia64/include/asm/irq.h
index 5282546..91b920f 100644
--- a/arch/ia64/include/asm/irq.h
+++ b/arch/ia64/include/asm/irq.h
@@ -13,7 +13,7 @@
#include <linux/types.h>
#include <linux/cpumask.h>
-#include <asm-ia64/nr-irqs.h>
+#include <generated/nr-irqs.h>
static __inline__ int
irq_canonicalize (int irq)
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index 6b7edca..2a75e93 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -81,17 +81,14 @@ define cmd_nr_irqs
endef
# We use internal kbuild rules to avoid the "is up to date" message from make
-arch/$(SRCARCH)/kernel/nr-irqs.s: $(srctree)/arch/$(SRCARCH)/kernel/nr-irqs.c \
- $(wildcard $(srctree)/include/asm-ia64/*/irq.h)
+arch/$(SRCARCH)/kernel/nr-irqs.s: arch/$(SRCARCH)/kernel/nr-irqs.c
$(Q)mkdir -p $(dir $@)
$(call if_changed_dep,cc_s_c)
-include/asm-ia64/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s
+include/generated/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s
$(Q)mkdir -p $(dir $@)
$(call cmd,nr_irqs)
-clean-files += $(objtree)/include/asm-ia64/nr-irqs.h
-
#
# native ivt.S, entry.S and fsys.S
#
--
1.6.2.5
next prev parent reply other threads:[~2009-10-18 8:13 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-18 8:06 [PATCH 0/14 v2] kbuild: Move files " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 01/14] kbuild: search arch/$ARCH/include before include/ Sam Ravnborg
2009-10-18 8:15 ` [PATCH 02/14] dontdiff: add generated Sam Ravnborg
2009-10-18 8:15 ` [PATCH 03/14] kbuild: move bounds.h to include/generated Sam Ravnborg
2009-10-18 8:15 ` [PATCH 04/14] kbuild: move asm-offsets.h " Sam Ravnborg
2009-10-18 8:15 ` Sam Ravnborg [this message]
2009-10-18 8:15 ` [PATCH 06/14] arm: move mach-types " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 07/14] sh: move machtypes.h " Sam Ravnborg
2009-10-18 8:15 ` [PATCH 08/14] kbuild: drop include2/ used for O=... builds Sam Ravnborg
2009-10-18 8:15 ` [PATCH 09/14] kbuild: do not check for include/asm-$ARCH Sam Ravnborg
2009-10-18 8:15 ` [PATCH 10/14] kbuild: drop include/asm Sam Ravnborg
2009-10-18 8:15 ` [PATCH 11/14] kbuild: move compile.h to include/generated Sam Ravnborg
2009-10-18 8:15 ` [PATCH 12/14] drop explicit include of autoconf.h Sam Ravnborg
2009-10-18 8:15 ` [PATCH 13/14] kbuild: move autoconf.h to include/generated Sam Ravnborg
2009-11-25 14:28 ` Michal Marek
2009-10-18 8:15 ` [PATCH 14/14] kbuild: move utsrelease.h " Sam Ravnborg
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=1255853723-477-5-git-send-email-sam@ravnborg.org \
--to=sam@ravnborg.org \
--cc=fenghua.yu@intel.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tony.luck@intel.com \
--cc=viro@zeniv.linux.org.uk \
/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
Powered by JetHome