diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-11 13:35:31 -0500 |
| commit | 749dfc70554f2c9e6624ac843d66571265ed9338 (patch) | |
| tree | bf591255b3f158222f90852d53c4279e6e7e9ced /arch/x86_64/kernel/machine_kexec.c | |
| parent | 74f5ec29ae93aa42c49f4285c20c457afe937881 (diff) | |
| parent | 0992a5d029181421877a716eaf99145828ff7eae (diff) | |
Merge branch 'upstream-fixes'
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 | ||