Commit fe758fb1 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Ingo Molnar

x86: clean up include/asm-x86/pda.h

clean up include/asm-x86/pda.h, as suggested by checkpatch.pl.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c6b48324
...@@ -14,7 +14,7 @@ struct x8664_pda { ...@@ -14,7 +14,7 @@ struct x8664_pda {
address */ address */
unsigned long kernelstack; /* 16 top of kernel stack for current */ unsigned long kernelstack; /* 16 top of kernel stack for current */
unsigned long oldrsp; /* 24 user rsp for system call */ unsigned long oldrsp; /* 24 user rsp for system call */
int irqcount; /* 32 Irq nesting counter. Starts with -1 */ int irqcount; /* 32 Irq nesting counter. Starts -1 */
unsigned int cpunumber; /* 36 Logical CPU number */ unsigned int cpunumber; /* 36 Logical CPU number */
#ifdef CONFIG_CC_STACKPROTECTOR #ifdef CONFIG_CC_STACKPROTECTOR
unsigned long stack_canary; /* 40 stack canary value */ unsigned long stack_canary; /* 40 stack canary value */
...@@ -58,7 +58,7 @@ extern struct x8664_pda _proxy_pda; ...@@ -58,7 +58,7 @@ extern struct x8664_pda _proxy_pda;
#define pda_offset(field) offsetof(struct x8664_pda, field) #define pda_offset(field) offsetof(struct x8664_pda, field)
#define pda_to_op(op,field,val) do { \ #define pda_to_op(op, field, val) do { \
typedef typeof(_proxy_pda.field) T__; \ typedef typeof(_proxy_pda.field) T__; \
if (0) { T__ tmp__; tmp__ = (val); } /* type checking */ \ if (0) { T__ tmp__; tmp__ = (val); } /* type checking */ \
switch (sizeof(_proxy_pda.field)) { \ switch (sizeof(_proxy_pda.field)) { \
...@@ -111,14 +111,14 @@ extern struct x8664_pda _proxy_pda; ...@@ -111,14 +111,14 @@ extern struct x8664_pda _proxy_pda;
} \ } \
ret__; }) ret__; })
#define read_pda(field) pda_from_op("mov",field) #define read_pda(field) pda_from_op("mov", field)
#define write_pda(field,val) pda_to_op("mov",field,val) #define write_pda(field, val) pda_to_op("mov", field, val)
#define add_pda(field,val) pda_to_op("add",field,val) #define add_pda(field, val) pda_to_op("add", field, val)
#define sub_pda(field,val) pda_to_op("sub",field,val) #define sub_pda(field, val) pda_to_op("sub", field, val)
#define or_pda(field,val) pda_to_op("or",field,val) #define or_pda(field, val) pda_to_op("or", field, val)
/* This is not atomic against other CPUs -- CPU preemption needs to be off */ /* This is not atomic against other CPUs -- CPU preemption needs to be off */
#define test_and_clear_bit_pda(bit,field) ({ \ #define test_and_clear_bit_pda(bit, field) ({ \
int old__; \ int old__; \
asm volatile("btr %2,%%gs:%c3\n\tsbbl %0,%0" \ asm volatile("btr %2,%%gs:%c3\n\tsbbl %0,%0" \
: "=r" (old__), "+m" (_proxy_pda.field) \ : "=r" (old__), "+m" (_proxy_pda.field) \
......
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