diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-14 15:18:01 -0500 |
| commit | f33b5d783b4f56be5ace6a1c98fb5f76b2d2d07d (patch) | |
| tree | b027b5f3429d416b3da5b9195024007dab062a5e /arch/x86_64/kernel/machine_kexec.c | |
| parent | e935d5da8e5d12fabe5b632736c50eae0427e8c8 (diff) | |
| parent | 67963132638e67ad3c5aa16765e6f3f2f3cdd85c (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/x86_64/kernel/machine_kexec.c')
| -rw-r--r-- | arch/x86_64/kernel/machine_kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 | ||