diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-07-25 04:47:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 13:53:39 -0400 |
commit | f22ab814a24e654b1de24db0c5f8b57b5ab2026a (patch) | |
tree | 827f3fe1c94ba9cfd180f199ea6d2dc2dfa885df /include/asm-xtensa/ptrace.h | |
parent | bc64efd220dcd4449aef8dd2564d73127b583b09 (diff) |
include/asm/ptrace.h userspace headers cleanup
This patch contains the following cleanups for the asm/ptrace.h
userspace headers:
- include/asm-generic/Kbuild.asm already lists ptrace.h, remove
the superfluous listings in the Kbuild files of the following
architectures:
- cris
- frv
- powerpc
- x86
- don't expose function prototypes and macros to userspace:
- arm
- blackfin
- cris
- mn10300
- parisc
- remove #ifdef CONFIG_'s around #define's:
- blackfin
- m68knommu
- sh: AFAIK __SH5__ should work in both kernel and userspace,
no need to leak CONFIG_SUPERH64 to userspace
- xtensa: cosmetical change to remove empty
#ifndef __ASSEMBLY__ #else #endif
from the userspace headers
Not changed by this patch is the fact that the following architectures
have a different struct pt_regs depending on CONFIG_ variables:
- h8300
- m68knommu
- mips
This does not work in userspace.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Cc: <linux-arch@vger.kernel.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Grant Grundler <grundler@parisc-linux.org>
Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>
Acked-by: Chris Zankel <chris@zankel.net>
Acked-by: David Howells <dhowells@redhat.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-xtensa/ptrace.h')
-rw-r--r-- | include/asm-xtensa/ptrace.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-xtensa/ptrace.h b/include/asm-xtensa/ptrace.h index 422c73e26937..089b0db44816 100644 --- a/include/asm-xtensa/ptrace.h +++ b/include/asm-xtensa/ptrace.h | |||
@@ -73,10 +73,10 @@ | |||
73 | #define PTRACE_GETXTREGS 18 | 73 | #define PTRACE_GETXTREGS 18 |
74 | #define PTRACE_SETXTREGS 19 | 74 | #define PTRACE_SETXTREGS 19 |
75 | 75 | ||
76 | #ifndef __ASSEMBLY__ | ||
77 | |||
78 | #ifdef __KERNEL__ | 76 | #ifdef __KERNEL__ |
79 | 77 | ||
78 | #ifndef __ASSEMBLY__ | ||
79 | |||
80 | /* | 80 | /* |
81 | * This struct defines the way the registers are stored on the | 81 | * This struct defines the way the registers are stored on the |
82 | * kernel stack during a system call or other kernel entry. | 82 | * kernel stack during a system call or other kernel entry. |
@@ -122,14 +122,14 @@ extern void show_regs(struct pt_regs *); | |||
122 | # ifndef CONFIG_SMP | 122 | # ifndef CONFIG_SMP |
123 | # define profile_pc(regs) instruction_pointer(regs) | 123 | # define profile_pc(regs) instruction_pointer(regs) |
124 | # endif | 124 | # endif |
125 | #endif /* __KERNEL__ */ | ||
126 | 125 | ||
127 | #else /* __ASSEMBLY__ */ | 126 | #else /* __ASSEMBLY__ */ |
128 | 127 | ||
129 | #ifdef __KERNEL__ | ||
130 | # include <asm/asm-offsets.h> | 128 | # include <asm/asm-offsets.h> |
131 | #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) | 129 | #define PT_REGS_OFFSET (KERNEL_STACK_SIZE - PT_USER_SIZE) |
132 | #endif | ||
133 | 130 | ||
134 | #endif /* !__ASSEMBLY__ */ | 131 | #endif /* !__ASSEMBLY__ */ |
132 | |||
133 | #endif /* __KERNEL__ */ | ||
134 | |||
135 | #endif /* _XTENSA_PTRACE_H */ | 135 | #endif /* _XTENSA_PTRACE_H */ |