diff options
| author | Jesper Nilsson <jespern@axis.com> | 2014-01-15 14:42:37 +0100 |
|---|---|---|
| committer | Jesper Nilsson <jespern@axis.com> | 2014-01-15 14:44:02 +0100 |
| commit | e269a869417cd4053b37da1b19186902d3cbf63b (patch) | |
| tree | 6d97e80f40859b62cfa8a1a634a1c3ad944681b1 /arch/cris/arch-v10/kernel/entry.S | |
| parent | e7672be573afa078e8d85d5ad0202b78bd6bd1fd (diff) | |
| download | linux-e269a869417cd4053b37da1b19186902d3cbf63b.tar.bz2 | |
Drop code for CRISv10 CPU simulator
That simulator is dead and redundant.
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v10/kernel/entry.S')
| -rw-r--r-- | arch/cris/arch-v10/kernel/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S index def0a530e9d4..81570fcd0412 100644 --- a/arch/cris/arch-v10/kernel/entry.S +++ b/arch/cris/arch-v10/kernel/entry.S @@ -457,7 +457,7 @@ IRQ1_interrupt: ba _Rexit ; Return the standard way nop wdog: -#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) +#if defined(CONFIG_ETRAX_WATCHDOG) ;; Check if we're waiting for reset to happen, as signalled by ;; hard_reset_now setting cause_of_death to a magic value. If so, just ;; get stuck until reset happens. @@ -523,7 +523,7 @@ _watchdogmsg: .ascii "Oops: bitten by watchdog\n\0" .previous -#endif /* CONFIG_ETRAX_WATCHDOG and not CONFIG_SVINTO_SIM */ +#endif /* CONFIG_ETRAX_WATCHDOG */ spurious_interrupt: di |