Skip to content

Commit

Permalink
CRIS v32: Minor updates to kernel/process.c
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
Jesper Nilsson committed Feb 8, 2008
1 parent 693d984 commit 8cca29b
Showing 1 changed file with 5 additions and 9 deletions.
14 changes: 5 additions & 9 deletions arch/cris/arch-v32/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,13 @@
#include <linux/err.h>
#include <linux/fs.h>
#include <linux/slab.h>
#include <asm/arch/hwregs/reg_rdwr.h>
#include <asm/arch/hwregs/reg_map.h>
#include <asm/arch/hwregs/timer_defs.h>
#include <asm/arch/hwregs/intr_vect_defs.h>
#include <hwregs/reg_rdwr.h>
#include <hwregs/reg_map.h>
#include <hwregs/timer_defs.h>
#include <hwregs/intr_vect_defs.h>

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;

/* We use this if we don't have any better idle routine. */
Expand Down Expand Up @@ -82,7 +78,7 @@ hard_reset_now(void)
wd_ctrl.cmd = regk_timer_start;

arch_enable_nmi();
REG_WR(timer, regi_timer, rw_wd_ctrl, wd_ctrl);
REG_WR(timer, regi_timer0, rw_wd_ctrl, wd_ctrl);
}
#endif

Expand Down

0 comments on commit 8cca29b

Please sign in to comment.