diff -Nur -x.svn linux-2.6.18-orig/arch/arm/Kconfig linux-2.6.18/arch/arm/Kconfig --- linux-2.6.18-orig/arch/arm/Kconfig 2008-01-23 15:19:50.000000000 +0900 +++ linux-2.6.18/arch/arm/Kconfig 2007-11-02 17:02:30.000000000 +0900 @@ -612,6 +612,7 @@ correct operation of some network protocols. With an IP-only configuration it is safe to say N, otherwise say Y. +source "drivers/cabi/Kconfig" endmenu menu "Boot options" diff -Nur -x.svn linux-2.6.18-orig/arch/arm/kernel/calls.S linux-2.6.18/arch/arm/kernel/calls.S --- linux-2.6.18-orig/arch/arm/kernel/calls.S 2008-01-23 15:19:26.000000000 +0900 +++ linux-2.6.18/arch/arm/kernel/calls.S 2007-12-11 20:42:33.000000000 +0900 @@ -331,6 +331,9 @@ CALL(sys_mbind) /* 320 */ CALL(sys_get_mempolicy) CALL(sys_set_mempolicy) +#ifdef CONFIG_CABI + CALL(sys_cabi) +#endif #ifndef syscalls_counted .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls #define syscalls_counted diff -Nur -x.svn linux-2.6.18-orig/include/asm-arm/unistd.h linux-2.6.18/include/asm-arm/unistd.h --- linux-2.6.18-orig/include/asm-arm/unistd.h 2008-01-23 15:13:46.000000000 +0900 +++ linux-2.6.18/include/asm-arm/unistd.h 2007-12-11 20:43:14.000000000 +0900 @@ -347,6 +347,9 @@ #define __NR_mbind (__NR_SYSCALL_BASE+319) #define __NR_get_mempolicy (__NR_SYSCALL_BASE+320) #define __NR_set_mempolicy (__NR_SYSCALL_BASE+321) +#ifdef CONFIG_CABI +#define __NR_cabi (__NR_SYSCALL_BASE+322) +#endif /* * The following SWIs are ARM private.