aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/Intel-IOMMU.txt
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-22 13:08:57 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-22 13:08:57 +0200
commit0b88641f1bafdbd087d5e63987a30cc0eadd63b9 (patch)
tree81dcf756db373444140bb2623584710c628e3048 /Documentation/Intel-IOMMU.txt
parentx86, debug: gpio_free might sleep (diff)
parentLinux 2.6.27-rc7 (diff)
downloadlinux-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.tar.xz
linux-dev-0b88641f1bafdbd087d5e63987a30cc0eadd63b9.zip
Merge commit 'v2.6.27-rc7' into x86/debug
Diffstat (limited to 'Documentation/Intel-IOMMU.txt')
-rw-r--r--Documentation/Intel-IOMMU.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/Intel-IOMMU.txt b/Documentation/Intel-IOMMU.txt
index c2321903aa09..21bc416d887e 100644
--- a/Documentation/Intel-IOMMU.txt
+++ b/Documentation/Intel-IOMMU.txt
@@ -48,7 +48,7 @@ IOVA generation is pretty generic. We used the same technique as vmalloc()
but these are not global address spaces, but separate for each domain.
Different DMA engines may support different number of domains.
-We also allocate gaurd pages with each mapping, so we can attempt to catch
+We also allocate guard pages with each mapping, so we can attempt to catch
any overflow that might happen.
@@ -112,4 +112,4 @@ TBD
- For compatibility testing, could use unity map domain for all devices, just
provide a 1-1 for all useful memory under a single domain for all devices.
-- API for paravirt ops for abstracting functionlity for VMM folks.
+- API for paravirt ops for abstracting functionality for VMM folks.