X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=mm%2Fswapfile.c;h=f1f5ec783781cfebcbd4f3c5efe79336eaedcfa1;hb=115b384cf87249d76adb0b21aca11ee22128927d;hp=cc367f7e75d87f39f27a3f4c214a9174b61e87fd;hpb=090d2b185d8680fc26a2eaf4245d4171dcf4baf1;p=mv-sheeva.git

diff --git a/mm/swapfile.c b/mm/swapfile.c
index cc367f7e75d..f1f5ec78378 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -5,7 +5,6 @@
  *  Swap reorganised 29.12.95, Stephen Tweedie
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
 #include <linux/mman.h>
@@ -443,11 +442,12 @@ int swap_type_of(dev_t device)
 
 		if (!(swap_info[i].flags & SWP_WRITEOK))
 			continue;
+
 		if (!device) {
 			spin_unlock(&swap_lock);
 			return i;
 		}
-		inode = swap_info->swap_file->f_dentry->d_inode;
+		inode = swap_info[i].swap_file->f_dentry->d_inode;
 		if (S_ISBLK(inode->i_mode) &&
 		    device == MKDEV(imajor(inode), iminor(inode))) {
 			spin_unlock(&swap_lock);