aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/adm5120
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:46 +0000
committerJonas Gorski <jogo@openwrt.org>2015-05-21 19:32:46 +0000
commit76d079204df113afa9e382a43abb5e1a2135150d (patch)
tree8e472ab203e8d6a47dc2e285b3becbfca35d04c6 /target/linux/adm5120
parent072937888e133f5e97fd05a7496eaf7eeae04079 (diff)
downloadupstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.gz
upstream-76d079204df113afa9e382a43abb5e1a2135150d.tar.bz2
upstream-76d079204df113afa9e382a43abb5e1a2135150d.zip
kernel: update 3.18 to 3.18.14
Changelogs: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.12 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.13 * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.14 Build tested on brcm63xx and ipq806x, runtested on brcm63xx. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 45711
Diffstat (limited to 'target/linux/adm5120')
-rw-r--r--target/linux/adm5120/patches-3.18/050-revert_rootfs_splits.patch14
-rw-r--r--target/linux/adm5120/patches-3.18/100-rootfs_split.patch6
2 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/adm5120/patches-3.18/050-revert_rootfs_splits.patch b/target/linux/adm5120/patches-3.18/050-revert_rootfs_splits.patch
index 8b1191a022..7181b91c5f 100644
--- a/target/linux/adm5120/patches-3.18/050-revert_rootfs_splits.patch
+++ b/target/linux/adm5120/patches-3.18/050-revert_rootfs_splits.patch
@@ -46,7 +46,7 @@
}
if (slave->offset == MTDPART_OFS_RETAIN) {
slave->offset = cur_offset;
-@@ -629,10 +628,8 @@ out_register:
+@@ -626,10 +625,8 @@ out_register:
return slave;
}
@@ -59,7 +59,7 @@
{
struct mtd_partition part;
struct mtd_part *p, *new;
-@@ -664,24 +661,21 @@ __mtd_add_partition(struct mtd_info *mas
+@@ -661,24 +658,21 @@ __mtd_add_partition(struct mtd_info *mas
end = offset + length;
mutex_lock(&mtd_partitions_mutex);
@@ -94,7 +94,7 @@
return ret;
err_inv:
-@@ -691,12 +685,6 @@ err_inv:
+@@ -688,12 +682,6 @@ err_inv:
}
EXPORT_SYMBOL_GPL(mtd_add_partition);
@@ -107,7 +107,7 @@
int mtd_del_partition(struct mtd_info *master, int partno)
{
struct mtd_part *slave, *next;
-@@ -720,166 +708,6 @@ int mtd_del_partition(struct mtd_info *m
+@@ -717,166 +705,6 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -274,7 +274,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -909,7 +737,6 @@ int add_mtd_partitions(struct mtd_info *
+@@ -906,7 +734,6 @@ int add_mtd_partitions(struct mtd_info *
mutex_unlock(&mtd_partitions_mutex);
add_mtd_device(&slave->mtd);
@@ -282,7 +282,7 @@
cur_offset = slave->offset + slave->mtd.size;
}
-@@ -939,30 +766,6 @@ static struct mtd_part_parser *get_parti
+@@ -936,30 +763,6 @@ static struct mtd_part_parser *get_parti
#define put_partition_parser(p) do { module_put((p)->owner); } while (0)
@@ -313,7 +313,7 @@
void register_mtd_parser(struct mtd_part_parser *p)
{
spin_lock(&part_parser_lock);
-@@ -1036,38 +839,6 @@ int parse_mtd_partitions(struct mtd_info
+@@ -1033,38 +836,6 @@ int parse_mtd_partitions(struct mtd_info
return ret;
}
diff --git a/target/linux/adm5120/patches-3.18/100-rootfs_split.patch b/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
index 22241e4fdf..44108a608a 100644
--- a/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
+++ b/target/linux/adm5120/patches-3.18/100-rootfs_split.patch
@@ -35,7 +35,7 @@
/*
* MTD methods which simply translate the effective address and pass through
-@@ -708,6 +710,144 @@ int mtd_del_partition(struct mtd_info *m
+@@ -705,6 +707,144 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -180,7 +180,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
-@@ -724,6 +864,9 @@ int add_mtd_partitions(struct mtd_info *
+@@ -721,6 +861,9 @@ int add_mtd_partitions(struct mtd_info *
struct mtd_part *slave;
uint64_t cur_offset = 0;
int i;
@@ -190,7 +190,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
-@@ -738,12 +881,53 @@ int add_mtd_partitions(struct mtd_info *
+@@ -735,12 +878,53 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd);