v2.4.9.12 -> v2.4.9.13

  - Manfred Spraul: /proc/pid/maps cleanup (and bugfix for non-x86)
  - Al Viro: "block device fs" - cleanup of page cache handling
  - Hugh Dickins: VM/shmem cleanups and swap search speedup
  - David Miller: sparc updates, soc driver typo fix, net updates
  - Jeff Garzik: network driver updates (dl2k, yellowfin and tulip)
  - Neil Brown: knfsd cleanups and fixues
  - Ben LaHaise: zap_page_range merge from -ac

5 files changed, 9 insertions, 0 deletions

diff --git a/include/linux/eeprom.h b/include/linux/eeprom.h
index ef070e148042..0f0642271857 100644
--- a/include/linux/eeprom.h
+++ b/include/linux/eeprom.h
@@ -1,5 +1,6 @@
 /* credit winbond-840.c
  */
+#include <asm/io.h>
 struct eeprom_ops {
 	void	(*set_cs)(void *ee);
 	void	(*clear_cs)(void *ee);
diff --git a/include/linux/lockd/xdr.h b/include/linux/lockd/xdr.h
index 9354683a720f..51657ceffa2d 100644
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
@@ -26,6 +26,7 @@
 /* Lock info passed via NLM */
 struct nlm_lock {
 	char *			caller;
+	int			len; 	/* length of "caller" */
 	struct nfs_fh		fh;
 	struct xdr_netobj	oh;
 	struct file_lock	fl;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 48f0831d62f6..8f9e8bfbce88 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -487,6 +487,8 @@ static inline int exclusive_swap_page(struct page *page)
 	return count == 3;				/* =3: total */
 }
 
+extern void __free_pte(pte_t);
+
 /* mmap.c */
 extern void lock_vma_mappings(struct vm_area_struct *);
 extern void unlock_vma_mappings(struct vm_area_struct *);
diff --git a/include/linux/sonypi.h b/include/linux/sonypi.h
index b563a2922275..29a0c691883c 100644
--- a/include/linux/sonypi.h
+++ b/include/linux/sonypi.h
@@ -67,6 +67,10 @@
 #define SONYPI_EVENT_FNKEY_S			29
 #define SONYPI_EVENT_FNKEY_B			30
 #define SONYPI_EVENT_BLUETOOTH_PRESSED		31
+#define SONYPI_EVENT_PKEY_P1                    32
+#define SONYPI_EVENT_PKEY_P2                    33
+#define SONYPI_EVENT_PKEY_P3                    34
+
 
 /* brightness etc. ioctls */
 #define SONYPI_IOCGBRT	_IOR('v', 0, __u8)
diff --git a/include/linux/sunrpc/xdr.h b/include/linux/sunrpc/xdr.h
index f0ec6e7b2e72..facaddcd50c8 100644
--- a/include/linux/sunrpc/xdr.h
+++ b/include/linux/sunrpc/xdr.h
@@ -62,6 +62,7 @@ typedef int	(*kxdrproc_t)(void *rqstp, u32 *data, void *obj);
 u32 *	xdr_encode_array(u32 *p, const char *s, unsigned int len);
 u32 *	xdr_encode_string(u32 *p, const char *s);
 u32 *	xdr_decode_string(u32 *p, char **sp, int *lenp, int maxlen);
+u32 *	xdr_decode_string_inplace(u32 *p, char **sp, int *lenp, int maxlen);
 u32 *	xdr_encode_netobj(u32 *p, const struct xdr_netobj *);
 u32 *	xdr_decode_netobj(u32 *p, struct xdr_netobj *);
 u32 *	xdr_decode_netobj_fixed(u32 *p, void *obj, unsigned int len);