mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-01 15:15:19 -04:00
Merge branch 'linus' into locking/core, to pick up upstream fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
@@ -251,6 +251,30 @@ static inline int is_syscall_trace_event(struct trace_event_call *tp_event)
|
||||
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
||||
#endif /* __SYSCALL_DEFINEx */
|
||||
|
||||
/* For split 64-bit arguments on 32-bit architectures */
|
||||
#ifdef __LITTLE_ENDIAN
|
||||
#define SC_ARG64(name) u32, name##_lo, u32, name##_hi
|
||||
#else
|
||||
#define SC_ARG64(name) u32, name##_hi, u32, name##_lo
|
||||
#endif
|
||||
#define SC_VAL64(type, name) ((type) name##_hi << 32 | name##_lo)
|
||||
|
||||
#ifdef CONFIG_COMPAT
|
||||
#define SYSCALL32_DEFINE1 COMPAT_SYSCALL_DEFINE1
|
||||
#define SYSCALL32_DEFINE2 COMPAT_SYSCALL_DEFINE2
|
||||
#define SYSCALL32_DEFINE3 COMPAT_SYSCALL_DEFINE3
|
||||
#define SYSCALL32_DEFINE4 COMPAT_SYSCALL_DEFINE4
|
||||
#define SYSCALL32_DEFINE5 COMPAT_SYSCALL_DEFINE5
|
||||
#define SYSCALL32_DEFINE6 COMPAT_SYSCALL_DEFINE6
|
||||
#else
|
||||
#define SYSCALL32_DEFINE1 SYSCALL_DEFINE1
|
||||
#define SYSCALL32_DEFINE2 SYSCALL_DEFINE2
|
||||
#define SYSCALL32_DEFINE3 SYSCALL_DEFINE3
|
||||
#define SYSCALL32_DEFINE4 SYSCALL_DEFINE4
|
||||
#define SYSCALL32_DEFINE5 SYSCALL_DEFINE5
|
||||
#define SYSCALL32_DEFINE6 SYSCALL_DEFINE6
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Called before coming back to user-mode. Returning to user-mode with an
|
||||
* address limit different than USER_DS can allow to overwrite kernel memory.
|
||||
|
||||
Reference in New Issue
Block a user