[kernel] r6187 - dists/trunk/linux-2.6/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Mon Mar 13 19:45:40 2006
New Revision: 6187

Modified:
   dists/trunk/linux-2.6/debian/patches/mips-gettimeofday.patch
Log:
fix compilation error on SB1 1480


Modified: dists/trunk/linux-2.6/debian/patches/mips-gettimeofday.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/mips-gettimeofday.patch	(original)
+++ dists/trunk/linux-2.6/debian/patches/mips-gettimeofday.patch	Mon Mar 13 19:45:40 2006
@@ -112,10 +112,9 @@
  5 files changed, 73 insertions(+), 24 deletions(-)
 
 
-diff -urN linux-mips/arch/mips/kernel/time.c new/arch/mips/kernel/time.c
---- linux-mips/arch/mips/kernel/time.c	2006-01-10 11:21:15.000000000 +0000
-+++ new/arch/mips/kernel/time.c	2006-01-16 16:40:10.000000000 +0000
-@@ -423,6 +423,8 @@
+--- a/arch/mips/kernel/time.c
++++ b/arch/mips/kernel/time.c
+@@ -424,6 +424,8 @@ irqreturn_t timer_interrupt(int irq, voi
  	unsigned long j;
  	unsigned int count;
  
@@ -124,7 +123,7 @@
  	count = mips_hpt_read();
  	mips_timer_ack();
  
-@@ -440,7 +442,6 @@
+@@ -441,7 +443,6 @@ irqreturn_t timer_interrupt(int irq, voi
  	 * CMOS clock accordingly every ~11 minutes. rtc_set_time() has to be
  	 * called as close as possible to 500 ms before the new second starts.
  	 */
@@ -132,7 +131,7 @@
  	if (ntp_synced() &&
  	    xtime.tv_sec > last_rtc_update + 660 &&
  	    (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
-@@ -452,7 +453,6 @@
+@@ -453,7 +454,6 @@ irqreturn_t timer_interrupt(int irq, voi
  			last_rtc_update = xtime.tv_sec - 600;
  		}
  	}
@@ -140,7 +139,7 @@
  
  	/*
  	 * If jiffies has overflown in this timer_interrupt, we must
-@@ -495,6 +495,8 @@
+@@ -496,6 +496,8 @@ irqreturn_t timer_interrupt(int irq, voi
  		}
  	}
  
@@ -149,9 +148,8 @@
  	/*
  	 * In UP mode, we call local_timer_interrupt() to do profiling
  	 * and process accouting.
-diff -urN linux-mips/arch/mips/sibyte/sb1250/time.c new/arch/mips/sibyte/sb1250/time.c
---- linux-mips/arch/mips/sibyte/sb1250/time.c	2006-01-10 11:21:16.000000000 +0000
-+++ new/arch/mips/sibyte/sb1250/time.c	2006-01-16 16:39:27.000000000 +0000
+--- a/arch/mips/sibyte/sb1250/time.c
++++ b/arch/mips/sibyte/sb1250/time.c
 @@ -47,23 +47,51 @@
  #define IMR_IP3_VAL	K_INT_MAP_I1
  #define IMR_IP4_VAL	K_INT_MAP_I2
@@ -211,7 +209,7 @@
  	sb1250_mask_irq(cpu, irq);
  
  	/* Map the timer interrupt to ip[4] of this cpu */
-@@ -75,10 +103,10 @@
+@@ -75,10 +103,10 @@ void sb1250_time_init(void)
  	/* Disable the timer and set up the count */
  	__raw_writeq(0, IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
  #ifdef CONFIG_SIMULATION
@@ -224,7 +222,7 @@
  		     IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_INIT)));
  #endif
  
-@@ -103,7 +131,7 @@
+@@ -103,7 +131,7 @@ void sb1250_timer_interrupt(struct pt_re
  	int cpu = smp_processor_id();
  	int irq = K_INT_TIMER_0 + cpu;
  
@@ -233,7 +231,7 @@
  	____raw_writeq(M_SCD_TIMER_ENABLE | M_SCD_TIMER_MODE_CONTINUOUS,
  		       IOADDR(A_SCD_TIMER_REGISTER(cpu, R_SCD_TIMER_CFG)));
  
-@@ -122,15 +150,26 @@
+@@ -122,15 +150,26 @@ void sb1250_timer_interrupt(struct pt_re
  }
  
  /*
@@ -269,23 +267,24 @@
 +	hpt_offset = count;
 +	return;
 +}
-diff -urN linux-mips/arch/mips/sibyte/swarm/setup.c new/arch/mips/sibyte/swarm/setup.c
---- linux-mips/arch/mips/sibyte/swarm/setup.c	2006-01-10 11:21:16.000000000 +0000
-+++ new/arch/mips/sibyte/swarm/setup.c	2006-01-16 16:39:27.000000000 +0000
-@@ -70,6 +70,12 @@
+--- a/arch/mips/sibyte/swarm/setup.c
++++ b/arch/mips/sibyte/swarm/setup.c
+@@ -70,6 +70,14 @@ const char *get_system_type(void)
  	return "SiByte " SIBYTE_BOARD_NAME;
  }
  
 +void __init swarm_time_init(void)
 +{
++#if defined(CONFIG_SIBYTE_SB1250) || defined(CONFIG_SIBYTE_BCM112X)
 +	/* Setup HPT */
 +	sb1250_hpt_setup();
++#endif
 +}
 +
  void __init swarm_timer_setup(struct irqaction *irq)
  {
          /*
-@@ -109,6 +115,7 @@
+@@ -109,6 +117,7 @@ void __init plat_setup(void)
  
  	panic_timeout = 5;  /* For debug.  */
  
@@ -293,10 +292,9 @@
  	board_timer_setup = swarm_timer_setup;
  	board_be_handler = swarm_be_handler;
  
-diff -urN linux-mips/include/asm-mips/sibyte/sb1250.h new/include/asm-mips/sibyte/sb1250.h
---- linux-mips/include/asm-mips/sibyte/sb1250.h	2006-01-10 11:21:59.000000000 +0000
-+++ new/include/asm-mips/sibyte/sb1250.h	2006-01-16 16:39:27.000000000 +0000
-@@ -45,8 +45,8 @@
+--- a/include/asm-mips/sibyte/sb1250.h
++++ b/include/asm-mips/sibyte/sb1250.h
+@@ -45,8 +45,8 @@ extern unsigned int soc_type;
  extern unsigned int periph_rev;
  extern unsigned int zbbus_mhz;
  
@@ -306,9 +304,8 @@
  extern void sb1250_mask_irq(int cpu, int irq);
  extern void sb1250_unmask_irq(int cpu, int irq);
  extern void sb1250_smp_finish(void);
-diff -urN linux-mips/include/asm-mips/sibyte/sb1250_scd.h new/include/asm-mips/sibyte/sb1250_scd.h
---- linux-mips/include/asm-mips/sibyte/sb1250_scd.h	2006-01-10 11:21:59.000000000 +0000
-+++ new/include/asm-mips/sibyte/sb1250_scd.h	2006-01-16 16:39:27.000000000 +0000
+--- a/include/asm-mips/sibyte/sb1250_scd.h
++++ b/include/asm-mips/sibyte/sb1250_scd.h
 @@ -359,14 +359,15 @@
   */