diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2009-06-11 12:45:27 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2009-06-11 12:45:27 +0000 |
| commit | a7fbcce69fcf8a79b219a638eea519380fcaf95b (patch) | |
| tree | bfae67db3ef26270860716a2a1686a0aad1a53ad /target/linux/octeon | |
| parent | 462f5857a15e39382fc190d64be860b61d06255f (diff) | |
| download | upstream-a7fbcce69fcf8a79b219a638eea519380fcaf95b.tar.gz upstream-a7fbcce69fcf8a79b219a638eea519380fcaf95b.tar.bz2 upstream-a7fbcce69fcf8a79b219a638eea519380fcaf95b.zip | |
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
Diffstat (limited to 'target/linux/octeon')
| -rw-r--r-- | target/linux/octeon/patches/001-handle_removal_h_constraint.patch | 18 |
1 files changed, 0 insertions, 18 deletions
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 48c41d74d5..b0ec076ab0 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 <ddaney@caviumnetworks.com> --- 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 <ddaney@caviumnetworks.com> +#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) |