diff options
author | Mike Frysinger <vapier.adi@gmail.com> | 2008-10-10 06:57:21 -0400 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-10-10 06:57:21 -0400 |
commit | 9a6f5ae1f1f3c37aad938a1c82db248a3f95a629 (patch) | |
tree | 434b8306bb63f9b2ac09caa30c8a8cf6b5e429f3 | |
parent | e482cad241c0b7108cbc94959307a73d19ba17d5 (diff) |
Blackfin arch: bfin_reset() is an internal reboot function ... everyone should go through machine_restart()
Signed-off-by: Mike Frysinger <vapier.adi@gmail.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r-- | arch/blackfin/include/asm/bfin-global.h | 1 | ||||
-rw-r--r-- | arch/blackfin/kernel/reboot.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/bfin-global.h b/arch/blackfin/include/asm/bfin-global.h index f842ea3bfc19..56dcb0a2d244 100644 --- a/arch/blackfin/include/asm/bfin-global.h +++ b/arch/blackfin/include/asm/bfin-global.h | |||
@@ -63,7 +63,6 @@ extern void bfin_dcache_init(void); | |||
63 | extern void init_exception_vectors(void); | 63 | extern void init_exception_vectors(void); |
64 | extern void program_IAR(void); | 64 | extern void program_IAR(void); |
65 | 65 | ||
66 | extern void bfin_reset(void); | ||
67 | extern asmlinkage void lower_to_irq14(void); | 66 | extern asmlinkage void lower_to_irq14(void); |
68 | extern asmlinkage void bfin_return_from_exception(void); | 67 | extern asmlinkage void bfin_return_from_exception(void); |
69 | extern asmlinkage void evt14_softirq(void); | 68 | extern asmlinkage void evt14_softirq(void); |
diff --git a/arch/blackfin/kernel/reboot.c b/arch/blackfin/kernel/reboot.c index b0a8f89cc9b6..d0ead640d992 100644 --- a/arch/blackfin/kernel/reboot.c +++ b/arch/blackfin/kernel/reboot.c | |||
@@ -20,7 +20,7 @@ | |||
20 | * the core reset. | 20 | * the core reset. |
21 | */ | 21 | */ |
22 | __attribute__((l1_text)) | 22 | __attribute__((l1_text)) |
23 | void bfin_reset(void) | 23 | static void bfin_reset(void) |
24 | { | 24 | { |
25 | /* Wait for completion of "system" events such as cache line | 25 | /* Wait for completion of "system" events such as cache line |
26 | * line fills so that we avoid infinite stalls later on as | 26 | * line fills so that we avoid infinite stalls later on as |