diff options
author | Andi Kleen <ak@suse.de> | 2005-09-12 12:49:24 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:49:56 -0400 |
commit | a54e678b8f476d6f28e6aa4409f6b88ce476af1b (patch) | |
tree | b19330f36410cc229b3229f135c8f522cc89f044 | |
parent | 63f02fd7ceb2fa4065d8a0c9943e4af2876b6c91 (diff) |
[PATCH] x86-64: Remove redundant swiotlb=force handling
It's already handled in the main swiotlb code.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/x86_64/mm/init.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c index aa4a5189ecee..47cf9163aa89 100644 --- a/arch/x86_64/mm/init.c +++ b/arch/x86_64/mm/init.c | |||
@@ -403,8 +403,6 @@ static inline int page_is_ram (unsigned long pagenr) | |||
403 | return 0; | 403 | return 0; |
404 | } | 404 | } |
405 | 405 | ||
406 | extern int swiotlb_force; | ||
407 | |||
408 | static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, | 406 | static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, |
409 | kcore_vsyscall; | 407 | kcore_vsyscall; |
410 | 408 | ||
@@ -414,8 +412,6 @@ void __init mem_init(void) | |||
414 | int tmp; | 412 | int tmp; |
415 | 413 | ||
416 | #ifdef CONFIG_SWIOTLB | 414 | #ifdef CONFIG_SWIOTLB |
417 | if (swiotlb_force) | ||
418 | swiotlb = 1; | ||
419 | if (!iommu_aperture && | 415 | if (!iommu_aperture && |
420 | (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) | 416 | (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) |
421 | swiotlb = 1; | 417 | swiotlb = 1; |