From patchwork Tue Nov 27 19:45:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 152160 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp188986ljp; Tue, 27 Nov 2018 11:44:53 -0800 (PST) X-Google-Smtp-Source: AJdET5dETW3fFz+Z4Kwp2ds6gIQbnrvVriUZ5FGyOvuqAuIEHXxN2p0mIHSRs7FwvApJd3Za8lvW X-Received: by 2002:a62:938f:: with SMTP id r15mr34143276pfk.27.1543347892845; Tue, 27 Nov 2018 11:44:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543347892; cv=none; d=google.com; s=arc-20160816; b=gS8HHEcE35PwnuMDOPS8qQKKzxthjySQDIXYg7/lAm7lkoXLIa/F9AobC9dXEBT9Qb CBGORogcKgb3OqGXDQueZSczAdDjgszyF/etVy+usUkwuYPFD4Gv8o1MIaTb9EOTTUAN reJdCDYSJ7eZZ8tjikHg+v0QOVYrEKJtBvjmd/8+d8A0oszaJueeYlS2QnLR6KC+J2nk pjctqyv784hl0z9o8ylUGY8Ch1+5NLXG2fKjq673VKkz/VUdVpWA8xOnn2t3AL0JkWvs NKsys+2nzwMyCvHi+Eh800i2JqW/AkKv9SLOwGn2lcFeWFIxCBqa80jOf2Xv9g69qUsB XVYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=mYHNG8lfEzIyMHUhDDLvx87Kw5p0THgL4LdZGWas/wk=; b=DX/yM/Hvlk9j/BZHbFnIM2fFag7+sJ+DZC5QW4bwd4D8N18O5ndHIj/kr7NzdLidsQ 4sNriJnT6r8nzSKJx4nBSmelUlKLxUTVDNhqaqvmcLwwmvSB296ZGPeHffU5UuV+j+I4 SBYXGuJbzvgwU7ZYbfKeUKftieYFd/y4pDdr9b/1gWbM+9JJPSeu5PTOjWOk1GdCMjST 8IiEgVx2haE5D/PQXmQQ7LedslFm2vu9kFYfeYhMcrG2u5hV3AxjWGzJjWllB5NAfBgW 80M5O4Dv24JsZ2yYO42aswF6WTjFee/GRWRXWqap24OR2bGQlCT/WncSzq6hsn1+Jqb7 /FWw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 37si4242160pgw.590.2018.11.27.11.44.52; Tue, 27 Nov 2018 11:44:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726333AbeK1Gnn (ORCPT + 32 others); Wed, 28 Nov 2018 01:43:43 -0500 Received: from foss.arm.com ([217.140.101.70]:46938 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726234AbeK1Gnm (ORCPT ); Wed, 28 Nov 2018 01:43:42 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2678036B6; Tue, 27 Nov 2018 11:44:45 -0800 (PST) Received: from edgewater-inn.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id EB5AE3F763; Tue, 27 Nov 2018 11:44:44 -0800 (PST) Received: by edgewater-inn.cambridge.arm.com (Postfix, from userid 1000) id C169A1AE06FA; Tue, 27 Nov 2018 19:45:02 +0000 (GMT) From: Will Deacon To: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, ard.biesheuvel@linaro.org, catalin.marinas@arm.com, rml@tech9.net, tglx@linutronix.de, peterz@infradead.org, schwidefsky@de.ibm.com, Will Deacon Subject: [PATCH 1/2] preempt: Move PREEMPT_NEED_RESCHED definition into arch code Date: Tue, 27 Nov 2018 19:45:01 +0000 Message-Id: <1543347902-21170-2-git-send-email-will.deacon@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1543347902-21170-1-git-send-email-will.deacon@arm.com> References: <1543347902-21170-1-git-send-email-will.deacon@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org PREEMPT_NEED_RESCHED is never used directly, so move it into the arch code where it can potentially be implemented using either a different bit in the preempt count or as an entirely separate entity. Cc: Robert Love Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Martin Schwidefsky Signed-off-by: Will Deacon --- arch/s390/include/asm/preempt.h | 2 ++ arch/x86/include/asm/preempt.h | 3 +++ include/linux/preempt.h | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) -- 2.1.4 diff --git a/arch/s390/include/asm/preempt.h b/arch/s390/include/asm/preempt.h index 23a14d187fb1..b5ea9e14c017 100644 --- a/arch/s390/include/asm/preempt.h +++ b/arch/s390/include/asm/preempt.h @@ -8,6 +8,8 @@ #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES +/* We use the MSB mostly because its available */ +#define PREEMPT_NEED_RESCHED 0x80000000 #define PREEMPT_ENABLED (0 + PREEMPT_NEED_RESCHED) static inline int preempt_count(void) diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h index 90cb2f36c042..99a7fa9ab0a3 100644 --- a/arch/x86/include/asm/preempt.h +++ b/arch/x86/include/asm/preempt.h @@ -8,6 +8,9 @@ DECLARE_PER_CPU(int, __preempt_count); +/* We use the MSB mostly because its available */ +#define PREEMPT_NEED_RESCHED 0x80000000 + /* * We use the PREEMPT_NEED_RESCHED bit as an inverted NEED_RESCHED such * that a decrement hitting 0 means we can and should reschedule. diff --git a/include/linux/preempt.h b/include/linux/preempt.h index c01813c3fbe9..dd92b1a93919 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h @@ -53,9 +53,6 @@ #define SOFTIRQ_DISABLE_OFFSET (2 * SOFTIRQ_OFFSET) -/* We use the MSB mostly because its available */ -#define PREEMPT_NEED_RESCHED 0x80000000 - #define PREEMPT_DISABLED (PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED) /*