build fix for uml/amd64

PATCH In review Al Viro 3 participants 3 messages Oct 18, 2005 – Oct 19, 2005 User-mode Linux (UML)

Share & tools

Al Viro

author

2005-10-18 21:45 UTC #0 lore raw

PATCH 1/1 build fix for uml/amd64

Missing half of the [PATCH] uml: Fix sysrq-r support for skas mode
We need to remove these (UPT_[DEFG]S) from the read side as well as the write one - otherwise it simply won't build.

Signed-off-by Al Viro <[email protected]>

----

IMO it should go in before 2.6.14. Jeff, could you ACK that?

arch/um/include/sysdep-x86_64/ptrace.h +0 -4

diff -urN RC14-rc4-git4-hppfs-sparse/arch/um/include/sysdep-x86_64/ptrace.h RC14-rc4-git4-pending-1/arch/um/include/sysdep-x86_64/ptrace.h
@@ -183,10 +183,6 @@
                 case RBP: val = UPT_RBP(regs); break; \
                 case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \
                 case CS: val = UPT_CS(regs); break; \
-                case DS: val = UPT_DS(regs); break; \
-                case ES: val = UPT_ES(regs); break; \
-                case FS: val = UPT_FS(regs); break; \
-                case GS: val = UPT_GS(regs); break; \
                 case EFLAGS: val = UPT_EFLAGS(regs); break; \
                 default :  \
                         panic("Bad register in UPT_REG : %d\n", reg);  \

Blaisorblade

Acked-by Acked-by Jeff Dike on v1 1/1

2005-10-19 00:24 UTC #1 lore raw

Quoted 7 lines · Al Viro

Missing half of the [PATCH] uml: Fix sysrq-r support for skas mode
We need to remove these (UPT_[DEFG]S) from the read side as well as the write one - otherwise it simply won't build.
Signed-off-by Al Viro <[email protected]>
----
IMO it should go in before 2.6.14. Jeff, could you ACK that?

Acked-by Paolo 'Blaisorblade' Giarrusso <[email protected]>

and probably

Acked-by Jeff Dike <[email protected]>

(we already discussed this via IRC, but since I couldn't test the patch at the moment, I asked Jeff to send it in my place, and then I've been busy).

Quoted 16 lines

diff -urN RC14-rc4-git4-hppfs-sparse/arch/um/include/sysdep-x86_64/ptrace.h RC14-rc4-git4-pending-1/arch/um/include/sysdep-x86_64/ptrace.h ---
RC14-rc4-git4-hppfs-sparse/arch/um/include/sysdep-x86_64/ptrace.h 2005-10-1
0 21:36:17.000000000 -0400 +++
RC14-rc4-git4-pending-1/arch/um/include/sysdep-x86_64/ptrace.h 2005-10-16
03:10:04.000000000 -0400 @@ -183,10 +183,6 @@

                 case RBP: val = UPT_RBP(regs); break; \
                 case ORIG_RAX: val = UPT_ORIG_RAX(regs); break; \
                 case CS: val = UPT_CS(regs); break; \

arch/um/include/sysdep-x86_64/ptrace.h +0 -4

-                case DS: val = UPT_DS(regs); break; \
-                case ES: val = UPT_ES(regs); break; \
-                case FS: val = UPT_FS(regs); break; \
-                case GS: val = UPT_GS(regs); break; \
                 case EFLAGS: val = UPT_EFLAGS(regs); break; \
                 default :  \
                         panic("Bad register in UPT_REG : %d\n", reg);  \

Signature · 11 lines

Inform me of my mistakes, so I can keep imitating Homer Simpson's "Doh!".
Paolo Giarrusso, aka Blaisorblade (Skype ID "PaoloGiarrusso", ICQ 215621894)
http://www.user-mode-linux.org/~blaisorblade

	

	
		
___________________________________ 
Yahoo! Mail: gratis 1GB per i messaggi e allegati da 10MB 
http://mail.yahoo.it

Jeff Dike

Acked-by on v1 1/1

2005-10-19 01:29 UTC #2 lore raw

In reply to Al Viro

Quoted 8 lines · Al Viro

Missing half of the [PATCH] uml: Fix sysrq-r support for skas mode
We need to remove these (UPT_[DEFG]S) from the read side as well as the write one - otherwise it simply won't build.
Signed-off-by Al Viro <[email protected]>
----
IMO it should go in before 2.6.14. Jeff, could you ACK that?

Yup.

Acked-by Jeff Dike <[email protected]>

-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions, and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel