diff options
author | Paul Mundt <lethal@linux-sh.org> | 2008-09-17 18:24:02 +0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-09-17 18:24:02 +0400 |
commit | 81b669952ed5fe0d6f65f8b9a97d1fdeac93ff10 (patch) | |
tree | 219d4c3b78017d2df96457136d61948ccac267ec /arch/sh/include/asm/processor_64.h | |
parent | 8a80a5e9e89cf3aacf8165dd34b40c7c3fe91b4d (diff) | |
download | linux-81b669952ed5fe0d6f65f8b9a97d1fdeac93ff10.tar.xz |
sh: Consolidate struct sh_cpuinfo definitions across _32/_64 split.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include/asm/processor_64.h')
-rw-r--r-- | arch/sh/include/asm/processor_64.h | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/arch/sh/include/asm/processor_64.h b/arch/sh/include/asm/processor_64.h index ae19839f1d97..b0b4824dfc4c 100644 --- a/arch/sh/include/asm/processor_64.h +++ b/arch/sh/include/asm/processor_64.h @@ -17,7 +17,6 @@ #include <linux/compiler.h> #include <asm/page.h> #include <asm/types.h> -#include <asm/cache.h> #include <asm/ptrace.h> #include <cpu/registers.h> @@ -36,46 +35,6 @@ __asm__("gettr tr0, %1\n\t" \ : "1" (__dummy)); \ pc; }) -/* - * TLB information structure - * - * Defined for both I and D tlb, per-processor. - */ -struct tlb_info { - unsigned long long next; - unsigned long long first; - unsigned long long last; - - unsigned int entries; - unsigned int step; - - unsigned long flags; -}; - -struct sh_cpuinfo { - enum cpu_type type; - unsigned long loops_per_jiffy; - unsigned long asid_cache; - - unsigned int cpu_clock, master_clock, bus_clock, module_clock; - - /* Cache info */ - struct cache_info icache; - struct cache_info dcache; - struct cache_info scache; - - /* TLB info */ - struct tlb_info itlb; - struct tlb_info dtlb; - - unsigned long flags; -}; - -extern struct sh_cpuinfo cpu_data[]; -#define boot_cpu_data cpu_data[0] -#define current_cpu_data cpu_data[smp_processor_id()] -#define raw_current_cpu_data cpu_data[raw_smp_processor_id()] - #endif /* |