From: hcg Date: Thu, 11 Jun 2009 12:45:27 +0000 (+0000) Subject: Removed delay.h update from 001-handle_removal_h_constraint.patch X-Git-Url: http://git.rohieb.name/openwrt.git/commitdiff_plain/51c6d32fb33b9768b13f189bd432fe692018302e Removed delay.h update from 001-handle_removal_h_constraint.patch git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16423 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/target/linux/octeon/patches/001-handle_removal_h_constraint.patch b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch index 48c41d74d..b0ec076ab 100644 --- a/target/linux/octeon/patches/001-handle_removal_h_constraint.patch +++ b/target/linux/octeon/patches/001-handle_removal_h_constraint.patch @@ -7,7 +7,6 @@ Comments welcome. Signed-off-by: David Daney --- arch/mips/include/asm/compiler.h | 7 +++++++ - arch/mips/include/asm/delay.h | 4 ++++ 2 files changed, 11 insertions(+), 0 deletions(-) --- a/arch/mips/include/asm/compiler.h @@ -24,20 +23,3 @@ Signed-off-by: David Daney +#endif + #endif /* _ASM_COMPILER_H */ ---- a/arch/mips/include/asm/delay.h -+++ b/arch/mips/include/asm/delay.h -@@ -67,10 +67,14 @@ static inline unsigned long __usecs_to_l - : "r" (usecs), "r" (lpj) - : GCC_REG_ACCUM); - else if (sizeof(long) == 8 && !R4000_WAR) -+#ifdef GCC_NO_H_CONSTRAINT -+ usecs = ((uint128_t)usecs * lpj) >> 64; -+#else - __asm__("dmultu\t%2, %3" - : "=h" (usecs), "=l" (lo) - : "r" (usecs), "r" (lpj) - : GCC_REG_ACCUM); -+#endif - else if (sizeof(long) == 8 && R4000_WAR) - __asm__("dmultu\t%3, %4\n\tmfhi\t%0" - : "=r" (usecs), "=h" (hi), "=l" (lo)