The patch titled fix: sched_clock() use in zfcp driver has been added to the -mm tree. Its filename is statistics-infrastructure-exploitation-zfcp-sched_clock-fix.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: fix: sched_clock() use in zfcp driver From: Martin Peschke <mp3@xxxxxxxxxx> We are not supposed to use sched_clock(). Reverting a change which wasn't meant to slip through with statistics-infrastructure-exploitation-zfcp.patch. It fixes zfcp, which couldn't be compiled as module (found by Cedric). Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/s390/scsi/zfcp_fsf.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/s390/scsi/zfcp_fsf.c~statistics-infrastructure-exploitation-zfcp-sched_clock-fix drivers/s390/scsi/zfcp_fsf.c --- a/drivers/s390/scsi/zfcp_fsf.c~statistics-infrastructure-exploitation-zfcp-sched_clock-fix +++ a/drivers/s390/scsi/zfcp_fsf.c @@ -4813,7 +4813,7 @@ zfcp_fsf_req_send(struct zfcp_fsf_req *f req_queue->free_index %= QDIO_MAX_BUFFERS_PER_Q; /* wrap if needed */ new_distance_from_int = zfcp_qdio_determine_pci(req_queue, fsf_req); - fsf_req->issued = sched_clock(); + fsf_req->issued = get_clock(); retval = do_QDIO(adapter->ccw_device, QDIO_FLAG_SYNC_OUTPUT, _ Patches currently in -mm which might be from mp3@xxxxxxxxxx are git-block.patch cpu-hotplug-compatible-alloc_percpu.patch cpu-hotplug-compatible-alloc_percpu-fix.patch cpu-hotplug-compatible-alloc_percpu-fix-2.patch statistics-infrastructure-prerequisite-list.patch statistics-infrastructure-prerequisite-parser.patch statistics-infrastructure-prerequisite-timestamp.patch statistics-infrastructure-prerequisite-timestamp-fix.patch statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch statistics-infrastructure-documentation.patch statistics-infrastructure.patch statistics-infrastructure-update-9.patch statistics-use-the-enhanced-percpu-interface.patch statistics-replace-inode-ugeneric_ip-with-i_private.patch statistics-infrastructure-exploitation-zfcp.patch statistics-infrastructure-exploitation-zfcp-sched_clock-fix.patch zfcp-gather-hba-specific-latencies-in-statistics.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