Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
7b9726a7
Commit
7b9726a7
authored
Mar 06, 2008
by
Paul Mundt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sh: Fix up the sh64 build.
Signed-off-by:
Paul Mundt
<
lethal@linux-sh.org
>
parent
e7d7deca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
19 deletions
+7
-19
arch/sh/lib64/udelay.c
arch/sh/lib64/udelay.c
+7
-14
include/asm-sh/delay.h
include/asm-sh/delay.h
+0
-5
No files found.
arch/sh/lib64/udelay.c
View file @
7b9726a7
...
...
@@ -21,7 +21,7 @@
* a 1GHz box, that's about 2 seconds.
*/
void
__delay
(
int
loops
)
void
__delay
(
unsigned
long
loops
)
{
long
long
dummy
;
__asm__
__volatile__
(
"gettr tr0, %1
\n\t
"
...
...
@@ -33,24 +33,17 @@ void __delay(int loops)
:
"0"
(
loops
));
}
void
__udelay
(
unsigned
long
long
usecs
,
unsigned
long
lpj
)
inline
void
__const_udelay
(
unsigned
long
xloops
)
{
usecs
*=
(((
unsigned
long
long
)
HZ
<<
32
)
/
1000000
)
*
lpj
;
__delay
((
long
long
)
usecs
>>
32
);
__delay
(
xloops
*
(
HZ
*
cpu_data
[
raw_smp_processor_id
()].
loops_per_jiffy
));
}
void
__
ndelay
(
unsigned
long
long
nsecs
,
unsigned
long
lpj
)
void
__
udelay
(
unsigned
long
usecs
)
{
nsecs
*=
(((
unsigned
long
long
)
HZ
<<
32
)
/
1000000000
)
*
lpj
;
__delay
((
long
long
)
nsecs
>>
32
);
__const_udelay
(
usecs
*
0x000010c6
);
/* 2**32 / 1000000 */
}
void
udelay
(
unsigned
long
u
secs
)
void
__ndelay
(
unsigned
long
n
secs
)
{
__udelay
(
usecs
,
cpu_data
[
raw_smp_processor_id
()].
loops_per_jiffy
);
}
void
ndelay
(
unsigned
long
nsecs
)
{
__ndelay
(
nsecs
,
cpu_data
[
raw_smp_processor_id
()].
loops_per_jiffy
);
__const_udelay
(
nsecs
*
0x00000005
);
}
include/asm-sh/delay.h
View file @
7b9726a7
...
...
@@ -15,7 +15,6 @@ extern void __ndelay(unsigned long nsecs);
extern
void
__const_udelay
(
unsigned
long
xloops
);
extern
void
__delay
(
unsigned
long
loops
);
#ifdef CONFIG_SUPERH32
#define udelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_udelay() : __const_udelay((n) * 0x10c6ul)) : \
__udelay(n))
...
...
@@ -23,9 +22,5 @@ extern void __delay(unsigned long loops);
#define ndelay(n) (__builtin_constant_p(n) ? \
((n) > 20000 ? __bad_ndelay() : __const_udelay((n) * 5ul)) : \
__ndelay(n))
#else
extern
void
udelay
(
unsigned
long
usecs
);
extern
void
ndelay
(
unsigned
long
nsecs
);
#endif
#endif
/* __ASM_SH_DELAY_H */
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