Merge HEAD from ../linux-2.6

[linux-2.6-omap-h63xx.git] / fs / proc / vmcore.c

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 124e35442ac8b8712922a0349ecde89f7596c4e4..4063fb32f78c210dd6c41690ff107966e68ed821 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -41,7 +41,7 @@ struct proc_dir_entry *proc_vmcore = NULL;
 
 /* Reads a page from the oldmem device from given offset. */
 static ssize_t read_from_oldmem(char *buf, size_t count,
-                            loff_t *ppos, int userbuf)
+                               u64 *ppos, int userbuf)
 {
        unsigned long pfn, offset;
        size_t nr_bytes;