Messages in this thread Patch in this message | | | Date | Thu, 28 Jun 2007 15:39:04 +0200 | From | Heiko Carstens <> | Subject | [patch -mm] s390: struct bin_attribute changes |
| |
From: Heiko Carstens <heiko.carstens@de.ibm.com>
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 <rui.zhang@intel.com> Cc: Greg KH <greg@kroah.com> Cc: Len Brown <len.brown@intel.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> --- arch/s390/kernel/ipl.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)
Index: linux-2.6.22-rc6-mm1/arch/s390/kernel/ipl.c =================================================================== --- linux-2.6.22-rc6-mm1.orig/arch/s390/kernel/ipl.c +++ linux-2.6.22-rc6-mm1/arch/s390/kernel/ipl.c @@ -295,8 +295,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; @@ -317,8 +318,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-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |