61 lines
2.4 KiB
Diff
61 lines
2.4 KiB
Diff
From 268984331a319f47179d6f0b62aa0e312fe4497d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Thomas=20B=C3=A4chler?= <thomas@archlinux.org>
|
|
Date: Tue, 1 Apr 2014 01:15:34 +0200
|
|
Subject: [PATCH 4/6] Revert "syscalls.h: use gcc alias instead of assembler
|
|
aliases for syscalls"
|
|
|
|
This reverts commit 83460ec8dcac14142e7860a01fa59c267ac4657c.
|
|
|
|
For details, see https://lkml.org/lkml/2014/1/26/22.
|
|
---
|
|
include/linux/compat.h | 4 ++--
|
|
include/linux/syscalls.h | 4 ++--
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/include/linux/compat.h b/include/linux/compat.h
|
|
index 3f448c6..90c199f 100644
|
|
--- a/include/linux/compat.h
|
|
+++ b/include/linux/compat.h
|
|
@@ -41,14 +41,14 @@
|
|
COMPAT_SYSCALL_DEFINEx(6, _##name, __VA_ARGS__)
|
|
|
|
#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
|
|
- asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))\
|
|
- __attribute__((alias(__stringify(compat_SyS##name)))); \
|
|
+ asmlinkage long compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
|
|
static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__));\
|
|
asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__));\
|
|
asmlinkage long compat_SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__))\
|
|
{ \
|
|
return C_SYSC##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
|
|
} \
|
|
+ SYSCALL_ALIAS(compat_sys##name, compat_SyS##name); \
|
|
static inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
#ifndef compat_user_stack_pointer
|
|
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
|
|
index a747a77..9e7cb9d 100644
|
|
--- a/include/linux/syscalls.h
|
|
+++ b/include/linux/syscalls.h
|
|
@@ -185,8 +185,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
|
|
|
|
#define __PROTECT(...) asmlinkage_protect(__VA_ARGS__)
|
|
#define __SYSCALL_DEFINEx(x, name, ...) \
|
|
- asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)) \
|
|
- __attribute__((alias(__stringify(SyS##name)))); \
|
|
+ asmlinkage long sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
|
|
asmlinkage long SyS##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
|
|
@@ -196,6 +195,7 @@ extern struct trace_event_functions exit_syscall_print_funcs;
|
|
__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \
|
|
return ret; \
|
|
} \
|
|
+ SYSCALL_ALIAS(sys##name, SyS##name); \
|
|
static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
asmlinkage long sys_time(time_t __user *tloc);
|
|
--
|
|
1.9.1
|
|
|