korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-04 09:34:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Wire up bpf syscall for ia64

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUO/b9AAoJEKurIx+X31iBqkwQAKo4qnxpZPF1+u48xkM9ytQp
 E4YOWwefdc3Q5DU4BkcU1b+qnv2v2+m397Apsm62BbVT2nBk9sgpXizAZ52NWNzp
 jxxTbm01nuGnH/1HhaLw/wvjsNLM3A53FSiEE19mO9MVRXIM0sxkc1F8Q/3nfU6a
 83yQD6QOeG2+FyIhhyYcLDKTNyxOCHFx+LJkHTcXpWqADIGPbtSSntiVxe5UihKV
 2ffWSUOmXa2kwWixAQaJkjMwPblFo2Mc1fkCKEmxy4JB/fHOBYDho7jnmWW+Je/c
 hN2sHF80v2pfBCr4oHhZYfosDjiDTLENng+++yP/+GSqBTprzU6GE6hmFdyvTZI/
 0OF2LdiqR2F+t3c5E+AK2TaC1ji5M/Ss0CykYAxj76SfrZGFzgpnTZ/58Hytjxuj
 5zz4/fqMAJlygRTxmZym2Ic1MZftMTFY+Y7fFJsdUNUJ5CpPANNHwba8BgrIZEfA
 nfRYsqBvQk8QVbKdW4lMVYMi3iJNJv2mYgsHGz9+NcJkhWSBsW+aAfyhdpL3xlh8
 p2pBW7KUiLWiD+naBdWFTQB0jd2DDUFmRVxq7uNMfOAlTfcmCaG4TT3q7LIDYF83
 zH2NUeNXPS0XtTOZ8iuJQ1kWp1Vmc4dHSrPJ5i+OxuTbCAzIzjx9xuPHme4hUGrk
 5kp5vvJ/xS9Rl6KDUfA9
 =T3ST
 -----END PGP SIGNATURE-----

Merge tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 update from Tony Luck:
 "Wire up bpf syscall for ia64"

* tag 'please-pull-sys_bpf' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable bpf syscall for ia64
This commit is contained in:
Linus Torvalds 2014-10-14 03:50:34 +02:00
commit fc2414b4b4
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,7 @@
#define NR_syscalls 317 /* length of syscall table */ #define NR_syscalls 318 /* length of syscall table */
/* /*
* The following defines stop scripts/checksyscalls.sh from complaining about * The following defines stop scripts/checksyscalls.sh from complaining about

1
arch/ia64/include/uapi/asm/unistd.h
View File

@ -330,5 +330,6 @@
#define __NR_renameat2 1338 #define __NR_renameat2 1338
#define __NR_getrandom 1339 #define __NR_getrandom 1339
#define __NR_memfd_create 1340 #define __NR_memfd_create 1340
#define __NR_bpf 1341
#endif /* _UAPI_ASM_IA64_UNISTD_H */ #endif /* _UAPI_ASM_IA64_UNISTD_H */

1
arch/ia64/kernel/entry.S
View File

@ -1778,6 +1778,7 @@ sys_call_table:
data8 sys_renameat2 data8 sys_renameat2
data8 sys_getrandom data8 sys_getrandom
data8 sys_memfd_create // 1340 data8 sys_memfd_create // 1340
data8 sys_bpf
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */