From: Andrew Morton <akpm@osdl.org>
Date: Tue, 10 Jan 2006 04:52:24 +0000 (-0800)
Subject: [PATCH] hrtimer: export deinlined mktime
X-Git-Tag: v2.6.16-rc1~598
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=199e7056895c8427dec63e1d9841ceafcfaaf314;p=linux-2.6

[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>
---

diff --git a/kernel/time.c b/kernel/time.c
index a0502aef43..bbc8ca194b 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -619,6 +619,8 @@ mktime(const unsigned int year0, const unsigned int mon0,
 	)*60 + sec; /* finally seconds */
 }
 
+EXPORT_SYMBOL(mktime);
+
 /**
  * set_normalized_timespec - set timespec sec and nsec parts and normalize
  *