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
8a024690
Commit
8a024690
authored
Mar 20, 2006
by
Tony Lindgren
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ARM: OMAP: Manual merge after updating to 2.6.16
Manual merge after updating to 2.6.16
parent
667a3448
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
5 deletions
+8
-5
kernel/timer.c
kernel/timer.c
+8
-5
No files found.
kernel/timer.c
View file @
8a024690
...
...
@@ -488,7 +488,8 @@ unsigned long next_timer_interrupt(void)
tvec_base_t
*
base
;
struct
list_head
*
list
;
struct
timer_list
*
nte
;
unsigned
long
expires
,
hr_expires
=
MAX_JIFFY_OFFSET
;
unsigned
long
expires
;
unsigned
long
hr_expires
=
MAX_JIFFY_OFFSET
;
ktime_t
hr_delta
;
tvec_t
*
varray
[
4
];
int
i
,
j
;
...
...
@@ -940,6 +941,8 @@ static inline void update_times(void)
void
do_timer
(
struct
pt_regs
*
regs
)
{
jiffies_64
++
;
/* prevent loading jiffies before storing new jiffies_64 value. */
barrier
();
update_times
();
softlockup_tick
(
regs
);
}
...
...
@@ -1351,8 +1354,8 @@ void __init init_timers(void)
#ifdef CONFIG_TIME_INTERPOLATION
struct
time_interpolator
*
time_interpolator
;
static
struct
time_interpolator
*
time_interpolator_list
;
struct
time_interpolator
*
time_interpolator
__read_mostly
;
static
struct
time_interpolator
*
time_interpolator_list
__read_mostly
;
static
DEFINE_SPINLOCK
(
time_interpolator_lock
);
static
inline
u64
time_interpolator_get_cycles
(
unsigned
int
src
)
...
...
@@ -1366,10 +1369,10 @@ static inline u64 time_interpolator_get_cycles(unsigned int src)
return
x
();
case
TIME_SOURCE_MMIO64
:
return
readq
((
void
__iomem
*
)
time_interpolator
->
addr
);
return
readq
_relaxed
((
void
__iomem
*
)
time_interpolator
->
addr
);
case
TIME_SOURCE_MMIO32
:
return
readl
((
void
__iomem
*
)
time_interpolator
->
addr
);
return
readl
_relaxed
((
void
__iomem
*
)
time_interpolator
->
addr
);
default:
return
get_cycles
();
}
...
...
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