diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-01-29 03:24:57 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-01-29 04:36:22 -0500 |
| commit | ae7f6711d6231c9ba54feb5ba9856c3775e482f8 (patch) | |
| tree | 89070c82204b2503348e4fd6c51d25a169375545 /arch/sh/kernel | |
| parent | 64abebf731df87e6f4ae7d9ffc340bdf0c033e44 (diff) | |
| parent | b23ff0e9330e4b11e18af984d50573598e10e7f9 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to queue up a dependent patch. Also update to
later -rc's.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/sh/kernel')
| -rw-r--r-- | arch/sh/kernel/syscalls_32.S | 1 | ||||
| -rw-r--r-- | arch/sh/kernel/syscalls_64.S | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/syscalls_32.S b/arch/sh/kernel/syscalls_32.S index 4bd5a1146956..19fd11dd9871 100644 --- a/arch/sh/kernel/syscalls_32.S +++ b/arch/sh/kernel/syscalls_32.S | |||
| @@ -353,4 +353,3 @@ ENTRY(sys_call_table) | |||
| 353 | .long sys_pwritev | 353 | .long sys_pwritev |
| 354 | .long sys_rt_tgsigqueueinfo /* 335 */ | 354 | .long sys_rt_tgsigqueueinfo /* 335 */ |
| 355 | .long sys_perf_event_open | 355 | .long sys_perf_event_open |
| 356 | .long sys_recvmmsg | ||
diff --git a/arch/sh/kernel/syscalls_64.S b/arch/sh/kernel/syscalls_64.S index 07d2aaea9ae8..2048a20d7c80 100644 --- a/arch/sh/kernel/syscalls_64.S +++ b/arch/sh/kernel/syscalls_64.S | |||
| @@ -392,3 +392,4 @@ sys_call_table: | |||
| 392 | .long sys_rt_tgsigqueueinfo | 392 | .long sys_rt_tgsigqueueinfo |
| 393 | .long sys_perf_event_open | 393 | .long sys_perf_event_open |
| 394 | .long sys_recvmmsg /* 365 */ | 394 | .long sys_recvmmsg /* 365 */ |
| 395 | .long sys_accept4 | ||