diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-07-24 16:34:56 -0400 |
commit | d14b7a419a664cd7c1c585c9e7fffee9e9051d53 (patch) | |
tree | 42a1d5b61b58fa0a75252b082c4c6cef6fa9fd8d /drivers/iommu | |
parent | e8ff13b0bf88b5e696323a1eec877783d965b3c6 (diff) | |
parent | a58b3a4aba2fd5c445d9deccc73192bff48b591d (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree from Jiri Kosina:
"Trivial updates all over the place as usual."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (29 commits)
Fix typo in include/linux/clk.h .
pci: hotplug: Fix typo in pci
iommu: Fix typo in iommu
video: Fix typo in drivers/video
Documentation: Add newline at end-of-file to files lacking one
arm,unicore32: Remove obsolete "select MISC_DEVICES"
module.c: spelling s/postition/position/g
cpufreq: Fix typo in cpufreq driver
trivial: typo in comment in mksysmap
mach-omap2: Fix typo in debug message and comment
scsi: aha152x: Fix sparse warning and make printing pointer address more portable.
Change email address for Steve Glendinning
Btrfs: fix typo in convert_extent_bit
via: Remove bogus if check
netprio_cgroup.c: fix comment typo
backlight: fix memory leak on obscure error path
Documentation: asus-laptop.txt references an obsolete Kconfig item
Documentation: ManagementStyle: fixed typo
mm/vmscan: cleanup comment error in balance_pgdat
mm: cleanup on the comments of zone_reclaim_stat
...
Diffstat (limited to 'drivers/iommu')
-rw-r--r-- | drivers/iommu/amd_iommu_v2.c | 2 | ||||
-rw-r--r-- | drivers/iommu/exynos-iommu.c | 2 | ||||
-rw-r--r-- | drivers/iommu/iova.c | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index 036fe9bf157..be03238ad81 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c | |||
@@ -924,7 +924,7 @@ static int __init amd_iommu_v2_init(void) | |||
924 | pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n"); | 924 | pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n"); |
925 | 925 | ||
926 | if (!amd_iommu_v2_supported()) { | 926 | if (!amd_iommu_v2_supported()) { |
927 | pr_info("AMD IOMMUv2 functionality not available on this sytem\n"); | 927 | pr_info("AMD IOMMUv2 functionality not available on this system\n"); |
928 | /* | 928 | /* |
929 | * Load anyway to provide the symbols to other modules | 929 | * Load anyway to provide the symbols to other modules |
930 | * which may use AMD IOMMUv2 optionally. | 930 | * which may use AMD IOMMUv2 optionally. |
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 9a114b9ff17..4407d5eff05 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c | |||
@@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype, | |||
317 | if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) | 317 | if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) |
318 | itype = SYSMMU_FAULT_UNKNOWN; | 318 | itype = SYSMMU_FAULT_UNKNOWN; |
319 | 319 | ||
320 | pr_err("%s occured at 0x%lx(Page table base: 0x%lx)\n", | 320 | pr_err("%s occurred at 0x%lx(Page table base: 0x%lx)\n", |
321 | sysmmu_fault_name[itype], fault_addr, pgtable_base); | 321 | sysmmu_fault_name[itype], fault_addr, pgtable_base); |
322 | 322 | ||
323 | ent = section_entry(__va(pgtable_base), fault_addr); | 323 | ent = section_entry(__va(pgtable_base), fault_addr); |
diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c index c5c274ab5c5..67da6cff74e 100644 --- a/drivers/iommu/iova.c +++ b/drivers/iommu/iova.c | |||
@@ -198,10 +198,10 @@ iova_insert_rbtree(struct rb_root *root, struct iova *iova) | |||
198 | 198 | ||
199 | /** | 199 | /** |
200 | * alloc_iova - allocates an iova | 200 | * alloc_iova - allocates an iova |
201 | * @iovad - iova domain in question | 201 | * @iovad: - iova domain in question |
202 | * @size - size of page frames to allocate | 202 | * @size: - size of page frames to allocate |
203 | * @limit_pfn - max limit address | 203 | * @limit_pfn: - max limit address |
204 | * @size_aligned - set if size_aligned address range is required | 204 | * @size_aligned: - set if size_aligned address range is required |
205 | * This function allocates an iova in the range limit_pfn to IOVA_START_PFN | 205 | * This function allocates an iova in the range limit_pfn to IOVA_START_PFN |
206 | * looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned | 206 | * looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned |
207 | * flag is set then the allocated address iova->pfn_lo will be naturally | 207 | * flag is set then the allocated address iova->pfn_lo will be naturally |
@@ -238,8 +238,8 @@ alloc_iova(struct iova_domain *iovad, unsigned long size, | |||
238 | 238 | ||
239 | /** | 239 | /** |
240 | * find_iova - find's an iova for a given pfn | 240 | * find_iova - find's an iova for a given pfn |
241 | * @iovad - iova domain in question. | 241 | * @iovad: - iova domain in question. |
242 | * pfn - page frame number | 242 | * @pfn: - page frame number |
243 | * This function finds and returns an iova belonging to the | 243 | * This function finds and returns an iova belonging to the |
244 | * given doamin which matches the given pfn. | 244 | * given doamin which matches the given pfn. |
245 | */ | 245 | */ |
@@ -260,7 +260,7 @@ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn) | |||
260 | /* We are not holding the lock while this iova | 260 | /* We are not holding the lock while this iova |
261 | * is referenced by the caller as the same thread | 261 | * is referenced by the caller as the same thread |
262 | * which called this function also calls __free_iova() | 262 | * which called this function also calls __free_iova() |
263 | * and it is by desing that only one thread can possibly | 263 | * and it is by design that only one thread can possibly |
264 | * reference a particular iova and hence no conflict. | 264 | * reference a particular iova and hence no conflict. |
265 | */ | 265 | */ |
266 | return iova; | 266 | return iova; |