diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/infiniband/hw/ipath/ipath_user_pages.c | 6 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qib/qib_user_pages.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index bab9f74c0665..cfed5399f074 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c +++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c | |||
| @@ -53,8 +53,8 @@ static void __ipath_release_user_pages(struct page **p, size_t num_pages, | |||
| 53 | } | 53 | } |
| 54 | 54 | ||
| 55 | /* call with current->mm->mmap_sem held */ | 55 | /* call with current->mm->mmap_sem held */ |
| 56 | static int __get_user_pages(unsigned long start_page, size_t num_pages, | 56 | static int __ipath_get_user_pages(unsigned long start_page, size_t num_pages, |
| 57 | struct page **p, struct vm_area_struct **vma) | 57 | struct page **p, struct vm_area_struct **vma) |
| 58 | { | 58 | { |
| 59 | unsigned long lock_limit; | 59 | unsigned long lock_limit; |
| 60 | size_t got; | 60 | size_t got; |
| @@ -165,7 +165,7 @@ int ipath_get_user_pages(unsigned long start_page, size_t num_pages, | |||
| 165 | 165 | ||
| 166 | down_write(¤t->mm->mmap_sem); | 166 | down_write(¤t->mm->mmap_sem); |
| 167 | 167 | ||
| 168 | ret = __get_user_pages(start_page, num_pages, p, NULL); | 168 | ret = __ipath_get_user_pages(start_page, num_pages, p, NULL); |
| 169 | 169 | ||
| 170 | up_write(¤t->mm->mmap_sem); | 170 | up_write(¤t->mm->mmap_sem); |
| 171 | 171 | ||
diff --git a/drivers/infiniband/hw/qib/qib_user_pages.c b/drivers/infiniband/hw/qib/qib_user_pages.c index d7a26c1d4f37..7689e49c13c9 100644 --- a/drivers/infiniband/hw/qib/qib_user_pages.c +++ b/drivers/infiniband/hw/qib/qib_user_pages.c | |||
| @@ -51,8 +51,8 @@ static void __qib_release_user_pages(struct page **p, size_t num_pages, | |||
| 51 | /* | 51 | /* |
| 52 | * Call with current->mm->mmap_sem held. | 52 | * Call with current->mm->mmap_sem held. |
| 53 | */ | 53 | */ |
| 54 | static int __get_user_pages(unsigned long start_page, size_t num_pages, | 54 | static int __qib_get_user_pages(unsigned long start_page, size_t num_pages, |
| 55 | struct page **p, struct vm_area_struct **vma) | 55 | struct page **p, struct vm_area_struct **vma) |
| 56 | { | 56 | { |
| 57 | unsigned long lock_limit; | 57 | unsigned long lock_limit; |
| 58 | size_t got; | 58 | size_t got; |
| @@ -136,7 +136,7 @@ int qib_get_user_pages(unsigned long start_page, size_t num_pages, | |||
| 136 | 136 | ||
| 137 | down_write(¤t->mm->mmap_sem); | 137 | down_write(¤t->mm->mmap_sem); |
| 138 | 138 | ||
| 139 | ret = __get_user_pages(start_page, num_pages, p, NULL); | 139 | ret = __qib_get_user_pages(start_page, num_pages, p, NULL); |
| 140 | 140 | ||
| 141 | up_write(¤t->mm->mmap_sem); | 141 | up_write(¤t->mm->mmap_sem); |
| 142 | 142 | ||