From 7177071768ba57a2799a373cb3108e5c40b968e1 Mon Sep 17 00:00:00 2001
From: Olaf Hering <olh@suse.de>
Date: Sun, 7 Aug 2005 09:42:24 -0700
Subject: [PATCH] --- yaml --- r: 5696 b: refs/heads/master c:
 9ae5b3c703cce89a7d8ccf25fe16955ec6f016c0 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/swap.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d31077b95c90..41e3c4e788a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46bdac99382dd36e2d8c36cfb35d879b5c136965
+refs/heads/master: 9ae5b3c703cce89a7d8ccf25fe16955ec6f016c0
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 239f520cc49e..bfe3e763ccf2 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -7,7 +7,6 @@
 #include <linux/mmzone.h>
 #include <linux/list.h>
 #include <linux/sched.h>
-#include <linux/pagemap.h>
 
 #include <asm/atomic.h>
 #include <asm/page.h>
@@ -255,6 +254,8 @@ static inline void put_swap_token(struct mm_struct *mm)
 
 #define si_swapinfo(val) \
 	do { (val)->freeswap = (val)->totalswap = 0; } while (0)
+/* only sparc can not include linux/pagemap.h in this file
+ * so leave page_cache_release and release_pages undeclared... */
 #define free_page_and_swap_cache(page) \
 	page_cache_release(page)
 #define free_pages_and_swap_cache(pages, nr) \