From patchwork Wed May 30 21:38:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 137298 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp5826332lji; Wed, 30 May 2018 14:40:31 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKFKuir+R6K56EPTwMXJfJxXiufslQEaKoYaQgv92AYYtjulQ8fNWZ0HyoVXO+/Xx9wVzgq X-Received: by 2002:a62:9f15:: with SMTP id g21-v6mr4199800pfe.207.1527716430946; Wed, 30 May 2018 14:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1527716430; cv=none; d=google.com; s=arc-20160816; b=P3DyEiTtJ8nuUGgnmvHDEoGFQY14txumBdzRvmtyhjlD0bvoejBFTLUxeSCgHdYm1d ymU34AA3lFU6ScQyWilwVOw7n9F6NrCKvPwBO3o4WSBbZzd/+q0pVihpQi9sK1nFlJlp AJM66mROwJs7zUyTYq0vJxxaVL1H4qHqO9QKmwZiddvQE3drABVE1nIKP4d9vOly2gFQ lpNQjF7HP3ND3bD1RgoUgBZoCHPoQGkT4wIkZFt2OnHkUdsohoGRjon3eIulSM1nFV2R JTNkllV6CVU6Imtgz0BQdNOOfYkogIeNgVqSViLYLZiFic0y435J9lIVYMLkajKMCpuE mVzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=yANs6RMhdpGqGQ4bxMFOsXxVNVCxNzBXk0M+culLQ+s=; b=PxszVam1CAs/EPFFaM1zEgGac7iKSxxsMB8hgW00u9/CuGWUej/ljFGY90WT5ArIch H/d8nmy0P6LU0DLEWSQkikiAUfickKEINuXTgbfz4RkOcOCRYobGhfItVYUKBkKXRq6q +0SnuJCUI5BXDFNgpztinl26OKRj6lTs3rahbsDVfOaPo53rImDE/sMujvGNjpE6uvHH KSY1F78lhI9jtJezCu/lrTLkGkC+kkJQ70L06u0YF1i22UqaXJ91hsO8eDENe8/b8vgj V8zZtYUjyM6mtR00KUmiATH0c22S76MvLUIWDoA4FBQvDJ+uV5TYnfzPPn8FZhTsVxfO rjVQ== 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 l81-v6si36684192pfj.127.2018.05.30.14.40.30; Wed, 30 May 2018 14:40:30 -0700 (PDT) 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 S932495AbeE3Vk2 (ORCPT + 30 others); Wed, 30 May 2018 17:40:28 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:57225 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932300AbeE3VkZ (ORCPT ); Wed, 30 May 2018 17:40:25 -0400 Received: from wuerfel.lan ([95.208.111.237]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.145]) with ESMTPA (Nemesis) id 0MNtql-1fPUPH2BKd-007UAN; Wed, 30 May 2018 23:39:48 +0200 From: Arnd Bergmann To: Oleg Drokin , Andreas Dilger , James Simmons , Greg Kroah-Hartman Cc: Arnd Bergmann , Doug Oucharek , NeilBrown , Dmitry Eremin , Ingo Molnar , lustre-devel@lists.lustre.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging: lustre: include linux/highmem.h when needed Date: Wed, 30 May 2018 23:38:48 +0200 Message-Id: <20180530213941.772006-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K1:pQYOzkXnNjuORuEYjN/kXtTO8xZCNpu4GH1Em+PJsgshkwyLGyn 8b61AxYLB6O+nIEwyLmezRpyEOUdX5aT1wz33wJ821dmhIk0rjmiWkbawoTtl3KtGJNoSkZ NPJx6ApgTrIX2c+/k5CTDyZMxf0oPf+6uONycnW18uu0R+luBGQKHYrIEIPTMYp1sCG3JFH K+RyffcGb2riDEbwC2qZg== X-UI-Out-Filterresults: notjunk:1; V01:K0:WEAPVNXrm7U=:Bk3zZ+/oPEU7xUnoEpD5Kj 9R0Y+MrUaR6oXAiDo124C30uP4gqAsy4+MFwwKnsnTpPetNcjKfRB5mxEOrVpdAb5cD89/+oX S5TgQEPyqfuSh16MymdAxamklNZGJjw/qxSd6mG67+K6n08CUnqNamBv4MYD0CmyttUQebEw5 LXihgg4Sj3mQhjIVl9s/I7634wyz+MIrYDVuORcIH/3fdoCYZmbvCdXgt87pa/iFXetmERpZq a8ONEGwdOOvisRuStURZauf5BiMv2W8Bx90sOzRecksayiKNUqjHpKTWtRuAJsJKvPgXdsUX1 cZKbpuQe8iE6D0epPDcaaT98lw5Lq/utU8ibCe8TCqhQV40PnmBFchqHjH4ckLDp8y+O3qLyD 6pRWoiBF7PoTWxWoIgXavEq+k4qEdCeyl0Cy35NrDpwfgSOK4bD+z3EIrLa+SXieJ1aEjw+l+ nGMVDXVDa1pFwRZvFZmfx3PXBv7qGvY514kImvqiu/eI+WB6tsFWnPa+WBPIN7TcWQIyQpRAp DNKNCa+sL7udKkdR6f+NLXQI8VSwhlkF0fFjkFbx2BhmWJEuC0mg/YL0IuBKEKX7D+ZlPi4x8 DB+m73dZeteonQqjpzcvO41TvfhOZAgTcMTbK8T7v2hjczqD/hQMxgT4qS+crLfPYW6U7BQZx B2nSw+l0x4bmIqSBZjnjp6HDvvaPUJfIz41HWzt0zhfajbi10iZ8BLPA46/lyWf01p0Q= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Something in recent linux-next kernels caused linux/highmem.h to no longer be included implicitly from o2iblnd_cb.c, causing a build failure: drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c: In function 'kiblnd_kvaddr_to_page': drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: error: 'PKMAP_BASE' undeclared (first use in this function); did you mean 'RTM_BASE'? if (vaddr >= PKMAP_BASE && ^~~~~~~~~~ RTM_BASE drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:549:15: note: each undeclared identifier is reported only once for each function it appears in drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c:550:28: error: 'LAST_PKMAP' undeclared (first use in this function); did you mean 'AT_HWCAP'? vaddr < (PKMAP_BASE + LAST_PKMAP * PAGE_SIZE)) { ^~~~~~~~~~ AT_HWCAP This adds back an explicit include for the header. Signed-off-by: Arnd Bergmann --- drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 Reviewed-by: NeilBrown diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c index 47eb8b4c28db..65b7a62943ad 100644 --- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -35,6 +35,7 @@ * Author: Eric Barton */ +#include #include "o2iblnd.h" #define MAX_CONN_RACES_BEFORE_ABORT 20