summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/unistd_64.h
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/include/asm/unistd_64.h')
-rw-r--r--arch/x86/include/asm/unistd_64.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index b9f3c60de5f7..8d3ad0adbc68 100644
--- a/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@ -659,8 +659,8 @@ __SYSCALL(__NR_preadv, sys_preadv)
__SYSCALL(__NR_pwritev, sys_pwritev)
#define __NR_rt_tgsigqueueinfo 297
__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
-#define __NR_perf_counter_open 298
-__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
+#define __NR_perf_event_open 298
+__SYSCALL(__NR_perf_event_open, sys_perf_event_open)
#ifndef __NO_STUBS
#define __ARCH_WANT_OLD_READDIR
ommit/drivers/net/ethernet/mellanox?id=aa2794b42f17574e2d3588666ef61c48e64e095a'>mlxsw: spectrum_trap: Use err variable instead of directly checking func retu...Jiri Pirko 2020-02-22mlxsw: spectrum: Remove RTNL where possibleIdo Schimmel 2020-02-22mlxsw: spectrum_router: Take router lock from exported helpersIdo Schimmel 2020-02-22mlxsw: spectrum_router: Take router lock from inetaddr listenersIdo Schimmel 2020-02-22mlxsw: spectrum_router: Take router lock from netdev listenerIdo Schimmel 2020-02-22mlxsw: spectrum_dpipe: Take router lock from dpipe codeIdo Schimmel 2020-02-22mlxsw: spectrum_router: Take router lock from inside routing codeIdo Schimmel 2020-02-22mlxsw: spectrum_router: Introduce router lockIdo Schimmel 2020-02-22mlxsw: spectrum_router: Store NVE decapsulation configuration in routerIdo Schimmel 2020-02-22mlxsw: spectrum_router: Expose router struct to internal usersIdo Schimmel 2020-02-22mlxsw: spectrum_mr: Protect multicast route list with a lockIdo Schimmel 2020-02-22mlxsw: spectrum_mr: Protect multicast table list with a lockIdo Schimmel 2020-02-22mlxsw: spectrum_mr: Publish multicast route after writing it to the deviceIdo Schimmel 2020-02-21net/mlx5: Add fsm_reactivate callback supportEran Ben Elisha 2020-02-21net/mlxfw: Add reactivate flow support to FSM burn flowEran Ben Elisha 2020-02-21net/mlxfw: Use MLXFW_ERR_MSG macro for error reportingSaeed Mahameed 2020-02-21net/mlxfw: Convert pr_* to dev_* in mlxfw_fsm.cSaeed Mahameed 2020-02-21net/mlxfw: More error messages coverageSaeed Mahameed 2020-02-21net/mlxfw: Improve FSM err message reporting and return codesSaeed Mahameed 2020-02-21net/mlxfw: Generic mlx FW flash status notifySaeed Mahameed