ia64: move nr-irqs.h to include/generated
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> Signed-off-by: Michal Marek <mmarek@suse.cz>
This commit is contained in:
parent
559df2e021
commit
4929d29c0d
|
@ -103,4 +103,4 @@ archprepare: make_nr_irqs_h FORCE
|
||||||
PHONY += make_nr_irqs_h FORCE
|
PHONY += make_nr_irqs_h FORCE
|
||||||
|
|
||||||
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
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
|
|
||||||
#include <linux/types.h>
|
#include <linux/types.h>
|
||||||
#include <linux/cpumask.h>
|
#include <linux/cpumask.h>
|
||||||
#include <asm-ia64/nr-irqs.h>
|
#include <generated/nr-irqs.h>
|
||||||
|
|
||||||
static __inline__ int
|
static __inline__ int
|
||||||
irq_canonicalize (int irq)
|
irq_canonicalize (int irq)
|
||||||
|
|
|
@ -81,17 +81,14 @@ define cmd_nr_irqs
|
||||||
endef
|
endef
|
||||||
|
|
||||||
# We use internal kbuild rules to avoid the "is up to date" message from make
|
# 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 \
|
arch/$(SRCARCH)/kernel/nr-irqs.s: arch/$(SRCARCH)/kernel/nr-irqs.c
|
||||||
$(wildcard $(srctree)/include/asm-ia64/*/irq.h)
|
|
||||||
$(Q)mkdir -p $(dir $@)
|
$(Q)mkdir -p $(dir $@)
|
||||||
$(call if_changed_dep,cc_s_c)
|
$(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 $@)
|
$(Q)mkdir -p $(dir $@)
|
||||||
$(call cmd,nr_irqs)
|
$(call cmd,nr_irqs)
|
||||||
|
|
||||||
clean-files += $(objtree)/include/asm-ia64/nr-irqs.h
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# native ivt.S, entry.S and fsys.S
|
# native ivt.S, entry.S and fsys.S
|
||||||
#
|
#
|
||||||
|
|
Loading…
Reference in New Issue