diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-01 06:47:58 -0500 |
| commit | 55f2b78995826d549401bdf20abeac1832636bb6 (patch) | |
| tree | 931b31f3b6e0879df0f9a1d58ffd040d9a652f2e /arch/mips/alchemy/common/time.c | |
| parent | f5c1aa1537be39d8b9bb5279b5881d81898fd3cd (diff) | |
| parent | 92b9af9e4f144535c65aee673cfad309f25fa465 (diff) | |
Merge branch 'x86/urgent' into x86/pat
Diffstat (limited to 'arch/mips/alchemy/common/time.c')
| -rw-r--r-- | arch/mips/alchemy/common/time.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/alchemy/common/time.c b/arch/mips/alchemy/common/time.c index 6fd441d16af5..f58d4ffb8945 100644 --- a/arch/mips/alchemy/common/time.c +++ b/arch/mips/alchemy/common/time.c | |||
| @@ -118,7 +118,7 @@ void __init plat_time_init(void) | |||
| 118 | * setup counter 1 (RTC) to tick at full speed | 118 | * setup counter 1 (RTC) to tick at full speed |
| 119 | */ | 119 | */ |
| 120 | t = 0xffffff; | 120 | t = 0xffffff; |
| 121 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S) && t--) | 121 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_T1S) && --t) |
| 122 | asm volatile ("nop"); | 122 | asm volatile ("nop"); |
| 123 | if (!t) | 123 | if (!t) |
| 124 | goto cntr_err; | 124 | goto cntr_err; |
| @@ -127,7 +127,7 @@ void __init plat_time_init(void) | |||
| 127 | au_sync(); | 127 | au_sync(); |
| 128 | 128 | ||
| 129 | t = 0xffffff; | 129 | t = 0xffffff; |
| 130 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && t--) | 130 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t) |
| 131 | asm volatile ("nop"); | 131 | asm volatile ("nop"); |
| 132 | if (!t) | 132 | if (!t) |
| 133 | goto cntr_err; | 133 | goto cntr_err; |
| @@ -135,7 +135,7 @@ void __init plat_time_init(void) | |||
| 135 | au_sync(); | 135 | au_sync(); |
| 136 | 136 | ||
| 137 | t = 0xffffff; | 137 | t = 0xffffff; |
| 138 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && t--) | 138 | while ((au_readl(SYS_COUNTER_CNTRL) & SYS_CNTRL_C1S) && --t) |
| 139 | asm volatile ("nop"); | 139 | asm volatile ("nop"); |
| 140 | if (!t) | 140 | if (!t) |
| 141 | goto cntr_err; | 141 | goto cntr_err; |