[Linux-mips-commits]CVS: linux/arch/mips/ite-boards/generic irq.c,1.1.1.1,1.2 it8172_setup.c,1.3,1.4 pmon_prom.c,1.1.1.1,1.2 reset.c,1.2,1.3 time.c,1.2,1.3

[Paul M. <le...@us...>]

Update of /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic
In directory usw-pr-cvs1:/tmp/cvs-serv13548/arch/mips/ite-boards/generic

Modified Files:
	irq.c it8172_setup.c pmon_prom.c reset.c time.c 
Log Message:
Sync to 2.4.7



Index: irq.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/irq.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** irq.c	2001/06/22 02:29:31	1.1.1.1
--- irq.c	2001/08/25 02:19:27	1.2
***************
*** 76,80 ****
  extern void mips_timer_interrupt(int irq, struct pt_regs *regs);
  extern asmlinkage void it8172_IRQ(void);
- irq_cpustat_t irq_stat [NR_CPUS];
  unsigned int local_bh_count[NR_CPUS];
  unsigned int local_irq_count[NR_CPUS];
--- 76,79 ----
***************
*** 108,121 ****
  
  void disable_irq(unsigned int irq_nr)
- {
-         unsigned long flags;
- 
-         save_and_cli(flags);
- 	disable_it8172_irq(irq_nr);
-         restore_flags(flags);
- }
- 
- /* FIXME */
- void disable_irq_nosync(unsigned int irq_nr)
  {
          unsigned long flags;
--- 107,110 ----

Index: it8172_setup.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/it8172_setup.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** it8172_setup.c	2001/07/07 19:41:39	1.3
--- it8172_setup.c	2001/08/25 02:19:27	1.4
***************
*** 67,71 ****
  extern void InitLPCInterface(void);
  extern char * __init prom_getcmdline(void);
! extern void it8172_restart(void);
  extern void it8172_halt(void);
  extern void it8172_power_off(void);
--- 67,71 ----
  extern void InitLPCInterface(void);
  extern char * __init prom_getcmdline(void);
! extern void it8172_restart(char *command);
  extern void it8172_halt(void);
  extern void it8172_power_off(void);
***************
*** 126,129 ****
--- 126,130 ----
  #endif	  
  
+ 	clear_cp0_status(ST0_FR);
  	rtc_ops = &it8172_rtc_ops;
  

Index: pmon_prom.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/pmon_prom.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** pmon_prom.c	2001/06/22 02:29:31	1.1.1.1
--- pmon_prom.c	2001/08/25 02:19:27	1.2
***************
*** 46,51 ****
  
  char arcs_cmdline[COMMAND_LINE_SIZE];
! int prom_argc;
! char **prom_argv, **prom_envp;
  
  typedef struct
--- 46,51 ----
  
  char arcs_cmdline[COMMAND_LINE_SIZE];
! extern int prom_argc;
! extern char **prom_argv, **prom_envp;
  
  typedef struct

Index: reset.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/reset.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** reset.c	2001/07/07 19:41:39	1.2
--- reset.c	2001/08/25 02:19:27	1.3
***************
*** 40,44 ****
  {
  	set_cp0_status(ST0_BEV | ST0_ERL);
! 	set_cp0_config(CONF_CM_UNCACHED);
  	flush_cache_all();
  	write_32bit_cp0_register(CP0_WIRED, 0);
--- 40,44 ----
  {
  	set_cp0_status(ST0_BEV | ST0_ERL);
! 	change_cp0_config(CONF_CM_CMASK, CONF_CM_UNCACHED);
  	flush_cache_all();
  	write_32bit_cp0_register(CP0_WIRED, 0);

Index: time.c
===================================================================
RCS file: /cvsroot/linux-mips/linux/arch/mips/ite-boards/generic/time.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** time.c	2001/07/06 01:56:11	1.2
--- time.c	2001/08/25 02:19:27	1.3
***************
*** 47,53 ****
  static unsigned int timer_tick_count=0;
  
- /* Cycle counter value at the previous timer interrupt.. */
- static unsigned int timerhi = 0, timerlo = 0;
- 
  static inline void ack_r4ktimer(unsigned long newval)
  {
--- 47,50 ----
***************
*** 123,136 ****
  void mips_timer_interrupt(struct pt_regs *regs)
  {
- 	unsigned long count;
- 
  	if (r4k_offset == 0)
  		goto null;
  
  	do {
- 		count = read_32bit_cp0_register(CP0_COUNT);
- 		timerhi += (count < timerlo);   /* Wrap around */
- 		timerlo = count;
- 
  		kstat.irqs[0][MIPS_CPU_TIMER_IRQ]++;
  		do_timer(regs);
--- 120,127 ----
***************
*** 266,269 ****
--- 257,263 ----
  #define USECS_PER_JIFFY (1000000/HZ)
  
+ /* Cycle counter value at the previous timer interrupt.. */
+ 
+ static unsigned int timerhi = 0, timerlo = 0;
  
  /*