From 7e856e5a97966fe89f6336783c0c676eb999e7cf Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Wed, 24 Oct 2012 13:05:22 +0000 Subject: make all 3.6 patches apply and build SVN-Revision: 33911 --- .../patches-3.6/330-mips-add-crash-and-kdump-support.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch') diff --git a/target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch b/target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch index 7a79c4144c..e94ef650a6 100644 --- a/target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch +++ b/target/linux/generic/patches-3.6/330-mips-add-crash-and-kdump-support.patch @@ -437,7 +437,7 @@ Signed-off-by: Wu Zhangjin #include #include -@@ -523,12 +524,62 @@ static void __init arch_mem_init(char ** +@@ -522,12 +523,62 @@ static void __init arch_mem_init(char ** } bootmem_init(); @@ -500,7 +500,7 @@ Signed-off-by: Wu Zhangjin static void __init resource_init(void) { int i; -@@ -544,6 +595,8 @@ static void __init resource_init(void) +@@ -543,6 +594,8 @@ static void __init resource_init(void) /* * Request address space for all standard RAM. */ @@ -509,7 +509,7 @@ Signed-off-by: Wu Zhangjin for (i = 0; i < boot_mem_map.nr_map; i++) { struct resource *res; unsigned long start, end; -@@ -580,6 +633,7 @@ static void __init resource_init(void) +@@ -579,6 +632,7 @@ static void __init resource_init(void) */ request_resource(res, &code_resource); request_resource(res, &data_resource); @@ -519,7 +519,7 @@ Signed-off-by: Wu Zhangjin --- a/arch/mips/kernel/smp.c +++ b/arch/mips/kernel/smp.c -@@ -433,3 +433,21 @@ void flush_tlb_one(unsigned long vaddr) +@@ -386,3 +386,21 @@ void flush_tlb_one(unsigned long vaddr) EXPORT_SYMBOL(flush_tlb_page); EXPORT_SYMBOL(flush_tlb_one); -- cgit v1.2.3