diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 04:47:44 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 04:47:44 -0400 |
| commit | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (patch) | |
| tree | 390c07ea2c3b9631c2e8fe64c1a6feba0b503e8b /include/linux/clocksource.h | |
| parent | 08ef2e427b59393d68a65b16e97e894b662a5573 (diff) | |
| parent | f2b9726105824fdeea32a339e5072a358f89a25b (diff) | |
Merge branch 'sh/stable-updates' into sh-latest
Diffstat (limited to 'include/linux/clocksource.h')
| -rw-r--r-- | include/linux/clocksource.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/clocksource.h b/include/linux/clocksource.h index d4646b48dc4a..18a1baf31f2d 100644 --- a/include/linux/clocksource.h +++ b/include/linux/clocksource.h | |||
| @@ -188,6 +188,7 @@ struct clocksource { | |||
| 188 | #ifdef CONFIG_CLOCKSOURCE_WATCHDOG | 188 | #ifdef CONFIG_CLOCKSOURCE_WATCHDOG |
| 189 | /* Watchdog related data, used by the framework */ | 189 | /* Watchdog related data, used by the framework */ |
| 190 | struct list_head wd_list; | 190 | struct list_head wd_list; |
| 191 | cycle_t cs_last; | ||
| 191 | cycle_t wd_last; | 192 | cycle_t wd_last; |
| 192 | #endif | 193 | #endif |
| 193 | } ____cacheline_aligned; | 194 | } ____cacheline_aligned; |