diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-06-28 14:06:39 -0400 |
| commit | f28e71617ddaf2483e3e5c5237103484a303743f (patch) | |
| tree | 67627d2d8ddbf6a4449371e9261d796c013b1fa1 /include/asm-x86_64/string.h | |
| parent | dc6a78f1af10d28fb8c395034ae1e099b85c05b0 (diff) | |
| parent | a39727f212426b9d5f9267b3318a2afaf9922d3b (diff) | |
Merge ../linux-2.6/
Conflicts:
drivers/scsi/aacraid/comminit.c
Fixed up by removing the now renamed CONFIG_IOMMU option from
aacraid
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'include/asm-x86_64/string.h')
| -rw-r--r-- | include/asm-x86_64/string.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-x86_64/string.h b/include/asm-x86_64/string.h index ee6bf275349e..9505d9f4bead 100644 --- a/include/asm-x86_64/string.h +++ b/include/asm-x86_64/string.h | |||
| @@ -6,7 +6,8 @@ | |||
| 6 | /* Written 2002 by Andi Kleen */ | 6 | /* Written 2002 by Andi Kleen */ |
| 7 | 7 | ||
| 8 | /* Only used for special circumstances. Stolen from i386/string.h */ | 8 | /* Only used for special circumstances. Stolen from i386/string.h */ |
| 9 | static inline void * __inline_memcpy(void * to, const void * from, size_t n) | 9 | static __always_inline void * |
| 10 | __inline_memcpy(void * to, const void * from, size_t n) | ||
| 10 | { | 11 | { |
| 11 | unsigned long d0, d1, d2; | 12 | unsigned long d0, d1, d2; |
| 12 | __asm__ __volatile__( | 13 | __asm__ __volatile__( |