Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe359bf5 authored by Pete Popov's avatar Pete Popov Committed by Ralf Baechle
Browse files

Fixed buglet with previous patch that broke non au1x builds. 



Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 494900af

arch/mips/au1000/common/time.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

arch/mips/kernel/cpu-probe.c

+7 −9
Original line number Original line Diff line number Diff line
@@ -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:

		{

			extern int allow_au1k_wait; /* au1000/common/time.c */

		if (allow_au1k_wait) {

		if (allow_au1k_wait) {

			cpu_wait = au1k_wait;

			cpu_wait = au1k_wait;

			printk(" available.\n");

			printk(" available.\n");

		} else

		} else

			printk(" unavailable.\n");

			printk(" unavailable.\n");

		}

		break;

		break;

	default:

	default:

		printk(" unavailable.\n");

		printk(" unavailable.\n");