From: Hauke Mehrtens Date: Sun, 14 Jun 2009 09:45:26 +0000 (+0000) Subject: refresh patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=567b6d1a271d901aa381e70b2060bacfbc51bd50;p=openwrt%2Fstaging%2Faparcar.git refresh patches SVN-Revision: 16444 --- diff --git a/target/linux/generic-2.6/patches-2.6.28/023-mips_delay_gcc4.4.0.patch b/target/linux/generic-2.6/patches-2.6.28/023-mips_delay_gcc4.4.0.patch index ed95bcdc1c..fcfa792806 100644 --- a/target/linux/generic-2.6/patches-2.6.28/023-mips_delay_gcc4.4.0.patch +++ b/target/linux/generic-2.6/patches-2.6.28/023-mips_delay_gcc4.4.0.patch @@ -21,11 +21,9 @@ Signed-off-by: Wu Zhangjin arch/mips/include/asm/delay.h | 58 +++++++++++++++++++++++++------------ 3 files changed, 57 insertions(+), 20 deletions(-) -diff --git a/arch/mips/Makefile b/arch/mips/Makefile -index a25c2e5..1ee5504 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -120,7 +120,14 @@ cflags-$(CONFIG_CPU_R4300) += -march=r4300 -Wa,--trap +@@ -119,7 +119,14 @@ cflags-$(CONFIG_CPU_R4300) += -march=r43 cflags-$(CONFIG_CPU_VR41XX) += -march=r4100 -Wa,--trap cflags-$(CONFIG_CPU_R4X00) += -march=r4600 -Wa,--trap cflags-$(CONFIG_CPU_TX49XX) += -march=r4600 -Wa,--trap @@ -41,8 +39,6 @@ index a25c2e5..1ee5504 100644 cflags-$(CONFIG_CPU_MIPS32_R1) += $(call cc-option,-march=mips32,-mips32 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ -Wa,-mips32 -Wa,--trap cflags-$(CONFIG_CPU_MIPS32_R2) += $(call cc-option,-march=mips32r2,-mips32r2 -U_MIPS_ISA -D_MIPS_ISA=_MIPS_ISA_MIPS32) \ -diff --git a/arch/mips/include/asm/compiler.h b/arch/mips/include/asm/compiler.h -index 71f5c5c..95256a8 100644 --- a/arch/mips/include/asm/compiler.h +++ b/arch/mips/include/asm/compiler.h @@ -1,5 +1,6 @@ @@ -66,8 +62,6 @@ index 71f5c5c..95256a8 100644 +#endif + #endif /* _ASM_COMPILER_H */ -diff --git a/arch/mips/include/asm/delay.h b/arch/mips/include/asm/delay.h -index b0bccd2..00d7969 100644 --- a/arch/mips/include/asm/delay.h +++ b/arch/mips/include/asm/delay.h @@ -7,6 +7,7 @@ @@ -78,7 +72,7 @@ index b0bccd2..00d7969 100644 */ #ifndef _ASM_DELAY_H #define _ASM_DELAY_H -@@ -48,6 +49,43 @@ static inline void __delay(unsigned long loops) +@@ -48,6 +49,43 @@ static inline void __delay(unsigned long : "0" (loops), "r" (1)); } @@ -122,7 +116,7 @@ index b0bccd2..00d7969 100644 /* * Division by multiplication: you don't have to worry about -@@ -62,8 +100,6 @@ static inline void __delay(unsigned long loops) +@@ -62,8 +100,6 @@ static inline void __delay(unsigned long static inline void __udelay(unsigned long usecs, unsigned long lpj) { @@ -131,7 +125,7 @@ index b0bccd2..00d7969 100644 /* * The rates of 128 is rounded wrongly by the catchall case * for 64-bit. Excessive precission? Probably ... -@@ -77,23 +113,7 @@ static inline void __udelay(unsigned long usecs, unsigned long lpj) +@@ -77,23 +113,7 @@ static inline void __udelay(unsigned lon 0x80000000ULL) >> 32); #endif @@ -156,8 +150,3 @@ index b0bccd2..00d7969 100644 } #define __udelay_val cpu_data[raw_smp_processor_id()].udelay_val --- -1.6.0.4 - - - diff --git a/target/linux/generic-2.6/patches-2.6.28/202-mips-freestanding.patch b/target/linux/generic-2.6/patches-2.6.28/202-mips-freestanding.patch index 34dd2b3e19..4844893f3b 100644 --- a/target/linux/generic-2.6/patches-2.6.28/202-mips-freestanding.patch +++ b/target/linux/generic-2.6/patches-2.6.28/202-mips-freestanding.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Makefile +++ b/arch/mips/Makefile -@@ -586,6 +586,9 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ +@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4927) += arch/ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/mips/txx9/rbtx4938/ core-$(CONFIG_TOSHIBA_RBTX4939) += arch/mips/txx9/rbtx4939/ diff --git a/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch index ca25aeda99..9d9ae5023e 100644 --- a/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.28/208-rtl8110sb_fix.patch @@ -27,7 +27,7 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .features = RTL_FEATURE_MSI -@@ -3554,10 +3554,12 @@ static irqreturn_t rtl8169_interrupt(int +@@ -3555,10 +3555,12 @@ static irqreturn_t rtl8169_interrupt(int goto out; } diff --git a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch index 8168742eba..023bf295e7 100644 --- a/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.28/980-vm_exports.patch @@ -67,7 +67,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -5015,6 +5015,7 @@ int can_nice(const struct task_struct *p +@@ -5064,6 +5064,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } diff --git a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch index 6799fdbb8b..57dcc1dc43 100644 --- a/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch +++ b/target/linux/generic-2.6/patches-2.6.30/020-mips_multi_machine_support.patch @@ -132,7 +132,7 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -802,6 +802,9 @@ config MIPS_DISABLE_OBSOLETE_IDE +@@ -803,6 +803,9 @@ config MIPS_DISABLE_OBSOLETE_IDE config SYNC_R4K bool diff --git a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch b/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch index 463dbc60f1..49045fea31 100644 --- a/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch +++ b/target/linux/generic-2.6/patches-2.6.30/021-mips_simple_prom_emulator.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -804,6 +804,9 @@ config SYNC_R4K +@@ -805,6 +805,9 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch index 0d22636ab6..128ed54ecb 100644 --- a/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch +++ b/target/linux/generic-2.6/patches-2.6.30/024-mips_delay.patch @@ -6,8 +6,6 @@ Signed-off-by: Atsushi Nemoto arch/mips/lib/delay.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/arch/mips/lib/delay.c b/arch/mips/lib/delay.c -index f69c6b5..6b3b1de 100644 --- a/arch/mips/lib/delay.c +++ b/arch/mips/lib/delay.c @@ -43,7 +43,7 @@ void __udelay(unsigned long us) @@ -27,6 +25,3 @@ index f69c6b5..6b3b1de 100644 + __delay((ns * 0x00000005ull * HZ * lpj) >> 32); } EXPORT_SYMBOL(__ndelay); - - -