Commit ac0657ed authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm

Russell writes:
  "A couple of small ARM fixes from Stefan and Thomas:
   - Adding the io_pgetevents syscall
   - Fixing a bounds check in pci_ioremap_io()"

* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8799/1: mm: fix pci_ioremap_io() offset check
  ARM: 8787/1: wire up io_pgetevents syscall
parents 10be83cc 3a58ac65
...@@ -473,7 +473,7 @@ void pci_ioremap_set_mem_type(int mem_type) ...@@ -473,7 +473,7 @@ void pci_ioremap_set_mem_type(int mem_type)
int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr) int pci_ioremap_io(unsigned int offset, phys_addr_t phys_addr)
{ {
BUG_ON(offset + SZ_64K > IO_SPACE_LIMIT); BUG_ON(offset + SZ_64K - 1 > IO_SPACE_LIMIT);
return ioremap_page_range(PCI_IO_VIRT_BASE + offset, return ioremap_page_range(PCI_IO_VIRT_BASE + offset,
PCI_IO_VIRT_BASE + offset + SZ_64K, PCI_IO_VIRT_BASE + offset + SZ_64K,
......
...@@ -413,3 +413,4 @@ ...@@ -413,3 +413,4 @@
396 common pkey_free sys_pkey_free 396 common pkey_free sys_pkey_free
397 common statx sys_statx 397 common statx sys_statx
398 common rseq sys_rseq 398 common rseq sys_rseq
399 common io_pgetevents sys_io_pgetevents
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment