diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:45:49 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-13 17:45:49 -0500 |
| commit | 15c989d4d14b82f43cae7efc6a7794cdd556f274 (patch) | |
| tree | 3f1a22991aacf42acaf56467cbe79897146d3e32 /arch/x86/kernel/pci-gart_64.c | |
| parent | 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 (diff) | |
| parent | 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 (diff) | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems
x86, UV: Fix target_cpus() in x2apic_uv_x.c
x86: Reduce per cpu warning boot up messages
x86: Reduce per cpu MCA boot up messages
x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already
Diffstat (limited to 'arch/x86/kernel/pci-gart_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-gart_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c index 34de53b46f87..f3af115a573a 100644 --- a/arch/x86/kernel/pci-gart_64.c +++ b/arch/x86/kernel/pci-gart_64.c | |||
| @@ -735,7 +735,7 @@ int __init gart_iommu_init(void) | |||
| 735 | unsigned long scratch; | 735 | unsigned long scratch; |
| 736 | long i; | 736 | long i; |
| 737 | 737 | ||
| 738 | if (cache_k8_northbridges() < 0 || num_k8_northbridges == 0) | 738 | if (num_k8_northbridges == 0) |
| 739 | return 0; | 739 | return 0; |
| 740 | 740 | ||
| 741 | #ifndef CONFIG_AGP_AMD64 | 741 | #ifndef CONFIG_AGP_AMD64 |