diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-20 11:58:09 -0500 |
| commit | fd4a0b92db6a57cba8d03efbe1cebf91f9124ce0 (patch) | |
| tree | 5886a08bfa1132058b06074f4666a36dc5ddd2a1 /arch/i386/kernel/machine_kexec.c | |
| parent | 88274815f7477dc7550439413ab87c5ce4c5a623 (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/i386/kernel/machine_kexec.c')
| -rw-r--r-- | arch/i386/kernel/machine_kexec.c | 14 |
1 files changed, 7 insertions, 7 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 | } |
