patch-2.1.4 linux/drivers/char/rtc.c

• Lines: 54
• Date: Sun Oct 13 21:11:11 1996
• Orig file: v2.1.3/linux/drivers/char/rtc.c
• Orig date: Tue May 28 07:39:18 1996

diff -u --recursive --new-file v2.1.3/linux/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -174,7 +174,7 @@
 		data = rtc_irq_data;
 		rtc_irq_data = 0;
 		restore_flags(flags);
-		memcpy_tofs(buf, &data, sizeof(unsigned long));
+		copy_to_user(buf, &data, sizeof(unsigned long));
 		retval = sizeof(unsigned long);
 	}
 
@@ -254,7 +254,7 @@
 
 			get_rtc_alm_time(&alm_tm);
 
-			memcpy_tofs((struct rtc_time*)arg, &alm_tm, sizeof(struct rtc_time));
+			copy_to_user((struct rtc_time*)arg, &alm_tm, sizeof(struct rtc_time));
 			
 			return 0;
 		}
@@ -273,7 +273,7 @@
 			if (retval != 0 )
 				return retval;
 
-			memcpy_fromfs(&alm_tm, (struct rtc_time*)arg, sizeof(struct rtc_time));
+			copy_from_user(&alm_tm, (struct rtc_time*)arg, sizeof(struct rtc_time));
 
 			hrs = alm_tm.tm_hour;
 			min = alm_tm.tm_min;
@@ -314,7 +314,7 @@
 				return retval;
 
 			get_rtc_time(&rtc_tm);
-			memcpy_tofs((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time));
+			copy_to_user((struct rtc_time*)arg, &rtc_tm, sizeof(struct rtc_time));
 			return 0;
 		}
 		case RTC_SET_TIME:	/* Set the RTC */
@@ -333,7 +333,7 @@
 			if (retval !=0 )
 				return retval;
 
-			memcpy_fromfs(&rtc_tm, (struct rtc_time*)arg, sizeof(struct rtc_time));
+			copy_from_user(&rtc_tm, (struct rtc_time*)arg, sizeof(struct rtc_time));
 
 			yrs = rtc_tm.tm_year + 1900;
 			mon = rtc_tm.tm_mon + 1;   /* tm_mon starts at zero */
@@ -400,7 +400,7 @@
 			if (retval != 0)
 				return retval;
 
-			memcpy_tofs((unsigned long*)arg, &rtc_freq, sizeof(unsigned long));
+			copy_to_user((unsigned long*)arg, &rtc_freq, sizeof(unsigned long));
 			return 0;
 		}
 		case RTC_IRQP_SET:	/* Set periodic IRQ rate.	*/