From 3cd7e5a880782809c5d2eec84e207e252e50317d Mon Sep 17 00:00:00 2001
From: "Kirill A. Shutemov" <kirill@shutemov.name>
Date: Tue, 10 Feb 2009 15:21:44 +0200
Subject: [PATCH] --- yaml --- r: 131302 b: refs/heads/master c:
 b1aabecd55931ee754f6a913969516b26a0e682e h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/mm/page-writeback.c | 2 +-
 trunk/mm/slab.c           | 1 +
 trunk/mm/slob.c           | 1 +
 trunk/mm/slub.c           | 1 +
 5 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 49b74e3ea103..ba4662fc3108 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a4c6800f31ea8395628af5e7e490270ee5d0585
+refs/heads/master: b1aabecd55931ee754f6a913969516b26a0e682e
diff --git a/trunk/mm/page-writeback.c b/trunk/mm/page-writeback.c
index 3c84128596ba..6106a5c7ed44 100644
--- a/trunk/mm/page-writeback.c
+++ b/trunk/mm/page-writeback.c
@@ -1079,7 +1079,7 @@ int write_cache_pages(struct address_space *mapping,
 		pagevec_release(&pvec);
 		cond_resched();
 	}
-	if (!cycled && !done) {
+	if (!cycled) {
 		/*
 		 * range_cyclic:
 		 * We hit the last page and there is more work to be done: wrap
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index ddc41f337d58..4d00855629c4 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -4457,3 +4457,4 @@ size_t ksize(const void *objp)
 
 	return obj_size(virt_to_cache(objp));
 }
+EXPORT_SYMBOL(ksize);
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index bf7e8fc3aed8..52bc8a2bd9ef 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -521,6 +521,7 @@ size_t ksize(const void *block)
 	} else
 		return sp->page.private;
 }
+EXPORT_SYMBOL(ksize);
 
 struct kmem_cache {
 	unsigned int size, align;
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index bdc9abb08a23..0280eee6cf37 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -2736,6 +2736,7 @@ size_t ksize(const void *object)
 	 */
 	return s->size;
 }
+EXPORT_SYMBOL(ksize);
 
 void kfree(const void *x)
 {