aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/time.c
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-01-09 23:52:24 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:35 -0500
commit199e7056895c8427dec63e1d9841ceafcfaaf314 (patch)
treeb59eca8403ca504287228dde91d6f7aeb67b8c12 /kernel/time.c
parentf4818900fa3ee1c56e96f6dede7cc4c05ed383d1 (diff)
[PATCH] hrtimer: export deinlined mktime
This is now uninlined, but some modules use it. Make it a non-GPL export, since the inlined mktime() was also available that way. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/time.c')
-rw-r--r--kernel/time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/time.c b/kernel/time.c
index a0502aef43ce..bbc8ca194b59 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -619,6 +619,8 @@ mktime(const unsigned int year0, const unsigned int mon0,
619 )*60 + sec; /* finally seconds */ 619 )*60 + sec; /* finally seconds */
620} 620}
621 621
622EXPORT_SYMBOL(mktime);
623
622/** 624/**
623 * set_normalized_timespec - set timespec sec and nsec parts and normalize 625 * set_normalized_timespec - set timespec sec and nsec parts and normalize
624 * 626 *