diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-10 22:20:10 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-10 22:20:10 +1000 |
| commit | b3b8dc6c07cecc1f8d52d03f677206bdf9f794c9 (patch) | |
| tree | 5d5c3ac4de563d03759d98399030aac00be33023 | |
| parent | ff64208df7eb17c5526197449762ff5e04a95de6 (diff) | |
powerpc: Use reg.h instead of processor.h when we just want reg names
Now that the register names and bit definitions are all in reg.h,
use that instead of processor.h in assembly code in a few places.
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/fpu.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/head_32.S | 6 | ||||
| -rw-r--r-- | arch/powerpc/kernel/idle_6xx.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/vector.S | 2 | ||||
| -rw-r--r-- | arch/powerpc/lib/string.S | 5 | ||||
| -rw-r--r-- | arch/powerpc/mm/hash_low_32.S | 2 |
6 files changed, 7 insertions, 12 deletions
diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S index 04e95e810b2..563d445ff58 100644 --- a/arch/powerpc/kernel/fpu.S +++ b/arch/powerpc/kernel/fpu.S @@ -10,7 +10,7 @@ */ #include <linux/config.h> -#include <asm/processor.h> +#include <asm/reg.h> #include <asm/page.h> #include <asm/mmu.h> #include <asm/pgtable.h> diff --git a/arch/powerpc/kernel/head_32.S b/arch/powerpc/kernel/head_32.S index d9dbbd42674..108e78ef387 100644 --- a/arch/powerpc/kernel/head_32.S +++ b/arch/powerpc/kernel/head_32.S @@ -23,7 +23,7 @@ */ #include <linux/config.h> -#include <asm/processor.h> +#include <asm/reg.h> #include <asm/page.h> #include <asm/mmu.h> #include <asm/pgtable.h> @@ -55,8 +55,8 @@ 1: .text - .stabs "arch/ppc/kernel/",N_SO,0,0,0f - .stabs "head.S",N_SO,0,0,0f + .stabs "arch/powerpc/kernel/",N_SO,0,0,0f + .stabs "head_32.S",N_SO,0,0,0f 0: .globl _stext _stext: diff --git a/arch/powerpc/kernel/idle_6xx.S b/arch/powerpc/kernel/idle_6xx.S index 1a2194cf682..444fdcc769f 100644 --- a/arch/powerpc/kernel/idle_6xx.S +++ b/arch/powerpc/kernel/idle_6xx.S @@ -15,7 +15,7 @@ #include <linux/config.h> #include <linux/threads.h> -#include <asm/processor.h> +#include <asm/reg.h> #include <asm/page.h> #include <asm/cputable.h> #include <asm/thread_info.h> diff --git a/arch/powerpc/kernel/vector.S b/arch/powerpc/kernel/vector.S index 12cb90bc209..66b3d03c5fa 100644 --- a/arch/powerpc/kernel/vector.S +++ b/arch/powerpc/kernel/vector.S @@ -1,6 +1,6 @@ #include <linux/config.h> #include <asm/ppc_asm.h> -#include <asm/processor.h> +#include <asm/reg.h> /* * The routines below are in assembler so we can closely control the diff --git a/arch/powerpc/lib/string.S b/arch/powerpc/lib/string.S index 15d40e9ef8b..b9ca84ed892 100644 --- a/arch/powerpc/lib/string.S +++ b/arch/powerpc/lib/string.S @@ -13,11 +13,6 @@ #include <asm/errno.h> #include <asm/ppc_asm.h> - .text - .stabs "arch/powerpc/lib/",N_SO,0,0,0f - .stabs "string.S",N_SO,0,0,0f -0: - .section __ex_table,"a" #ifdef CONFIG_PPC64 .align 3 diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index 57278a8dd13..12ccd7155ba 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S @@ -24,7 +24,7 @@ */ #include <linux/config.h> -#include <asm/processor.h> +#include <asm/reg.h> #include <asm/page.h> #include <asm/pgtable.h> #include <asm/cputable.h> |