diff options
| author |   Jeff Dike <jdike@addtoit.com> | 2006-09-25 23:33:09 -0700 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:49:10 -0700 |
| commit | 70e0eb8ef143f3729065c504177413ffe165af22 (patch) | |
| tree | 9bf2f94b51dcf2ab8a0cd0b8df775d3452ea1b74 /include/asm-x86_64/Kbuild | |
| parent | [PATCH] UML: tty locking (diff) | |
| download | linux-dev-70e0eb8ef143f3729065c504177413ffe165af22.tar.xz linux-dev-70e0eb8ef143f3729065c504177413ffe165af22.zip | |
[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>
Diffstat (limited to 'include/asm-x86_64/Kbuild')
| -rw-r--r-- | include/asm-x86_64/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild index 40f2f13fe174..1ee9b07f3fe6 100644 --- a/include/asm-x86_64/Kbuild +++ b/include/asm-x86_64/Kbuild @@ -11,6 +11,7 @@ header-y += debugreg.h header-y += ldt.h header-y += msr.h header-y += prctl.h +header-y += ptrace-abi.h header-y += setup.h header-y += sigcontext32.h header-y += ucontext.h |