Gentoo Archives: gentoo-commits

From: "Mike Pagano (mpagano)" <mpagano@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] linux-patches r2023 - genpatches-2.6/trunk/3.1
Date: Tue, 29 Nov 2011 00:18:35
Message-Id: 20111129001826.BFD3A2004B@flycatcher.gentoo.org
1 Author: mpagano
2 Date: 2011-11-29 00:18:26 +0000 (Tue, 29 Nov 2011)
3 New Revision: 2023
4
5 Added:
6 genpatches-2.6/trunk/3.1/1003_linux-3.1.4.patch
7 Modified:
8 genpatches-2.6/trunk/3.1/0000_README
9 Log:
10 Linux patch 3.1.4
11
12 Modified: genpatches-2.6/trunk/3.1/0000_README
13 ===================================================================
14 --- genpatches-2.6/trunk/3.1/0000_README 2011-11-27 20:33:32 UTC (rev 2022)
15 +++ genpatches-2.6/trunk/3.1/0000_README 2011-11-29 00:18:26 UTC (rev 2023)
16 @@ -51,6 +51,10 @@
17 From: http://www.kernel.org
18 Desc: Linux 3.1.3
19
20 +Patch: 1003_linux-3.1.4.patch
21 +From: http://www.kernel.org
22 +Desc: Linux 3.1.4
23 +
24 Patch: 2400_pci-enable-msi-failure-fix.patch
25 From: http://bugs.gentoo.org/show_bug.cgi?id=389215
26 Desc: Continue the init process after pci_enable_msi failure
27
28 Added: genpatches-2.6/trunk/3.1/1003_linux-3.1.4.patch
29 ===================================================================
30 --- genpatches-2.6/trunk/3.1/1003_linux-3.1.4.patch (rev 0)
31 +++ genpatches-2.6/trunk/3.1/1003_linux-3.1.4.patch 2011-11-29 00:18:26 UTC (rev 2023)
32 @@ -0,0 +1,45 @@
33 +diff --git a/Makefile b/Makefile
34 +index d614254..7f8a93b 100644
35 +--- a/Makefile
36 ++++ b/Makefile
37 +@@ -1,6 +1,6 @@
38 + VERSION = 3
39 + PATCHLEVEL = 1
40 +-SUBLEVEL = 3
41 ++SUBLEVEL = 4
42 + EXTRAVERSION =
43 + NAME = "Divemaster Edition"
44 +
45 +diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
46 +index afef3df..29bec34 100644
47 +--- a/drivers/usb/host/ehci-sched.c
48 ++++ b/drivers/usb/host/ehci-sched.c
49 +@@ -1480,15 +1480,10 @@ iso_stream_schedule (
50 +
51 + /* NOTE: assumes URB_ISO_ASAP, to limit complexity/bugs */
52 +
53 +- /* find a uframe slot with enough bandwidth.
54 +- * Early uframes are more precious because full-speed
55 +- * iso IN transfers can't use late uframes,
56 +- * and therefore they should be allocated last.
57 +- */
58 +- next = start;
59 +- start += period;
60 +- do {
61 +- start--;
62 ++ /* find a uframe slot with enough bandwidth */
63 ++ next = start + period;
64 ++ for (; start < next; start++) {
65 ++
66 + /* check schedule: enough space? */
67 + if (stream->highspeed) {
68 + if (itd_slot_ok(ehci, mod, start,
69 +@@ -1501,7 +1496,7 @@ iso_stream_schedule (
70 + start, sched, period))
71 + break;
72 + }
73 +- } while (start > next);
74 ++ }
75 +
76 + /* no room in the schedule */
77 + if (start == next) {