## Automatically generated incremental diff
## From:   linux-2.4.23-bk9
## To:     linux-2.4.23-bk10
## Robot:  $Id: make-incremental-diff,v 1.11 2002/02/20 02:59:33 hpa Exp $

diff -urN linux-2.4.23-bk9/Makefile linux-2.4.23-bk10/Makefile
--- linux-2.4.23-bk9/Makefile	2003-12-12 02:55:35.000000000 -0800
+++ linux-2.4.23-bk10/Makefile	2003-12-12 02:55:43.000000000 -0800
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 23
-EXTRAVERSION = -bk9
+EXTRAVERSION = -bk10
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
diff -urN linux-2.4.23-bk9/arch/cris/drivers/ds1302.c linux-2.4.23-bk10/arch/cris/drivers/ds1302.c
--- linux-2.4.23-bk9/arch/cris/drivers/ds1302.c	2003-08-25 04:44:39.000000000 -0700
+++ linux-2.4.23-bk10/arch/cris/drivers/ds1302.c	2003-12-12 02:55:43.000000000 -0800
@@ -346,6 +346,7 @@
 		{
 			struct rtc_time rtc_tm;
 						
+			memset(&rtc_tm, 0, sizeof (struct rtc_time));
 			get_rtc_time(&rtc_tm);						
 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
 				return -EFAULT;	
diff -urN linux-2.4.23-bk9/arch/cris/drivers/pcf8563.c linux-2.4.23-bk10/arch/cris/drivers/pcf8563.c
--- linux-2.4.23-bk9/arch/cris/drivers/pcf8563.c	2003-08-25 04:44:39.000000000 -0700
+++ linux-2.4.23-bk10/arch/cris/drivers/pcf8563.c	2003-12-12 02:55:43.000000000 -0800
@@ -220,6 +220,7 @@
 		{
 			struct rtc_time tm;
 
+			memset(&tm, 0, sizeof (struct rtc_time));
 			get_rtc_time(&tm);
 
 			if (copy_to_user((struct rtc_time *) arg, &tm, sizeof tm)) {
diff -urN linux-2.4.23-bk9/arch/m68k/bvme6000/rtc.c linux-2.4.23-bk10/arch/m68k/bvme6000/rtc.c
--- linux-2.4.23-bk9/arch/m68k/bvme6000/rtc.c	2003-06-13 07:51:31.000000000 -0700
+++ linux-2.4.23-bk10/arch/m68k/bvme6000/rtc.c	2003-12-12 02:55:44.000000000 -0800
@@ -54,6 +54,7 @@
 		/* Ensure clock and real-time-mode-register are accessible */
 		msr = rtc->msr & 0xc0;
 		rtc->msr = 0x40;
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		do {
 			wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
 			wtime.tm_min =  BCD2BIN(rtc->bcd_min);
diff -urN linux-2.4.23-bk9/arch/m68k/mvme16x/rtc.c linux-2.4.23-bk10/arch/m68k/mvme16x/rtc.c
--- linux-2.4.23-bk9/arch/m68k/mvme16x/rtc.c	2003-06-13 07:51:31.000000000 -0700
+++ linux-2.4.23-bk10/arch/m68k/mvme16x/rtc.c	2003-12-12 02:55:45.000000000 -0800
@@ -52,6 +52,7 @@
 		cli();
 		/* Ensure clock and real-time-mode-register are accessible */
 		rtc->ctrl = RTC_READ;
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		wtime.tm_sec =  BCD2BIN(rtc->bcd_sec);
 		wtime.tm_min =  BCD2BIN(rtc->bcd_min);
 		wtime.tm_hour = BCD2BIN(rtc->bcd_hr);
diff -urN linux-2.4.23-bk9/arch/ppc64/kernel/rtc.c linux-2.4.23-bk10/arch/ppc64/kernel/rtc.c
--- linux-2.4.23-bk9/arch/ppc64/kernel/rtc.c	2003-06-13 07:51:32.000000000 -0700
+++ linux-2.4.23-bk10/arch/ppc64/kernel/rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -96,6 +96,7 @@
 	switch (cmd) {
 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
 	{
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		ppc_md.get_rtc_time(&wtime);
 		break;
 	}
diff -urN linux-2.4.23-bk9/drivers/acorn/char/i2c.c linux-2.4.23-bk10/drivers/acorn/char/i2c.c
--- linux-2.4.23-bk9/drivers/acorn/char/i2c.c	2003-08-25 04:44:40.000000000 -0700
+++ linux-2.4.23-bk10/drivers/acorn/char/i2c.c	2003-12-12 02:55:47.000000000 -0800
@@ -166,6 +166,7 @@
 		break;
 
 	case RTC_RD_TIME:
+		memset(&rtctm, 0, sizeof(struct rtc_time));
 		get_rtc_time(&rtc_raw, &year);
 		rtctm.tm_sec  = rtc_raw.secs;
 		rtctm.tm_min  = rtc_raw.mins;
diff -urN linux-2.4.23-bk9/drivers/char/Config.in linux-2.4.23-bk10/drivers/char/Config.in
--- linux-2.4.23-bk9/drivers/char/Config.in	2003-12-12 02:55:40.000000000 -0800
+++ linux-2.4.23-bk10/drivers/char/Config.in	2003-12-12 02:55:47.000000000 -0800
@@ -267,7 +267,9 @@
       fi
    fi
    tristate '  ZF MachZ Watchdog' CONFIG_MACHZ_WDT
-   dep_tristate '  Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
+   if [ "$CONFIG_SGI_IP22" = "y" ]; then
+      dep_tristate '  Indy/I2 Hardware Watchdog' CONFIG_INDYDOG $CONFIG_SGI_IP22
+   fi
    dep_tristate '  AMD 766/768 TCO Timer/Watchdog' CONFIG_AMD7XX_TCO $CONFIG_EXPERIMENTAL
 fi
 endmenu
diff -urN linux-2.4.23-bk9/drivers/char/ds1286.c linux-2.4.23-bk10/drivers/char/ds1286.c
--- linux-2.4.23-bk9/drivers/char/ds1286.c	2003-12-12 02:55:40.000000000 -0800
+++ linux-2.4.23-bk10/drivers/char/ds1286.c	2003-12-12 02:55:47.000000000 -0800
@@ -173,7 +173,7 @@
 		 * means "don't care" or "match all". Only the tm_hour,
 		 * tm_min, and tm_sec values are filled in.
 		 */
-
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		ds1286_get_alm_time(&wtime);
 		break;
 	}
@@ -216,6 +216,7 @@
 	}
 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
 	{
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		ds1286_get_time(&wtime);
 		break;
 	}
diff -urN linux-2.4.23-bk9/drivers/char/efirtc.c linux-2.4.23-bk10/drivers/char/efirtc.c
--- linux-2.4.23-bk9/drivers/char/efirtc.c	2003-06-13 07:51:32.000000000 -0700
+++ linux-2.4.23-bk10/drivers/char/efirtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -118,6 +118,7 @@
 static void
 convert_from_efi_time(efi_time_t *eft, struct rtc_time *wtime)
 {
+	memset(&wtime, 0, sizeof(struct rtc_time));
 	wtime->tm_sec  = eft->second;
 	wtime->tm_min  = eft->minute;
 	wtime->tm_hour = eft->hour;
diff -urN linux-2.4.23-bk9/drivers/char/ip27-rtc.c linux-2.4.23-bk10/drivers/char/ip27-rtc.c
--- linux-2.4.23-bk9/drivers/char/ip27-rtc.c	2003-08-25 04:44:41.000000000 -0700
+++ linux-2.4.23-bk10/drivers/char/ip27-rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -83,6 +83,7 @@
 	switch (cmd) {
 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
 	{
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		get_rtc_time(&wtime);
 		break;
 	}
diff -urN linux-2.4.23-bk9/drivers/char/mips_rtc.c linux-2.4.23-bk10/drivers/char/mips_rtc.c
--- linux-2.4.23-bk9/drivers/char/mips_rtc.c	2003-08-25 04:44:41.000000000 -0700
+++ linux-2.4.23-bk10/drivers/char/mips_rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -82,6 +82,7 @@
 
 	switch (cmd) {
 	case RTC_RD_TIME:	/* Read the time/date from RTC  */
+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
 		curr_time = rtc_get_time();
 		to_tm(curr_time, &rtc_tm);
 		rtc_tm.tm_year -= 1900;
diff -urN linux-2.4.23-bk9/drivers/char/rtc.c linux-2.4.23-bk10/drivers/char/rtc.c
--- linux-2.4.23-bk9/drivers/char/rtc.c	2003-12-12 02:55:40.000000000 -0800
+++ linux-2.4.23-bk10/drivers/char/rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -376,7 +376,7 @@
 		 * means "don't care" or "match all". Only the tm_hour,
 		 * tm_min, and tm_sec values are filled in.
 		 */
-
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		get_rtc_alm_time(&wtime);
 		break; 
 	}
@@ -420,6 +420,7 @@
 	}
 	case RTC_RD_TIME:	/* Read the time/date from RTC	*/
 	{
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		get_rtc_time(&wtime);
 		break;
 	}
diff -urN linux-2.4.23-bk9/drivers/hil/hp_sdc_rtc.c linux-2.4.23-bk10/drivers/hil/hp_sdc_rtc.c
--- linux-2.4.23-bk9/drivers/hil/hp_sdc_rtc.c	2003-06-13 07:51:33.000000000 -0700
+++ linux-2.4.23-bk10/drivers/hil/hp_sdc_rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -561,6 +561,7 @@
         }
         case RTC_ALM_READ:      /* Read the present alarm time */
         {
+		memset(&ttime, 0, sizeof(struct timeval));
 		if (hp_sdc_rtc_read_mt(&ttime)) return -EFAULT;
                 break;
         }
@@ -609,6 +610,7 @@
         }
         case RTC_RD_TIME:       /* Read the time/date from RTC  */
         {
+		memset(&wtime, 0, sizeof(struct rtc_time));
 		if (hp_sdc_rtc_read_bbrtc(&wtime)) return -EFAULT;
                 break;
         }
diff -urN linux-2.4.23-bk9/drivers/macintosh/rtc.c linux-2.4.23-bk10/drivers/macintosh/rtc.c
--- linux-2.4.23-bk9/drivers/macintosh/rtc.c	2002-02-25 11:37:58.000000000 -0800
+++ linux-2.4.23-bk10/drivers/macintosh/rtc.c	2003-12-12 02:55:47.000000000 -0800
@@ -64,6 +64,7 @@
 	case RTC_RD_TIME:
 		if (ppc_md.get_rtc_time)
 		{
+			memset(&rtc_tm, 0, sizeof(struct rtc_time));
 			get_rtc_time(&rtc_tm);
 
 			if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
diff -urN linux-2.4.23-bk9/drivers/sbus/char/rtc.c linux-2.4.23-bk10/drivers/sbus/char/rtc.c
--- linux-2.4.23-bk9/drivers/sbus/char/rtc.c	2001-10-10 23:42:47.000000000 -0700
+++ linux-2.4.23-bk10/drivers/sbus/char/rtc.c	2003-12-12 02:55:48.000000000 -0800
@@ -89,6 +89,7 @@
 	switch (cmd)
 	{
 	case RTCGET:
+		memset(&rtc_tm, 0, sizeof(struct rtc_time));
 		get_rtc_time(&rtc_tm);
 
 		if (copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time)))
