On Tue, Jul 21, 2009 at 02:48:22PM -0700, Yu, Fenghua wrote: > >--- > > 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 58a7e46..e9fcac6 100644 > >--- a/arch/ia64/Makefile > >+++ b/arch/ia64/Makefile > >@@ -108,4 +108,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..cedd773 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/ia64/kernel/nr-irqs.s: arch/ia64/kernel/nr-irqs.c > > $(Q)mkdir -p $(dir $@) > > $(call if_changed_dep,cc_s_c) > > > > Could you keep the SRCARCH and srctree variables? There is no need to hard code them. I will update my patch to continue using SRCARCH. I usually hardcode the name of the arch because it makes the code IMO more explicit and thus more readable. The use of srctree is not needed but I can add that back too. Both changes are unrelated to the actual patch and I just rutinely made it look like I would have doen it. > > >-include/asm-ia64/nr-irqs.h: arch/$(SRCARCH)/kernel/nr-irqs.s > >+include/generated/nr-irqs.h: arch/ia64/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 > > # > > Ditto. OK. Sam -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
