* [PATCH] ARM64: do not include ptrace.h from compat.h
@ 2015-11-16 16:32 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2015-11-16 16:32 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon; +Cc: linux-arm-kernel, linux-kernel
including ptrace.h brings a definition of BITS_PER_PAGE into device
drivers and cause a build warning in allmodconfig builds:
drivers/block/drbd/drbd_bitmap.c:482:0: warning: "BITS_PER_PAGE" redefined
#define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3))
This uses a slightly different way to express current_pt_regs()
that avoids the use of the header and gets away with the already
included asm/ptrace.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index 7fbed6919b54..eb8432bb82b8 100644
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -23,7 +23,6 @@
*/
#include <linux/types.h>
#include <linux/sched.h>
-#include <linux/ptrace.h>
#define COMPAT_USER_HZ 100
#ifdef __AARCH64EB__
@@ -234,7 +233,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
return (u32)(unsigned long)uptr;
}
-#define compat_user_stack_pointer() (user_stack_pointer(current_pt_regs()))
+#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))
static inline void __user *arch_compat_alloc_user_space(long len)
{
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] ARM64: do not include ptrace.h from compat.h
@ 2015-11-16 16:32 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2015-11-16 16:32 UTC (permalink / raw)
To: linux-arm-kernel
including ptrace.h brings a definition of BITS_PER_PAGE into device
drivers and cause a build warning in allmodconfig builds:
drivers/block/drbd/drbd_bitmap.c:482:0: warning: "BITS_PER_PAGE" redefined
#define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3))
This uses a slightly different way to express current_pt_regs()
that avoids the use of the header and gets away with the already
included asm/ptrace.h.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index 7fbed6919b54..eb8432bb82b8 100644
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -23,7 +23,6 @@
*/
#include <linux/types.h>
#include <linux/sched.h>
-#include <linux/ptrace.h>
#define COMPAT_USER_HZ 100
#ifdef __AARCH64EB__
@@ -234,7 +233,7 @@ static inline compat_uptr_t ptr_to_compat(void __user *uptr)
return (u32)(unsigned long)uptr;
}
-#define compat_user_stack_pointer() (user_stack_pointer(current_pt_regs()))
+#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))
static inline void __user *arch_compat_alloc_user_space(long len)
{
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM64: do not include ptrace.h from compat.h
2015-11-16 16:32 ` Arnd Bergmann
@ 2015-11-17 13:24 ` Catalin Marinas
-1 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2015-11-17 13:24 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: Will Deacon, linux-kernel, linux-arm-kernel
On Mon, Nov 16, 2015 at 05:32:15PM +0100, Arnd Bergmann wrote:
> including ptrace.h brings a definition of BITS_PER_PAGE into device
> drivers and cause a build warning in allmodconfig builds:
>
> drivers/block/drbd/drbd_bitmap.c:482:0: warning: "BITS_PER_PAGE" redefined
> #define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3))
>
> This uses a slightly different way to express current_pt_regs()
> that avoids the use of the header and gets away with the already
> included asm/ptrace.h.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied. Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] ARM64: do not include ptrace.h from compat.h
@ 2015-11-17 13:24 ` Catalin Marinas
0 siblings, 0 replies; 4+ messages in thread
From: Catalin Marinas @ 2015-11-17 13:24 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 16, 2015 at 05:32:15PM +0100, Arnd Bergmann wrote:
> including ptrace.h brings a definition of BITS_PER_PAGE into device
> drivers and cause a build warning in allmodconfig builds:
>
> drivers/block/drbd/drbd_bitmap.c:482:0: warning: "BITS_PER_PAGE" redefined
> #define BITS_PER_PAGE (1UL << (PAGE_SHIFT + 3))
>
> This uses a slightly different way to express current_pt_regs()
> that avoids the use of the header and gets away with the already
> included asm/ptrace.h.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Applied. Thanks.
--
Catalin
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-11-17 13:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-16 16:32 [PATCH] ARM64: do not include ptrace.h from compat.h Arnd Bergmann
2015-11-16 16:32 ` Arnd Bergmann
2015-11-17 13:24 ` Catalin Marinas
2015-11-17 13:24 ` Catalin Marinas
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.