-#ifndef CONFIG_UID16
-
-#define OVERRIDE_sys_getgroups16
-#define OVERRIDE_sys_setgroups16
-#define OVERRIDE_sys_lchown16
-#define OVERRIDE_sys_getresuid16
-#define OVERRIDE_sys_getresgid16
-#define OVERRIDE_sys_chown16
-
-#define OVERRIDE_TABLE_sys_getgroups16
-#define OVERRIDE_TABLE_sys_setgroups16
-#define OVERRIDE_TABLE_sys_lchown16
-#define OVERRIDE_TABLE_sys_getresuid16
-#define OVERRIDE_TABLE_sys_getresgid16
-#define OVERRIDE_TABLE_sys_chown16
-
-#endif
+
+#ifndef CREATE_SYSCALL_TABLE
+
+# ifndef CONFIG_UID16
+# define OVERRIDE_32_getgroups16
+# define OVERRIDE_32_setgroups16
+# define OVERRIDE_32_lchown16
+# define OVERRIDE_32_getresuid16
+# define OVERRIDE_32_getresgid16
+# define OVERRIDE_32_chown16
+# endif
+
+#else /* CREATE_SYSCALL_TABLE */
+
+# ifndef CONFIG_UID16
+# define OVERRIDE_TABLE_32_getgroups16
+# define OVERRIDE_TABLE_32_setgroups16
+# define OVERRIDE_TABLE_32_lchown16
+# define OVERRIDE_TABLE_32_getresuid16
+# define OVERRIDE_TABLE_32_getresgid16
+# define OVERRIDE_TABLE_32_chown16
+# endif
+
+#define OVERRIDE_TABLE_32_execve
+TRACE_SYSCALL_TABLE(execve, execve, 11, 3)
+#define OVERRIDE_TABLE_32_clone
+TRACE_SYSCALL_TABLE(clone, clone, 120, 5)
+#define OVERRIDE_TABLE_32_getcpu
+TRACE_SYSCALL_TABLE(getcpu, getcpu, 318, 3)
+
+#endif /* CREATE_SYSCALL_TABLE */
+
+