Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
fe359bf5
Commit
fe359bf5
authored
Apr 08, 2005
by
Pete Popov
Committed by
Ralf Baechle
Oct 29, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed buglet with previous patch that broke non au1x builds.
Signed-off-by:
Ralf Baechle
<
ralf@linux-mips.org
>
parent
494900af
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
10 deletions
+8
-10
arch/mips/au1000/common/time.c
arch/mips/au1000/common/time.c
+1
-1
arch/mips/kernel/cpu-probe.c
arch/mips/kernel/cpu-probe.c
+7
-9
No files found.
arch/mips/au1000/common/time.c
View file @
fe359bf5
...
...
@@ -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_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
;
...
...
arch/mips/kernel/cpu-probe.c
View file @
fe359bf5
...
...
@@ -53,9 +53,10 @@ static void r4k_wait(void)
/* 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 @@ static inline void check_wait(void)
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
"
);
}
break
;
default:
printk
(
" unavailable.
\n
"
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment