| Revision | 6a76456407be8aa48f4a9e09a31bbe0119a4d065 (tree) |
|---|---|
| Zeit | 2005-06-10 03:49:59 |
| Autor | H. J. Lu <hjl@luco...> |
| Commiter | Marcelo Tosatti |
[PATCH] newer i386/x86_64 assemblers prohibit instructions for moving between a seg register and a 32bit location
The new i386/x86_64 assemblers no longer accept instructions for moving
between a segment register and a 32bit memory location, i.e.,
To generate instructions for moving between a segment register and a
16bit memory location without the 16bit operand size prefix, 0x66,
should be used. It will work with both new and old assemblers. The
assembler starting from 2.16.90.0.1 will also support
without the 0x66 prefix. I am enclosing patches for 2.4 and 2.6 kernels
here. The resulting kernel binaries should be unchanged as before, with
old and new assemblers, if gcc never generates memory access for
If gcc does generate memory access for the code above, the upper bits
in gsindex are undefined and the new assembler doesn't allow it.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
arch/i386/kernel/apm.c (diff) arch/i386/kernel/process.c (diff) arch/x86_64/kernel/process.c (diff)
include/asm-i386/system.h (diff)| @@ -327,7 +327,7 @@ extern int (*console_blank_hook)(int); | ||
| 327 | 327 | * Save a segment register away |
| 328 | 328 | */ |
| 329 | 329 | #define savesegment(seg, where) \ |
| 330 | - __asm__ __volatile__("movl %%" #seg ",%0" : "=m" (where)) | |
| 330 | + __asm__ __volatile__("mov %%" #seg ",%0" : "=m" (where)) | |
| 331 | 331 | |
| 332 | 332 | /* |
| 333 | 333 | * Maximum number of events stored |
| @@ -553,7 +553,7 @@ static inline void apm_restore_cpus(unsigned long mask) | ||
| 553 | 553 | |
| 554 | 554 | #ifdef APM_ZERO_SEGS |
| 555 | 555 | # define APM_DECL_SEGS \ |
| 556 | - unsigned int saved_fs; unsigned int saved_gs; | |
| 556 | + unsigned short saved_fs; unsigned short saved_gs; | |
| 557 | 557 | # define APM_DO_SAVE_SEGS \ |
| 558 | 558 | savesegment(fs, saved_fs); savesegment(gs, saved_gs) |
| 559 | 559 | # define APM_DO_ZERO_SEGS \ |
| @@ -544,7 +544,7 @@ void release_thread(struct task_struct *dead_task) | ||
| 544 | 544 | * Save a segment. |
| 545 | 545 | */ |
| 546 | 546 | #define savesegment(seg,value) \ |
| 547 | - asm volatile("movl %%" #seg ",%0":"=m" (*(int *)&(value))) | |
| 547 | + asm volatile("mov %%" #seg ",%0":"=m" (value)) | |
| 548 | 548 | |
| 549 | 549 | int copy_thread(int nr, unsigned long clone_flags, unsigned long esp, |
| 550 | 550 | unsigned long unused, |
| @@ -661,8 +661,8 @@ void fastcall __switch_to(struct task_struct *prev_p, struct task_struct *next_p | ||
| 661 | 661 | * Save away %fs and %gs. No need to save %es and %ds, as |
| 662 | 662 | * those are always kernel segments while inside the kernel. |
| 663 | 663 | */ |
| 664 | - asm volatile("movl %%fs,%0":"=m" (*(int *)&prev->fs)); | |
| 665 | - asm volatile("movl %%gs,%0":"=m" (*(int *)&prev->gs)); | |
| 664 | + asm volatile("mov %%fs,%0":"=m" (prev->fs)); | |
| 665 | + asm volatile("mov %%gs,%0":"=m" (prev->gs)); | |
| 666 | 666 | |
| 667 | 667 | /* |
| 668 | 668 | * Restore %fs and %gs. |
| @@ -526,10 +526,10 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long rsp, | ||
| 526 | 526 | p->thread.fs = me->thread.fs; |
| 527 | 527 | p->thread.gs = me->thread.gs; |
| 528 | 528 | |
| 529 | - asm("movl %%gs,%0" : "=m" (p->thread.gsindex)); | |
| 530 | - asm("movl %%fs,%0" : "=m" (p->thread.fsindex)); | |
| 531 | - asm("movl %%es,%0" : "=m" (p->thread.es)); | |
| 532 | - asm("movl %%ds,%0" : "=m" (p->thread.ds)); | |
| 529 | + asm("mov %%gs,%0" : "=m" (p->thread.gsindex)); | |
| 530 | + asm("mov %%fs,%0" : "=m" (p->thread.fsindex)); | |
| 531 | + asm("mov %%es,%0" : "=m" (p->thread.es)); | |
| 532 | + asm("mov %%ds,%0" : "=m" (p->thread.ds)); | |
| 533 | 533 | |
| 534 | 534 | unlazy_fpu(current); |
| 535 | 535 | p->thread.i387 = current->thread.i387; |
| @@ -574,11 +574,11 @@ struct task_struct *__switch_to(struct task_struct *prev_p, struct task_struct * | ||
| 574 | 574 | /* |
| 575 | 575 | * Switch DS and ES. |
| 576 | 576 | */ |
| 577 | - asm volatile("movl %%es,%0" : "=m" (prev->es)); | |
| 577 | + asm volatile("mov %%es,%0" : "=m" (prev->es)); | |
| 578 | 578 | if (unlikely(next->es | prev->es)) |
| 579 | 579 | loadsegment(es, next->es); |
| 580 | 580 | |
| 581 | - asm volatile ("movl %%ds,%0" : "=m" (prev->ds)); | |
| 581 | + asm volatile ("mov %%ds,%0" : "=m" (prev->ds)); | |
| 582 | 582 | if (unlikely(next->ds | prev->ds)) |
| 583 | 583 | loadsegment(ds, next->ds); |
| 584 | 584 |
| @@ -587,7 +587,7 @@ struct task_struct *__switch_to(struct task_struct *prev_p, struct task_struct * | ||
| 587 | 587 | */ |
| 588 | 588 | { |
| 589 | 589 | unsigned fsindex; |
| 590 | - asm volatile("movl %%fs,%0" : "=g" (fsindex)); | |
| 590 | + asm volatile("movl %%fs,%0" : "=r" (fsindex)); | |
| 591 | 591 | /* segment register != 0 always requires a reload. |
| 592 | 592 | also reload when it has changed. |
| 593 | 593 | when prev process used 64bit base always reload |
| @@ -608,7 +608,7 @@ struct task_struct *__switch_to(struct task_struct *prev_p, struct task_struct * | ||
| 608 | 608 | } |
| 609 | 609 | { |
| 610 | 610 | unsigned gsindex; |
| 611 | - asm volatile("movl %%gs,%0" : "=g" (gsindex)); | |
| 611 | + asm volatile("movl %%gs,%0" : "=r" (gsindex)); | |
| 612 | 612 | if (unlikely((gsindex | next->gsindex) || prev->gs)) { |
| 613 | 613 | load_gs_index(next->gsindex); |
| 614 | 614 | if (gsindex) |
| @@ -84,7 +84,7 @@ static inline unsigned long _get_base(char * addr) | ||
| 84 | 84 | #define loadsegment(seg,value) \ |
| 85 | 85 | asm volatile("\n" \ |
| 86 | 86 | "1:\t" \ |
| 87 | - "movl %0,%%" #seg "\n" \ | |
| 87 | + "mov %0,%%" #seg "\n" \ | |
| 88 | 88 | "2:\n" \ |
| 89 | 89 | ".section .fixup,\"ax\"\n" \ |
| 90 | 90 | "3:\t" \ |
| @@ -96,7 +96,7 @@ static inline unsigned long _get_base(char * addr) | ||
| 96 | 96 | ".align 4\n\t" \ |
| 97 | 97 | ".long 1b,3b\n" \ |
| 98 | 98 | ".previous" \ |
| 99 | - : :"m" (*(unsigned int *)&(value))) | |
| 99 | + : :"m" (value)) | |
| 100 | 100 | |
| 101 | 101 | /* |
| 102 | 102 | * Clear and set 'TS' bit respectively |
Linux Kernel Documents
Fork