Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 54633
b: refs/heads/master
c: 329c8d8
h: refs/heads/master
i:
  54631: 8da34c2
v: v3
  • Loading branch information
Eric Dumazet authored and Linus Torvalds committed May 8, 2007
1 parent 54e4665 commit 587bf72
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f75d222b836f7febfab0954c7612b23059d748cb
refs/heads/master: 329c8d84ca1946c037d9859dc251b56d8b1b4630
15 changes: 13 additions & 2 deletions trunk/include/linux/clocksource.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <linux/timex.h>
#include <linux/time.h>
#include <linux/list.h>
#include <linux/cache.h>
#include <linux/timer.h>
#include <asm/div64.h>
#include <asm/io.h>
Expand Down Expand Up @@ -52,6 +53,9 @@ struct clocksource;
* @xtime_interval: Used internally by timekeeping core, please ignore.
*/
struct clocksource {
/*
* First part of structure is read mostly
*/
char *name;
struct list_head list;
int rating;
Expand All @@ -63,8 +67,15 @@ struct clocksource {
cycle_t (*vread)(void);

/* timekeeping specific data, ignore */
cycle_t cycle_last, cycle_interval;
u64 xtime_nsec, xtime_interval;
cycle_t cycle_interval;
u64 xtime_interval;
/*
* Second part is written at each timer interrupt
* Keep it in a different cache line to dirty no
* more than one cache line.
*/
cycle_t cycle_last ____cacheline_aligned_in_smp;
u64 xtime_nsec;
s64 error;

#ifdef CONFIG_CLOCKSOURCE_WATCHDOG
Expand Down

0 comments on commit 587bf72

Please sign in to comment.