diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-27 19:49:30 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-27 19:49:30 +0300 |
| commit | 22c3b1521aedb4732a9dba7d4d861b7fbb4203f6 (patch) | |
| tree | a5c191f63b7923882a77a0b42fd7718de384eb40 /arch/microblaze/include/asm/unistd.h | |
| parent | debd52a0506147c0ce8370ee82f5a3b79efa2f26 (diff) | |
| parent | 45df561a7ae2ca5080708cc2cf84a236f4d930ef (diff) | |
| download | linux-22c3b1521aedb4732a9dba7d4d861b7fbb4203f6.tar.xz | |
Merge tag 'microblaze-v4.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze fixes from Michal Simek:
- fix architecture gpio heart beat code
- add new syscalls
- remove unused xlnx,compound handling
- remove platform.c
* tag 'microblaze-v4.18-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: consolidate GPIO reset handling
microblaze: remove unecessary of_platform_bus_probe call
microblaze: Add new syscalls io_pgetevents and rseq
microblaze: Remove architecture heart beat code
microblaze: heartbeat: fix missing prom.h include
Diffstat (limited to 'arch/microblaze/include/asm/unistd.h')
| -rw-r--r-- | arch/microblaze/include/asm/unistd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/unistd.h b/arch/microblaze/include/asm/unistd.h index 9774e1d9507b..a62d09420a47 100644 --- a/arch/microblaze/include/asm/unistd.h +++ b/arch/microblaze/include/asm/unistd.h @@ -38,6 +38,6 @@ #endif /* __ASSEMBLY__ */ -#define __NR_syscalls 399 +#define __NR_syscalls 401 #endif /* _ASM_MICROBLAZE_UNISTD_H */ |