From patchwork Wed Jun 19 01:38:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Summers, Stuart" X-Patchwork-Id: 11003193 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 30DDF13AF for ; Wed, 19 Jun 2019 01:39:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2104928A6F for ; Wed, 19 Jun 2019 01:39:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1218028B21; Wed, 19 Jun 2019 01:39:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 43EAD28B2D for ; Wed, 19 Jun 2019 01:39:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BA27F6E279; Wed, 19 Jun 2019 01:38:58 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 664956E278 for ; Wed, 19 Jun 2019 01:38:57 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 18 Jun 2019 18:38:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,391,1557212400"; d="scan'208";a="160227577" Received: from jssummer-desk.ra.intel.com ([10.54.134.159]) by fmsmga008.fm.intel.com with ESMTP; 18 Jun 2019 18:38:56 -0700 From: Stuart Summers To: intel-gfx@lists.freedesktop.org Date: Tue, 18 Jun 2019 18:38:56 -0700 Message-Id: <20190619013856.11872-1-stuart.summers@intel.com> X-Mailer: git-send-email 2.21.0.5.gaeb582a983 MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH] mm: Use local variable for swap address space X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP This addresses the following build error: mm/huge_memory.c: In function ‘__split_huge_page’: mm/huge_memory.c:2506:41: warning: dereferencing ‘void *’ pointer __xa_store(&swap_address_space(entry)->i_pages, ^~ mm/huge_memory.c:2506:41: error: request for member ‘i_pages’ in something not a structure or union Cc: Chris Wilson Signed-off-by: Stuart Summers --- mm/huge_memory.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index affb2c3667f9..bced5485137b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -2503,7 +2503,9 @@ static void __split_huge_page(struct page *page, struct list_head *list, head + i, 0); } else if (PageSwapCache(page)) { swp_entry_t entry = { .val = page_private(head + i) }; - __xa_store(&swap_address_space(entry)->i_pages, + struct address_space *address_space = + swap_address_space(entry); + __xa_store(&address_space->i_pages, swp_offset(entry), head + i, 0); }