diff options
| author |   Andi Kleen <ak@suse.de> | 2005-09-12 18:49:24 +0200 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 10:49:56 -0700 |
| commit | a54e678b8f476d6f28e6aa4409f6b88ce476af1b (patch) | |
| tree | b19330f36410cc229b3229f135c8f522cc89f044 /arch/x86_64/mm | |
| parent | [PATCH] x86-64: Don't allocate aperture when swiotlb is enabled and no AGP found (diff) | |
| download | linux-dev-a54e678b8f476d6f28e6aa4409f6b88ce476af1b.tar.xz linux-dev-a54e678b8f476d6f28e6aa4409f6b88ce476af1b.zip | |
[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>
Diffstat (limited to 'arch/x86_64/mm')
| -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) return 0; } -extern int swiotlb_force; - static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules, kcore_vsyscall; @@ -414,8 +412,6 @@ void __init mem_init(void) int tmp; #ifdef CONFIG_SWIOTLB - if (swiotlb_force) - swiotlb = 1; if (!iommu_aperture && (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu)) swiotlb = 1; |