From: Pavel Machek <pavel@ucw.cz>
To: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@elte.hu>, kernel list <linux-kernel@vger.kernel.org>
Subject: agpgart: scary messages are fortunately obsolete
Date: Tue, 1 Apr 2008 14:24:03 +0200 [thread overview]
Message-ID: <20080401122403.GC12129@elf.ucw.cz> (raw)
In-Reply-To: <20080328113508.GP29105@one.firstfloor.org>
Fix obsolete printks in aperture-64. We used not to handle missing
agpgart, but we handle it okay now.
Signed-off-by: Pavel Machek <pavel@suse.cz>
diff --git a/arch/x86/kernel/pci-gart_64.c b/arch/x86/kernel/pci-gart_64.c
index faf3229..3939c6d 100644
--- a/arch/x86/kernel/pci-gart_64.c
+++ b/arch/x86/kernel/pci-gart_64.c
@@ -615,13 +615,13 @@ static __init int init_k8_gatt(struct ag
nommu:
/* Should not happen anymore */
- printk(KERN_ERR "PCI-DMA: More than 4GB of RAM and no IOMMU\n"
- KERN_ERR "PCI-DMA: 32bit PCI IO may malfunction.\n");
+ printk(KERN_WARNING "PCI-DMA: More than 4GB of RAM and no IOMMU\n"
+ KERN_WARNING "falling back to iommu=soft.\n");
return -1;
}
extern int agp_amd64_init(void);
static const struct dma_mapping_ops gart_dma_ops = {
.mapping_error = NULL,
.map_single = gart_map_single,
@@ -692,9 +690,9 @@ #endif
!gart_iommu_aperture ||
(no_agp && init_k8_gatt(&info) < 0)) {
if (end_pfn > MAX_DMA32_PFN) {
- printk(KERN_ERR "WARNING more than 4GB of memory "
- "but GART IOMMU not available.\n"
- KERN_ERR "WARNING 32bit PCI may malfunction.\n");
+ printk(KERN_WARNING "More than 4GB of memory "
+ "but GART IOMMU not available.\n"
+ KERN_WARNING "falling back to iommu=soft.\n");
}
return;
}
--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
next prev parent reply other threads:[~2008-04-01 12:23 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-28 11:25 agpgart: when telling user you'll corrupt his data, at least do it at KERN_CRIT Pavel Machek
2008-03-28 11:35 ` Andi Kleen
2008-04-01 12:24 ` Pavel Machek [this message]
2008-04-01 13:33 ` agpgart: scary messages are fortunately obsolete Andi Kleen
2008-04-04 8:55 ` Ingo Molnar
2008-03-28 11:35 ` agpgart: when telling user you'll corrupt his data, at least do it at KERN_CRIT Ingo Molnar
2008-03-28 12:48 ` Jiri Kosina
2008-03-28 12:51 ` Ingo Molnar
2008-03-28 13:44 ` Pavel Machek
2008-03-28 14:13 ` Ingo Molnar
2008-03-28 14:25 ` Andi Kleen
2008-04-01 12:13 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080401122403.GC12129@elf.ucw.cz \
--to=pavel@ucw.cz \
--cc=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.