]> err.no Git - linux-2.6/commit
[PATCH] Split i386 and x86_64 ptrace.h
authorJeff Dike <jdike@addtoit.com>
Tue, 26 Sep 2006 06:33:09 +0000 (23:33 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 26 Sep 2006 15:49:10 +0000 (08:49 -0700)
commit70e0eb8ef143f3729065c504177413ffe165af22
tree9bf2f94b51dcf2ab8a0cd0b8df775d3452ea1b74
parentb1fc0b1f21c4082d24d1f456a846b4fa7d16a70b
[PATCH] Split i386 and x86_64 ptrace.h

The use of SEGMENT_RPL_MASK in the i386 ptrace.h introduced by
x86-allow-a-kernel-to-not-be-in-ring-0.patch broke the UML build, as UML
includes the underlying architecture's ptrace.h, but has no easy access to the
x86 segment definitions.

Rather than kludging around this, as in the past, this patch splits the
userspace-usable parts, which are the bits that UML needs, of ptrace.h into
ptrace-abi.h, which is included back into ptrace.h.  Thus, there is no net
effect on i386.

As a side-effect, this creates a ptrace header which is close to being usable
in /usr/include.

x86_64 is also treated in this way for consistency.  There was some trailing
whitespace there, which is cleaned up.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
include/asm-i386/Kbuild
include/asm-i386/ptrace-abi.h [new file with mode: 0644]
include/asm-i386/ptrace.h
include/asm-x86_64/Kbuild
include/asm-x86_64/ptrace-abi.h [new file with mode: 0644]
include/asm-x86_64/ptrace.h