From 45226a13674299178ef31595decf8b0e26cf50bf Mon Sep 17 00:00:00 2001
From: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
Date: Sat, 22 Apr 2006 02:35:48 -0700
Subject: [PATCH] --- yaml --- r: 26102 b: refs/heads/master c:
 304dbdb7a4fbb7f40a6ad5c5836fdd456c233c63 h: refs/heads/master v: v3

---
 [refs]           | 2 +-
 trunk/mm/shmem.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9e41c83d703e..7fcd8692b821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3b5fd59fdd2e656dd4d10f2cedb41a7519b131b2
+refs/heads/master: 304dbdb7a4fbb7f40a6ad5c5836fdd456c233c63
diff --git a/trunk/mm/shmem.c b/trunk/mm/shmem.c
index 37eaf42ed2c6..4c5e68e4e9ae 100644
--- a/trunk/mm/shmem.c
+++ b/trunk/mm/shmem.c
@@ -46,6 +46,8 @@
 #include <linux/mempolicy.h>
 #include <linux/namei.h>
 #include <linux/ctype.h>
+#include <linux/migrate.h>
+
 #include <asm/uaccess.h>
 #include <asm/div64.h>
 #include <asm/pgtable.h>
@@ -2173,6 +2175,7 @@ static struct address_space_operations shmem_aops = {
 	.prepare_write	= shmem_prepare_write,
 	.commit_write	= simple_commit_write,
 #endif
+	.migratepage	= migrate_page,
 };
 
 static struct file_operations shmem_file_operations = {