CVS Update@linux-mips.org: linux

[ppopov@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ppopov@ftp.linux-mips.org       05/04/08 09:34:43

Modified files:
        arch/mips/au1000/common: time.c 
        arch/mips/kernel: cpu-probe.c 

Log message:
        Fixed buglet with previous patch that broke non au1x builds.

diff -urN linux/arch/mips/au1000/common/time.c 
linux/arch/mips/au1000/common/time.c
--- linux/arch/mips/au1000/common/time.c        2005/04/07 00:42:10     1.34
+++ linux/arch/mips/au1000/common/time.c        2005/04/08 08:34:43     1.35
@@ -57,7 +57,7 @@
 static unsigned long r4k_offset; /* Amount to increment compare reg each time 
*/
 static unsigned long r4k_cur;    /* What counter should be at next timer irq */
 int    no_au1xxx_32khz;
-int allow_au1k_wait = 0; /* default off for CP0 Counter */
+extern int allow_au1k_wait; /* default off for CP0 Counter */
 
 /* Cycle counter value at the previous timer interrupt.. */
 static unsigned int timerhi = 0, timerlo = 0;
diff -urN linux/arch/mips/kernel/cpu-probe.c linux/arch/mips/kernel/cpu-probe.c
--- linux/arch/mips/kernel/cpu-probe.c  2005/04/07 00:42:10     1.41
+++ linux/arch/mips/kernel/cpu-probe.c  2005/04/08 08:34:43     1.42
@@ -53,9 +53,10 @@
 
 /* The Au1xxx wait is available only if using 32khz counter or
  * external timer source, but specifically not CP0 Counter. */
+int allow_au1k_wait; 
 static void au1k_wait(void)
 {
-       unsigned long addr;
+       unsigned long addr = 0;
        /* using the wait instruction makes CP0 counter unusable */
        __asm__("la %0,au1k_wait\n\t"
                ".set mips3\n\t"
@@ -113,14 +114,11 @@
        case CPU_AU1500:
        case CPU_AU1550:
        case CPU_AU1200:
-               {
-                       extern int allow_au1k_wait; /* au1000/common/time.c */
-                       if (allow_au1k_wait) {
-                               cpu_wait = au1k_wait;
-                               printk(" available.\n");
-                       } else
-                               printk(" unavailable.\n");
-               }
+               if (allow_au1k_wait) {
+                       cpu_wait = au1k_wait;
+                       printk(" available.\n");
+               } else
+                       printk(" unavailable.\n");
                break;
        default:
                printk(" unavailable.\n");