diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:07 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-20 12:08:12 -0400 |
| commit | 62d170290979e0bb805d969cca4ea852bdd45260 (patch) | |
| tree | 837372297501a2d144358b44e7db3f88c5612aa2 /drivers/infiniband/hw/mlx4/main.c | |
| parent | 8b5b94e4e9813cdd77103827f48d58c806ab45c6 (diff) | |
| parent | d91dfbb41bb2e9bdbfbd2cc7078ed7436eab027a (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We need the x86/uv updates from upstream, to queue up
dependent fix.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/infiniband/hw/mlx4/main.c')
| -rw-r--r-- | drivers/infiniband/hw/mlx4/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index 2ccb9d31771f..ae3d7590346e 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
| @@ -394,8 +394,7 @@ static int mlx4_ib_mmap(struct ib_ucontext *context, struct vm_area_struct *vma) | |||
| 394 | PAGE_SIZE, vma->vm_page_prot)) | 394 | PAGE_SIZE, vma->vm_page_prot)) |
| 395 | return -EAGAIN; | 395 | return -EAGAIN; |
| 396 | } else if (vma->vm_pgoff == 1 && dev->dev->caps.bf_reg_size != 0) { | 396 | } else if (vma->vm_pgoff == 1 && dev->dev->caps.bf_reg_size != 0) { |
| 397 | /* FIXME want pgprot_writecombine() for BlueFlame pages */ | 397 | vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot); |
| 398 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | ||
| 399 | 398 | ||
| 400 | if (io_remap_pfn_range(vma, vma->vm_start, | 399 | if (io_remap_pfn_range(vma, vma->vm_start, |
| 401 | to_mucontext(context)->uar.pfn + | 400 | to_mucontext(context)->uar.pfn + |