diff --git a/[refs] b/[refs] index bf824b3ed376..0a14586f7863 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd85d765b75db608500c783e5bc41b63627957c8 +refs/heads/master: 9e9e3941d0a3497c1e7fb9ce62059705825bb775 diff --git a/trunk/fs/proc/vmcore.c b/trunk/fs/proc/vmcore.c index 124e35442ac8..4063fb32f78c 100644 --- a/trunk/fs/proc/vmcore.c +++ b/trunk/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;