Message ID | 1488920133-27229-13-git-send-email-labbott@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 116B8602B4 for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Mar 2017 21:02:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0B162853B for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Mar 2017 21:02:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C34542853D; Tue, 7 Mar 2017 21:02:10 +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=-1.4 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_SORBS_SPAM autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 533F42853B for <patchwork-linux-arm@patchwork.kernel.org>; Tue, 7 Mar 2017 21:02:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=BVu8bzkk0+yFJkBNRcTiyM6HH1g0uwbKgtJmIXdx+6A=; b=jSnxl8lZ1XeS6ahWLCt7cM629Y 5uB/VP5G3LeTkE2sb2CgReC/8XHuwUvcMuzcx7GPKA+QsqZJr/hh/ESN8jpPDvi9MmXUbW65Ufr3Q jldznmGr/ImRZcbkTB7OstEQW8d1KNUUdZLZiX5fNUn+FBOg1mQnAId7pW/p5ZhgPF4X1WEy25qqQ jT3m8FeO6dDR4/CkJdboJG+HV9md60iU7tXa/a0uyVKw7QSpnYwaFphY17vl2KPqb+4h7d31u99L+ WolThDp4K/0qCkaHOGwEPKPNsfMdAhCP/Wj61eNgn100nUSauYm1/s6sssLtDo6TSWM00OBRzv5eR SQ6SxCyw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1clMFD-0008Oe-Tr; Tue, 07 Mar 2017 21:02:07 +0000 Received: from mail-qk0-f177.google.com ([209.85.220.177]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1clMAA-0003IW-Hu for linux-arm-kernel@lists.infradead.org; Tue, 07 Mar 2017 20:56:56 +0000 Received: by mail-qk0-f177.google.com with SMTP id y76so25665127qkb.0 for <linux-arm-kernel@lists.infradead.org>; Tue, 07 Mar 2017 12:56:34 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PEbgyuK+Nc1BMYC6W+vnWAIPd+BxT0uh9gOE02Qji80=; b=QoWpKPNz5TKsCPym86EDLORHQHNx8Rslg2ZW7P6wSKGP5Vl9GtiZGlntWALdQML3ms pdgd/o5Ne9w8LtnXKApYeijLnjoHSEZpC9eBwFdjT6ZuppeOpidkH2RFLyGT7ykT7h0L 3RFrr624klc6i/NUl0zyTIna1d91WxudyCjR8Qo4nF+dATP+GUML4et5cR6h+VRCfVOM PkJ2Xcc5ZRZYpVnagOT6Sxh5zTRJFkmtrSJrVh+tTgqERlGzStMQp4PiDdSMMrQIXwnZ DAiswVqF1032T7CqBH3iYC8yAwszO9J05Q3me5CFZiiwlx9bdXbLXW4UFSGa/ucRSDtl o5QA== X-Gm-Message-State: AFeK/H3wOYsQ1FQjnH2uqE6Nf/QdwOSo/87hl50tTpfurdSLx5lou1F9VUpJtAha6a0B72dG X-Received: by 10.55.7.7 with SMTP id 7mr3194225qkh.228.1488920193172; Tue, 07 Mar 2017 12:56:33 -0800 (PST) Received: from labbott-redhat-machine.redhat.com ([2601:602:9802:a8dc::5ce7]) by smtp.gmail.com with ESMTPSA id z196sm764343qkb.11.2017.03.07.12.56.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Mar 2017 12:56:31 -0800 (PST) From: Laura Abbott <labbott@redhat.com> To: Andrew Morton <akpm@linux-foundation.org> Subject: [PATCHv3 12/16] PM / hibernate: Use set_memory.h header Date: Tue, 7 Mar 2017 12:55:29 -0800 Message-Id: <1488920133-27229-13-git-send-email-labbott@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1488920133-27229-1-git-send-email-labbott@redhat.com> References: <1488920133-27229-1-git-send-email-labbott@redhat.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170307_125654_671073_EB1A8174 X-CRM114-Status: GOOD ( 10.65 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: Mark Rutland <mark.rutland@arm.com>, David Airlie <airlied@linux.ie>, Catalin Marinas <catalin.marinas@arm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Takashi Iwai <tiwai@suse.com>, Wim Van Sebroeck <wim@iguana.be>, "H. Peter Anvin" <hpa@zytor.com>, linux-watchdog@vger.kernel.org, linux-arch@vger.kernel.org, linux-s390@vger.kernel.org, Jessica Yu <jeyu@redhat.com>, Daniel Borkmann <daniel@iogearbox.net>, x86@kernel.org, Russell King <linux@armlinux.org.uk>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Ingo Molnar <mingo@redhat.com>, Laura Abbott <labbott@redhat.com>, Guenter Roeck <linux@roeck-us.net>, Kees Cook <keescook@chromium.org>, Arnd Bergmann <arnd@arndb.de>, Will Deacon <will.deacon@arm.com>, Thomas Gleixner <tglx@linutronix.de>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Martin Schwidefsky <schwidefsky@de.ibm.com>, "David S. Miller" <davem@davemloft.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index d79a38d..3b1e0f3 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c @@ -36,6 +36,9 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> #include <asm/io.h> +#ifdef CONFIG_STRICT_KERNEL_RWX +#include <asm/set_memory.h> +#endif #include "power.h"
set_memory_* functions have moved to set_memory.h. Switch to this explicitly. Signed-off-by: Laura Abbott <labbott@redhat.com> --- v3: #ifdef protection --- kernel/power/snapshot.c | 3 +++ 1 file changed, 3 insertions(+)