kernel: refresh patches

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

SVN-Revision: 41909
This commit is contained in:
Hauke Mehrtens 2014-07-31 21:33:58 +00:00
parent 83c803086c
commit 2b32939040
17 changed files with 39 additions and 49 deletions

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -331,7 +331,14 @@ static int part_lock(struct mtd_info *mt @@ -332,7 +332,14 @@ static int part_lock(struct mtd_info *mt
static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -356,7 +356,14 @@ static int part_unlock(struct mtd_info * @@ -357,7 +357,14 @@ static int part_unlock(struct mtd_info *
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);
if ((len + ofs) > mtd->size) if ((len + ofs) > mtd->size)
return -EINVAL; return -EINVAL;

View file

@ -29,7 +29,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -307,8 +306,9 @@ done: @@ -294,8 +293,9 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
@ -40,7 +40,7 @@
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l @@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
goto no_restart; goto no_restart;
} }

View file

@ -96,8 +96,6 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++------------------------- arch/arm/lib/memset.S | 85 ++++++++++++++++++++++++++-------------------------
1 file changed, 44 insertions(+), 41 deletions(-) 1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index 650d5923ab83..d912e7397ecc 100644
--- a/arch/arm/lib/memset.S --- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S
@@ -19,9 +19,9 @@ @@ -19,9 +19,9 @@
@ -250,6 +248,3 @@ index 650d5923ab83..d912e7397ecc 100644
+ strneb r1, [ip], #1 + strneb r1, [ip], #1
mov pc, lr mov pc, lr
ENDPROC(memset) ENDPROC(memset)
--
1.8.3.2

View file

@ -24,8 +24,6 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/lib/memset.S | 33 +++++++++++++-------------------- arch/arm/lib/memset.S | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-) 1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S
index d912e7397ecc..94b0650ea98f 100644
--- a/arch/arm/lib/memset.S --- a/arch/arm/lib/memset.S
+++ b/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S
@@ -14,31 +14,15 @@ @@ -14,31 +14,15 @@
@ -78,6 +76,3 @@ index d912e7397ecc..94b0650ea98f 100644
+ add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3)) + add r2, r2, r3 @ 1 (r2 = r2 - (4 - r3))
+ b 1b + b 1b
ENDPROC(memset) ENDPROC(memset)
--
1.8.3.2

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -330,7 +330,14 @@ static int part_lock(struct mtd_info *mt @@ -331,7 +331,14 @@ static int part_lock(struct mtd_info *mt
static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);

View file

@ -29,7 +29,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -307,8 +306,9 @@ done: @@ -294,8 +293,9 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
@ -40,7 +40,7 @@
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l @@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
goto no_restart; goto no_restart;
} }

View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/mtdpart.c --- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c +++ b/drivers/mtd/mtdpart.c
@@ -330,7 +330,14 @@ static int part_lock(struct mtd_info *mt @@ -331,7 +331,14 @@ static int part_lock(struct mtd_info *mt
static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len) static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
{ {
struct mtd_part *part = PART(mtd); struct mtd_part *part = PART(mtd);

View file

@ -29,7 +29,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/timer.h> #include <linux/timer.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -307,8 +306,9 @@ done: @@ -294,8 +293,9 @@ done:
static void netdev_trig_timer(unsigned long arg) static void netdev_trig_timer(unsigned long arg)
{ {
struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg; struct led_netdev_data *trigger_data = (struct led_netdev_data *)arg;
@ -40,7 +40,7 @@
write_lock(&trigger_data->lock); write_lock(&trigger_data->lock);
@@ -318,7 +318,7 @@ static void netdev_trig_timer(unsigned l @@ -305,7 +305,7 @@ static void netdev_trig_timer(unsigned l
goto no_restart; goto no_restart;
} }

View file

@ -1,6 +1,6 @@
--- a/fs/Kconfig --- a/fs/Kconfig
+++ b/fs/Kconfig +++ b/fs/Kconfig
@@ -62,6 +62,11 @@ config FILE_LOCKING @@ -61,6 +61,11 @@ config FILE_LOCKING
for filesystems like NFS and for the flock() system for filesystems like NFS and for the flock() system
call. Disabling this option saves about 11k. call. Disabling this option saves about 11k.