Re: [2.6 patch] asm/ptrace.h userspace headers cleanup

From: Russell King
Date: Wed Jun 25 2008 - 03:47:06 EST


On Mon, Jun 23, 2008 at 08:48:09PM +0300, Adrian Bunk wrote:
> diff --git a/include/asm-arm/ptrace.h b/include/asm-arm/ptrace.h
> index 7aaa206..8382b75 100644
> --- a/include/asm-arm/ptrace.h
> +++ b/include/asm-arm/ptrace.h
> @@ -139,8 +139,6 @@ static inline int valid_user_regs(struct pt_regs *regs)
> return 0;
> }
>
> -#endif /* __KERNEL__ */
> -
> #define pc_pointer(v) \
> ((v) & ~PCMASK)
>
> @@ -153,10 +151,10 @@ extern unsigned long profile_pc(struct pt_regs *regs);
> #define profile_pc(regs) instruction_pointer(regs)
> #endif
>
> -#ifdef __KERNEL__
> #define predicate(x) ((x) & 0xf0000000)
> #define PREDICATE_ALWAYS 0xe0000000
> -#endif
> +
> +#endif /* __KERNEL__ */
>
> #endif /* __ASSEMBLY__ */
>

Acked-by: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/