merge netfilter changes to 2.6.27

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.23 / 012-mips_cpu_tlb.patch

diff --git a/target/linux/generic-2.6/patches-2.6.23/012-mips_cpu_tlb.patch b/target/linux/generic-2.6/patches-2.6.23/012-mips_cpu_tlb.patch
index ab7f0dd..7d89fe4 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.23/012-mips_cpu_tlb.patch
+++ b/target/linux/generic-2.6/patches-2.6.23/012-mips_cpu_tlb.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.23-rc6/arch/mips/mm/tlbex.c
-===================================================================
---- linux-2.6.23-rc6.orig/arch/mips/mm/tlbex.c 2007-09-21 16:23:54.000000000 +0800
-+++ linux-2.6.23-rc6/arch/mips/mm/tlbex.c      2007-09-21 16:23:58.000000000 +0800
-@@ -887,7 +887,6 @@
+--- a/arch/mips/mm/tlbex.c
++++ b/arch/mips/mm/tlbex.c
+@@ -902,7 +902,6 @@ static __init void build_tlb_write_entry
        case CPU_R10000:
        case CPU_R12000:
        case CPU_R14000:
@@ -10,7 +8,7 @@ Index: linux-2.6.23-rc6/arch/mips/mm/tlbex.c
        case CPU_SB1:
        case CPU_SB1A:
        case CPU_4KSC:
-@@ -916,6 +915,7 @@
+@@ -933,6 +932,7 @@ static __init void build_tlb_write_entry
                tlbw(p);
                break;