diff options
author | Sam Ravnborg <sam@mars.(none)> | 2005-09-09 14:57:26 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@mars.(none)> | 2005-09-09 14:57:26 -0400 |
commit | 0013a85454c281faaf064ccb576e373a2881aac8 (patch) | |
tree | 06fc1af0a321631e89ad0f589214e291bd91d19a /arch/ppc64 | |
parent | 47003497dd819b10874a2291e54df7dc5cf8be57 (diff) |
kbuild: m68k,parisc,ppc,ppc64,s390,xtensa use generic asm-offsets.h support
Delete obsoleted parts form arch makefiles and rename to asm-offsets.h
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch/ppc64')
-rw-r--r-- | arch/ppc64/Makefile | 9 | ||||
-rw-r--r-- | arch/ppc64/kernel/cpu_setup_power4.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/entry.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/head.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/idle_power4.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/misc.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso32/cacheflush.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso32/datapage.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso32/gettimeofday.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso64/cacheflush.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso64/datapage.S | 2 | ||||
-rw-r--r-- | arch/ppc64/kernel/vdso64/gettimeofday.S | 2 | ||||
-rw-r--r-- | arch/ppc64/mm/hash_low.S | 2 | ||||
-rw-r--r-- | arch/ppc64/mm/slb_low.S | 2 |
14 files changed, 13 insertions, 22 deletions
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile index 8189953a372c..d795775a5cd7 100644 --- a/arch/ppc64/Makefile +++ b/arch/ppc64/Makefile | |||
@@ -116,13 +116,6 @@ archclean: | |||
116 | $(Q)$(MAKE) $(clean)=$(boot) | 116 | $(Q)$(MAKE) $(clean)=$(boot) |
117 | $(Q)rm -rf include3 | 117 | $(Q)rm -rf include3 |
118 | 118 | ||
119 | prepare: include/asm-ppc64/offsets.h | ||
120 | |||
121 | arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \ | ||
122 | include/config/MARKER | ||
123 | |||
124 | include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s | ||
125 | $(call filechk,gen-asm-offsets) | ||
126 | 119 | ||
127 | # Temporary hack until we have migrated to asm-powerpc | 120 | # Temporary hack until we have migrated to asm-powerpc |
128 | include/asm: include3/asm | 121 | include/asm: include3/asm |
@@ -136,5 +129,3 @@ define archhelp | |||
136 | echo ' sourced from arch/$(ARCH)/boot/ramdisk.image.gz' | 129 | echo ' sourced from arch/$(ARCH)/boot/ramdisk.image.gz' |
137 | echo ' (arch/$(ARCH)/boot/zImage.initrd)' | 130 | echo ' (arch/$(ARCH)/boot/zImage.initrd)' |
138 | endef | 131 | endef |
139 | |||
140 | CLEAN_FILES += include/asm-ppc64/offsets.h | ||
diff --git a/arch/ppc64/kernel/cpu_setup_power4.S b/arch/ppc64/kernel/cpu_setup_power4.S index 0482c063c26e..bfce609e8e6b 100644 --- a/arch/ppc64/kernel/cpu_setup_power4.S +++ b/arch/ppc64/kernel/cpu_setup_power4.S | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/cputable.h> | 16 | #include <asm/cputable.h> |
17 | #include <asm/ppc_asm.h> | 17 | #include <asm/ppc_asm.h> |
18 | #include <asm/offsets.h> | 18 | #include <asm/asm-offsets.h> |
19 | #include <asm/cache.h> | 19 | #include <asm/cache.h> |
20 | 20 | ||
21 | _GLOBAL(__970_cpu_preinit) | 21 | _GLOBAL(__970_cpu_preinit) |
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S index bf99b4a92f20..d133a49cdf89 100644 --- a/arch/ppc64/kernel/entry.S +++ b/arch/ppc64/kernel/entry.S | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/mmu.h> | 28 | #include <asm/mmu.h> |
29 | #include <asm/thread_info.h> | 29 | #include <asm/thread_info.h> |
30 | #include <asm/ppc_asm.h> | 30 | #include <asm/ppc_asm.h> |
31 | #include <asm/offsets.h> | 31 | #include <asm/asm-offsets.h> |
32 | #include <asm/cputable.h> | 32 | #include <asm/cputable.h> |
33 | 33 | ||
34 | #ifdef CONFIG_PPC_ISERIES | 34 | #ifdef CONFIG_PPC_ISERIES |
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index b436206e317d..58c314738c99 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S | |||
@@ -30,7 +30,7 @@ | |||
30 | #include <asm/mmu.h> | 30 | #include <asm/mmu.h> |
31 | #include <asm/systemcfg.h> | 31 | #include <asm/systemcfg.h> |
32 | #include <asm/ppc_asm.h> | 32 | #include <asm/ppc_asm.h> |
33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
34 | #include <asm/bug.h> | 34 | #include <asm/bug.h> |
35 | #include <asm/cputable.h> | 35 | #include <asm/cputable.h> |
36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
diff --git a/arch/ppc64/kernel/idle_power4.S b/arch/ppc64/kernel/idle_power4.S index 97e4a2655040..ca02afe2a795 100644 --- a/arch/ppc64/kernel/idle_power4.S +++ b/arch/ppc64/kernel/idle_power4.S | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | #include <asm/thread_info.h> | 21 | #include <asm/thread_info.h> |
22 | #include <asm/ppc_asm.h> | 22 | #include <asm/ppc_asm.h> |
23 | #include <asm/offsets.h> | 23 | #include <asm/asm-offsets.h> |
24 | 24 | ||
25 | #undef DEBUG | 25 | #undef DEBUG |
26 | 26 | ||
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S index 6d860c1d9fa0..757903544e24 100644 --- a/arch/ppc64/kernel/misc.S +++ b/arch/ppc64/kernel/misc.S | |||
@@ -26,7 +26,7 @@ | |||
26 | #include <asm/page.h> | 26 | #include <asm/page.h> |
27 | #include <asm/cache.h> | 27 | #include <asm/cache.h> |
28 | #include <asm/ppc_asm.h> | 28 | #include <asm/ppc_asm.h> |
29 | #include <asm/offsets.h> | 29 | #include <asm/asm-offsets.h> |
30 | #include <asm/cputable.h> | 30 | #include <asm/cputable.h> |
31 | 31 | ||
32 | .text | 32 | .text |
diff --git a/arch/ppc64/kernel/vdso32/cacheflush.S b/arch/ppc64/kernel/vdso32/cacheflush.S index 0ed7ea721715..c8db993574ee 100644 --- a/arch/ppc64/kernel/vdso32/cacheflush.S +++ b/arch/ppc64/kernel/vdso32/cacheflush.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | 17 | ||
18 | .text | 18 | .text |
19 | 19 | ||
diff --git a/arch/ppc64/kernel/vdso32/datapage.S b/arch/ppc64/kernel/vdso32/datapage.S index 29b6bd32e1f1..4f4eb0be3992 100644 --- a/arch/ppc64/kernel/vdso32/datapage.S +++ b/arch/ppc64/kernel/vdso32/datapage.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
17 | #include <asm/vdso.h> | 17 | #include <asm/vdso.h> |
18 | 18 | ||
diff --git a/arch/ppc64/kernel/vdso32/gettimeofday.S b/arch/ppc64/kernel/vdso32/gettimeofday.S index 2b48bf1fb109..07f1c1c650c8 100644 --- a/arch/ppc64/kernel/vdso32/gettimeofday.S +++ b/arch/ppc64/kernel/vdso32/gettimeofday.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | #include <asm/unistd.h> | 17 | #include <asm/unistd.h> |
18 | 18 | ||
19 | .text | 19 | .text |
diff --git a/arch/ppc64/kernel/vdso64/cacheflush.S b/arch/ppc64/kernel/vdso64/cacheflush.S index e0725b7b7003..d4a0ad28d534 100644 --- a/arch/ppc64/kernel/vdso64/cacheflush.S +++ b/arch/ppc64/kernel/vdso64/cacheflush.S | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/vdso.h> | 15 | #include <asm/vdso.h> |
16 | #include <asm/offsets.h> | 16 | #include <asm/asm-offsets.h> |
17 | 17 | ||
18 | .text | 18 | .text |
19 | 19 | ||
diff --git a/arch/ppc64/kernel/vdso64/datapage.S b/arch/ppc64/kernel/vdso64/datapage.S index 18afd971c9d9..ed6e599ae824 100644 --- a/arch/ppc64/kernel/vdso64/datapage.S +++ b/arch/ppc64/kernel/vdso64/datapage.S | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/config.h> | 12 | #include <linux/config.h> |
13 | #include <asm/processor.h> | 13 | #include <asm/processor.h> |
14 | #include <asm/ppc_asm.h> | 14 | #include <asm/ppc_asm.h> |
15 | #include <asm/offsets.h> | 15 | #include <asm/asm-offsets.h> |
16 | #include <asm/unistd.h> | 16 | #include <asm/unistd.h> |
17 | #include <asm/vdso.h> | 17 | #include <asm/vdso.h> |
18 | 18 | ||
diff --git a/arch/ppc64/kernel/vdso64/gettimeofday.S b/arch/ppc64/kernel/vdso64/gettimeofday.S index ed3f970ff05e..f6df8028570a 100644 --- a/arch/ppc64/kernel/vdso64/gettimeofday.S +++ b/arch/ppc64/kernel/vdso64/gettimeofday.S | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <asm/processor.h> | 14 | #include <asm/processor.h> |
15 | #include <asm/ppc_asm.h> | 15 | #include <asm/ppc_asm.h> |
16 | #include <asm/vdso.h> | 16 | #include <asm/vdso.h> |
17 | #include <asm/offsets.h> | 17 | #include <asm/asm-offsets.h> |
18 | 18 | ||
19 | .text | 19 | .text |
20 | /* | 20 | /* |
diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S index 35eb49e1b890..ee5a5d36bfa8 100644 --- a/arch/ppc64/mm/hash_low.S +++ b/arch/ppc64/mm/hash_low.S | |||
@@ -16,7 +16,7 @@ | |||
16 | #include <asm/page.h> | 16 | #include <asm/page.h> |
17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
18 | #include <asm/ppc_asm.h> | 18 | #include <asm/ppc_asm.h> |
19 | #include <asm/offsets.h> | 19 | #include <asm/asm-offsets.h> |
20 | #include <asm/cputable.h> | 20 | #include <asm/cputable.h> |
21 | 21 | ||
22 | .text | 22 | .text |
diff --git a/arch/ppc64/mm/slb_low.S b/arch/ppc64/mm/slb_low.S index 698d6b9ed6d1..a3a03da503bc 100644 --- a/arch/ppc64/mm/slb_low.S +++ b/arch/ppc64/mm/slb_low.S | |||
@@ -21,7 +21,7 @@ | |||
21 | #include <asm/page.h> | 21 | #include <asm/page.h> |
22 | #include <asm/mmu.h> | 22 | #include <asm/mmu.h> |
23 | #include <asm/ppc_asm.h> | 23 | #include <asm/ppc_asm.h> |
24 | #include <asm/offsets.h> | 24 | #include <asm/asm-offsets.h> |
25 | #include <asm/cputable.h> | 25 | #include <asm/cputable.h> |
26 | 26 | ||
27 | /* void slb_allocate(unsigned long ea); | 27 | /* void slb_allocate(unsigned long ea); |