From patchwork Thu Jul 26 16:12:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 143163 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp4387227ljj; Mon, 30 Jul 2018 11:23:49 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeVIjL2tPs2wQ7MSm7D4COAVefq42iFX6BLR4b56X7NVSavUfv0mrIGcA7r6HdnQksm7aHc X-Received: by 2002:a1c:6e07:: with SMTP id j7-v6mr265762wmc.126.1532975029263; Mon, 30 Jul 2018 11:23:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532975029; cv=none; d=google.com; s=arc-20160816; b=zog8yIH7oCShDrl7Jy/lS8gsOf/c2C/UFHVshvXb4SCGuB75YtCkDhsTO0TPJsRLUB jTQDXbUBiNPR06buOsYHb+HruL/dZ086nogu3AR9atdVzKwqUJDYCTZ6MWzk3mOVNhpA 3Ir3XrwphIF1GgDsLqH26giO4hG3UYZVy2rNuvUMVR+Nv+G0p/OfyNpnWrCAU41BuGte 8BwmZpKkbJBVh18oIbf20TrHAfRm4sqD3SAV2OyzNrYseZ6gjIioRitJpDbMgXeQvHTI M7bnM9+VtUb6p9rihcEZvpElbYM3H24BH2UAPf9+RfN+LjBXCEeBHX5xlMr3yrXLHWBJ sRyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to:arc-authentication-results; bh=ViUk5k+9jQxU2VwBnAt769jHWCxfimGfGYGHp7Sqvs0=; b=e9yse/7iLxfSj/OI1EtdlFnw1c2LLUYp8eNY73AnwJlUg4DcBHmoopdr7tiNiitHVH G11ayUpadBy062aXGcyCmcCqdSa4dXoqmIlvBnhzLLnZRkCa1XxtMppPCFoGUUktPMpY eIW6wqA50TaIapXwhst8vWDmXbheuiZ6RnulftgEgefE3WlXRa4UklEwM7f/o+aHHEb5 eIZrLQh8dYp7nGuJmjDm8ReMMEFRyXrjwBdBWr2K4sz6+Gw7SQAjCA0ZHjNE9YeWbv35 54s2Re9/8GALq5q5T1I5yoeUFH0+uhXd87+yCs/x2Egx7U2ylYtqfYu6ysMxEAABy9uw UNdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=JC1itxAz; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id k2-v6si6049961wru.81.2018.07.30.11.23.49; Mon, 30 Jul 2018 11:23:49 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=JC1itxAz; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 081C32677DD; Mon, 30 Jul 2018 20:23:04 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id A3BD02677C6; Mon, 30 Jul 2018 20:22:55 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: ** X-Spam-Status: No, score=2.1 required=5.0 tests=DATE_IN_PAST_96_XX, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 7F57E2677BB for ; Mon, 30 Jul 2018 20:22:51 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=bBj80t3N1jVARtG1JOmQI9HuNROvRr5rb2NAf4xdTP8=; b=JC1itxAzZw2q GlTcgNoCVNrkdGkqzP65fJg52Hiq/OcRYIP/OEodac8zHXpl8n8b94R+HiaroPVn97m6MpLYEJeIs rQEb7UYskshEjSJ2D3Eij5udU/TcFmDgm3y/FLJ/+icDG4dTIJMoOLzuUAahWSkcGi+9Dw7qCB96h MPUlY=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1fkCob-0005jf-PD; Mon, 30 Jul 2018 18:22:41 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id F366244008F; Thu, 26 Jul 2018 17:12:04 +0100 (BST) From: Mark Brown To: Pierre-Louis Bossart In-Reply-To: <20180725201556.21136-1-pierre-louis.bossart@linux.intel.com> Message-Id: <20180726161204.F366244008F@finisterre.ee.mobilebroadband> Date: Thu, 26 Jul 2018 17:12:04 +0100 (BST) Cc: alsa-devel@alsa-project.org, kbuild test robot , tiwai@suse.de, liam.r.girdwood@linux.intel.com, vkoul@kernel.org, broonie@kernel.org Subject: [alsa-devel] Applied "ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 4cae99d9b5305ab8cccc839fccceb81ec9e5abda Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart Date: Wed, 25 Jul 2018 15:15:56 -0500 Subject: [PATCH] ALSA: memalloc: declare snd_sgbuf_aligned_pages() unconditionally Make this helper inline function available for all platforms. This helps solve 0-day compilation issues when CONFIG_SND_DMA_SGBUF is not defined. Reported-by: kbuild test robot Signed-off-by: Pierre-Louis Bossart Reviewed-by: Takashi Iwai Signed-off-by: Mark Brown --- include/sound/memalloc.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -- 2.18.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index 9c3db3dce32b..c669900e6cbe 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -67,6 +67,14 @@ struct snd_dma_buffer { void *private_data; /* private for allocator; don't touch */ }; +/* + * return the pages matching with the given byte size + */ +static inline unsigned int snd_sgbuf_aligned_pages(size_t size) +{ + return (size + PAGE_SIZE - 1) >> PAGE_SHIFT; +} + #ifdef CONFIG_SND_DMA_SGBUF /* * Scatter-Gather generic device pages @@ -90,14 +98,6 @@ struct snd_sg_buf { struct device *dev; }; -/* - * return the pages matching with the given byte size - */ -static inline unsigned int snd_sgbuf_aligned_pages(size_t size) -{ - return (size + PAGE_SIZE - 1) >> PAGE_SHIFT; -} - /* * return the physical address at the corresponding offset */