Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp272154imm; Thu, 20 Sep 2018 23:23:12 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ1fzMtYzpIWXdi/lXdnrNQnnsopniEtBaTkgl/sXhKLdm5quyXnzUMs3KjzF29l0rdn6wI X-Received: by 2002:a63:6243:: with SMTP id w64-v6mr40548185pgb.145.1537510992829; Thu, 20 Sep 2018 23:23:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537510992; cv=none; d=google.com; s=arc-20160816; b=zYSuagrU/hsqowUjIeJUwThLGGnmZVniEyVZE9ojX3Bk/DoCpz2UuAjKgNu63XT4pz mpzGKZUvmyvIzAJDedRwilleX4o7ghJ7GubDMMsrMqd37ZQS1AO+ogjHnUT7zpL6dv84 jCw2Dcr7h5qu57tEQylsoS39griSUW+aaFAbIHXCLas8zRHSVzIdWATXhZ446v4epkFo t7WVkVBJAbQXrX2CZKUQO8omCdWf6uOi1dRcBrVeXSW+zUXurhd/GTrPkg463/KEgoRJ YPhhAE6SKlB33kyoZdP/75ebidxgpmhe10M1zWFuvLbD8GIEhO5vHFEBwD5maHLK0s6R 2/UQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=Fhsb3TmhMBe2sqcysndc9zMhkMQBCw/zDTV6+acTI6s=; b=VCH1vdPvf56xvcQhFY0bZNFi8Dd0YDqKtQp9IoLoHVi7K7YI9dJSFuLnq9eErowXDv zh6Ronn2cUN7yAmNq1Q86ezolsskeiXPln/NfIeakyVSpPsLylJDfo6DteoWuBCh6T8/ H0O0guAOJ/pCym2KpVBEPH5ai6O4CvmK8NjInmyDo6456xh2knRpNjWRN2A7uMyAKP+Y 2DvC6YnRAX/V8cfYgKxCHZcfLvC12+aCfR8ak+5BWTKNOBmV4ysLeYzt3ySuwXy/q06b xt0CfcMgfMO7teWothVqoB/OkB7g+LdmOvT6l/snvhl1ZNc0wIwuQNei5842SH2JhnJ4 hMqQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8-v6si26088256plt.57.2018.09.20.23.22.57; Thu, 20 Sep 2018 23:23:12 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389472AbeIUMJU (ORCPT + 99 others); Fri, 21 Sep 2018 08:09:20 -0400 Received: from mga02.intel.com ([134.134.136.20]:42211 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389203AbeIUMJT (ORCPT ); Fri, 21 Sep 2018 08:09:19 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Sep 2018 23:21:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,283,1534834800"; d="scan'208";a="74799045" Received: from chenyu-desktop.sh.intel.com ([10.239.160.116]) by orsmga007.jf.intel.com with ESMTP; 20 Sep 2018 23:21:55 -0700 From: Chen Yu To: Thomas Gleixner , "Rafael J. Wysocki" Cc: Pavel Machek , Len Brown , Zhimin Gu , Chen Yu , x86@kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, "Rafael J. Wysocki" Subject: [PATCH 12/12][v4] x86-32, hibernate: Adjust in_suspend after resumed on 32bit system Date: Fri, 21 Sep 2018 14:28:41 +0800 Message-Id: <78ca6c538d10eb04bc15d576833d8d6131e29bf4.1537448058.git.yu.c.chen@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Zhimin Gu Update the in_suspend variable to reflect the actual hibernation status. Back-port from 64bit system. Cc: "Rafael J. Wysocki" Signed-off-by: Zhimin Gu Acked-by: Pavel Machek Signed-off-by: Chen Yu --- arch/x86/power/hibernate_asm_32.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/power/hibernate_asm_32.S b/arch/x86/power/hibernate_asm_32.S index 01f653fae7bd..6fe383002125 100644 --- a/arch/x86/power/hibernate_asm_32.S +++ b/arch/x86/power/hibernate_asm_32.S @@ -103,5 +103,8 @@ ENTRY(restore_registers) xorl %eax, %eax + /* tell the hibernation core that we've just restored the memory */ + movl %eax, in_suspend + ret ENDPROC(restore_registers) -- 2.17.1