diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-06-17 10:22:04 +0000 |
commit | b9c13dc540403877ee43369ce0027f43c7cab928 (patch) | |
tree | dec25a80e17d7c6d67b6daf822c22f5d10db3dd5 /target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch | |
parent | 966f1ab30128279f7b07acda088f4f3399718867 (diff) | |
download | upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.gz upstream-b9c13dc540403877ee43369ce0027f43c7cab928.tar.bz2 upstream-b9c13dc540403877ee43369ce0027f43c7cab928.zip |
kernel: update 3.18 to 3.18.16
Changelogs:
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.15
* https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.16
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Backport of r46011.
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46015 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch')
-rw-r--r-- | target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch b/target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch index 329fe812cc..38b95d2eca 100644 --- a/target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch +++ b/target/linux/brcm47xx/patches-3.18/032-06-MIPS-BCM77xx-Remove-legacy-__cpuinit-data-sections-t.patch @@ -25,8 +25,6 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> arch/mips/mm/tlb-r4k.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c -index ab698ba..135a540 100644 --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c @@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void) @@ -38,8 +36,6 @@ index ab698ba..135a540 100644 { write_c0_pagemask(PM_DEFAULT_MASK); write_c0_wired(0); -diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h -index 7d56686..832e216 100644 --- a/arch/mips/include/asm/pgtable-32.h +++ b/arch/mips/include/asm/pgtable-32.h @@ -18,7 +18,7 @@ @@ -51,11 +47,9 @@ index 7d56686..832e216 100644 /* * - add_temporary_entry() add a temporary TLB entry. We use TLB entries -diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c -index 08318ec..5037d58 100644 --- a/arch/mips/mm/tlb-r4k.c +++ b/arch/mips/mm/tlb-r4k.c -@@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void) +@@ -411,7 +411,7 @@ int __init has_transparent_hugepage(void * lifetime of the system */ @@ -64,6 +58,3 @@ index 08318ec..5037d58 100644 __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1, unsigned long entryhi, unsigned long pagemask) --- -1.8.4.5 - |