Commit 486386f6 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar

include/asm-x86/elf.h: checkpatch cleanups - formatting only

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0c6f6abf
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
typedef unsigned long elf_greg_t; typedef unsigned long elf_greg_t;
#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t)) #define ELF_NGREG (sizeof(struct user_regs_struct) / sizeof(elf_greg_t))
typedef elf_greg_t elf_gregset_t[ELF_NGREG]; typedef elf_greg_t elf_gregset_t[ELF_NGREG];
typedef struct user_i387_struct elf_fpregset_t; typedef struct user_i387_struct elf_fpregset_t;
...@@ -100,7 +100,8 @@ extern unsigned int vdso_enabled; ...@@ -100,7 +100,8 @@ extern unsigned int vdso_enabled;
We might as well make sure everything else is cleared too (except for %esp), We might as well make sure everything else is cleared too (except for %esp),
just to make things more deterministic. just to make things more deterministic.
*/ */
#define ELF_PLAT_INIT(_r, load_addr) do { \ #define ELF_PLAT_INIT(_r, load_addr) \
do { \
_r->bx = 0; _r->cx = 0; _r->dx = 0; \ _r->bx = 0; _r->cx = 0; _r->dx = 0; \
_r->si = 0; _r->di = 0; _r->bp = 0; \ _r->si = 0; _r->di = 0; _r->bp = 0; \
_r->ax = 0; \ _r->ax = 0; \
...@@ -111,7 +112,8 @@ extern unsigned int vdso_enabled; ...@@ -111,7 +112,8 @@ extern unsigned int vdso_enabled;
* now struct_user_regs, they are different) * now struct_user_regs, they are different)
*/ */
#define ELF_CORE_COPY_REGS(pr_reg, regs) do { \ #define ELF_CORE_COPY_REGS(pr_reg, regs) \
do { \
pr_reg[0] = regs->bx; \ pr_reg[0] = regs->bx; \
pr_reg[1] = regs->cx; \ pr_reg[1] = regs->cx; \
pr_reg[2] = regs->dx; \ pr_reg[2] = regs->dx; \
...@@ -168,24 +170,30 @@ static inline void elf_common_init(struct thread_struct *t, ...@@ -168,24 +170,30 @@ static inline void elf_common_init(struct thread_struct *t,
t->ds = t->es = ds; t->ds = t->es = ds;
} }
#define ELF_PLAT_INIT(_r, load_addr) do { \ #define ELF_PLAT_INIT(_r, load_addr) \
do { \
elf_common_init(&current->thread, _r, 0); \ elf_common_init(&current->thread, _r, 0); \
clear_thread_flag(TIF_IA32); \ clear_thread_flag(TIF_IA32); \
} while (0) } while (0)
#define COMPAT_ELF_PLAT_INIT(regs, load_addr) \ #define COMPAT_ELF_PLAT_INIT(regs, load_addr) \
elf_common_init(&current->thread, regs, __USER_DS) elf_common_init(&current->thread, regs, __USER_DS)
#define compat_start_thread(regs, ip, sp) do { \
#define compat_start_thread(regs, ip, sp) \
do { \
start_ia32_thread(regs, ip, sp); \ start_ia32_thread(regs, ip, sp); \
set_fs(USER_DS); \ set_fs(USER_DS); \
} while (0) } while (0)
#define COMPAT_SET_PERSONALITY(ex, ibcs2) do { \
#define COMPAT_SET_PERSONALITY(ex, ibcs2) \
do { \
if (test_thread_flag(TIF_IA32)) \ if (test_thread_flag(TIF_IA32)) \
clear_thread_flag(TIF_ABI_PENDING); \ clear_thread_flag(TIF_ABI_PENDING); \
else \ else \
set_thread_flag(TIF_ABI_PENDING); \ set_thread_flag(TIF_ABI_PENDING); \
current->personality |= force_personality32; \ current->personality |= force_personality32; \
} while (0) } while (0)
#define COMPAT_ELF_PLATFORM ("i686") #define COMPAT_ELF_PLATFORM ("i686")
/* /*
...@@ -194,7 +202,8 @@ static inline void elf_common_init(struct thread_struct *t, ...@@ -194,7 +202,8 @@ static inline void elf_common_init(struct thread_struct *t,
* getting dumped. * getting dumped.
*/ */
#define ELF_CORE_COPY_REGS(pr_reg, regs) do { \ #define ELF_CORE_COPY_REGS(pr_reg, regs) \
do { \
unsigned v; \ unsigned v; \
(pr_reg)[0] = (regs)->r15; \ (pr_reg)[0] = (regs)->r15; \
(pr_reg)[1] = (regs)->r14; \ (pr_reg)[1] = (regs)->r14; \
...@@ -269,9 +278,11 @@ extern int force_personality32; ...@@ -269,9 +278,11 @@ extern int force_personality32;
struct task_struct; struct task_struct;
#define ARCH_DLINFO_IA32(vdso_enabled) \ #define ARCH_DLINFO_IA32(vdso_enabled) \
do if (vdso_enabled) { \ do { \
if (vdso_enabled) { \
NEW_AUX_ENT(AT_SYSINFO, VDSO_ENTRY); \ NEW_AUX_ENT(AT_SYSINFO, VDSO_ENTRY); \
NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_CURRENT_BASE); \ NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_CURRENT_BASE); \
} \
} while (0) } while (0)
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32
...@@ -290,8 +301,10 @@ do if (vdso_enabled) { \ ...@@ -290,8 +301,10 @@ do if (vdso_enabled) { \
#define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff) #define STACK_RND_MASK (test_thread_flag(TIF_IA32) ? 0x7ff : 0x3fffff)
#define ARCH_DLINFO \ #define ARCH_DLINFO \
do if (vdso_enabled) { \ do { \
NEW_AUX_ENT(AT_SYSINFO_EHDR,(unsigned long)current->mm->context.vdso);\ if (vdso_enabled) \
NEW_AUX_ENT(AT_SYSINFO_EHDR, \
(unsigned long)current->mm->context.vdso); \
} while (0) } while (0)
#define AT_SYSINFO 32 #define AT_SYSINFO 32
...@@ -305,7 +318,7 @@ do if (vdso_enabled) { \ ...@@ -305,7 +318,7 @@ do if (vdso_enabled) { \
#define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso) #define VDSO_CURRENT_BASE ((unsigned long)current->mm->context.vdso)
#define VDSO_ENTRY \ #define VDSO_ENTRY \
((unsigned long) VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall))
struct linux_binprm; struct linux_binprm;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment