diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /include/asm-i386/string-486.h | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'include/asm-i386/string-486.h')
| -rw-r--r-- | include/asm-i386/string-486.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/include/asm-i386/string-486.h b/include/asm-i386/string-486.h index 06022132c..51bfd051b 100644 --- a/include/asm-i386/string-486.h +++ b/include/asm-i386/string-486.h @@ -352,11 +352,6 @@ return (to); #ifdef CONFIG_X86_USE_3DNOW -#include <linux/spinlock.h> -#include <asm/system.h> -#include <asm/ptrace.h> -#include <linux/smp.h> -#include <linux/interrupt.h> #include <asm/mmx.h> /* @@ -365,14 +360,14 @@ return (to); static inline void * __constant_memcpy3d(void * to, const void * from, size_t len) { - if(len<512 || in_interrupt()) + if (len < 512) return __memcpy_c(to, from, len); return _mmx_memcpy(to, from, len); } static inline void *__memcpy3d(void *to, const void *from, size_t len) { - if(len<512 || in_interrupt()) + if(len < 512) return __memcpy_g(to, from, len); return _mmx_memcpy(to, from, len); } |