Commit 36b150bb authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze

Pull Microblaze updates from Michal Simek:

 - Wire-up new syscalls

 - Fix link error

* tag 'microblaze-4.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: pci: export isa_io_base to fix link errors
  microblaze: Wire up userfaultfd, membarrier, mlock2 syscalls
parents 84787c57 52e9e6e0
......@@ -38,6 +38,6 @@
#endif /* __ASSEMBLY__ */
#define __NR_syscalls 389
#define __NR_syscalls 392
#endif /* _ASM_MICROBLAZE_UNISTD_H */
......@@ -404,5 +404,8 @@
#define __NR_memfd_create 386
#define __NR_bpf 387
#define __NR_execveat 388
#define __NR_userfaultfd 389
#define __NR_membarrier 390
#define __NR_mlock2 391
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
......@@ -389,3 +389,6 @@ ENTRY(sys_call_table)
.long sys_memfd_create
.long sys_bpf
.long sys_execveat
.long sys_userfaultfd
.long sys_membarrier /* 390 */
.long sys_mlock2
......@@ -48,6 +48,8 @@ static int global_phb_number; /* Global phb counter */
resource_size_t isa_mem_base;
unsigned long isa_io_base;
EXPORT_SYMBOL(isa_io_base);
static int pci_bus_count;
struct pci_controller *pcibios_alloc_controller(struct device_node *dev)
......
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