From mboxrd@z Thu Jan 1 00:00:00 1970 From: Len Brown Subject: Re: [patch 1/7] git-acpi: s390: struct bin_attribute changes Date: Sun, 22 Jul 2007 00:43:28 -0400 Message-ID: <200707220043.29286.lenb@kernel.org> References: <200707091833.l69IXDiT000333@imap1.linux-foundation.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: Received: from hera.kernel.org ([140.211.167.34]:37872 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750900AbXGVErc (ORCPT ); Sun, 22 Jul 2007 00:47:32 -0400 In-Reply-To: <200707091833.l69IXDiT000333@imap1.linux-foundation.org> Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: akpm@linux-foundation.org Cc: linux-acpi@vger.kernel.org, heiko.carstens@de.ibm.com, greg@kroah.com, rui.zhang@intel.com, schwidefsky@de.ibm.com Applied. thanks, -Len On Monday 09 July 2007 14:33, akpm@linux-foundation.org wrote: > From: Heiko Carstens > > git-acpi contains a patch that adds 'struct bin_attribute *' to > the read method of struct bin_attribute. This breaks s390: > > CC arch/s390/kernel/ipl.o > arch/s390/kernel/ipl.c:317: > warning: initialization from incompatible pointer type > arch/s390/kernel/ipl.c:340: > warning: initialization from incompatible pointer type > > Cc: Zhang Rui > Cc: Greg KH > Cc: Len Brown > Cc: Martin Schwidefsky > Signed-off-by: Heiko Carstens > Signed-off-by: Andrew Morton > --- > > arch/s390/kernel/ipl.c | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff -puN arch/s390/kernel/ipl.c~git-acpi-s390-struct-bin_attribute-changes arch/s390/kernel/ipl.c > --- a/arch/s390/kernel/ipl.c~git-acpi-s390-struct-bin_attribute-changes > +++ a/arch/s390/kernel/ipl.c > @@ -297,8 +297,9 @@ static ssize_t sys_ipl_device_show(struc > static struct subsys_attribute sys_ipl_device_attr = > __ATTR(device, S_IRUGO, sys_ipl_device_show, NULL); > > -static ssize_t ipl_parameter_read(struct kobject *kobj, char *buf, loff_t off, > - size_t count) > +static ssize_t ipl_parameter_read(struct kobject *kobj, > + struct bin_attribute *attr, > + char *buf, loff_t off, size_t count) > { > unsigned int size = IPL_PARMBLOCK_SIZE; > > @@ -320,8 +321,9 @@ static struct bin_attribute ipl_paramete > .read = &ipl_parameter_read, > }; > > -static ssize_t ipl_scp_data_read(struct kobject *kobj, char *buf, loff_t off, > - size_t count) > +static ssize_t ipl_scp_data_read(struct kobject *kobj, > + struct bin_attribute *attr, > + char *buf, loff_t off, size_t count) > { > unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; > void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; > _ > - > To unsubscribe from this list: send the line "unsubscribe linux-acpi" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html >