diff options
author | Joe Perches <joe@perches.com> | 2008-03-23 04:02:32 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:24 -0400 |
commit | b69a3f9dc0bbdbf9278ac5bc8d4b6347c11a701b (patch) | |
tree | 2e08d628a31f93f7d35790ffc5bab86fa8d767ca /include/asm-x86/kexec.h | |
parent | f461f1372cef1853534df2115f9ff5b7fbfc6958 (diff) |
include/asm-x86/kexec.h: checkpatch cleanups - formatting only
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/kexec.h')
-rw-r--r-- | include/asm-x86/kexec.h | 71 |
1 files changed, 35 insertions, 36 deletions
diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h index c90d3c77afc2..8f855a15f64d 100644 --- a/include/asm-x86/kexec.h +++ b/include/asm-x86/kexec.h | |||
@@ -94,10 +94,9 @@ static inline void crash_fixup_ss_esp(struct pt_regs *newregs, | |||
94 | { | 94 | { |
95 | #ifdef CONFIG_X86_32 | 95 | #ifdef CONFIG_X86_32 |
96 | newregs->sp = (unsigned long)&(oldregs->sp); | 96 | newregs->sp = (unsigned long)&(oldregs->sp); |
97 | __asm__ __volatile__( | 97 | asm volatile("xorl %%eax, %%eax\n\t" |
98 | "xorl %%eax, %%eax\n\t" | 98 | "movw %%ss, %%ax\n\t" |
99 | "movw %%ss, %%ax\n\t" | 99 | :"=a"(newregs->ss)); |
100 | :"=a"(newregs->ss)); | ||
101 | #endif | 100 | #endif |
102 | } | 101 | } |
103 | 102 | ||
@@ -114,39 +113,39 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
114 | crash_fixup_ss_esp(newregs, oldregs); | 113 | crash_fixup_ss_esp(newregs, oldregs); |
115 | } else { | 114 | } else { |
116 | #ifdef CONFIG_X86_32 | 115 | #ifdef CONFIG_X86_32 |
117 | __asm__ __volatile__("movl %%ebx,%0" : "=m"(newregs->bx)); | 116 | asm volatile("movl %%ebx,%0" : "=m"(newregs->bx)); |
118 | __asm__ __volatile__("movl %%ecx,%0" : "=m"(newregs->cx)); | 117 | asm volatile("movl %%ecx,%0" : "=m"(newregs->cx)); |
119 | __asm__ __volatile__("movl %%edx,%0" : "=m"(newregs->dx)); | 118 | asm volatile("movl %%edx,%0" : "=m"(newregs->dx)); |
120 | __asm__ __volatile__("movl %%esi,%0" : "=m"(newregs->si)); | 119 | asm volatile("movl %%esi,%0" : "=m"(newregs->si)); |
121 | __asm__ __volatile__("movl %%edi,%0" : "=m"(newregs->di)); | 120 | asm volatile("movl %%edi,%0" : "=m"(newregs->di)); |
122 | __asm__ __volatile__("movl %%ebp,%0" : "=m"(newregs->bp)); | 121 | asm volatile("movl %%ebp,%0" : "=m"(newregs->bp)); |
123 | __asm__ __volatile__("movl %%eax,%0" : "=m"(newregs->ax)); | 122 | asm volatile("movl %%eax,%0" : "=m"(newregs->ax)); |
124 | __asm__ __volatile__("movl %%esp,%0" : "=m"(newregs->sp)); | 123 | asm volatile("movl %%esp,%0" : "=m"(newregs->sp)); |
125 | __asm__ __volatile__("movl %%ss, %%eax;" :"=a"(newregs->ss)); | 124 | asm volatile("movl %%ss, %%eax;" :"=a"(newregs->ss)); |
126 | __asm__ __volatile__("movl %%cs, %%eax;" :"=a"(newregs->cs)); | 125 | asm volatile("movl %%cs, %%eax;" :"=a"(newregs->cs)); |
127 | __asm__ __volatile__("movl %%ds, %%eax;" :"=a"(newregs->ds)); | 126 | asm volatile("movl %%ds, %%eax;" :"=a"(newregs->ds)); |
128 | __asm__ __volatile__("movl %%es, %%eax;" :"=a"(newregs->es)); | 127 | asm volatile("movl %%es, %%eax;" :"=a"(newregs->es)); |
129 | __asm__ __volatile__("pushfl; popl %0" :"=m"(newregs->flags)); | 128 | asm volatile("pushfl; popl %0" :"=m"(newregs->flags)); |
130 | #else | 129 | #else |
131 | __asm__ __volatile__("movq %%rbx,%0" : "=m"(newregs->bx)); | 130 | asm volatile("movq %%rbx,%0" : "=m"(newregs->bx)); |
132 | __asm__ __volatile__("movq %%rcx,%0" : "=m"(newregs->cx)); | 131 | asm volatile("movq %%rcx,%0" : "=m"(newregs->cx)); |
133 | __asm__ __volatile__("movq %%rdx,%0" : "=m"(newregs->dx)); | 132 | asm volatile("movq %%rdx,%0" : "=m"(newregs->dx)); |
134 | __asm__ __volatile__("movq %%rsi,%0" : "=m"(newregs->si)); | 133 | asm volatile("movq %%rsi,%0" : "=m"(newregs->si)); |
135 | __asm__ __volatile__("movq %%rdi,%0" : "=m"(newregs->di)); | 134 | asm volatile("movq %%rdi,%0" : "=m"(newregs->di)); |
136 | __asm__ __volatile__("movq %%rbp,%0" : "=m"(newregs->bp)); | 135 | asm volatile("movq %%rbp,%0" : "=m"(newregs->bp)); |
137 | __asm__ __volatile__("movq %%rax,%0" : "=m"(newregs->ax)); | 136 | asm volatile("movq %%rax,%0" : "=m"(newregs->ax)); |
138 | __asm__ __volatile__("movq %%rsp,%0" : "=m"(newregs->sp)); | 137 | asm volatile("movq %%rsp,%0" : "=m"(newregs->sp)); |
139 | __asm__ __volatile__("movq %%r8,%0" : "=m"(newregs->r8)); | 138 | asm volatile("movq %%r8,%0" : "=m"(newregs->r8)); |
140 | __asm__ __volatile__("movq %%r9,%0" : "=m"(newregs->r9)); | 139 | asm volatile("movq %%r9,%0" : "=m"(newregs->r9)); |
141 | __asm__ __volatile__("movq %%r10,%0" : "=m"(newregs->r10)); | 140 | asm volatile("movq %%r10,%0" : "=m"(newregs->r10)); |
142 | __asm__ __volatile__("movq %%r11,%0" : "=m"(newregs->r11)); | 141 | asm volatile("movq %%r11,%0" : "=m"(newregs->r11)); |
143 | __asm__ __volatile__("movq %%r12,%0" : "=m"(newregs->r12)); | 142 | asm volatile("movq %%r12,%0" : "=m"(newregs->r12)); |
144 | __asm__ __volatile__("movq %%r13,%0" : "=m"(newregs->r13)); | 143 | asm volatile("movq %%r13,%0" : "=m"(newregs->r13)); |
145 | __asm__ __volatile__("movq %%r14,%0" : "=m"(newregs->r14)); | 144 | asm volatile("movq %%r14,%0" : "=m"(newregs->r14)); |
146 | __asm__ __volatile__("movq %%r15,%0" : "=m"(newregs->r15)); | 145 | asm volatile("movq %%r15,%0" : "=m"(newregs->r15)); |
147 | __asm__ __volatile__("movl %%ss, %%eax;" :"=a"(newregs->ss)); | 146 | asm volatile("movl %%ss, %%eax;" :"=a"(newregs->ss)); |
148 | __asm__ __volatile__("movl %%cs, %%eax;" :"=a"(newregs->cs)); | 147 | asm volatile("movl %%cs, %%eax;" :"=a"(newregs->cs)); |
149 | __asm__ __volatile__("pushfq; popq %0" :"=m"(newregs->flags)); | 148 | asm volatile("pushfq; popq %0" :"=m"(newregs->flags)); |
150 | #endif | 149 | #endif |
151 | newregs->ip = (unsigned long)current_text_addr(); | 150 | newregs->ip = (unsigned long)current_text_addr(); |
152 | } | 151 | } |