The patch titled s390: use memory_read_from_buffer() has been added to the -mm tree. Its filename is s390-use-memory_read_from_buffer.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: s390: use memory_read_from_buffer() From: Akinobu Mita <akinobu.mita@xxxxxxxxx> Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Heiko Carstens <heiko.carstens@xxxxxxxxxx> Cc: Michael Holzheu <holzheu@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/s390/kernel/ipl.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff -puN arch/s390/kernel/ipl.c~s390-use-memory_read_from_buffer arch/s390/kernel/ipl.c --- a/arch/s390/kernel/ipl.c~s390-use-memory_read_from_buffer +++ a/arch/s390/kernel/ipl.c @@ -14,6 +14,7 @@ #include <linux/delay.h> #include <linux/reboot.h> #include <linux/ctype.h> +#include <linux/fs.h> #include <asm/ipl.h> #include <asm/smp.h> #include <asm/setup.h> @@ -285,14 +286,8 @@ static struct kobj_attribute sys_ipl_dev 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; - - if (off > size) - return 0; - if (off + count > size) - count = size - off; - memcpy(buf, (void *)IPL_PARMBLOCK_START + off, count); - return count; + return memory_read_from_buffer(buf, count, &off, IPL_PARMBLOCK_START, + IPL_PARMBLOCK_SIZE); } static struct bin_attribute ipl_parameter_attr = { @@ -310,12 +305,7 @@ static ssize_t ipl_scp_data_read(struct unsigned int size = IPL_PARMBLOCK_START->ipl_info.fcp.scp_data_len; void *scp_data = &IPL_PARMBLOCK_START->ipl_info.fcp.scp_data; - if (off > size) - return 0; - if (off + count > size) - count = size - off; - memcpy(buf, scp_data + off, count); - return count; + return memory_read_from_buffer(buf, count, &off, scp_data, size); } static struct bin_attribute ipl_scp_data_attr = { _ Patches currently in -mm which might be from akinobu.mita@xxxxxxxxx are lib-export-bitrev16.patch bluetooth-hci_bcspc-small-cleanups-api-users.patch bluetooth-hci_bcspc-small-cleanups-api-users-fix.patch binfmt_misc-use-simple_read_from_buffer.patch ocfs2-use-simple_read_from_buffer.patch ipc-use-simple_read_from_buffer.patch isdn-use-simple_read_from_buffer.patch s390-vmcp-use-simple_read_from_buffer.patch s390-use-simple_read_from_buffer.patch nwflash-use-simple_read_from_buffer.patch usbmon-use-simple_read_from_buffer.patch ttusb-use-simple_read_from_buffer.patch airo-use-simple_read_from_buffer.patch cris-use-simple_read_from_buffer.patch introduce-memory_read_from_buffer.patch dcdbas-use-memory_read_from_buffer.patch dell_rbu-use-memory_read_from_buffer.patch firmware-use-memory_read_from_buffer.patch acpi-use-memory_read_from_buffer.patch aty-use-memory_read_from_buffer.patch zorro-use-memory_read_from_buffer.patch s390-cio-use-memory_read_from_buffer.patch s390-use-memory_read_from_buffer.patch ipr-use-memory_read_from_buffer.patch qla2xxx-use-memory_read_from_buffer.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html