diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 09:43:20 +0100 |
| commit | 65370bdf881e20907e7a53abab9b8c0bc5f60a6b (patch) | |
| tree | 0d32a494e873b7b92dbfab0e67ffeef597ee8108 /arch/cris/arch-v10/kernel/process.c | |
| parent | e207552e64ea053a33e856828ad7915484911d06 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
| download | op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.zip op-kernel-dev-65370bdf881e20907e7a53abab9b8c0bc5f60a6b.tar.gz | |
Merge branch 'linus' into core/locking
Refresh the topic.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/cris/arch-v10/kernel/process.c')
| -rw-r--r-- | arch/cris/arch-v10/kernel/process.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/cris/arch-v10/kernel/process.c b/arch/cris/arch-v10/kernel/process.c index 753e9a0..02b7834 100644 --- a/arch/cris/arch-v10/kernel/process.c +++ b/arch/cris/arch-v10/kernel/process.c @@ -56,14 +56,14 @@ void hard_reset_now (void) * code to know about it than the watchdog handler in entry.S and * this code, implementing hard reset through the watchdog. */ -#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) +#if defined(CONFIG_ETRAX_WATCHDOG) extern int cause_of_death; #endif printk("*** HARD RESET ***\n"); local_irq_disable(); -#if defined(CONFIG_ETRAX_WATCHDOG) && !defined(CONFIG_SVINTO_SIM) +#if defined(CONFIG_ETRAX_WATCHDOG) cause_of_death = 0xbedead; #else /* Since we dont plan to keep on resetting the watchdog, |
