From patchwork Sat Nov 26 22:25:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Foley X-Patchwork-Id: 9448551 X-Patchwork-Delegate: rui.zhang@intel.com 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 A28A560487 for ; Sat, 26 Nov 2016 22:25:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9101126530 for ; Sat, 26 Nov 2016 22:25:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 81E2B267EC; Sat, 26 Nov 2016 22:25:36 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 167C026530 for ; Sat, 26 Nov 2016 22:25:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752765AbcKZWZe (ORCPT ); Sat, 26 Nov 2016 17:25:34 -0500 Received: from mail-qt0-f172.google.com ([209.85.216.172]:35343 "EHLO mail-qt0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752136AbcKZWZe (ORCPT ); Sat, 26 Nov 2016 17:25:34 -0500 Received: by mail-qt0-f172.google.com with SMTP id c47so92634984qtc.2 for ; Sat, 26 Nov 2016 14:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pefoley.com; s=google; h=from:to:cc:subject:date:message-id; bh=Sxc2vPxuQystu+7vnBWxSGo0JifNXtiLReK524ZSXNs=; b=gW/Mhw/ZyrEPGYUI3Hook0C/sq3Dh2uJsIxlJu3EJtMBBf3HObTZBqI2/B4vf+uvsa dO6fndw2OCGw8LXzEtjM6nxVfvqa2OZyAn46BtrFs1yr2XNfD5DtS1lmf8G1CyL2dtFt YOnIIXkDr9dERHWuWHZNlLOiMYHP2vfrh6gaI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Sxc2vPxuQystu+7vnBWxSGo0JifNXtiLReK524ZSXNs=; b=Eb/wTJiAhMC/D0+TZk1pai6KgieCAcS/TMnlnE0cz4aVMIsuauSfPMEWh2NjaYUwJZ nA8R+mFntIk/wQtnVfcr+vuXuH43JzPjddubr4Gc9ujJqs3hkpxXCAZV9OJ/jEz764Ri qT8f3zdD6U8dfSoDVuuVDq2CSGBmiCQ3qvAvuCuUJMbA9P5wOSE22Ucb/5yp7ZoKmrez mGXZIA7+h/I1jSXRfND7s+GV7rGA2tURoSMa/v4khy8X87AcrdGLYNZtSuPmaIDvPp8C CEP2KMO8VHzmT0TPNjoBcLaH4/7ojj8ofkGC612O9C6tfV/pUPhG11wFfn1Mr//Kx8a4 GO4w== X-Gm-Message-State: AKaTC01Y2jzKfp6e+bWocGUpTKoXNc9pe2IB3cq3Fdq84DQEgA6JL4n2Guyky3PSxnze6g== X-Received: by 10.237.60.200 with SMTP id e8mr12590327qtf.248.1480199133353; Sat, 26 Nov 2016 14:25:33 -0800 (PST) Received: from bronx.local.pefoley.com (foleype-1-pt.tunnel.tserv13.ash1.ipv6.he.net. [2001:470:7:ee7::2]) by smtp.gmail.com with ESMTPSA id 16sm24665213qtn.33.2016.11.26.14.25.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 26 Nov 2016 14:25:33 -0800 (PST) From: Peter Foley To: linux-kernel@vger.kernel.org, rui.zhang@intel.com, edubezval@gmail.com, linux-pm@vger.kernel.org Cc: Peter Foley Subject: [PATCH] Fix multiple definition error under lto Date: Sat, 26 Nov 2016 17:25:28 -0500 Message-Id: <20161126222528.15261-1-pefoley2@pefoley.com> X-Mailer: git-send-email 2.11.0.rc2 Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP drivers/thermal/built-in.o: In function `type_show.lto_priv.33': (.text+0x3d80): multiple definition of `type_show.lto_priv.33' drivers/base/built-in.o:(.text+0x2a40): first defined here Signed-off-by: Peter Foley --- drivers/thermal/thermal_core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index 226b0b4aced6..23ec1dd2ff3b 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -643,7 +643,7 @@ static void thermal_zone_device_check(struct work_struct *work) container_of(_dev, struct thermal_zone_device, device) static ssize_t -type_show(struct device *dev, struct device_attribute *attr, char *buf) +thermal_type_show(struct device *dev, struct device_attribute *attr, char *buf) { struct thermal_zone_device *tz = to_thermal_zone(dev); @@ -1159,7 +1159,7 @@ int power_actor_set_power(struct thermal_cooling_device *cdev, return 0; } -static DEVICE_ATTR(type, 0444, type_show, NULL); +static DEVICE_ATTR(type, 0444, thermal_type_show, NULL); static DEVICE_ATTR(temp, 0444, temp_show, NULL); static DEVICE_ATTR(mode, 0644, mode_show, mode_store); static DEVICE_ATTR(passive, S_IRUGO | S_IWUSR, passive_show, passive_store);