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/bitops.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/bitops.h')
| -rw-r--r-- | include/asm-x86_64/bitops.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86_64/bitops.h index e9bf933d25d0..f7ba57b1cc08 100644 --- a/include/asm-x86_64/bitops.h +++ b/include/asm-x86_64/bitops.h | |||
| @@ -5,12 +5,7 @@ | |||
| 5 | * Copyright 1992, Linus Torvalds. | 5 | * Copyright 1992, Linus Torvalds. |
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | 8 | #include <asm/alternative.h> | |
| 9 | #ifdef CONFIG_SMP | ||
| 10 | #define LOCK_PREFIX "lock ; " | ||
| 11 | #else | ||
| 12 | #define LOCK_PREFIX "" | ||
| 13 | #endif | ||
| 14 | 9 | ||
| 15 | #define ADDR (*(volatile long *) addr) | 10 | #define ADDR (*(volatile long *) addr) |
| 16 | 11 | ||