From patchwork Tue Dec 13 23:21:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9473369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 597B2607EE for ; Tue, 13 Dec 2016 23:24:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4349D286C9 for ; Tue, 13 Dec 2016 23:24:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 38191286CB; Tue, 13 Dec 2016 23:24:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3FB80286C9 for ; Tue, 13 Dec 2016 23:24:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGwOF-000439-C9; Tue, 13 Dec 2016 23:21:43 +0000 Received: from ozlabs.org ([2401:3900:2:1::2]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cGwO8-000405-3X for linux-arm-kernel@lists.infradead.org; Tue, 13 Dec 2016 23:21:37 +0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3tdbLF5GGBz9t1L; Wed, 14 Dec 2016 10:21:09 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1481671270; bh=zWgS3iPgjmQpgIOBsoIw64c/Tt5vwHuHBQ1TUBCNAfA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=RaMnBY1JM9CyKeyWZr85k9z0PLB7wM44IrnxumNHpw7B8pM/BE6287iq4nJVV+MmB g7dortSQS266XdrOuQ+jk/abEIED+Pt7cALb/3aReZfIfXhBn7hUUGawLaOpoU9YF5 l9+IRaRwmuEB3jtt2FiHaFxNT2XqPgdV1QNz7FBc= Date: Wed, 14 Dec 2016 10:21:09 +1100 From: Stephen Rothwell To: Catalin Marinas Subject: Re: [GIT PULL] arm64 updates for 4.10 Message-ID: <20161214102109.41c522f1@canb.auug.org.au> In-Reply-To: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> References: <20161213192156.GA12471@e104818-lin.cambridge.arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161213_152136_422384_387E4925 X-CRM114-Status: GOOD ( 16.19 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Marc Zyngier , Will Deacon , linux-kernel@vger.kernel.org, luto@kernel.org, Linus Torvalds , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Hi Linus, On Tue, 13 Dec 2016 19:21:59 +0000 Catalin Marinas wrote: > > Please pull the arm64 updates for 4.10 below. > > The patches touch the generic include/linux/thread_info.h to factor out > struct restart_block into a separate include/linux/restart_block.h file > (needed for arm64 moving thread_info off stack; acked by Andy > Lutomirski). > > There is also a small refactoring touching drivers/irqchip/irq-gic-v3.c > and additional watchpoint lengths added to > include/uapi/linux/hw_breakpoint.h. I have also been carrying a merge fix up patch due to a conflict in the merge of the arm64 tree with commit 272d01bd790f ("arm64: Fix circular include of asm/lse.h through linux/jump_label.h") from v4.9-rc5: From: Stephen Rothwell Date: Tue, 22 Nov 2016 10:30:40 +1100 Subject: [PATCH] arm64: merge fix for code movement to cpucaps.h Signed-off-by: Stephen Rothwell --- arch/arm64/include/asm/cpucaps.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 87b446535185..4174f09678c4 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -34,7 +34,8 @@ #define ARM64_HAS_32BIT_EL0 13 #define ARM64_HYP_OFFSET_LOW 14 #define ARM64_MISMATCHED_CACHE_LINE_SIZE 15 +#define ARM64_HAS_NO_FPSIMD 16 -#define ARM64_NCAPS 16 +#define ARM64_NCAPS 17 #endif /* __ASM_CPUCAPS_H */