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

• Lines: 52
• Date: Mon Oct 28 14:29:21 1996
• Orig file: v2.1.5/linux/drivers/char/rtc.c
• Orig date: Wed Oct 16 10:48:13 1996

diff -u --recursive --new-file v2.1.5/linux/drivers/char/rtc.c linux/drivers/char/rtc.c
@@ -52,7 +52,7 @@
 #include <linux/mc146818rtc.h>
 
 #include <asm/io.h>
-#include <asm/segment.h>
+#include <asm/uaccess.h>
 #include <asm/system.h>
 
 /*
@@ -66,11 +66,11 @@
 
 static struct timer_list rtc_irq_timer;
 
-static int rtc_lseek(struct inode *inode, struct file *file, off_t offset,
-			int origin);
+static long long rtc_llseek(struct inode *inode, struct file *file,
+			    loff_t offset, int origin);
 
-static int rtc_read(struct inode *inode, struct file *file,
-			char *buf, int count);
+static long rtc_read(struct inode *inode, struct file *file,
+			char *buf, unsigned long count);
 
 static int rtc_ioctl(struct inode *inode, struct file *file,
 			unsigned int cmd, unsigned long arg);
@@ -133,13 +133,14 @@
  *	Now all the various file operations that we export.
  */
 
-static int rtc_lseek(struct inode *inode, struct file *file, off_t offset,
-	int origin)
+static long long rtc_llseek(struct inode *inode, struct file *file,
+			    loff_t offset, int origin)
 {
 	return -ESPIPE;
 }
 
-static int rtc_read(struct inode *inode, struct file *file, char *buf, int count)
+static long rtc_read(struct inode *inode, struct file *file, char *buf,
+		     unsigned long count)
 {
 	struct wait_queue wait = { current, NULL };
 	int retval;
@@ -507,7 +508,7 @@
  */
 
 static struct file_operations rtc_fops = {
-	rtc_lseek,
+	rtc_llseek,
 	rtc_read,
 	NULL,		/* No write */
 	NULL,		/* No readdir */