The patch titled ieee1394: fix kerneldoc of hpsb_alloc_host has been removed from the -mm tree. Its filename is ieee1394-fix-kerneldoc-of-hpsb_alloc_host.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: ieee1394: fix kerneldoc of hpsb_alloc_host From: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> There was stuff between the comment and the function. Signed-off-by: Stefan Richter <stefanr@xxxxxxxxxxxxxxxxx> Cc: Ben Collins <bcollins@xxxxxxxxxx> Cc: Jody McIntyre <scjody@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/ieee1394/hosts.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff -puN drivers/ieee1394/hosts.c~ieee1394-fix-kerneldoc-of-hpsb_alloc_host drivers/ieee1394/hosts.c --- a/drivers/ieee1394/hosts.c~ieee1394-fix-kerneldoc-of-hpsb_alloc_host +++ a/drivers/ieee1394/hosts.c @@ -90,6 +90,16 @@ static int alloc_hostnum_cb(struct hpsb_ return 0; } +/* + * The pending_packet_queue is special in that it's processed + * from hardirq context too (such as hpsb_bus_reset()). Hence + * split the lock class from the usual networking skb-head + * lock class by using a separate key for it: + */ +static struct lock_class_key pending_packet_queue_key; + +static DEFINE_MUTEX(host_num_alloc); + /** * hpsb_alloc_host - allocate a new host controller. * @drv: the driver that will manage the host controller @@ -105,16 +115,6 @@ static int alloc_hostnum_cb(struct hpsb_ * Return Value: a pointer to the &hpsb_host if successful, %NULL if * no memory was available. */ -static DEFINE_MUTEX(host_num_alloc); - -/* - * The pending_packet_queue is special in that it's processed - * from hardirq context too (such as hpsb_bus_reset()). Hence - * split the lock class from the usual networking skb-head - * lock class by using a separate key for it: - */ -static struct lock_class_key pending_packet_queue_key; - struct hpsb_host *hpsb_alloc_host(struct hpsb_host_driver *drv, size_t extra, struct device *dev) { _ Patches currently in -mm which might be from stefanr@xxxxxxxxxxxxxxxxx are origin.patch git-ieee1394.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