diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 09:46:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 09:46:33 -0700 |
| commit | b7c142dbf1e7422d0be7f7faa3f1163ad9da9788 (patch) | |
| tree | 6e62c8654bb9c329f89246235062ac2a289960df /kernel | |
| parent | 0bd8df908de2aefe312d05bd25cd3abc21a6d1da (diff) | |
| parent | f2c5dbd7b7396457efc114f825acfdd4db4608f8 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/ubifs-2.6
* 'linux-next' of git://git.infradead.org/ubifs-2.6:
UBIFS: start using hrtimers
hrtimer: export ktime_add_safe
UBIFS: do not forget to register BDI device
UBIFS: allow sync option in rootflags
UBIFS: remove dead code
UBIFS: use anonymous device
UBIFS: return proper error code if the compr is not present
UBIFS: return error if link and unlink race
UBIFS: reset no_space flag after inode deletion
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/hrtimer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index b675a67c9ac3..9002958a96e7 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -380,6 +380,8 @@ ktime_t ktime_add_safe(const ktime_t lhs, const ktime_t rhs) return res; } +EXPORT_SYMBOL_GPL(ktime_add_safe); + #ifdef CONFIG_DEBUG_OBJECTS_TIMERS static struct debug_obj_descr hrtimer_debug_descr; |