From patchwork Sun Sep 10 22:10:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 9946405 Return-Path: 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 17423602C9 for ; Sun, 10 Sep 2017 22:10:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0B54728A54 for ; Sun, 10 Sep 2017 22:10:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 003D628A66; Sun, 10 Sep 2017 22:10:50 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B3D9328A54 for ; Sun, 10 Sep 2017 22:10:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbdIJWKu (ORCPT ); Sun, 10 Sep 2017 18:10:50 -0400 Received: from mx1.mailbox.org ([80.241.60.212]:58428 "EHLO mx1.mailbox.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751661AbdIJWKs (ORCPT ); Sun, 10 Sep 2017 18:10:48 -0400 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id EC51A43ABA; Mon, 11 Sep 2017 00:10:46 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id sNi5cpCq48si; Mon, 11 Sep 2017 00:10:46 +0200 (CEST) From: Hauke Mehrtens To: johannes@sipsolutions.net Cc: backports@vger.kernel.org, Hauke Mehrtens Subject: [PATCH 6/8] header: add pm_system_wakeup() Date: Mon, 11 Sep 2017 00:10:18 +0200 Message-Id: <20170910221020.13067-7-hauke@hauke-m.de> In-Reply-To: <20170910221020.13067-1-hauke@hauke-m.de> References: <20170910221020.13067-1-hauke@hauke-m.de> Sender: backports-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: backports@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This function was added in kernel 3.18 in commit 068765ba7987e ("PM / sleep: Mechanism for aborting system suspends unconditionally") In our implementation we only call pm_system_wakeup(() and do not handle the abortion of the current suspend process. Signed-off-by: Hauke Mehrtens --- backport/backport-include/linux/suspend.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 backport/backport-include/linux/suspend.h diff --git a/backport/backport-include/linux/suspend.h b/backport/backport-include/linux/suspend.h new file mode 100644 index 00000000..394b164b --- /dev/null +++ b/backport/backport-include/linux/suspend.h @@ -0,0 +1,12 @@ +#ifndef __BP_LINUX_SUSPEND_H +#define __BP_LINUX_SUSPEND_H +#include_next + +#if LINUX_VERSION_IS_LESS(3,18,0) +static inline void pm_system_wakeup(void) +{ + freeze_wake(); +} +#endif + +#endif /* __BP_LINUX_SUSPEND_H */