From patchwork Mon Apr 9 00:26:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 132974 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp691299ljb; Sun, 8 Apr 2018 18:46:40 -0700 (PDT) X-Google-Smtp-Source: AIpwx4/KZfJ7X1zEnKxwb1JyAgCH63S0F484adME9Xds6SnLvj3awEGDUBbaXw8zApyQ1d8OVv9g X-Received: by 2002:a17:902:2d01:: with SMTP id o1-v6mr36004012plb.309.1523238400802; Sun, 08 Apr 2018 18:46:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523238400; cv=none; d=google.com; s=arc-20160816; b=kpJy57YrK1tk+tKwKwPcDT0+ONJXNVuorKIieSY4XHTkKQZzCeSiYr6zAWxCX5ffQs czG5qdzFwyaheevacXpsSfHZOk724o/6JOtl97MfwMT5vQDAhOVjnkZG8PRQaYq408Lq yRK8wm711lBA1HyetN+JUWLMaHeQ4MJY8wHuqfoJkEvOviK/1pj9VtVJt2TA0D2POlmd N/nRF/4R1O6tQNCggv3RsNDGCqJoC9Hi1yovvdw+KlOKnMvp8NpTIQvSJmCKk8P8OO4r uqkL4iVfWPJusSnKyPvOhLqqCvWKEUjFhjvZ8WEjzIjL1NYQvhSDj6ND4RN8tl/1iRa1 9QOQ== 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=QxC1ci7ByVz4cHTk8jiSSEBb7ew0d3RlgefFsjr6Ymo=; b=wU7USd7phAW+eQUDgYV5nfe0DxoFHdJE9kOgyncCEYRdC3C6JRd0H3+GFPHGcjoCb6 QDGq3GFkfgcYLb263Oqn4KLwkL6swFL0UWfObv9jsruHgTOMKpM56OPI6LnPtVErnWQG C7Z/SaMDxreQa2ir9FCwmH1ES4LAoMsRSNryNZkZxQDzsHUmml9ckJ68fdJTiaPkUwxI tolorv0nBSQcXTXglioaPV1ZpJSZISpzSA+yDRNbzC4ZHaPHI4F4/MC5fOpcXlkM0xvT 6SsXqvJZCS5H0DzrHeXerKsKEvHtUE8w56ovy+HWvE/gvDWhGSqbk0bm89CXcX1FNRWQ f2Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=jWk7WNaW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 m1-v6si13583627plk.577.2018.04.08.18.46.40; Sun, 08 Apr 2018 18:46:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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=jWk7WNaW; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1754840AbeDIBqj (ORCPT + 11 others); Sun, 8 Apr 2018 21:46:39 -0400 Received: from mail-bl2nam02on0114.outbound.protection.outlook.com ([104.47.38.114]:2685 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932444AbeDIAeH (ORCPT ); Sun, 8 Apr 2018 20:34:07 -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=QxC1ci7ByVz4cHTk8jiSSEBb7ew0d3RlgefFsjr6Ymo=; b=jWk7WNaWOJfflix30OxD+JaTvSGreGcBp7wtbKmk+F2aP/NBERhaY6Uu9eZ2TdcwnctNjm9KipQB5sszonddWph9w4gB3wb6bkeX5cwOdFG2k68/wiJ4CVUfFCoFuT/b+ltxq9o11v25fWJvgprnSte26QFxh70FGFVvZUR7mec= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0984.namprd21.prod.outlook.com (52.132.133.30) 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:34:03 +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:34:02 +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.9 268/293] x86/power: Fix swsusp_arch_resume prototype Thread-Topic: [PATCH AUTOSEL for 4.9 268/293] x86/power: Fix swsusp_arch_resume prototype Thread-Index: AQHTz5lkevEXBdGU60yGk/7NLrKv2w== Date: Mon, 9 Apr 2018 00:26:24 +0000 Message-ID: <20180409002239.163177-268-alexander.levin@microsoft.com> References: <20180409002239.163177-1-alexander.levin@microsoft.com> In-Reply-To: <20180409002239.163177-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; DM5PR2101MB0984; 7:sEvjXVb/wBsEbx/uX7k2YySI3uHIDh8tDnyuF78USkHS1bXFrLlTFPKFRvr647Z8TqEMjUVBZytOsaFEnHjLdDdL8yytyYWEKE5v5+39ZkzDyc1xLc6tHt7IByLyDC2OistIwaMF3hcTq2KZyObkGPqYoR50odYiRgvh1XQ/gbQZr94SGbFtJ2tEP9h6p6l+bWzCGzzvICOsCCboNE0FLlZh/S3C7RhoKHxOj11TdvRdlZnYR4M8oLOcWaN7VHx6; 20:3m4tRQBsn3GwMBOwNXbsZ6Y7geezu1R0ql+tLgAjV9t0Yu4YmzfYk6JYbPZbvGVf9I/Sam1JWRBhDUEI0JAp4jyQtL4wrwy8+WJ3+5qm/JmeR7GWQRYlzK326iW5XzDARBC/e2HIhNvfxqa1/DHykm4i9p7zmDOZZ1NpGXRwCrE= x-ms-office365-filtering-ht: Tenant X-MS-Office365-Filtering-Correlation-Id: 34194d9c-ace0-4c98-924e-08d59db19820 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020); SRVR:DM5PR2101MB0984; x-ms-traffictypediagnostic: DM5PR2101MB0984: 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)(93006095)(93001095)(3231221)(944501327)(52105095)(3002001)(10201501046)(6055026)(61426038)(61427038)(6041310)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:DM5PR2101MB0984; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0984; x-forefront-prvs: 0637FCE711 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(396003)(39860400002)(366004)(39380400002)(346002)(376002)(199004)(189003)(26005)(99286004)(2906002)(14454004)(97736004)(59450400001)(8676002)(81156014)(81166006)(8936002)(6512007)(106356001)(76176011)(186003)(3280700002)(10090500001)(36756003)(6506007)(66066001)(3660700001)(72206003)(478600001)(6666003)(53936002)(2900100001)(105586002)(102836004)(966005)(2501003)(110136005)(54906003)(5250100002)(486006)(1076002)(25786009)(6116002)(6436002)(11346002)(6486002)(22452003)(4326008)(446003)(7736002)(575784001)(86362001)(305945005)(2616005)(476003)(6306002)(68736007)(3846002)(86612001)(5660300001)(7416002)(10290500003)(107886003)(316002)(22906009)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0984; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: KElItWfIc2DQwXGqa3QhADBZFu2ONBP7D+I9bOSwI//WOeVJ0441l6wVsYW6lzzihRUow33Yiu9zo91CUoV8bvYDAw+OIQx6R2NpfVYcEujVwlUUlXuxYIjv3q6BBLPc+E7ekDUFIJKhYkD7qvNux7Tgc6CQyOlf+Sl6tZamfMUa9r4GCYPyfpm9yYqejveBurjm4z015X8+E1dIvms5pUfgtq40nIC5FGtN+3ZFGWNGljz33/B0FeeJm2WdlRX00u2q9svHmk4eyGs+wIAs7fcdUiaZFTADiFuzB8LGY2XPQOHGkMNfwQTQrQ85fFRVRGZID8xtointbKin9oiDVkavD5+6QEOL6feBhot1xuZsuoCN/A86ve8zubJ4GkChQ3Moa6tmdA2oHHaXBnZIhVGhXvKRPZw17QM8yAH4sik= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34194d9c-ace0-4c98-924e-08d59db19820 X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Apr 2018 00:26:24.8164 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0984 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 9f14bd34581d..74b516cb39df 100644 --- a/arch/x86/power/hibernate_32.c +++ b/arch/x86/power/hibernate_32.c @@ -142,7 +142,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 9634557a5444..0cb1dd461529 100644 --- a/arch/x86/power/hibernate_64.c +++ b/arch/x86/power/hibernate_64.c @@ -149,7 +149,7 @@ static int relocate_restore_code(void) 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 d9718378a8be..249dafce2788 100644 --- a/include/linux/suspend.h +++ b/include/linux/suspend.h @@ -378,6 +378,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 56d1d0dedf76..ccba4d820078 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -103,9 +103,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);