---

yaml --- r: 181071 b: refs/heads/master c: 7025bec h: refs/heads/master i: 181069: d454536 181067: 505eff0 181063: f88048a 181055: bd97e6b v: v3
git-mirror · Jan 5, 2010 · bd2da7b · bd2da7b
1 parent 0c9ea9c
commit bd2da7b
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 222 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4352fc1b12fae4c753a063a2f162ddf9277af774
+refs/heads/master: 7025bec9125b0a02edcaf22c2dce753bf2c95480
diff --git a/trunk/arch/sh/include/asm/ubc.h b/trunk/arch/sh/include/asm/ubc.h
diff --git a/trunk/arch/sh/include/cpu-sh2/cpu/ubc.h b/trunk/arch/sh/include/cpu-sh2/cpu/ubc.h
diff --git a/trunk/arch/sh/include/cpu-sh3/cpu/ubc.h b/trunk/arch/sh/include/cpu-sh3/cpu/ubc.h
diff --git a/trunk/arch/sh/include/cpu-sh4/cpu/ubc.h b/trunk/arch/sh/include/cpu-sh4/cpu/ubc.h
diff --git a/trunk/arch/sh/kernel/cpu/init.c b/trunk/arch/sh/kernel/cpu/init.c
@@ -24,9 +24,6 @@
 #include <asm/elf.h>
 #include <asm/io.h>
 #include <asm/smp.h>
-#ifdef CONFIG_SUPERH32
-#include <asm/ubc.h>
-#endif
 
 /*
  * Generic wrapper for command line arguments to disable on-chip
@@ -252,20 +249,19 @@ static void __init dsp_init(void)
 /**
  * sh_cpu_init
  *
- * This is our initial entry point for each CPU, and is invoked on the boot
- * CPU prior to calling start_kernel(). For SMP, a combination of this and
- * start_secondary() will bring up each processor to a ready state prior
- * to hand forking the idle loop.
+ * This is our initial entry point for each CPU, and is invoked on the
+ * boot CPU prior to calling start_kernel(). For SMP, a combination of
+ * this and start_secondary() will bring up each processor to a ready
+ * state prior to hand forking the idle loop.
  *
- * We do all of the basic processor init here, including setting up the
- * caches, FPU, DSP, kicking the UBC, etc. By the time start_kernel() is
- * hit (and subsequently platform_setup()) things like determining the
- * CPU subtype and initial configuration will all be done.
+ * We do all of the basic processor init here, including setting up
+ * the caches, FPU, DSP, etc. By the time start_kernel() is hit (and
+ * subsequently platform_setup()) things like determining the CPU
+ * subtype and initial configuration will all be done.
  *
  * Each processor family is still responsible for doing its own probing
  * and cache configuration in detect_cpu_and_cache_system().
  */
-
 asmlinkage void __init sh_cpu_init(void)
 {
 	current_thread_info()->cpu = hard_smp_processor_id();

diff --git a/trunk/arch/sh/kernel/process_32.c b/trunk/arch/sh/kernel/process_32.c
@@ -30,7 +30,6 @@
 #include <asm/mmu_context.h>
 #include <asm/pgalloc.h>
 #include <asm/system.h>
-#include <asm/ubc.h>
 #include <asm/fpu.h>
 #include <asm/syscalls.h>
 #include <asm/watchdog.h>