diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2013-04-08 18:10:13 +0200 |
| commit | da821eb7d42935b0f7056d98c75fd1150f6636f4 (patch) | |
| tree | de83ac171d51bbe7621110c3145a68c198b13711 /arch/arm/kernel/calls.S | |
| parent | ARM: EXYNOS: fix compilation error introduced due to common clock migration (diff) | |
| parent | Linux 3.9-rc5 (diff) | |
| download | linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.tar.xz linux-da821eb7d42935b0f7056d98c75fd1150f6636f4.zip | |
Merge commit 'v3.9-rc5' into next/clk-exynos
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Diffstat (limited to 'arch/arm/kernel/calls.S')
| -rw-r--r-- | arch/arm/kernel/calls.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 0cc57611fc4f..c6ca7e376773 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S @@ -387,7 +387,7 @@ /* 375 */ CALL(sys_setns) CALL(sys_process_vm_readv) CALL(sys_process_vm_writev) - CALL(sys_ni_syscall) /* reserved for sys_kcmp */ + CALL(sys_kcmp) CALL(sys_finit_module) #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |