From patchwork Mon Apr 9 00:21:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132946 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp641392ljb; Sun, 8 Apr 2018 17:25:35 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+wK/x8C4GJu/rE6ngXfQRCqXpYviYKLpaSN4RxTUIBkzuR6QsRMNFyinuv8CRS3yGE/L9g X-Received: by 2002:a17:902:9894:: with SMTP id s20-v6mr28452191plp.196.1523233535439; Sun, 08 Apr 2018 17:25:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523233535; cv=none; d=google.com; s=arc-20160816; b=si1f0bwRwNaZL2bk9aW1mLvo7mAYgWHlSXIXiKgzzCYosvtaTU1N1l4Oj4zkj5KxAT sdlizLNY5WOUGOlawTFMl9ZF0FR3eebADpJ2VnsXd/bQYSynEuCpnxuAJNeylD57W5bk 4pA2jw/q8WvTHmpsrV74Ct2KHE+xMG4dnK1XKaEfM0Eiq97+Ty1IhDykGFsv1nZA0dFE R/bfMOM34MRh97D1NKc6KYohR4DcObsc0r5rUn8n10SHuf5es8KdeI9HNPpmnTtSg4Tc ebcj3B4M/hBvRvXcqmjj2aNrkI4pmiQB/TzspKemUQSTNWBptonpW+1bfqKXwCbYzcQ6 2Tcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=92LPbcuP1+Nu6hJ7JSAFmsZgtoYGVkr1KtL7T+wJ5YU=; b=Cg8NwfQLIxKXzQV0VQQBuSS1KNZ+q22thVU5qFP4VLwDAa/OXk9uRruXiYW0Bg4HX4 9ZeAyfOhGOXumJ3IaAfeRcRj3mi2AeB3DmjkyveNVRPKG55bTrAqcxhYd1idj+E2YW6S Ng1J26OEsAi2JJ43lE4NGWtSexaXGIo0WkcuSGK6qMRx6qle6lk4nkgQaT6Npx2TV0w8 c//b9pqyRnZ3/O2NU8lqk5DN16xBiOa+WodlzqsJuKoCkkz57n0qi/tIm758v98u7ZOE Wfz7BzGLuVT/AKoqwnhkNVxtdVq33bT12MHmReUvSFA29oOCTrZDzbGaaY//takd6BB7 S26A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=R0ryEgil; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z33-v6si16204459plb.694.2018.04.08.17.25.35; Sun, 08 Apr 2018 17:25:35 -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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=R0ryEgil; 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=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754314AbeDIAZa (ORCPT + 29 others); Sun, 8 Apr 2018 20:25:30 -0400 Received: from mail-bn3nam01on0112.outbound.protection.outlook.com ([104.47.33.112]:5721 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755155AbeDIAZZ (ORCPT ); Sun, 8 Apr 2018 20:25:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=92LPbcuP1+Nu6hJ7JSAFmsZgtoYGVkr1KtL7T+wJ5YU=; b=R0ryEgilroP9kJniih6EhP+EW8SKnv/GRFzoF89kGyDb00kBFJ17yLSZvTTtyxNm/lVGquRMGqwH0mrhYQ0RtekWHHUTuY64f/fyyYkqIWsARRD7tOFtawZmmONLu596diNEMhiTgxdBHQDoLUfBnHcEbAnDniHZhguxyn4Ngx8= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1013.namprd21.prod.outlook.com (52.132.133.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.696.0; Mon, 9 Apr 2018 00:25:22 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8109:aef0:a777:7059%2]) with mapi id 15.20.0696.003; Mon, 9 Apr 2018 00:25:22 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "linux-kernel@vger.kernel.org" CC: Arnd Bergmann , Thomas Gleixner , Len Brown , Andi Kleen , Nicolas Pitre , "linux-pm@vger.kernel.org" , "Rafael J. Wysocki" , Pavel Machek , Bart Van Assche , Sasha Levin Subject: [PATCH AUTOSEL for 4.14 116/161] x86/power: Fix swsusp_arch_resume prototype Thread-Topic: [PATCH AUTOSEL for 4.14 116/161] x86/power: Fix swsusp_arch_resume prototype Thread-Index: AQHTz5iziPGN6a6CTUiL7GOEJKblVw== Date: Mon, 9 Apr 2018 00:21:27 +0000 Message-ID: <20180409001936.162706-116-alexander.levin@microsoft.com> References: <20180409001936.162706-1-alexander.levin@microsoft.com> In-Reply-To: <20180409001936.162706-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1013; 7:NU7eYY1L9x1UIh9S87QUYtlve/KPmMKQ4OtRZdw/cR7enA1azVmntzqJNcQ+DhV7f3eNfoes3KcPtTtKKHIPI6UrbcXgn6ru0ZnI7YcJo4ojg4rVM+RviS2yKRAPI6puEIOcv2w5yATtTiSCakh6MrQOA5TrVKIfzKClmPyi0RVb1hBFezZh6sbOx54xEaeR1Bt5o/Xs/Ldhcil2rcQ/VCsSZBUioYIthwhP4YiK50LwdZrpuNpbeXSoPLhpsksA; 20:vwF6DIu2+DuS5SUymbkK1wxqwobYHCq/gfMbtGtGaJ0dMUO/RfkxYrlRAYk8uIuQ7Pty7aXS/bgEdqFMM/W3t98241LXko4v5iU5gQgbyNlLskVCqZXItDCGBgmkCkndpliCFtdBZ9d3AY8nfYlBrs8gpoopuIwVtKE8BHPyjvY= X-MS-Office365-Filtering-Correlation-Id: 9d6f50c8-239a-45d0-cd98-08d59db061e0 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(5600026)(4604075)(3008032)(48565401081)(2017052603328)(7193020); SRVR:DM5PR2101MB1013; x-ms-traffictypediagnostic: DM5PR2101MB1013: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(42068640409301)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040522)(2401047)(8121501046)(5005006)(3231221)(944501327)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123560045)(20161123564045)(20161123558120)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1013; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1013; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(346002)(366004)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(3280700002)(2616005)(8936002)(7736002)(476003)(446003)(11346002)(53936002)(3660700001)(86362001)(575784001)(86612001)(81156014)(2906002)(186003)(81166006)(105586002)(1076002)(8676002)(26005)(97736004)(25786009)(6306002)(6512007)(3846002)(68736007)(72206003)(106356001)(5660300001)(6486002)(6116002)(966005)(14454004)(4326008)(305945005)(6436002)(2501003)(5250100002)(10290500003)(478600001)(2900100001)(59450400001)(22452003)(110136005)(316002)(7416002)(99286004)(66066001)(10090500001)(107886003)(76176011)(102836004)(54906003)(6506007)(36756003)(486006)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1013; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: UxgE0R5GFWVN+GZDXH638zg3HbikgXA9t6+gV7Ce5mUM5crWutT6uGF3zCLvwLHUF/tOuOhVw+/uBgRRSYmLdJOQQPC3lkBpJbtdU9fD6oOZC8IGNxkwDR+rbDIyJuRwY0ZvDIRN7thqfUSnRYTNWzzIZUa/mGk3er9HA9mjRyVExmSkymehYlXUFHxfttVnCyNJWov9N3+h9WoCygR1ab8/jxRI4g1FVyWbLwGJrebdj+qVLDOhFG4Q88FFjnUUugGoRabO1QTYRrBiCmReX6QVXm/ZaExxFEb+0sV6qZ0IBVYEjhwVE7jutAXtrdm4e2f7blL0+VIBOpuiDSq2u73I2J9DggaR6GLlW4pYSR0gBGkD45ka731rCUMMhDFsnq1jO4AlY3GoEXK+vmZiVF3nEHdng/tYyFE5XayHUyk= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9d6f50c8-239a-45d0-cd98-08d59db061e0 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:21:27.9874 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1013 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann [ Upstream commit 328008a72d38b5bde6491e463405c34a81a65d3e ] The declaration for swsusp_arch_resume marks it as 'asmlinkage', but the definition in x86-32 does not, and it fails to include the header with the declaration. This leads to a warning when building with link-time-optimizations: kernel/power/power.h:108:23: error: type of 'swsusp_arch_resume' does not match original declaration [-Werror=lto-type-mismatch] extern asmlinkage int swsusp_arch_resume(void); ^ arch/x86/power/hibernate_32.c:148:0: note: 'swsusp_arch_resume' was previously declared here int swsusp_arch_resume(void) This moves the declaration into a globally visible header file and fixes up both x86 definitions to match it. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Cc: Len Brown Cc: Andi Kleen Cc: Nicolas Pitre Cc: linux-pm@vger.kernel.org Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Bart Van Assche Link: https://lkml.kernel.org/r/20180202145634.200291-2-arnd@arndb.de Signed-off-by: Sasha Levin --- arch/x86/power/hibernate_32.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- include/linux/suspend.h | 2 ++ kernel/power/power.h | 3 --- 4 files changed, 4 insertions(+), 5 deletions(-) -- 2.15.1 diff --git a/arch/x86/power/hibernate_32.c b/arch/x86/power/hibernate_32.c index c35fdb585c68..afc4ed7b1578 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c @@ -145,7 +145,7 @@ static inline void resume_init_first_level_page_table(pgd_t *pg_dir) #endif } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c index f910c514438f..0ef5e5204968 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -174,7 +174,7 @@ out: return 0; } -int swsusp_arch_resume(void) +asmlinkage int swsusp_arch_resume(void) { int error; diff --git a/include/linux/suspend.h b/include/linux/suspend.h index d60b0f5c38d5..8544357d92d0 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -384,6 +384,8 @@ extern int swsusp_page_is_forbidden(struct page *); extern void swsusp_set_page_free(struct page *); extern void swsusp_unset_page_free(struct page *); extern unsigned long get_safe_page(gfp_t gfp_mask); +extern asmlinkage int swsusp_arch_suspend(void); +extern asmlinkage int swsusp_arch_resume(void); extern void hibernation_set_ops(const struct platform_hibernation_ops *ops); extern int hibernate(void); diff --git a/kernel/power/power.h b/kernel/power/power.h index f29cd178df90..9e58bdc8a562 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -104,9 +104,6 @@ extern int in_suspend; extern dev_t swsusp_resume_device; extern sector_t swsusp_resume_block; -extern asmlinkage int swsusp_arch_suspend(void); -extern asmlinkage int swsusp_arch_resume(void); - extern int create_basic_memory_bitmaps(void); extern void free_basic_memory_bitmaps(void); extern int hibernate_preallocate_memory(void);