Merge commit 'v2.6.38-rc4' into spi/next

[~andy/linux] / fs / proc / kcore.c

diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 6f37c391468d168ebcc5d1f366e244163f504f88..d245cb23dd726206806304022d0c83a0ab784656 100644 (file)
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -558,7 +558,7 @@ static int open_kcore(struct inode *inode, struct file *filp)
 static const struct file_operations proc_kcore_operations = {
        .read           = read_kcore,
        .open           = open_kcore,
-       .llseek         = generic_file_llseek,
+       .llseek         = default_llseek,
 };
 
 #ifdef CONFIG_MEMORY_HOTPLUG