Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm (ac0657ed) · Commits · 戴 / test

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

arch/arm/mm/ioremap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)
		{
		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,
		PCI_IO_VIRT_BASE + offset + SZ_64K,

arch/arm/tools/syscall.tbl

+1 −0

Original line number	Diff line number	Diff line
		@@ -413,3 +413,4 @@
		396 common pkey_free sys_pkey_free
		397 common statx sys_statx
		398 common rseq sys_rseq
		399 common io_pgetevents sys_io_pgetevents

Admin message