Gitweb: http://git.kernel.org/linus/5fbcae57db69128c14080a7a5a42d0626bfe155c Commit: 5fbcae57db69128c14080a7a5a42d0626bfe155c Parent: 8564a6c140317de04a71eb203bdbb58845d69f9c Author: Heiko Carstens <heiko.carstens@de.ibm.com> AuthorDate: Fri Feb 12 11:19:24 2010 +0100 Committer: Greg Kroah-Hartman <gregkh@suse.de> CommitDate: Sun Mar 7 17:04:48 2010 -0800 sysdev: fix missing s390 conversion In linux-next "sysdev: Pass attribute in sysdev_class attributes show/store" forgot to convert one place in s390 code. Here is the missing part. Cc: Andi Kleen <ak@linux.intel.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- arch/s390/kernel/smp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index e212109..29f65bc 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -1033,7 +1033,9 @@ static ssize_t __ref rescan_store(struct sysdev_class *class, static SYSDEV_CLASS_ATTR(rescan, 0200, NULL, rescan_store); #endif /* CONFIG_HOTPLUG_CPU */ -static ssize_t dispatching_show(struct sysdev_class *class, char *buf) +static ssize_t dispatching_show(struct sysdev_class *class, + struct sysdev_class_attribute *attr, + char *buf) { ssize_t count; -- To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
