diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:01:10 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-11 17:01:10 -0500 |
| commit | 5ea8d3759244590defd369828c965101c97b65e1 (patch) | |
| tree | 534f4fea14ee177f12ad16304f159aaefb7f1f8f /drivers | |
| parent | f2d6cff7f5255985939fb752daee4fab397ed61d (diff) | |
| parent | 681ee44d40d7c93b42118320e4620d07d8704fd6 (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, apic: Don't use logical-flat mode when CPU hotplug may exceed 8 CPUs
x86-32: Make AT_VECTOR_SIZE_ARCH=2
x86/agp: Fix amd64-agp module initialization regression
x86, doc: Fix minor spelling error in arch/x86/mm/gup.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/agp/amd64-agp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c index 34cf04e21795..fd50ead59c79 100644 --- a/drivers/char/agp/amd64-agp.c +++ b/drivers/char/agp/amd64-agp.c | |||
| @@ -767,16 +767,19 @@ int __init agp_amd64_init(void) | |||
| 767 | 767 | ||
| 768 | static int __init agp_amd64_mod_init(void) | 768 | static int __init agp_amd64_mod_init(void) |
| 769 | { | 769 | { |
| 770 | #ifndef MODULE | ||
| 770 | if (gart_iommu_aperture) | 771 | if (gart_iommu_aperture) |
| 771 | return agp_bridges_found ? 0 : -ENODEV; | 772 | return agp_bridges_found ? 0 : -ENODEV; |
| 772 | 773 | #endif | |
| 773 | return agp_amd64_init(); | 774 | return agp_amd64_init(); |
| 774 | } | 775 | } |
| 775 | 776 | ||
| 776 | static void __exit agp_amd64_cleanup(void) | 777 | static void __exit agp_amd64_cleanup(void) |
| 777 | { | 778 | { |
| 779 | #ifndef MODULE | ||
| 778 | if (gart_iommu_aperture) | 780 | if (gart_iommu_aperture) |
| 779 | return; | 781 | return; |
| 782 | #endif | ||
| 780 | if (aperture_resource) | 783 | if (aperture_resource) |
| 781 | release_resource(aperture_resource); | 784 | release_resource(aperture_resource); |
| 782 | pci_unregister_driver(&agp_amd64_pci_driver); | 785 | pci_unregister_driver(&agp_amd64_pci_driver); |