kernel: update 3.14 to 3.14.32
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44302
This commit is contained in:
parent
84c6ee610b
commit
d81a8ad523
3 changed files with 7 additions and 12 deletions
|
@ -5,14 +5,14 @@ LINUX_RELEASE?=1
|
||||||
LINUX_VERSION-3.8 = .13
|
LINUX_VERSION-3.8 = .13
|
||||||
LINUX_VERSION-3.10 = .58
|
LINUX_VERSION-3.10 = .58
|
||||||
LINUX_VERSION-3.13 = .7
|
LINUX_VERSION-3.13 = .7
|
||||||
LINUX_VERSION-3.14 = .30
|
LINUX_VERSION-3.14 = .32
|
||||||
LINUX_VERSION-3.18 = .5
|
LINUX_VERSION-3.18 = .5
|
||||||
LINUX_VERSION-3.19 = -rc5
|
LINUX_VERSION-3.19 = -rc5
|
||||||
|
|
||||||
LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d
|
LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d
|
||||||
LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01
|
LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01
|
||||||
LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f
|
LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f
|
||||||
LINUX_KERNEL_MD5SUM-3.14.30 = 5926982f20bbef0988fca03b92fe43a5
|
LINUX_KERNEL_MD5SUM-3.14.32 = 3178fb8f6f1eafcffdd730fec68754f8
|
||||||
LINUX_KERNEL_MD5SUM-3.18.5 = b655fcbc4597aa4b0cbabcfc72983259
|
LINUX_KERNEL_MD5SUM-3.18.5 = b655fcbc4597aa4b0cbabcfc72983259
|
||||||
|
|
||||||
ifdef KERNEL_PATCHVER
|
ifdef KERNEL_PATCHVER
|
||||||
|
|
|
@ -14,8 +14,6 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
|
||||||
drivers/mtd/bcm47xxpart.c | 10 ++++++++++
|
drivers/mtd/bcm47xxpart.c | 10 ++++++++++
|
||||||
1 file changed, 10 insertions(+)
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c
|
|
||||||
index f14ec0f..40dd0db 100644
|
|
||||||
--- a/drivers/mtd/bcm47xxpart.c
|
--- a/drivers/mtd/bcm47xxpart.c
|
||||||
+++ b/drivers/mtd/bcm47xxpart.c
|
+++ b/drivers/mtd/bcm47xxpart.c
|
||||||
@@ -39,6 +39,7 @@
|
@@ -39,6 +39,7 @@
|
||||||
|
@ -26,10 +24,11 @@ index f14ec0f..40dd0db 100644
|
||||||
#define ML_MAGIC1 0x39685a42
|
#define ML_MAGIC1 0x39685a42
|
||||||
#define ML_MAGIC2 0x26594131
|
#define ML_MAGIC2 0x26594131
|
||||||
#define TRX_MAGIC 0x30524448
|
#define TRX_MAGIC 0x30524448
|
||||||
@@ -177,6 +178,15 @@ static int bcm47xxpart_parse(struct mtd_info *master,
|
@@ -176,6 +177,15 @@ static int bcm47xxpart_parse(struct mtd_
|
||||||
|
MTD_WRITEABLE);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
+
|
||||||
+ /* T_Meter */
|
+ /* T_Meter */
|
||||||
+ if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
|
+ if ((le32_to_cpu(buf[0x000 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
|
||||||
+ (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
|
+ (le32_to_cpu(buf[0x030 / 4]) & 0xFFFF0000) == T_METER_MAGIC &&
|
||||||
|
@ -38,10 +37,6 @@ index f14ec0f..40dd0db 100644
|
||||||
+ MTD_WRITEABLE);
|
+ MTD_WRITEABLE);
|
||||||
+ continue;
|
+ continue;
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
/* TRX */
|
/* TRX */
|
||||||
if (buf[0x000 / 4] == TRX_MAGIC) {
|
if (buf[0x000 / 4] == TRX_MAGIC) {
|
||||||
if (BCM47XXPART_MAX_PARTS - curr_part < 4) {
|
|
||||||
--
|
|
||||||
1.8.4.5
|
|
||||||
|
|
||||||
|
|
|
@ -133,7 +133,7 @@
|
||||||
}
|
}
|
||||||
--- a/mm/vmstat.c
|
--- a/mm/vmstat.c
|
||||||
+++ b/mm/vmstat.c
|
+++ b/mm/vmstat.c
|
||||||
@@ -1302,10 +1302,12 @@ static int __init setup_vmstat(void)
|
@@ -1303,10 +1303,12 @@ static int __init setup_vmstat(void)
|
||||||
put_online_cpus();
|
put_online_cpus();
|
||||||
#endif
|
#endif
|
||||||
#ifdef CONFIG_PROC_FS
|
#ifdef CONFIG_PROC_FS
|
||||||
|
|
Loading…
Reference in a new issue