diff options
Diffstat (limited to 'drivers/char/hpet.c')
| -rw-r--r-- | drivers/char/hpet.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index e3f9a99b8522..d784650d14f0 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -373,26 +373,14 @@ static int hpet_mmap(struct file *file, struct vm_area_struct *vma) | |||
| 373 | struct hpet_dev *devp; | 373 | struct hpet_dev *devp; |
| 374 | unsigned long addr; | 374 | unsigned long addr; |
| 375 | 375 | ||
| 376 | if (((vma->vm_end - vma->vm_start) != PAGE_SIZE) || vma->vm_pgoff) | ||
| 377 | return -EINVAL; | ||
| 378 | |||
| 379 | devp = file->private_data; | 376 | devp = file->private_data; |
| 380 | addr = devp->hd_hpets->hp_hpet_phys; | 377 | addr = devp->hd_hpets->hp_hpet_phys; |
| 381 | 378 | ||
| 382 | if (addr & (PAGE_SIZE - 1)) | 379 | if (addr & (PAGE_SIZE - 1)) |
| 383 | return -ENOSYS; | 380 | return -ENOSYS; |
| 384 | 381 | ||
| 385 | vma->vm_flags |= VM_IO; | ||
| 386 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); | 382 | vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); |
| 387 | 383 | return vm_iomap_memory(vma, addr, PAGE_SIZE); | |
| 388 | if (io_remap_pfn_range(vma, vma->vm_start, addr >> PAGE_SHIFT, | ||
| 389 | PAGE_SIZE, vma->vm_page_prot)) { | ||
| 390 | printk(KERN_ERR "%s: io_remap_pfn_range failed\n", | ||
| 391 | __func__); | ||
| 392 | return -EAGAIN; | ||
| 393 | } | ||
| 394 | |||
| 395 | return 0; | ||
| 396 | #else | 384 | #else |
| 397 | return -ENOSYS; | 385 | return -ENOSYS; |
| 398 | #endif | 386 | #endif |
