The patch titled
uml: add missing __volatile__
has been removed from the -mm tree. Its filename is
uml-add-missing-__volatile__.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Jeff Dike <jdike@xxxxxxxxxxx>
We were missing __volatile__ on some bits of asm in the segfault handlers.
On x86_64, this was messing up the move from %rdx to uc because that was
moved to after the GET_FAULTINFO_FROM_SC, which changed %rdx.
Also changed the other bit of asm and the one in the i386 handler to
prevent any similar occurrences.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/sys-i386/stub_segv.c | 4 ++--
arch/um/sys-x86_64/stub_segv.c | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
diff -puN arch/um/sys-i386/stub_segv.c~uml-add-missing-__volatile__ arch/um/sys-i386/stub_segv.c
--- devel/arch/um/sys-i386/stub_segv.c~uml-add-missing-__volatile__ 2006-04-18 22:20:00.000000000 -0700
+++ devel-akpm/arch/um/sys-i386/stub_segv.c 2006-04-18 22:20:00.000000000 -0700
@@ -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));
}
diff -puN arch/um/sys-x86_64/stub_segv.c~uml-add-missing-__volatile__ arch/um/sys-x86_64/stub_segv.c
--- devel/arch/um/sys-x86_64/stub_segv.c~uml-add-missing-__volatile__ 2006-04-18 22:20:00.000000000 -0700
+++ devel-akpm/arch/um/sys-x86_64/stub_segv.c 2006-04-18 22:20:00.000000000 -0700
@@ -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);
@@ -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));
}
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-prepare-fixing-compilation-output.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
