lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed buglet with previous patch that broke non au1x builds.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Pete Popov
2005-04-08 08:34:43 +00:00
committed by Ralf Baechle
parent 494900af68
commit fe359bf584
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/mips/au1000/common/time.c
View File

@@ -57,7 +57,7 @@ unsigned long missed_heart_beats = 0;
static unsigned long r4k_offset; /* Amount to increment compare reg each time */ 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 */ static unsigned long r4k_cur; /* What counter should be at next timer irq */
int no_au1xxx_32khz; 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.. */ /* Cycle counter value at the previous timer interrupt.. */
static unsigned int timerhi = 0, timerlo = 0; static unsigned int timerhi = 0, timerlo = 0;

16
arch/mips/kernel/cpu-probe.c
View File

@@ -53,9 +53,10 @@ static void r4k_wait(void)
/* The Au1xxx wait is available only if using 32khz counter or /* The Au1xxx wait is available only if using 32khz counter or
* external timer source, but specifically not CP0 Counter. */ * external timer source, but specifically not CP0 Counter. */
int allow_au1k_wait;
static void au1k_wait(void) static void au1k_wait(void)
{ {
unsigned long addr; unsigned long addr = 0;
/* using the wait instruction makes CP0 counter unusable */ /* using the wait instruction makes CP0 counter unusable */
__asm__("la %0,au1k_wait\n\t" __asm__("la %0,au1k_wait\n\t"
".set mips3\n\t" ".set mips3\n\t"
@@ -113,14 +114,11 @@ static inline void check_wait(void)
case CPU_AU1500: case CPU_AU1500:
case CPU_AU1550: case CPU_AU1550:
case CPU_AU1200: case CPU_AU1200:
{ if (allow_au1k_wait) {
extern int allow_au1k_wait; /* au1000/common/time.c */ cpu_wait = au1k_wait;
if (allow_au1k_wait) { printk(" available.\n");
cpu_wait = au1k_wait; } else
printk(" available.\n"); printk(" unavailable.\n");
} else
printk(" unavailable.\n");
}
break; break;
default: default:
printk(" unavailable.\n"); printk(" unavailable.\n");