diff options
| author |   Borislav Petkov <borislav.petkov@amd.com> | 2010-09-03 18:39:39 +0200 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2010-09-05 14:28:34 +0200 |
| commit | 57ab43e33122ffdc2eebca5d6de035699f0a8c06 (patch) | |
| tree | 1be8add962f7e870ac88194836e298c9ecc1a5be /arch/x86/kernel/aperture_64.c | |
| parent | Linux 2.6.36-rc3 (diff) | |
| download | linux-dev-57ab43e33122ffdc2eebca5d6de035699f0a8c06.tar.xz linux-dev-57ab43e33122ffdc2eebca5d6de035699f0a8c06.zip | |
x86, GART: Remove superfluous AMD64_GARTEN
There is a GARTEN so use that and drop the duplicate.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Dave Airlie <airlied@redhat.com>
Cc: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
LKML-Reference: <1283531981-7495-2-git-send-email-bp@amd64.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/aperture_64.c')
| -rw-r--r-- | arch/x86/kernel/aperture_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/aperture_64.c b/arch/x86/kernel/aperture_64.c index a2e0caf26e17..6fabd406aa7f 100644 --- a/arch/x86/kernel/aperture_64.c +++ b/arch/x86/kernel/aperture_64.c @@ -307,7 +307,7 @@ void __init early_gart_iommu_check(void) continue; ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); - aper_enabled = ctl & AMD64_GARTEN; + aper_enabled = ctl & GARTEN; aper_order = (ctl >> 1) & 7; aper_size = (32 * 1024 * 1024) << aper_order; aper_base = read_pci_config(bus, slot, 3, AMD64_GARTAPERTUREBASE) & 0x7fff; @@ -362,7 +362,7 @@ void __init early_gart_iommu_check(void) continue; ctl = read_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL); - ctl &= ~AMD64_GARTEN; + ctl &= ~GARTEN; write_pci_config(bus, slot, 3, AMD64_GARTAPERTURECTL, ctl); } } |