leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Microblaze patches for 4.7-rc1

Browse Source 
- Wire-up new syscalls
 - Fix link error
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iEYEABECAAYFAldENXUACgkQykllyylKDCFG0gCfSu1KW+eZVavDqZ4tGce7iZml
 YxoAnjQ/5SlmbNDDLY6lw6kwLtE4LByr
 =357n
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2016-05-24 09:19:38 -07:00
commit 36b150bbcc
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/microblaze/include/asm/unistd.h
View File

@ -38,6 +38,6 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define __NR_syscalls 389 #define __NR_syscalls 392
#endif /* _ASM_MICROBLAZE_UNISTD_H */ #endif /* _ASM_MICROBLAZE_UNISTD_H */

3
arch/microblaze/include/uapi/asm/unistd.h
View File

@ -404,5 +404,8 @@
#define __NR_memfd_create 386 #define __NR_memfd_create 386
#define __NR_bpf 387 #define __NR_bpf 387
#define __NR_execveat 388 #define __NR_execveat 388
#define __NR_userfaultfd 389
#define __NR_membarrier 390
#define __NR_mlock2 391
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */

3
arch/microblaze/kernel/syscall_table.S
View File

@ -389,3 +389,6 @@ ENTRY(sys_call_table)
.long sys_memfd_create .long sys_memfd_create
.long sys_bpf .long sys_bpf
.long sys_execveat .long sys_execveat
.long sys_userfaultfd
.long sys_membarrier /* 390 */
.long sys_mlock2

2
arch/microblaze/pci/pci-common.c
View File

@ -48,6 +48,8 @@ static int global_phb_number; /* Global phb counter */
resource_size_t isa_mem_base; resource_size_t isa_mem_base;
unsigned long isa_io_base; unsigned long isa_io_base;
EXPORT_SYMBOL(isa_io_base);
static int pci_bus_count; static int pci_bus_count;
struct pci_controller *pcibios_alloc_controller(struct device_node *dev) struct pci_controller *pcibios_alloc_controller(struct device_node *dev)