commit f4818900fa3ee1c56e96f6dede7cc4c05ed383d1
author Ingo Molnar <mingo@elte.hu> Mon Jan 09 20:52:23 2006 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> Tue Jan 10 08:01:35 2006 -0800
tree 63a53f60a01a33c1c6e755ba16b05de33008bb3d
parent 753be6222728996974e9e12c185108fcabbb7c6e

[PATCH] hrtimer: clean up mktime and make arguments const

add 'const' to mktime arguments, and clean it up a bit

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

kernel/time.c

diff --git a/kernel/time.c b/kernel/time.c
index fa56988..a0502ae 100644
--- a/kernel/time.c
+++ b/kernel/time.c
@@ -599,12 +599,15 @@
  * will already get problems at other places on 2038-01-19 03:14:08)
  */
 unsigned long
-mktime (unsigned int year, unsigned int mon,
-	unsigned int day, unsigned int hour,
-	unsigned int min, unsigned int sec)
+mktime(const unsigned int year0, const unsigned int mon0,
+       const unsigned int day, const unsigned int hour,
+       const unsigned int min, const unsigned int sec)
 {
-	if (0 >= (int) (mon -= 2)) {	/* 1..12 -> 11,12,1..10 */
-		mon += 12;		/* Puts Feb last since it has leap day */
+	unsigned int mon = mon0, year = year0;
+
+	/* 1..12 -> 11,12,1..10 */
+	if (0 >= (int) (mon -= 2)) {
+		mon += 12;	/* Puts Feb last since it has leap day */
 		year -= 1;
 	}
 
@@ -630,7 +633,7 @@
  * 	0 <= tv_nsec < NSEC_PER_SEC
  * For negative values only the tv_sec field is negative !
  */
-void set_normalized_timespec (struct timespec *ts, time_t sec, long nsec)
+void set_normalized_timespec(struct timespec *ts, time_t sec, long nsec)
 {
 	while (nsec >= NSEC_PER_SEC) {
 		nsec -= NSEC_PER_SEC;