Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 25993
b: refs/heads/master
c: fb30d64
h: refs/heads/master
i:
  25991: d00cd1b
v: v3
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Apr 19, 2006
1 parent 84201a3 commit b5e090e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 966a082f80a073af1564c5ed6313ef2f0587dde3
refs/heads/master: fb30d64568fd8f6a21afef987f11852a109723da
4 changes: 2 additions & 2 deletions trunk/arch/um/sys-i386/stub_segv.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ stub_segv_handler(int sig)
* the stack in its original form when we do the sigreturn here, by
* hand.
*/
__asm__("mov %0,%%esp ; movl %1, %%eax ; "
"int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
__asm__ __volatile__("mov %0,%%esp ; movl %1, %%eax ; "
"int $0x80" : : "a" (sc), "g" (__NR_sigreturn));
}
10 changes: 5 additions & 5 deletions trunk/arch/um/sys-x86_64/stub_segv.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ stub_segv_handler(int sig)
struct ucontext *uc;
int pid;

__asm__("movq %%rdx, %0" : "=g" (uc) :);
__asm__ __volatile__("movq %%rdx, %0" : "=g" (uc) :);
GET_FAULTINFO_FROM_SC(*((struct faultinfo *) UML_CONFIG_STUB_DATA),
&uc->uc_mcontext);

Expand All @@ -44,8 +44,8 @@ stub_segv_handler(int sig)
* the signal frame. So, we use the ucontext pointer, which we know
* already, to get the signal frame pointer, and add 8 to that.
*/
__asm__("movq %0, %%rsp; movq %1, %%rax ; syscall": :
"g" ((unsigned long) container_of(uc, struct rt_sigframe,
uc) + 8),
"g" (__NR_rt_sigreturn));
__asm__ __volatile__("movq %0, %%rsp; movq %1, %%rax ; syscall": :
"g" ((unsigned long)
container_of(uc, struct rt_sigframe, uc) + 8),
"g" (__NR_rt_sigreturn));
}

0 comments on commit b5e090e

Please sign in to comment.