diff options
| author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-19 18:39:12 +0000 |
|---|---|---|
| committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-11-19 18:39:12 +0000 |
| commit | fff36017cf5a5568810590ac31c7b66d2e6bfcbf (patch) | |
| tree | 39e2cbceebad180ff668e938e073b12dae8f0ecc /target/linux/malta | |
| parent | 921bb0da77125472d1011854e79f75882cbeaa7f (diff) | |
linux: update 3.0 to 3.0.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29264 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/malta')
| -rw-r--r-- | target/linux/malta/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/malta/patches-3.0/001-mips-malta-fix-crash-smp-kernel-on-non-cmp-systems.patch | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 2c884dfa43..03be924846 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.0.3 +LINUX_VERSION:=3.0.9 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/malta/patches-3.0/001-mips-malta-fix-crash-smp-kernel-on-non-cmp-systems.patch b/target/linux/malta/patches-3.0/001-mips-malta-fix-crash-smp-kernel-on-non-cmp-systems.patch index 03866df7fe..2f29a33d95 100644 --- a/target/linux/malta/patches-3.0/001-mips-malta-fix-crash-smp-kernel-on-non-cmp-systems.patch +++ b/target/linux/malta/patches-3.0/001-mips-malta-fix-crash-smp-kernel-on-non-cmp-systems.patch @@ -24,11 +24,9 @@ Patchwork: https://patchwork.linux-mips.org/patch/2413/ arch/mips/pmc-sierra/msp71xx/msp_setup.c | 8 ++--- 4 files changed, 56 insertions(+), 24 deletions(-) -diff --git a/arch/mips/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h -index 9e09af3..48b03ff 100644 --- a/arch/mips/include/asm/smp-ops.h +++ b/arch/mips/include/asm/smp-ops.h -@@ -56,8 +56,43 @@ static inline void register_smp_ops(struct plat_smp_ops *ops) +@@ -56,8 +56,43 @@ static inline void register_smp_ops(stru #endif /* !CONFIG_SMP */ @@ -75,8 +73,6 @@ index 9e09af3..48b03ff 100644 +} #endif /* __ASM_SMP_OPS_H */ -diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c -index 55f22a3..1970069 100644 --- a/arch/mips/mipssim/sim_setup.c +++ b/arch/mips/mipssim/sim_setup.c @@ -59,18 +59,17 @@ void __init prom_init(void) @@ -106,8 +102,6 @@ index 55f22a3..1970069 100644 } static void __init serial_init(void) -diff --git a/arch/mips/mti-malta/malta-init.c b/arch/mips/mti-malta/malta-init.c -index 31180c3..4b988b9 100644 --- a/arch/mips/mti-malta/malta-init.c +++ b/arch/mips/mti-malta/malta-init.c @@ -28,6 +28,7 @@ @@ -140,8 +134,6 @@ index 31180c3..4b988b9 100644 #ifdef CONFIG_MIPS_MT_SMTC register_smp_ops(&msmtc_smp_ops); #endif -diff --git a/arch/mips/pmc-sierra/msp71xx/msp_setup.c b/arch/mips/pmc-sierra/msp71xx/msp_setup.c -index 2413ea6..0abfbe0 100644 --- a/arch/mips/pmc-sierra/msp71xx/msp_setup.c +++ b/arch/mips/pmc-sierra/msp71xx/msp_setup.c @@ -228,13 +228,11 @@ void __init prom_init(void) @@ -161,6 +153,3 @@ index 2413ea6..0abfbe0 100644 #ifdef CONFIG_PMCTWILED /* --- -1.7.3.4 - |