Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl

[mv-sheeva.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 52ed77eb9713a932804cc8bb2b430ce4cdff4750..7bc46a9fe1f8709cadae67f329f57b0943403832 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -298,6 +298,7 @@ static const struct file_operations shm_file_operations = {
 #ifndef CONFIG_MMU
        .get_unmapped_area      = shm_get_unmapped_area,
 #endif
+       .llseek         = noop_llseek,
 };
 
 static const struct file_operations shm_file_operations_huge = {
@@ -305,6 +306,7 @@ static const struct file_operations shm_file_operations_huge = {
        .fsync          = shm_fsync,
        .release        = shm_release,
        .get_unmapped_area      = shm_get_unmapped_area,
+       .llseek         = noop_llseek,
 };
 
 int is_file_shm_hugepages(struct file *file)