diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-04 21:39:31 -0500 |
| commit | c2cc87ca9561ddfe744d446789cc10f507e87db9 (patch) | |
| tree | d505fc0110eb1a3d8750ba2f67648c131f0d9aca /include/linux/timex.h | |
| parent | ce1eeb95fc4eb25109c00bea3e83a87eeff6b07d (diff) | |
| parent | 7015faa7df829876a0f931cd18aa6d7c24a1b581 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/timex.h')
| -rw-r--r-- | include/linux/timex.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/timex.h b/include/linux/timex.h index 7e050a2cc35b..04a4a8cb4ed3 100644 --- a/include/linux/timex.h +++ b/include/linux/timex.h | |||
| @@ -282,6 +282,13 @@ static inline int ntp_synced(void) | |||
| 282 | return !(time_status & STA_UNSYNC); | 282 | return !(time_status & STA_UNSYNC); |
| 283 | } | 283 | } |
| 284 | 284 | ||
| 285 | /* Required to safely shift negative values */ | ||
| 286 | #define shift_right(x, s) ({ \ | ||
| 287 | __typeof__(x) __x = (x); \ | ||
| 288 | __typeof__(s) __s = (s); \ | ||
| 289 | __x < 0 ? -(-__x >> __s) : __x >> __s; \ | ||
| 290 | }) | ||
| 291 | |||
| 285 | 292 | ||
| 286 | #ifdef CONFIG_TIME_INTERPOLATION | 293 | #ifdef CONFIG_TIME_INTERPOLATION |
| 287 | 294 | ||