diff options
| author | Sam Ravnborg <sam@mars.(none)> | 2005-09-09 19:28:28 +0200 |
|---|---|---|
| committer | Sam Ravnborg <sam@mars.(none)> | 2005-09-09 19:28:28 +0200 |
| commit | 86feeaa8120bb1b0ab21efed49e9754039395ef1 (patch) | |
| tree | 548ab411f20c74b6aebb839e01b6bc938ffa41f6 /arch | |
| parent | 8920e8f94c44e31a73bdf923b04721e26e88cadd (diff) | |
| download | op-kernel-dev-86feeaa8120bb1b0ab21efed49e9754039395ef1.zip op-kernel-dev-86feeaa8120bb1b0ab21efed49e9754039395ef1.tar.gz | |
kbuild: full dependency check on asm-offsets.h
Building asm-offsets.h has been moved to a seperate Kbuild file
located in the top-level directory. This allow us to share the
functionality across the architectures.
The old rules in architecture specific Makefiles will die
in subsequent patches.
Furhtermore the usual kbuild dependency tracking is now used
when deciding to rebuild asm-offsets.s. So we no longer risk
to fail a rebuild caused by asm-offsets.c dependencies being touched.
With this common rule-set we now force the same name across
all architectures. Following patches will fix the rest.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/Makefile | 9 | ||||
| -rw-r--r-- | arch/i386/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/vsyscall-sigreturn.S | 2 | ||||
| -rw-r--r-- | arch/i386/kernel/vsyscall.lds.S | 2 | ||||
| -rw-r--r-- | arch/i386/power/swsusp.S | 2 |
5 files changed, 4 insertions, 13 deletions
diff --git a/arch/i386/Makefile b/arch/i386/Makefile index bf7c9ba..0995199 100644 --- a/arch/i386/Makefile +++ b/arch/i386/Makefile @@ -156,15 +156,6 @@ install: vmlinux install kernel_install: $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install -prepare: include/asm-$(ARCH)/asm_offsets.h -CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h - -arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \ - include/config/MARKER - -include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s - $(call filechk,gen-asm-offsets) - archclean: $(Q)$(MAKE) $(clean)=arch/i386/boot diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S index 0480ca9..e437fb3 100644 --- a/arch/i386/kernel/head.S +++ b/arch/i386/kernel/head.S @@ -17,7 +17,7 @@ #include <asm/desc.h> #include <asm/cache.h> #include <asm/thread_info.h> -#include <asm/asm_offsets.h> +#include <asm/asm-offsets.h> #include <asm/setup.h> /* diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S index 68afa50..fadb5bc 100644 --- a/arch/i386/kernel/vsyscall-sigreturn.S +++ b/arch/i386/kernel/vsyscall-sigreturn.S @@ -7,7 +7,7 @@ */ #include <asm/unistd.h> -#include <asm/asm_offsets.h> +#include <asm/asm-offsets.h> /* XXX diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S index a797770..98699ca 100644 --- a/arch/i386/kernel/vsyscall.lds.S +++ b/arch/i386/kernel/vsyscall.lds.S @@ -3,7 +3,7 @@ * object prelinked to its virtual address, and with only one read-only * segment (that fits in one page). This script controls its layout. */ -#include <asm/asm_offsets.h> +#include <asm/asm-offsets.h> SECTIONS { diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S index c410528..c893b89 100644 --- a/arch/i386/power/swsusp.S +++ b/arch/i386/power/swsusp.S @@ -12,7 +12,7 @@ #include <linux/linkage.h> #include <asm/segment.h> #include <asm/page.h> -#include <asm/asm_offsets.h> +#include <asm/asm-offsets.h> .text |
