diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 10:57:53 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 10:57:53 +0900 |
| commit | 8095e4e81b4bc38eef7e0be99f9ecc744eaa1683 (patch) | |
| tree | d3b5100db11784093e78513f3429022569b4bf7b /include/linux/time.h | |
| parent | 6b5f146535fe6969aeded9f00b0bc42b3783f7fd (diff) | |
| parent | e4aa937ec75df0eea0bee03bffa3303ad36c986b (diff) | |
Merge 3.10-rc3 into tty-next
We want these fixes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/time.h')
| -rw-r--r-- | include/linux/time.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 22d81b3c955b..d5d229b2e5af 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -117,14 +117,10 @@ static inline bool timespec_valid_strict(const struct timespec *ts) extern bool persistent_clock_exist; -#ifdef ALWAYS_USE_PERSISTENT_CLOCK -#define has_persistent_clock() true -#else static inline bool has_persistent_clock(void) { return persistent_clock_exist; } -#endif extern void read_persistent_clock(struct timespec *ts); extern void read_boot_clock(struct timespec *ts); |