The patch titled x86/agp: fix agp_amd64_init module initialization regression has been added to the -mm tree. Its filename is x86-agp-fix-agp_amd64_init-module-initialization-regression.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86/agp: fix agp_amd64_init module initialization regression From: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> This fixes the regression introduced by commit 42590a75019a50012f25a962246498dead428433 ("x86/agp: Fix agp_amd64_init and agp_amd64_cleanup"). The commit 61684ceaad4f65d1a9832c722f7bd5e7fc714de9 ("x86/agp: Fix agp_amd64_init regression") fixed the above regression but there is still a problem in the module initialization; when apg_amd64 is built as a module, the GART IOMMU is not still initialized. Reported-by: Marin Mitov <mitov@xxxxxxxxxxx> Signed-off-by: FUJITA Tomonori <fujita.tomonori@xxxxxxxxxxxxx> Tested-by: Marin Mitov <mitov@xxxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Dave Airlie <airlied@xxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/char/agp/amd64-agp.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff -puN drivers/char/agp/amd64-agp.c~x86-agp-fix-agp_amd64_init-module-initialization-regression drivers/char/agp/amd64-agp.c --- a/drivers/char/agp/amd64-agp.c~x86-agp-fix-agp_amd64_init-module-initialization-regression +++ a/drivers/char/agp/amd64-agp.c @@ -767,16 +767,19 @@ int __init agp_amd64_init(void) static int __init agp_amd64_mod_init(void) { +#ifndef MODULE if (gart_iommu_aperture) return agp_bridges_found ? 0 : -ENODEV; - +#endif return agp_amd64_init(); } static void __exit agp_amd64_cleanup(void) { +#ifndef MODULE if (gart_iommu_aperture) return; +#endif if (aperture_resource) release_resource(aperture_resource); pci_unregister_driver(&agp_amd64_pci_driver); _ Patches currently in -mm which might be from fujita.tomonori@xxxxxxxxxxxxx are origin.patch linux-next.patch x86-agp-fix-agp_amd64_init-module-initialization-regression.patch scsi-add-__init-__exit-macros-to-ibmvstgtc.patch frv-remove-pci_dma_sync_single-and-pci_dma_sync_sg.patch documentation-dma-apitxt-remove-deprecated-function-descriptions.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html