diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-04-01 07:56:55 +0000 |
| commit | d87efd8c3c2acd5d0f96b25514282a84f425419f (patch) | |
| tree | 1d89c8f9fb694414d9ae46d89bddf584f94c9b00 /target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch | |
| parent | 1a395bd290a84223da5d915b7e38b6ca23d14c09 (diff) | |
| download | upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.gz upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.tar.bz2 upstream-d87efd8c3c2acd5d0f96b25514282a84f425419f.zip | |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
SVN-Revision: 31158
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch b/target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch index cb0ad4a294..94442ce261 100644 --- a/target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch +++ b/target/linux/lantiq/patches-3.2/0060-MIPS-lantiq-cache-split.patch @@ -9,11 +9,9 @@ Subject: [PATCH 60/70] MIPS: lantiq: cache split arch/mips/mm/c-r4k.c | 172 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 260 insertions(+), 0 deletions(-) -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 902aedb..12ee3df 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1904,6 +1904,28 @@ config IFX_VPE_EXT +@@ -1916,6 +1916,28 @@ config IFX_VPE_EXT help IFX included extensions in APRP @@ -42,11 +40,9 @@ index 902aedb..12ee3df 100644 config PERFCTRS bool "34K Performance counters" depends on MIPS_MT && PROC_FS -diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c -index e338ba5..0511d11 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c -@@ -127,6 +127,13 @@ __setup("vpe1_wdog_timeout=", wdog_timeout); +@@ -127,6 +127,13 @@ __setup("vpe1_wdog_timeout=", wdog_timeo EXPORT_SYMBOL(vpe1_wdog_timeout); #endif @@ -126,11 +122,9 @@ index e338ba5..0511d11 100644 /* clear out any left overs from a previous program */ write_vpe_c0_status(0); write_vpe_c0_cause(0); -diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c -index a79fe9a..94cb24f 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -1383,6 +1383,106 @@ static int __init setcoherentio(char *str) +@@ -1383,6 +1383,106 @@ static int __init setcoherentio(char *st __setup("coherentio", setcoherentio); #endif @@ -316,6 +310,3 @@ index a79fe9a..94cb24f 100644 probe_pcache(); setup_scache(); --- -1.7.7.1 - |