diff options
-rw-r--r-- | arch/i386/kernel/machine_kexec.c | 14 | ||||
-rw-r--r-- | arch/x86_64/kernel/machine_kexec.c | 2 | ||||
-rw-r--r-- | include/asm-powerpc/kexec.h | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/arch/i386/kernel/machine_kexec.c b/arch/i386/kernel/machine_kexec.c index a912fed48482..f73d7374a2ba 100644 --- a/arch/i386/kernel/machine_kexec.c +++ b/arch/i386/kernel/machine_kexec.c | |||
@@ -116,13 +116,13 @@ static void load_segments(void) | |||
116 | __asm__ __volatile__ ( | 116 | __asm__ __volatile__ ( |
117 | "\tljmp $"STR(__KERNEL_CS)",$1f\n" | 117 | "\tljmp $"STR(__KERNEL_CS)",$1f\n" |
118 | "\t1:\n" | 118 | "\t1:\n" |
119 | "\tmovl $"STR(__KERNEL_DS)",%eax\n" | 119 | "\tmovl $"STR(__KERNEL_DS)",%%eax\n" |
120 | "\tmovl %eax,%ds\n" | 120 | "\tmovl %%eax,%%ds\n" |
121 | "\tmovl %eax,%es\n" | 121 | "\tmovl %%eax,%%es\n" |
122 | "\tmovl %eax,%fs\n" | 122 | "\tmovl %%eax,%%fs\n" |
123 | "\tmovl %eax,%gs\n" | 123 | "\tmovl %%eax,%%gs\n" |
124 | "\tmovl %eax,%ss\n" | 124 | "\tmovl %%eax,%%ss\n" |
125 | ); | 125 | ::: "eax", "memory"); |
126 | #undef STR | 126 | #undef STR |
127 | #undef __STR | 127 | #undef __STR |
128 | } | 128 | } |
diff --git a/arch/x86_64/kernel/machine_kexec.c b/arch/x86_64/kernel/machine_kexec.c index 89fab51e20f4..25ac8a3faae6 100644 --- a/arch/x86_64/kernel/machine_kexec.c +++ b/arch/x86_64/kernel/machine_kexec.c | |||
@@ -140,7 +140,7 @@ static void load_segments(void) | |||
140 | "\tmovl %0,%%ss\n" | 140 | "\tmovl %0,%%ss\n" |
141 | "\tmovl %0,%%fs\n" | 141 | "\tmovl %0,%%fs\n" |
142 | "\tmovl %0,%%gs\n" | 142 | "\tmovl %0,%%gs\n" |
143 | : : "a" (__KERNEL_DS) | 143 | : : "a" (__KERNEL_DS) : "memory" |
144 | ); | 144 | ); |
145 | } | 145 | } |
146 | 146 | ||
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index bda2f217e6fe..6a2af2f6853b 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
@@ -93,7 +93,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, | |||
93 | "mfxer %0\n" | 93 | "mfxer %0\n" |
94 | "std %0, 296(%2)\n" | 94 | "std %0, 296(%2)\n" |
95 | : "=&r" (tmp1), "=&r" (tmp2) | 95 | : "=&r" (tmp1), "=&r" (tmp2) |
96 | : "b" (newregs)); | 96 | : "b" (newregs) |
97 | : "memory"); | ||
97 | } | 98 | } |
98 | } | 99 | } |
99 | #else | 100 | #else |