aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeon
diff options
context:
space:
mode:
authorHamish Guthrie <hcg@openwrt.org>2009-06-11 12:45:27 +0000
committerHamish Guthrie <hcg@openwrt.org>2009-06-11 12:45:27 +0000
commit5cf41df67ad1e2917e0dc80039462085a0be69a3 (patch)
tree9b559761c167505b271ba2fc5e63ddc23e39cb6f /target/linux/octeon
parent985b62a228fc061c6d641eea200e67727434926d (diff)
downloadupstream-5cf41df67ad1e2917e0dc80039462085a0be69a3.tar.gz
upstream-5cf41df67ad1e2917e0dc80039462085a0be69a3.tar.bz2
upstream-5cf41df67ad1e2917e0dc80039462085a0be69a3.zip
Removed delay.h update from 001-handle_removal_h_constraint.patch
SVN-Revision: 16423
Diffstat (limited to 'target/linux/octeon')
-rw-r--r--target/linux/octeon/patches/001-handle_removal_h_constraint.patch18
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)