Commit e2d5df93 authored by Sam Ravnborg's avatar Sam Ravnborg

kbuild: alpha,x86_64 use generic asm-offsets.h support

Delete obsolete stuff from arch makefiles
Rename .h file to asm-offsets.h
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent e6ae744d
...@@ -108,20 +108,9 @@ $(boot)/vmlinux.gz: vmlinux ...@@ -108,20 +108,9 @@ $(boot)/vmlinux.gz: vmlinux
bootimage bootpfile bootpzfile: vmlinux bootimage bootpfile bootpzfile: vmlinux
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
prepare: 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: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
define archhelp define archhelp
echo '* boot - Compressed kernel image (arch/alpha/boot/vmlinux.gz)' echo '* boot - Compressed kernel image (arch/alpha/boot/vmlinux.gz)'
echo ' bootimage - SRM bootable image (arch/alpha/boot/bootimage)' echo ' bootimage - SRM bootable image (arch/alpha/boot/bootimage)'
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
*/ */
#include <linux/config.h> #include <linux/config.h>
#include <asm/asm_offsets.h> #include <asm/asm-offsets.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/pal.h> #include <asm/pal.h>
#include <asm/errno.h> #include <asm/errno.h>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/asm_offsets.h> #include <asm/asm-offsets.h>
.globl swapper_pg_dir .globl swapper_pg_dir
.globl _stext .globl _stext
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* Verify that we have not overflowed the stack. Oops if we have. * Verify that we have not overflowed the stack. Oops if we have.
*/ */
#include <asm/asm_offsets.h> #include <asm/asm-offsets.h>
.text .text
.set noat .set noat
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* uninitialized local variables in the act. * uninitialized local variables in the act.
*/ */
#include <asm/asm_offsets.h> #include <asm/asm-offsets.h>
.text .text
.set noat .set noat
......
...@@ -86,16 +86,6 @@ install fdimage fdimage144 fdimage288: vmlinux ...@@ -86,16 +86,6 @@ install fdimage fdimage144 fdimage288: vmlinux
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)
prepare: include/asm-$(ARCH)/offset.h
arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
include/config/MARKER
include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
$(call filechk,gen-asm-offsets)
CLEAN_FILES += include/asm-$(ARCH)/offset.h
define archhelp define archhelp
echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)' echo '* bzImage - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
echo ' install - Install kernel using' echo ' install - Install kernel using'
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#include <asm/dwarf2.h> #include <asm/dwarf2.h>
#include <asm/calling.h> #include <asm/calling.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/current.h> #include <asm/current.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/segment.h> #include <asm/segment.h>
.text .text
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
#include <asm/ia32_unistd.h> #include <asm/ia32_unistd.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
.text .text
.section .text.vsyscall,"ax" .section .text.vsyscall,"ax"
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/dwarf2.h> #include <asm/dwarf2.h>
#include <asm/calling.h> #include <asm/calling.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/msr.h> #include <asm/msr.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
ENTRY(swsusp_arch_suspend) ENTRY(swsusp_arch_suspend)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#define FIX_ALIGNMENT 1 #define FIX_ALIGNMENT 1
#include <asm/current.h> #include <asm/current.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
.text .text
......
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
#include <linux/linkage.h> #include <linux/linkage.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/errno.h> #include <asm/errno.h>
#include <asm/offset.h> #include <asm/asm-offsets.h>
#include <asm/thread_info.h> #include <asm/thread_info.h>
.text .text
......
...@@ -17,7 +17,7 @@ static inline struct task_struct *get_current(void) ...@@ -17,7 +17,7 @@ static inline struct task_struct *get_current(void)
#else #else
#ifndef ASM_OFFSET_H #ifndef ASM_OFFSET_H
#include <asm/offset.h> #include <asm/asm-offsets.h>
#endif #endif
#define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg #define GET_CURRENT(reg) movq %gs:(pda_pcurrent),reg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment