From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sun, 17 Sep 2006 16:17:19 +0000 (+0200)
Subject: ieee1394: merge from Linus
X-Git-Tag: Ubuntu-goldfish-3.4.0-4.27~30479^2~31
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=9b4f2e9576658c4e52d95dc8d309f51b2e2db096;p=mirror_ubuntu-zesty-kernel.git

ieee1394: merge from Linus

Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
---

9b4f2e9576658c4e52d95dc8d309f51b2e2db096
diff --cc drivers/ieee1394/hosts.c
index 3ed56be8706c,4feead4a35c5..59e6f49545bf
--- a/drivers/ieee1394/hosts.c
+++ b/drivers/ieee1394/hosts.c
@@@ -90,8 -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