From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755877AbYGHQPg (ORCPT ); Tue, 8 Jul 2008 12:15:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753971AbYGHQP0 (ORCPT ); Tue, 8 Jul 2008 12:15:26 -0400 Received: from ns2.suse.de ([195.135.220.15]:48986 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753866AbYGHQP0 (ORCPT ); Tue, 8 Jul 2008 12:15:26 -0400 Date: Wed, 09 Jul 2008 04:15:17 +0200 Message-ID: From: Takashi Iwai To: Ingo Molnar Cc: Stephen Rothwell , Andi Kleen , Andrew Morton , LKML , linux-next@vger.kernel.org Subject: [PATCH linux-next-0708] kernel/sched.c: Add missing attr parameter User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The second attribute parameter is missing in sched_*_show() and store() in kernel/sched.c, which has been added recently. CC kernel/sched.o kernel/sched.c:7743: warning: initialization from incompatible pointer type kernel/sched.c:7743: warning: initialization from incompatible pointer type kernel/sched.c:7757: warning: initialization from incompatible pointer type kernel/sched.c:7757: warning: initialization from incompatible pointer type Signed-off-by: Takashi Iwai --- diff --git a/kernel/sched.c b/kernel/sched.c index 96cee36..4b27bd9 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -7731,11 +7731,14 @@ static ssize_t sched_power_savings_store(const char *buf, size_t count, int smt) } #ifdef CONFIG_SCHED_MC -static ssize_t sched_mc_power_savings_show(struct sys_device *dev, char *page) +static ssize_t sched_mc_power_savings_show(struct sys_device *dev, + struct sysdev_attribute *attr, + char *page) { return sprintf(page, "%u\n", sched_mc_power_savings); } static ssize_t sched_mc_power_savings_store(struct sys_device *dev, + struct sysdev_attribute *attr, const char *buf, size_t count) { return sched_power_savings_store(buf, count, 0); @@ -7745,11 +7748,14 @@ static SYSDEV_ATTR(sched_mc_power_savings, 0644, sched_mc_power_savings_show, #endif #ifdef CONFIG_SCHED_SMT -static ssize_t sched_smt_power_savings_show(struct sys_device *dev, char *page) +static ssize_t sched_smt_power_savings_show(struct sys_device *dev, + struct sysdev_attribute *attr, + char *page) { return sprintf(page, "%u\n", sched_smt_power_savings); } static ssize_t sched_smt_power_savings_store(struct sys_device *dev, + struct sysdev_attribute *attr, const char *buf, size_t count) { return sched_power_savings_store(buf, count, 1);