diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 21:05:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-03-06 21:05:10 -0500 |
| commit | 1ba73b99c34c31ea18b44dcf161c6e1f2838e0fa (patch) | |
| tree | b0ce77589bdf5a860418181cf1704ba75d7fd415 /include/asm-x86_64 | |
| parent | 185d84b4e1f6febebbe30d785fe31310dcf9632a (diff) | |
| parent | cee87af2a5f75713b98d3e65e43872e547122cd5 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] kexec: Use EFI_LOADER_DATA for ELF core header
[IA64] permon use-after-free fix
[IA64] sync compat getdents
[IA64] always build arch/ia64/lib/xor.o
[IA64] Remove stack hard limit on ia64
[IA64] point saved_max_pfn to the max_pfn of the entire system
Revert "[IA64] swiotlb abstraction (e.g. for Xen)"
Diffstat (limited to 'include/asm-x86_64')
| -rw-r--r-- | include/asm-x86_64/swiotlb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86_64/swiotlb.h index ab913ffcad56..f9c589539a82 100644 --- a/include/asm-x86_64/swiotlb.h +++ b/include/asm-x86_64/swiotlb.h | |||
| @@ -44,7 +44,6 @@ extern void swiotlb_init(void); | |||
| 44 | extern int swiotlb_force; | 44 | extern int swiotlb_force; |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_SWIOTLB | 46 | #ifdef CONFIG_SWIOTLB |
| 47 | #define SWIOTLB_ARCH_NEED_ALLOC | ||
| 48 | extern int swiotlb; | 47 | extern int swiotlb; |
| 49 | #else | 48 | #else |
| 50 | #define swiotlb 0 | 49 | #define swiotlb 0 |