From patchwork Fri Nov 22 10:54:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180021 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp63471ilf; Fri, 22 Nov 2019 03:13:58 -0800 (PST) X-Google-Smtp-Source: APXvYqzbCLx65xRwgXboJye6og/CvRKMGAYsWoPUveCgFOl53i2SIX9ttA4EFr8OgGY/zC0ngH5/ X-Received: by 2002:a17:906:4b10:: with SMTP id y16mr1839759eju.216.1574421238686; Fri, 22 Nov 2019 03:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421238; cv=none; d=google.com; s=arc-20160816; b=HZeygDjP5ETL9NZd82D/eMIArt2hd6Qe24Zg3oy59beIW9QoMSkwqxGsRBvPfjP04/ AJRlMZ6pBy0yFWc/s2XqHcVoyI7JISjlpfnS/QT2F8ncLSekXeQQgUkjejQArqlMg++s hC79LQC/Q//9wIJXQQFt35UcjVwzc0XeMqfqzI+6Hb5RDM7N+5DaENYeqIBHcqHYrEB6 tlWA4+C4uZY4GBpgUANBbe3Td6GTzf2fyIHnJdbNJ2OrpybrEDwFQ/p0FMNLvUpPCoYR w+QjjZqECAHWJ9VoDBpX33C4/jnqXj/lceKKBMs3cAJ2wMOmDwQxCSEhOzdu91A2vbZb A+tg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:to:from:dkim-signature; bh=xBQD+e/TnUVrvhwSCfQXht9+xwZCKiD7itNG4fU+Fq0=; b=Snygvf/Wsdq8lTfzp+emgZ4ELgNLNnCaZYvB35UNQ+kwQ3242004L77AWYTeaVUcF8 ZxOczPW2cHKqh7LE9obKSCpgDvm+Y1iRQKvnOlKd+N1ZEFb+aXTkB7FpVaswQMQstQbs /mvWx2/ZLpnI0qnZK5HB2ogcWSrSSTl3xAreNKdMmxcD17NQM58KlZQrhRQwnVARi9KB 6zydf6PaZ+V7W4bMlggEOZ31V7ZZnoihg2zpnH1suL7pRxEGsUiOrkTmUiWUlRS83Nn9 /TiDvW58AOO/kwskghAewegzpc2qZz7q9KnXVG1e/SPahBR0x3upeURHn2KBNjuyIpGx ri9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WVUjmzQg; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ch17si4055882ejb.184.2019.11.22.03.13.58; Fri, 22 Nov 2019 03:13:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=WVUjmzQg; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727953AbfKVLN5 (ORCPT + 15 others); Fri, 22 Nov 2019 06:13:57 -0500 Received: from mail-wm1-f66.google.com ([209.85.128.66]:36304 "EHLO mail-wm1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727040AbfKVKye (ORCPT ); Fri, 22 Nov 2019 05:54:34 -0500 Received: by mail-wm1-f66.google.com with SMTP id n188so5132358wme.1 for ; Fri, 22 Nov 2019 02:54:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xBQD+e/TnUVrvhwSCfQXht9+xwZCKiD7itNG4fU+Fq0=; b=WVUjmzQgnmX9m9kz5Ox6beljyZDlaEOGtdNKL53tvC5vFnYupaCa4+1B5efUOrUjp/ +3yPYvcxdmY2MQMujBBqIPPIW3WxqrARpninMsxm0Zv5NV/Pm64YmpM2OK4Wafd/c020 pvWCkw4hL6HAaxZxx53i+UdQ//rLOBsHtAoLVlJaXr+0cRcAhZ3BvW0DiqySruDsMBcl 9/5uZNM0vZGQYC0rmV/NYFoX7bzOrRFKngDQVP2TcklGt242gOBznQRp+a/aLPiG3jJp quRBo6cW/H+KgYfBhuxfKHG8R19vkhUH+uw/dD7t65o8qlHltNuyTl3cQfShP5MubHq5 1g0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=xBQD+e/TnUVrvhwSCfQXht9+xwZCKiD7itNG4fU+Fq0=; b=hixpgrEnlHVJAWPSrfzGQu4EE3H2ePOINhIu6/WhuH0Mkt0nmPG60xV6KsRn322mQb 5Nat0k0d+obBIRQHiaKiyIZfcO4meGYk/Dk7QgJTNDmPQtqmtHcQU/PEG4UNKOaQ2+Tr 1zAmWzU4RXyMqNbNZ/79TXJAysFB+JdjB80ty6CDvJePLE5oL2A867ETACnMnRy6lDmJ bRhq0wqTRz8Njh7a/6PLSEl4RJMLmOSWmqJpkmSzHudi6dJlmVtNELarA9J7mBwSv1XJ OBOweUzjsRygsrGfdGWhYVFeOOYSeMPeIB04Dj73GWre0p0kmNo2zaG4Pz6Ey9DPOEHO Xw6g== X-Gm-Message-State: APjAAAU1IWyifIxjFA4BjPDuxB5K7HiMJ4sFC7gWHBjUVHXkoZcwMKzk wtPSyFB2DKl7UYH2PKTnW6yI3MSEiXI= X-Received: by 2002:a1c:7fd8:: with SMTP id a207mr15933896wmd.10.1574420072495; Fri, 22 Nov 2019 02:54:32 -0800 (PST) Received: from localhost.localdomain ([2.27.35.135]) by smtp.gmail.com with ESMTPSA id p14sm7498912wrq.72.2019.11.22.02.54.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2019 02:54:31 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org Subject: [PATCH 5.3 1/2] ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary Date: Fri, 22 Nov 2019 10:54:16 +0000 Message-Id: <20191122105417.11503-1-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Chester Lin [ Upstream commit 1d31999cf04c21709f72ceb17e65b54a401330da ] adjust_lowmem_bounds() checks every memblocks in order to find the boundary between lowmem and highmem. However some memblocks could be marked as NOMAP so they are not used by kernel, which should be skipped while calculating the boundary. Signed-off-by: Chester Lin Reviewed-by: Mike Rapoport Signed-off-by: Russell King Signed-off-by: Lee Jones --- arch/arm/mm/mmu.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.24.0 diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index d5e0b908f0ba..25da9b2d9610 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c @@ -1197,6 +1197,9 @@ void __init adjust_lowmem_bounds(void) phys_addr_t block_start = reg->base; phys_addr_t block_end = reg->base + reg->size; + if (memblock_is_nomap(reg)) + continue; + if (reg->base < vmalloc_limit) { if (block_end > lowmem_limit) /* From patchwork Fri Nov 22 10:54:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 180020 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp63460ilf; Fri, 22 Nov 2019 03:13:58 -0800 (PST) X-Google-Smtp-Source: APXvYqwly6uMotDux0Sc36PVl7k9z07zQr8YrCnwksz4J69wRymX+y0Fer693vxU4sQv58GdHPNl X-Received: by 2002:a17:906:2552:: with SMTP id j18mr21952051ejb.244.1574421238195; Fri, 22 Nov 2019 03:13:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574421238; cv=none; d=google.com; s=arc-20160816; b=V3FOni1GkX51EJZIef+mHIZqlOyGeZDE8P0HI748buXdT99BBERFktodTLT2BZ+UI8 cOaCS208zG9MGhEmYr+EHDsZWGiHDEoMzQNGR9rf4ir9ey2+1Lu/H6LvA7UF698yAxUQ +gXtJM3GFNnm8DpmhL+z6JPFGSCHKNpGcwn5TW8OIH4f024j4ju425q+H8rT/oI2cRcL kLFWqlL7PTY5Bnb4AU5KdJ+TUKeBvkkdPIlIX8igWrkp9U6fybMciCgMsd1LCwoKbHZJ 9U8ZfP++hXuDmh7t+Rou0s9R9ZJjzlVVqdgKgTo/N7dNcWPnJ75M8D9EXyT63SnjKW6m wlZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=VwBKkPsx+uAn3PLEG6SoAp/dys1syHkjUrLSI7HsUI8=; b=Bz4OujUwlqptpW46ELtXofIRsrbxuGZF8JC2O+nRETdpTXWKECWN6KyWq2IJkRMVGg fmhoXV1Q9KEs48di5ZqMcFS9ZIEakFLPXjGkuOwhE3+8eezyJMB+qHvjWehMeZc2A1+b MQbMMXeud+96KwdDxzCdto6HL4KmdntmV+fjmAPPyJQVBtKEdNucXX/kQ+oNixRcRnsI iuTKeRoQOHkugpyu2Co29eFxUk8FhqROzkBa9dh2OYwNrqBxvRWyUmw0LErns3HzKKqT yxHfi924E99xlYZ9AD97mctxbJoDPr/jwml4CJZmdzbjIBPwvNulI8xFBYIMWInnC1SC rA1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HwUI9fFJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ch17si4055882ejb.184.2019.11.22.03.13.57; Fri, 22 Nov 2019 03:13:58 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=HwUI9fFJ; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727933AbfKVLN4 (ORCPT + 15 others); Fri, 22 Nov 2019 06:13:56 -0500 Received: from mail-wr1-f65.google.com ([209.85.221.65]:39927 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728688AbfKVKyf (ORCPT ); Fri, 22 Nov 2019 05:54:35 -0500 Received: by mail-wr1-f65.google.com with SMTP id y11so4952703wrt.6 for ; Fri, 22 Nov 2019 02:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=VwBKkPsx+uAn3PLEG6SoAp/dys1syHkjUrLSI7HsUI8=; b=HwUI9fFJNxtsdpCg4xWYfU+iP6+/7PY7fRxLe9CFgOAZH3ipTuPM/YizuXCsWyBZbI IA418LsnFx1W+AbVLqumG7RgwXrYbQ+W8ZjN0ixmrYLHfoGAsXBF785tnFgaQDy92cpw cbhi/Ppm+FQTL/vGswBETufWftjRQqA8DNh2jGevORLSsC6f9RICdw/ui3FJ0HYN/EvX Zf+JlWy3kltJAOWj96DsfW9qLDKUF7misDpqFoyE0If6mMuJG4y6gY6gxGKAvJQiVOLl Zn4sScjafXQ+gB94B4DvG06kofpo8hWDFPoZiRi0yzz7pRcppi9eq/iv2plU1oHu9YLT 3iRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VwBKkPsx+uAn3PLEG6SoAp/dys1syHkjUrLSI7HsUI8=; b=beBSgAFjQ6q5/c1g8ZuR0PuaBdCCCe778/0hyfp4XJwUhilHglDlqiURCAz4wcQBJW 5NmmoOL9yG1ZrJuAOzHm5HdcRunVjE6BZBks7G4/AXg6YUsoZSXVGtBj6L3GQqU2tKkl pHUaxqLKqZhMlFhHRyChEgexbf20a6jvgXMT8am8IoAgY81JAt9vAeYFPLP1hmrWUaNf W9zXPec+BUA6V3+j+77ycicvUdi4UDMZBUqIdOvq8juTMJP5zl0zkRinrlDbf8mlC6lN Vif1XOtIol8rou3tyFe2tpIlBNFbAv1MDGzpKVMVLip6jFLS0VhwtKpHH9sN0/vvdJbK z+sw== X-Gm-Message-State: APjAAAUEn3VYWvIvzvL7rOHzejweFQsB/7J793WBEVuoYQu3erlu9v7j 0DCwcMbkwyxgOese00/ldunS+LLSmEY= X-Received: by 2002:adf:f987:: with SMTP id f7mr17030957wrr.284.1574420073541; Fri, 22 Nov 2019 02:54:33 -0800 (PST) Received: from localhost.localdomain ([2.27.35.135]) by smtp.gmail.com with ESMTPSA id p14sm7498912wrq.72.2019.11.22.02.54.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Nov 2019 02:54:33 -0800 (PST) From: Lee Jones To: lee.jones@linaro.org, gregkh@google.com, stable@vger.kernel.org Subject: [PATCH 5.3 2/2] can: dev: can_dellink(): remove return at end of void function Date: Fri, 22 Nov 2019 10:54:17 +0000 Message-Id: <20191122105417.11503-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191122105417.11503-1-lee.jones@linaro.org> References: <20191122105417.11503-1-lee.jones@linaro.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Marc Kleine-Budde [ Upstream commit d36673f5918c8fd3533f7c0d4bac041baf39c7bb ] This patch remove the return at the end of the void function can_dellink(). Signed-off-by: Marc Kleine-Budde Signed-off-by: Lee Jones --- drivers/net/can/dev.c | 1 - 1 file changed, 1 deletion(-) -- 2.24.0 diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 99fa712b48b3..8ada8e7326f9 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c @@ -1210,7 +1210,6 @@ static int can_newlink(struct net *src_net, struct net_device *dev, static void can_dellink(struct net_device *dev, struct list_head *head) { - return; } static struct rtnl_link_ops can_link_ops __read_mostly = {