Commit d5379e5e authored by Linus Torvalds's avatar Linus Torvalds

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

Pull arch/microblaze updates from Michal Simek:

 - wire-up new syscalls

 - add new codes and fpga families

 - fix a return value

* tag 'microblaze-4.10-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Add new fpga families
  microblaze: Add missing release version code v9.6 and v10
  microblaze: Add missing syscalls
  microblaze: Fix return value from xilinx_timer_init
parents ec92b88c 3400606d
...@@ -38,6 +38,6 @@ ...@@ -38,6 +38,6 @@
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#define __NR_syscalls 392 #define __NR_syscalls 398
#endif /* _ASM_MICROBLAZE_UNISTD_H */ #endif /* _ASM_MICROBLAZE_UNISTD_H */
...@@ -407,5 +407,11 @@ ...@@ -407,5 +407,11 @@
#define __NR_userfaultfd 389 #define __NR_userfaultfd 389
#define __NR_membarrier 390 #define __NR_membarrier 390
#define __NR_mlock2 391 #define __NR_mlock2 391
#define __NR_copy_file_range 392
#define __NR_preadv2 393
#define __NR_pwritev2 394
#define __NR_pkey_mprotect 395
#define __NR_pkey_alloc 396
#define __NR_pkey_free 397
#endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */ #endif /* _UAPI_ASM_MICROBLAZE_UNISTD_H */
...@@ -49,6 +49,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = { ...@@ -49,6 +49,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = {
{"9.3", 0x20}, {"9.3", 0x20},
{"9.4", 0x21}, {"9.4", 0x21},
{"9.5", 0x22}, {"9.5", 0x22},
{"9.6", 0x23},
{"10.0", 0x24},
{NULL, 0}, {NULL, 0},
}; };
...@@ -75,6 +77,10 @@ const struct family_string_key family_string_lookup[] = { ...@@ -75,6 +77,10 @@ const struct family_string_key family_string_lookup[] = {
{"zynq7000", 0x12}, {"zynq7000", 0x12},
{"UltraScale Virtex", 0x13}, {"UltraScale Virtex", 0x13},
{"UltraScale Kintex", 0x14}, {"UltraScale Kintex", 0x14},
{"UltraScale+ Zynq", 0x15},
{"UltraScale+ Virtex", 0x16},
{"UltraScale+ Kintex", 0x17},
{"Spartan7", 0x18},
{NULL, 0}, {NULL, 0},
}; };
......
...@@ -392,3 +392,9 @@ ENTRY(sys_call_table) ...@@ -392,3 +392,9 @@ ENTRY(sys_call_table)
.long sys_userfaultfd .long sys_userfaultfd
.long sys_membarrier /* 390 */ .long sys_membarrier /* 390 */
.long sys_mlock2 .long sys_mlock2
.long sys_copy_file_range
.long sys_preadv2
.long sys_pwritev2
.long sys_pkey_mprotect /* 395 */
.long sys_pkey_alloc
.long sys_pkey_free
...@@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer) ...@@ -259,7 +259,7 @@ static int __init xilinx_timer_init(struct device_node *timer)
int ret; int ret;
if (initialized) if (initialized)
return; return -EINVAL;
initialized = 1; initialized = 1;
......
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