Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp13929750pxu; Mon, 4 Jan 2021 08:13:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzk2IFI7MUrU7LBiUfU2PcEgrnr+tMvVXjO+ARJDTzUe83+71b7kMvwu8drd8X+EOQX+dC0 X-Received: by 2002:a05:6402:1765:: with SMTP id da5mr72968931edb.27.1609776798750; Mon, 04 Jan 2021 08:13:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609776798; cv=none; d=google.com; s=arc-20160816; b=U968kEybDAf8ckY5Qa2wmyFd2Cz5H94Qh76qy9kb/0rLi3eUs/pSUR/zPSOlKK+CXD 6FwQfill5MwV+HL6Xjd2MPgqn3Br5Nf6y6m6juDz5WNqscFcdnjA4Td+leumqRGSBlUm 4KDX7oi9ebYdLWbESq/xtX8TmIOsA+uQG1zRkSuKzfqATTrq7Lcs8nFS6xPLUtM8zmxO WNUYTnfALJTLx4CLOBl17G3QmUmkRZ7g+Gm667DW5BkFkQW9Ybx3Ct/cN43kB28GVCVx 2FtqDlnRzq6OnX6b1m2NQbiSlnR4aXijjNpkOApwVbZN13ymJjcKksPy6aRlZpEujqJA bTUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=PqhazDIekVBOltO/Qb8BQKu0H+V3A0P7O344+hap/n4=; b=NfmvjyReBrygcv9sJGzU+n1urtONyLljpqlwbg4BT/CQPwlFDVyH8lO0BPAwucRV1l V6YuQN9LzmQ6cnkxnp7SesxRJv8B792lWnF2ffsPXhv2lQ2QM6tHDvRmp0BxctOTHOqJ P8s8zfUFTYgwfH+5mQZR8b00lB8XRcOSU/IHwqazC9UhO/HFM55GGaSQozIB+qcaQQQI nj3PN8WpyWKi1E6hqTeARdoYFFRWRpWReVO3TtDUjoWNyNEqRua4DFD0hfHyIsq2y+NI zRXa7lykelWzkf6eJKn6my8iOrOiPXHvusd8MfGPMa25wPXWc9tQQUOK66hocDaN8bJT bOAg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=coP2M8Uo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a20si32543414edn.43.2021.01.04.08.12.54; Mon, 04 Jan 2021 08:13:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=coP2M8Uo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727750AbhADQJk (ORCPT + 99 others); Mon, 4 Jan 2021 11:09:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:36472 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728519AbhADQBN (ORCPT ); Mon, 4 Jan 2021 11:01:13 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id DA77F2250E; Mon, 4 Jan 2021 16:00:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609776058; bh=HnNaHNJxfVxU+EAUPCD8OQpZsquJAgWFDNBE0aZ9X8w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=coP2M8UoqPsQeHhzA4Jsz9/HeH3N8jy9kI1FG+Ht9TmNchrTZrPK1cHeqQgsiwfMF TxQu8zKe6g5Rl2uwdlTSf0GWPZkjqWLIqh9nlQmYwyZvMy6ZdLKgdZv3hf4Q73jha4 zP6+QtO+CF7onv53sqkznukZdM4W3KDGGY3Zbp6M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Ian Rogers , Jiri Olsa , Namhyung Kim , Petr Vorel , Arnaldo Carvalho de Melo Subject: [PATCH 5.4 20/47] tools headers UAPI: Sync linux/const.h with the kernel headers Date: Mon, 4 Jan 2021 16:57:19 +0100 Message-Id: <20210104155706.716155976@linuxfoundation.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210104155705.740576914@linuxfoundation.org> References: <20210104155705.740576914@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo commit 7ddcdea5b54492f54700f427f58690cf1e187e5e upstream. To pick up the changes in: a85cbe6159ffc973 ("uapi: move constants from to ") That causes no changes in tooling, just addresses this perf build warning: Warning: Kernel ABI header at 'tools/include/uapi/linux/const.h' differs from latest version at 'include/uapi/linux/const.h' diff -u tools/include/uapi/linux/const.h include/uapi/linux/const.h Cc: Adrian Hunter Cc: Ian Rogers Cc: Jiri Olsa Cc: Namhyung Kim Cc: Petr Vorel Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Greg Kroah-Hartman --- tools/include/uapi/linux/const.h | 5 +++++ 1 file changed, 5 insertions(+) --- a/tools/include/uapi/linux/const.h +++ b/tools/include/uapi/linux/const.h @@ -28,4 +28,9 @@ #define _BITUL(x) (_UL(1) << (x)) #define _BITULL(x) (_ULL(1) << (x)) +#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1) +#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask)) + +#define __KERNEL_DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d)) + #endif /* _UAPI_LINUX_CONST_H */