CRIS v32: Minor updates to kernel/process.c
- Shorten include paths for machine dependent header files. - Remove unused extern declaration of etrax_gpio_wake_up_check. - Register name for first timer is now regi_timer0.
This commit is contained in:
parent
693d9847b2
commit
8cca29b713
|
@ -12,17 +12,13 @@
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/fs.h>
|
#include <linux/fs.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <asm/arch/hwregs/reg_rdwr.h>
|
#include <hwregs/reg_rdwr.h>
|
||||||
#include <asm/arch/hwregs/reg_map.h>
|
#include <hwregs/reg_map.h>
|
||||||
#include <asm/arch/hwregs/timer_defs.h>
|
#include <hwregs/timer_defs.h>
|
||||||
#include <asm/arch/hwregs/intr_vect_defs.h>
|
#include <hwregs/intr_vect_defs.h>
|
||||||
|
|
||||||
extern void stop_watchdog(void);
|
extern void stop_watchdog(void);
|
||||||
|
|
||||||
#ifdef CONFIG_ETRAX_GPIO
|
|
||||||
extern void etrax_gpio_wake_up_check(void); /* Defined in drivers/gpio.c. */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
extern int cris_hlt_counter;
|
extern int cris_hlt_counter;
|
||||||
|
|
||||||
/* We use this if we don't have any better idle routine. */
|
/* We use this if we don't have any better idle routine. */
|
||||||
|
@ -82,7 +78,7 @@ hard_reset_now(void)
|
||||||
wd_ctrl.cmd = regk_timer_start;
|
wd_ctrl.cmd = regk_timer_start;
|
||||||
|
|
||||||
arch_enable_nmi();
|
arch_enable_nmi();
|
||||||
REG_WR(timer, regi_timer, rw_wd_ctrl, wd_ctrl);
|
REG_WR(timer, regi_timer0, rw_wd_ctrl, wd_ctrl);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue