From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 14 Mar 2011 23:57:41 +0000 (-0700)
Subject: .37 patches
X-Git-Tag: v2.6.37.5~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=794bdda648aa42cbf159f85eab1a6d67ac9af0d8;p=thirdparty%2Fkernel%2Fstable-queue.git

.37 patches
---

diff --git a/queue-2.6.37/nfs-fix-compilation-warning.patch b/queue-2.6.37/nfs-fix-compilation-warning.patch
new file mode 100644
index 00000000000..df6b11779ca
--- /dev/null
+++ b/queue-2.6.37/nfs-fix-compilation-warning.patch
@@ -0,0 +1,31 @@
+From 43b7c3f051dea504afccc39bcb56d8e26c2e0b77 Mon Sep 17 00:00:00 2001
+From: Jovi Zhang <bookjovi@gmail.com>
+Date: Wed, 2 Mar 2011 23:19:37 +0000
+Subject: nfs: fix compilation warning
+
+From: Jovi Zhang <bookjovi@gmail.com>
+
+commit 43b7c3f051dea504afccc39bcb56d8e26c2e0b77 upstream.
+
+this commit fix compilation warning as following:
+linux-2.6/fs/nfs/nfs4proc.c:3265: warning: comparison of distinct pointer types lacks a cast
+
+Signed-off-by: Jovi Zhang <bookjovi@gmail.com>
+Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ fs/nfs/nfs4proc.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -3226,7 +3226,7 @@ static int buf_to_pages_noslab(const voi
+ 	spages = pages;
+ 
+ 	do {
+-		len = min(PAGE_CACHE_SIZE, buflen);
++		len = min_t(size_t, PAGE_CACHE_SIZE, buflen);
+ 		newpage = alloc_page(GFP_KERNEL);
+ 
+ 		if (newpage == NULL)
diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index c1f0400d930..caacb4fc1b7 100644
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -14,3 +14,4 @@ rt2x00-fix-crash-on-usb-unplug.patch
 rt2x00-fix-hang-when-unplugging-usb-device-in-use.patch
 drm-i915-fix-calculation-of-backlight-value-in-combined-mode.patch
 block-fix-mis-synchronisation-in-blkdev_issue_zeroout.patch
+nfs-fix-compilation-warning.patch