target/linux/uml/patches/002-syscall_define_fix_uml_compile_bug.patch

   1 http://patchwork.kernel.org/patch/7166/
   2
   3 --- a/include/linux/syscalls.h
   4 +++ b/include/linux/syscalls.h
   5 @@ -95,13 +95,13 @@ struct old_linux_dirent;
   6  #define __SC_TEST5(t5, a5, ...)        __SC_TEST(t5); __SC_TEST4(__VA_ARGS__)
   7  #define __SC_TEST6(t6, a6, ...)        __SC_TEST(t6); __SC_TEST5(__VA_ARGS__)
   8
   9 -#define SYSCALL_DEFINE0(name)   asmlinkage long sys_##name(void)
  10 -#define SYSCALL_DEFINE1(...)    SYSCALL_DEFINEx(1, __VA_ARGS__)
  11 -#define SYSCALL_DEFINE2(...)    SYSCALL_DEFINEx(2, __VA_ARGS__)
  12 -#define SYSCALL_DEFINE3(...)    SYSCALL_DEFINEx(3, __VA_ARGS__)
  13 -#define SYSCALL_DEFINE4(...)    SYSCALL_DEFINEx(4, __VA_ARGS__)
  14 -#define SYSCALL_DEFINE5(...)    SYSCALL_DEFINEx(5, __VA_ARGS__)
  15 -#define SYSCALL_DEFINE6(...)    SYSCALL_DEFINEx(6, __VA_ARGS__)
  16 +#define SYSCALL_DEFINE0(name)     asmlinkage long sys_##name(void)
  17 +#define SYSCALL_DEFINE1(name, ...) SYSCALL_DEFINEx(1, _##name, __VA_ARGS__)
  18 +#define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
  19 +#define SYSCALL_DEFINE3(name, ...) SYSCALL_DEFINEx(3, _##name, __VA_ARGS__)
  20 +#define SYSCALL_DEFINE4(name, ...) SYSCALL_DEFINEx(4, _##name, __VA_ARGS__)
  21 +#define SYSCALL_DEFINE5(name, ...) SYSCALL_DEFINEx(5, _##name, __VA_ARGS__)
  22 +#define SYSCALL_DEFINE6(name, ...) SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
  23
  24  #ifdef CONFIG_PPC64
  25  #define SYSCALL_ALIAS(alias, name)                                     \
  26 @@ -116,21 +116,21 @@ struct old_linux_dirent;
  27
  28  #define SYSCALL_DEFINE(name) static inline long SYSC_##name
  29  #define SYSCALL_DEFINEx(x, name, ...)                                  \
  30 -       asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__));          \
  31 -       static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__));      \
  32 -       asmlinkage long SyS_##name(__SC_LONG##x(__VA_ARGS__))           \
  33 +       asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__));           \
  34 +       static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__));       \
  35 +       asmlinkage long SyS##name(__SC_LONG##x(__VA_ARGS__))            \
  36         {                                                               \
  37                 __SC_TEST##x(__VA_ARGS__);                              \
  38 -               return (long) SYSC_##name(__SC_CAST##x(__VA_ARGS__));   \
  39 +               return (long) SYSC##name(__SC_CAST##x(__VA_ARGS__));    \
  40         }                                                               \
  41 -       SYSCALL_ALIAS(sys_##name, SyS_##name);                          \
  42 -       static inline long SYSC_##name(__SC_DECL##x(__VA_ARGS__))
  43 +       SYSCALL_ALIAS(sys##name, SyS##name);                            \
  44 +       static inline long SYSC##name(__SC_DECL##x(__VA_ARGS__))
  45
  46  #else /* CONFIG_HAVE_SYSCALL_WRAPPERS */
  47
  48  #define SYSCALL_DEFINE(name) asmlinkage long sys_##name
  49  #define SYSCALL_DEFINEx(x, name, ...)                                  \
  50 -       asmlinkage long sys_##name(__SC_DECL##x(__VA_ARGS__))
  51 +       asmlinkage long sys##name(__SC_DECL##x(__VA_ARGS__))
  52
  53  #endif /* CONFIG_HAVE_SYSCALL_WRAPPERS */
  54