summaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-06-30 13:10:12 +0000
committerJonas Gorski <jogo@openwrt.org>2013-06-30 13:10:12 +0000
commit0d9f760f272f3ccb3abcaca8e678734b666e234c (patch)
tree14237dc1b483b6fefbf696164b80f594e9826e49 /target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch
parent6a4e78dca6ecd4325504f0a74cd1816275157eea (diff)
downloadmaster-31e0f0ae-0d9f760f272f3ccb3abcaca8e678734b666e234c.tar.gz
master-31e0f0ae-0d9f760f272f3ccb3abcaca8e678734b666e234c.tar.bz2
master-31e0f0ae-0d9f760f272f3ccb3abcaca8e678734b666e234c.zip
kernel: update linux 3.9 to 3.9.8
Includes memory allocation fixes as well as several networking fixes. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 37103
Diffstat (limited to 'target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch')
-rw-r--r--target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch9
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch b/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch
index 90ca369901..bfb6ca2022 100644
--- a/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch
+++ b/target/linux/ramips/patches-3.9/0121-MIPS-add-detect_memory_region.patch
@@ -13,8 +13,6 @@ Patchwork: http://patchwork.linux-mips.org/patch/5178/
arch/mips/kernel/setup.c | 20 ++++++++++++++++++++
2 files changed, 21 insertions(+)
-diff --git a/arch/mips/include/asm/bootinfo.h b/arch/mips/include/asm/bootinfo.h
-index b71dd5b..4d2cdea 100644
--- a/arch/mips/include/asm/bootinfo.h
+++ b/arch/mips/include/asm/bootinfo.h
@@ -104,6 +104,7 @@ struct boot_mem_map {
@@ -25,8 +23,6 @@ index b71dd5b..4d2cdea 100644
extern void prom_init(void);
extern void prom_free_prom_memory(void);
-diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
-index 4c774d5..7325793 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -23,6 +23,7 @@
@@ -37,7 +33,7 @@ index 4c774d5..7325793 100644
#include <asm/addrspace.h>
#include <asm/bootinfo.h>
-@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t start, phys_t size, long type)
+@@ -122,6 +123,25 @@ void __init add_memory_region(phys_t sta
boot_mem_map.nr_map++;
}
@@ -63,6 +59,3 @@ index 4c774d5..7325793 100644
static void __init print_memory_map(void)
{
int i;
---
-1.7.10.4
-