From 99cb70a739bb5d78476ed94b1340e3541e726805 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Wed, 24 Apr 2013 21:41:20 +0200
Subject: [PATCH] --- yaml --- r: 362723 b: refs/heads/master c:
 cf3fa17c2003dd9d1534e7da2d462132e1b70811 h: refs/heads/master i:   362721:
 9ed0ac04eb2891701cd44a9416cd607f43916c44   362719:
 31dadd9521c70084cddbbc05b2d1193b10545283 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/mips/include/asm/page.h | 2 +-
 trunk/crypto/algif_hash.c          | 2 --
 trunk/crypto/algif_skcipher.c      | 1 -
 trunk/drivers/gpio/gpio-pxa.c      | 7 ++++++-
 trunk/kernel/.gitignore            | 1 -
 6 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ec5605cb0886..9ffb9c6fb391 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 824282ca7d250bd7c301f221c3cd902ce906d731
+refs/heads/master: cf3fa17c2003dd9d1534e7da2d462132e1b70811
diff --git a/trunk/arch/mips/include/asm/page.h b/trunk/arch/mips/include/asm/page.h
index eab99e536b5c..99fc547af9d3 100644
--- a/trunk/arch/mips/include/asm/page.h
+++ b/trunk/arch/mips/include/asm/page.h
@@ -31,7 +31,7 @@
 #define PAGE_SHIFT	16
 #endif
 #define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
-#define PAGE_MASK	(~((1 << PAGE_SHIFT) - 1))
+#define PAGE_MASK	(~(PAGE_SIZE - 1))
 
 #ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
 #define HPAGE_SHIFT	(PAGE_SHIFT + PAGE_SHIFT - 3)
diff --git a/trunk/crypto/algif_hash.c b/trunk/crypto/algif_hash.c
index 0262210cad38..ef5356cd280a 100644
--- a/trunk/crypto/algif_hash.c
+++ b/trunk/crypto/algif_hash.c
@@ -161,8 +161,6 @@ static int hash_recvmsg(struct kiocb *unused, struct socket *sock,
 	else if (len < ds)
 		msg->msg_flags |= MSG_TRUNC;
 
-	msg->msg_namelen = 0;
-
 	lock_sock(sk);
 	if (ctx->more) {
 		ctx->more = 0;
diff --git a/trunk/crypto/algif_skcipher.c b/trunk/crypto/algif_skcipher.c
index a1c4f0a55583..6a6dfc062d2a 100644
--- a/trunk/crypto/algif_skcipher.c
+++ b/trunk/crypto/algif_skcipher.c
@@ -432,7 +432,6 @@ static int skcipher_recvmsg(struct kiocb *unused, struct socket *sock,
 	long copied = 0;
 
 	lock_sock(sk);
-	msg->msg_namelen = 0;
 	for (iov = msg->msg_iov, iovlen = msg->msg_iovlen; iovlen > 0;
 	     iovlen--, iov++) {
 		unsigned long seglen = iov->iov_len;
diff --git a/trunk/drivers/gpio/gpio-pxa.c b/trunk/drivers/gpio/gpio-pxa.c
index 9cc108d2b770..8325f580c0f1 100644
--- a/trunk/drivers/gpio/gpio-pxa.c
+++ b/trunk/drivers/gpio/gpio-pxa.c
@@ -642,7 +642,12 @@ static struct platform_driver pxa_gpio_driver = {
 		.of_match_table = of_match_ptr(pxa_gpio_dt_ids),
 	},
 };
-module_platform_driver(pxa_gpio_driver);
+
+static int __init pxa_gpio_init(void)
+{
+	return platform_driver_register(&pxa_gpio_driver);
+}
+postcore_initcall(pxa_gpio_init);
 
 #ifdef CONFIG_PM
 static int pxa_gpio_suspend(void)
diff --git a/trunk/kernel/.gitignore b/trunk/kernel/.gitignore
index b3097bde4e9c..ab4f1090f437 100644
--- a/trunk/kernel/.gitignore
+++ b/trunk/kernel/.gitignore
@@ -4,4 +4,3 @@
 config_data.h
 config_data.gz
 timeconst.h
-hz.bc