From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752948AbbKPQcn (ORCPT <rfc822;w@1wt.eu>);
	Mon, 16 Nov 2015 11:32:43 -0500
Received: from mout.kundenserver.de ([212.227.17.24]:51817 "EHLO
	mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752766AbbKPQcm (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 16 Nov 2015 11:32:42 -0500
From: Arnd Bergmann <arnd@arndb.de>
To: Catalin Marinas <catalin.marinas@arm.com>,
        Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ARM64: do not include ptrace.h from compat.h
Date: Mon, 16 Nov 2015 17:32:15 +0100
Message-ID: <4870233.DUFZXD30Rq@wuerfel>
User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; )
MIME-Version: 1.0
Content-Transfer-Encoding: 7Bit
Content-Type: text/plain; charset="us-ascii"
X-Provags-ID: V03:K0:PdCZX17ft4mklGuOmyMX6FfphJfNBQ0m517VKzEoQFAQPcRqWfo
 AdURmEWDbMHqGxaDCW618AXYt2GRcbAhDtCjHUoIIvfuGlpQ0vJx1uK+dhf077vDM4TMuCE
 gvucgpy5NBCFhOkKnxH8birRUSHHBd0V9wodWXdHD2UfHjF7NBzfXYHOUjyPo/22h1D3LV2
 DlGs6Dgy8vJ1NzGqPkv1g==
X-UI-Out-Filterresults: notjunk:1;V01:K0:hzEIf+k/rfc=:MB2KJU08X8/9IfahlMH1Ap
 5FPkWnW6IbUMZZyJm+bXY3BUNoEeacW+NtqkfKB/RkxJCj2kj/ojaEUQkRlsnwtD3IzhJ4hAk
 wlfFrBo9vPX0Vvhhz0Rba7ibxaWKsjN2WUYOU/hZnqKHsxXVZPXAj9Uxw7OiVrBu9HF3JCpCv
 1LHhY8DY6Rgx3J0XTYoI0GQLWE4h09yLcVRngQ1J34gw9Ys7HVpFLdiVgr5/xAu1tOoQFHPLE
 35xCZLQNk0h/Og94u7TuXqn06dfQGM4M0YaRadmC8d3bb1Ou8smEtQp0P1WO8aLMcNKVaA268
 PGbiLCmquNtkoIIMCUkoKC9KFSHdW5fvJF9vIPQheUG+o3hP3elgAdCn+6YrqFSRZLj6Um2Hj
 A71k8ato79ca440UOh9P/qam3JyfBcCLgaDcZxXTRhWfe8c4ZdNj1FETwLv734fMl03VUHD7S
 yP0BS3DOPYEz4jehlS/l3c/94eTPO2cm9L9Xn6MxrAyTE5NTcfDv3/CJUvIp7xjoJGULOenu8
 AMNrzaI6yWISSQYOajbMKwzInQRAUF1IJClijMxVTooQvpnd9HpDeYO9H5Pw/3OZJoMov3lhz
 Hx2MbRrnMv78vMt0Aqi1IoEcRH+kxgytLElQqPYwjK55zJOCOctSDSqpaFE6x4Pj6rVzuBIFX
 ij85+e6+63fDMDNiJt/eLp0X0PKSSyukVrWDEeaL52QaUqe+KwsP9iWI/Br2dJ0DEQ4euVHfG
 Zl0C3kPCxjGhUC0u
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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)
 {