Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 316112
b: refs/heads/master
c: 07db040
h: refs/heads/master
v: v3
  • Loading branch information
Masanari Iida authored and Jiri Kosina committed Jul 24, 2012
1 parent ff8ca53 commit 98c0c10
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ff0c26424c1d993d8d1e04f72f1d428e935798da
refs/heads/master: 07db04098d1e2f238959c858a0d63243157695f9
2 changes: 1 addition & 1 deletion trunk/drivers/iommu/amd_iommu_v2.c
Original file line number Diff line number Diff line change
Expand Up @@ -924,7 +924,7 @@ static int __init amd_iommu_v2_init(void)
pr_info("AMD IOMMUv2 driver by Joerg Roedel <joerg.roedel@amd.com>\n");

if (!amd_iommu_v2_supported()) {
pr_info("AMD IOMMUv2 functionality not available on this sytem\n");
pr_info("AMD IOMMUv2 functionality not available on this system\n");
/*
* Load anyway to provide the symbols to other modules
* which may use AMD IOMMUv2 optionally.
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/iommu/exynos-iommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype,
if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN;

pr_err("%s occured at 0x%lx(Page table base: 0x%lx)\n",
pr_err("%s occurred at 0x%lx(Page table base: 0x%lx)\n",
sysmmu_fault_name[itype], fault_addr, pgtable_base);

ent = section_entry(__va(pgtable_base), fault_addr);
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/iommu/iova.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,10 @@ iova_insert_rbtree(struct rb_root *root, struct iova *iova)

/**
* alloc_iova - allocates an iova
* @iovad - iova domain in question
* @size - size of page frames to allocate
* @limit_pfn - max limit address
* @size_aligned - set if size_aligned address range is required
* @iovad: - iova domain in question
* @size: - size of page frames to allocate
* @limit_pfn: - max limit address
* @size_aligned: - set if size_aligned address range is required
* This function allocates an iova in the range limit_pfn to IOVA_START_PFN
* looking from limit_pfn instead from IOVA_START_PFN. If the size_aligned
* flag is set then the allocated address iova->pfn_lo will be naturally
Expand Down Expand Up @@ -238,8 +238,8 @@ alloc_iova(struct iova_domain *iovad, unsigned long size,

/**
* find_iova - find's an iova for a given pfn
* @iovad - iova domain in question.
* pfn - page frame number
* @iovad: - iova domain in question.
* @pfn: - page frame number
* This function finds and returns an iova belonging to the
* given doamin which matches the given pfn.
*/
Expand All @@ -260,7 +260,7 @@ struct iova *find_iova(struct iova_domain *iovad, unsigned long pfn)
/* We are not holding the lock while this iova
* is referenced by the caller as the same thread
* which called this function also calls __free_iova()
* and it is by desing that only one thread can possibly
* and it is by design that only one thread can possibly
* reference a particular iova and hence no conflict.
*/
return iova;
Expand Down

0 comments on commit 98c0c10

Please sign in to comment.