KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Removed delay.h update from 001-handle_removal_h_constraint.patch

Browse source 
SVN-Revision: 16423
This commit is contained in:
Hamish Guthrie 2009-06-11 12:45:27 +00:00
parent 985b62a228
commit 5cf41df67a
1 changed files with 0 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/octeon/patches/001-handle_removal_h_constraint.patch
View file

@ -7,7 +7,6 @@ Comments welcome.
Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: David Daney <ddaney@caviumnetworks.com>
--- ---
arch/mips/include/asm/compiler.h | 7 +++++++ arch/mips/include/asm/compiler.h | 7 +++++++
arch/mips/include/asm/delay.h | 4 ++++
2 files changed, 11 insertions(+), 0 deletions(-) 2 files changed, 11 insertions(+), 0 deletions(-)
--- a/arch/mips/include/asm/compiler.h --- a/arch/mips/include/asm/compiler.h
@ -24,20 +23,3 @@ Signed-off-by: David Daney <ddaney@caviumnetworks.com>
+#endif +#endif
+ +
#endif /* _ASM_COMPILER_H */ #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)