Magellan Linux

  • Back to homepage
    • /[pkg-src]/trunk/kernel-magellan/patches-3.7/0100-3.7.1-all-fixes.patch

    Contents of /trunk/kernel-magellan/patches-3.7/0100-3.7.1-all-fixes.patch

    Parent Directory Parent Directory | Revision Log Revision Log

    Revision 2003 - (show annotations) (download)
    Thu Dec 27 18:00:58 2012 UTC (11 years, 4 months ago) by niro
    File size: 35229 byte(s) 
    -linux-3.7.1
    1 diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c
    2 index 1460a5d..e28670f 100644
    3 --- a/arch/x86/kernel/hpet.c
    4 +++ b/arch/x86/kernel/hpet.c
    5 @@ -434,7 +434,7 @@ void hpet_msi_unmask(struct irq_data *data)
    6
    7 /* unmask it */
    8 cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
    9 - cfg |= HPET_TN_FSB;
    10 + cfg |= HPET_TN_ENABLE | HPET_TN_FSB;
    11 hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
    12 }
    13
    14 @@ -445,7 +445,7 @@ void hpet_msi_mask(struct irq_data *data)
    15
    16 /* mask it */
    17 cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
    18 - cfg &= ~HPET_TN_FSB;
    19 + cfg &= ~(HPET_TN_ENABLE | HPET_TN_FSB);
    20 hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
    21 }
    22
    23 diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
    24 index 45e3e17..7efaeaa 100644
    25 --- a/drivers/acpi/battery.c
    26 +++ b/drivers/acpi/battery.c
    27 @@ -34,6 +34,7 @@
    28 #include <linux/dmi.h>
    29 #include <linux/slab.h>
    30 #include <linux/suspend.h>
    31 +#include <asm/unaligned.h>
    32
    33 #ifdef CONFIG_ACPI_PROCFS_POWER
    34 #include <linux/proc_fs.h>
    35 @@ -95,6 +96,18 @@ enum {
    36 ACPI_BATTERY_ALARM_PRESENT,
    37 ACPI_BATTERY_XINFO_PRESENT,
    38 ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY,
    39 + /* On Lenovo Thinkpad models from 2010 and 2011, the power unit
    40 + switches between mWh and mAh depending on whether the system
    41 + is running on battery or not. When mAh is the unit, most
    42 + reported values are incorrect and need to be adjusted by
    43 + 10000/design_voltage. Verified on x201, t410, t410s, and x220.
    44 + Pre-2010 and 2012 models appear to always report in mWh and
    45 + are thus unaffected (tested with t42, t61, t500, x200, x300,
    46 + and x230). Also, in mid-2012 Lenovo issued a BIOS update for
    47 + the 2011 models that fixes the issue (tested on x220 with a
    48 + post-1.29 BIOS), but as of Nov. 2012, no such update is
    49 + available for the 2010 models. */
    50 + ACPI_BATTERY_QUIRK_THINKPAD_MAH,
    51 };
    52
    53 struct acpi_battery {
    54 @@ -438,6 +451,21 @@ static int acpi_battery_get_info(struct acpi_battery *battery)
    55 kfree(buffer.pointer);
    56 if (test_bit(ACPI_BATTERY_QUIRK_PERCENTAGE_CAPACITY, &battery->flags))
    57 battery->full_charge_capacity = battery->design_capacity;
    58 + if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
    59 + battery->power_unit && battery->design_voltage) {
    60 + battery->design_capacity = battery->design_capacity *
    61 + 10000 / battery->design_voltage;
    62 + battery->full_charge_capacity = battery->full_charge_capacity *
    63 + 10000 / battery->design_voltage;
    64 + battery->design_capacity_warning =
    65 + battery->design_capacity_warning *
    66 + 10000 / battery->design_voltage;
    67 + /* Curiously, design_capacity_low, unlike the rest of them,
    68 + is correct. */
    69 + /* capacity_granularity_* equal 1 on the systems tested, so
    70 + it's impossible to tell if they would need an adjustment
    71 + or not if their values were higher. */
    72 + }
    73 return result;
    74 }
    75
    76 @@ -486,6 +514,11 @@ static int acpi_battery_get_state(struct acpi_battery *battery)
    77 && battery->capacity_now >= 0 && battery->capacity_now <= 100)
    78 battery->capacity_now = (battery->capacity_now *
    79 battery->full_charge_capacity) / 100;
    80 + if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags) &&
    81 + battery->power_unit && battery->design_voltage) {
    82 + battery->capacity_now = battery->capacity_now *
    83 + 10000 / battery->design_voltage;
    84 + }
    85 return result;
    86 }
    87
    88 @@ -595,6 +628,24 @@ static void sysfs_remove_battery(struct acpi_battery *battery)
    89 mutex_unlock(&battery->sysfs_lock);
    90 }
    91
    92 +static void find_battery(const struct dmi_header *dm, void *private)
    93 +{
    94 + struct acpi_battery *battery = (struct acpi_battery *)private;
    95 + /* Note: the hardcoded offsets below have been extracted from
    96 + the source code of dmidecode. */
    97 + if (dm->type == DMI_ENTRY_PORTABLE_BATTERY && dm->length >= 8) {
    98 + const u8 *dmi_data = (const u8 *)(dm + 1);
    99 + int dmi_capacity = get_unaligned((const u16 *)(dmi_data + 6));
    100 + if (dm->length >= 18)
    101 + dmi_capacity *= dmi_data[17];
    102 + if (battery->design_capacity * battery->design_voltage / 1000
    103 + != dmi_capacity &&
    104 + battery->design_capacity * 10 == dmi_capacity)
    105 + set_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
    106 + &battery->flags);
    107 + }
    108 +}
    109 +
    110 /*
    111 * According to the ACPI spec, some kinds of primary batteries can
    112 * report percentage battery remaining capacity directly to OS.
    113 @@ -620,6 +671,32 @@ static void acpi_battery_quirks(struct acpi_battery *battery)
    114 battery->capacity_now = (battery->capacity_now *
    115 battery->full_charge_capacity) / 100;
    116 }
    117 +
    118 + if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH, &battery->flags))
    119 + return ;
    120 +
    121 + if (battery->power_unit && dmi_name_in_vendors("LENOVO")) {
    122 + const char *s;
    123 + s = dmi_get_system_info(DMI_PRODUCT_VERSION);
    124 + if (s && !strnicmp(s, "ThinkPad", 8)) {
    125 + dmi_walk(find_battery, battery);
    126 + if (test_bit(ACPI_BATTERY_QUIRK_THINKPAD_MAH,
    127 + &battery->flags) &&
    128 + battery->design_voltage) {
    129 + battery->design_capacity =
    130 + battery->design_capacity *
    131 + 10000 / battery->design_voltage;
    132 + battery->full_charge_capacity =
    133 + battery->full_charge_capacity *
    134 + 10000 / battery->design_voltage;
    135 + battery->design_capacity_warning =
    136 + battery->design_capacity_warning *
    137 + 10000 / battery->design_voltage;
    138 + battery->capacity_now = battery->capacity_now *
    139 + 10000 / battery->design_voltage;
    140 + }
    141 + }
    142 + }
    143 }
    144
    145 static int acpi_battery_update(struct acpi_battery *battery)
    146 diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
    147 index fdcdbb6..847ed55 100644
    148 --- a/drivers/acpi/sleep.c
    149 +++ b/drivers/acpi/sleep.c
    150 @@ -519,6 +519,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = {
    151 },
    152 {
    153 .callback = init_nvs_nosave,
    154 + .ident = "Sony Vaio VPCEB1S1E",
    155 + .matches = {
    156 + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
    157 + DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB1S1E"),
    158 + },
    159 + },
    160 + {
    161 + .callback = init_nvs_nosave,
    162 .ident = "Sony Vaio VGN-FW520F",
    163 .matches = {
    164 DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
    165 diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c
    166 index 0230cb6..ac9a69c 100644
    167 --- a/drivers/acpi/video.c
    168 +++ b/drivers/acpi/video.c
    169 @@ -389,6 +389,12 @@ static int __init video_set_bqc_offset(const struct dmi_system_id *d)
    170 return 0;
    171 }
    172
    173 +static int video_ignore_initial_backlight(const struct dmi_system_id *d)
    174 +{
    175 + use_bios_initial_backlight = 0;
    176 + return 0;
    177 +}
    178 +
    179 static struct dmi_system_id video_dmi_table[] __initdata = {
    180 /*
    181 * Broken _BQC workaround http://bugzilla.kernel.org/show_bug.cgi?id=13121
    182 @@ -433,6 +439,14 @@ static struct dmi_system_id video_dmi_table[] __initdata = {
    183 DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7720"),
    184 },
    185 },
    186 + {
    187 + .callback = video_ignore_initial_backlight,
    188 + .ident = "HP Folio 13-2000",
    189 + .matches = {
    190 + DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
    191 + DMI_MATCH(DMI_PRODUCT_NAME, "HP Folio 13 - 2000 Notebook PC"),
    192 + },
    193 + },
    194 {}
    195 };
    196
    197 diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c
    198 index b728880..4ac2593 100644
    199 --- a/drivers/acpi/video_detect.c
    200 +++ b/drivers/acpi/video_detect.c
    201 @@ -156,6 +156,14 @@ static struct dmi_system_id video_detect_dmi_table[] = {
    202 DMI_MATCH(DMI_BOARD_NAME, "X360"),
    203 },
    204 },
    205 + {
    206 + .callback = video_detect_force_vendor,
    207 + .ident = "Asus UL30VT",
    208 + .matches = {
    209 + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
    210 + DMI_MATCH(DMI_PRODUCT_NAME, "UL30VT"),
    211 + },
    212 + },
    213 { },
    214 };
    215
    216 diff --git a/drivers/clk/ux500/u8500_clk.c b/drivers/clk/ux500/u8500_clk.c
    217 index e2c17d1..6939009 100644
    218 --- a/drivers/clk/ux500/u8500_clk.c
    219 +++ b/drivers/clk/ux500/u8500_clk.c
    220 @@ -323,7 +323,7 @@ void u8500_clk_init(void)
    221 clk_register_clkdev(clk, NULL, "gpioblock1");
    222
    223 clk = clk_reg_prcc_pclk("p2_pclk12", "per2clk", U8500_CLKRST2_BASE,
    224 - BIT(11), 0);
    225 + BIT(12), 0);
    226
    227 clk = clk_reg_prcc_pclk("p3_pclk0", "per3clk", U8500_CLKRST3_BASE,
    228 BIT(0), 0);
    229 diff --git a/drivers/hwmon/fam15h_power.c b/drivers/hwmon/fam15h_power.c
    230 index 4f41104..34ab2a8 100644
    231 --- a/drivers/hwmon/fam15h_power.c
    232 +++ b/drivers/hwmon/fam15h_power.c
    233 @@ -31,6 +31,9 @@ MODULE_DESCRIPTION("AMD Family 15h CPU processor power monitor");
    234 MODULE_AUTHOR("Andreas Herrmann <herrmann.der.user@googlemail.com>");
    235 MODULE_LICENSE("GPL");
    236
    237 +/* Family 16h Northbridge's function 4 PCI ID */
    238 +#define PCI_DEVICE_ID_AMD_16H_NB_F4 0x1534
    239 +
    240 /* D18F3 */
    241 #define REG_NORTHBRIDGE_CAP 0xe8
    242
    243 @@ -248,6 +251,7 @@ static void __devexit fam15h_power_remove(struct pci_dev *pdev)
    244
    245 static DEFINE_PCI_DEVICE_TABLE(fam15h_power_id_table) = {
    246 { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
    247 + { PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
    248 {}
    249 };
    250 MODULE_DEVICE_TABLE(pci, fam15h_power_id_table);
    251 diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c
    252 index 26b5d4b..ec8e914 100644
    253 --- a/drivers/pnp/pnpacpi/core.c
    254 +++ b/drivers/pnp/pnpacpi/core.c
    255 @@ -95,6 +95,9 @@ static int pnpacpi_set_resources(struct pnp_dev *dev)
    256 return -ENODEV;
    257 }
    258
    259 + if (WARN_ON_ONCE(acpi_dev != dev->data))
    260 + dev->data = acpi_dev;
    261 +
    262 ret = pnpacpi_build_resource_template(dev, &buffer);
    263 if (ret)
    264 return ret;
    265 diff --git a/drivers/staging/bcm/InterfaceInit.c b/drivers/staging/bcm/InterfaceInit.c
    266 index b05f5f7..f10ab70 100644
    267 --- a/drivers/staging/bcm/InterfaceInit.c
    268 +++ b/drivers/staging/bcm/InterfaceInit.c
    269 @@ -4,11 +4,12 @@ static struct usb_device_id InterfaceUsbtable[] = {
    270 { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3) },
    271 { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3B) },
    272 { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_T3L) },
    273 - { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SM250) },
    274 + { USB_DEVICE(BCM_USB_VENDOR_ID_T3, BCM_USB_PRODUCT_ID_SYM) },
    275 { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_226) },
    276 { USB_DEVICE(BCM_USB_VENDOR_ID_FOXCONN, BCM_USB_PRODUCT_ID_1901) },
    277 { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_TU25) },
    278 { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_226) },
    279 + { USB_DEVICE(BCM_USB_VENDOR_ID_ZTE, BCM_USB_PRODUCT_ID_ZTE_326) },
    280 { }
    281 };
    282 MODULE_DEVICE_TABLE(usb, InterfaceUsbtable);
    283 diff --git a/drivers/staging/bcm/InterfaceInit.h b/drivers/staging/bcm/InterfaceInit.h
    284 index 866924e..241bf97 100644
    285 --- a/drivers/staging/bcm/InterfaceInit.h
    286 +++ b/drivers/staging/bcm/InterfaceInit.h
    287 @@ -8,11 +8,11 @@
    288 #define BCM_USB_PRODUCT_ID_T3 0x0300
    289 #define BCM_USB_PRODUCT_ID_T3B 0x0210
    290 #define BCM_USB_PRODUCT_ID_T3L 0x0220
    291 -#define BCM_USB_PRODUCT_ID_SM250 0xbccd
    292 #define BCM_USB_PRODUCT_ID_SYM 0x15E
    293 #define BCM_USB_PRODUCT_ID_1901 0xe017
    294 #define BCM_USB_PRODUCT_ID_226 0x0132 /* not sure if this is valid */
    295 #define BCM_USB_PRODUCT_ID_ZTE_226 0x172
    296 +#define BCM_USB_PRODUCT_ID_ZTE_326 0x173 /* ZTE AX326 */
    297 #define BCM_USB_PRODUCT_ID_ZTE_TU25 0x0007
    298
    299 #define BCM_USB_MINOR_BASE 192
    300 diff --git a/drivers/staging/telephony/ixj.c b/drivers/staging/telephony/ixj.c
    301 index 1cfa0b0..cf6aa83 100644
    302 --- a/drivers/staging/telephony/ixj.c
    303 +++ b/drivers/staging/telephony/ixj.c
    304 @@ -3190,12 +3190,12 @@ static void ixj_write_cid(IXJ *j)
    305
    306 ixj_fsk_alloc(j);
    307
    308 - strcpy(sdmf1, j->cid_send.month);
    309 - strcat(sdmf1, j->cid_send.day);
    310 - strcat(sdmf1, j->cid_send.hour);
    311 - strcat(sdmf1, j->cid_send.min);
    312 - strcpy(sdmf2, j->cid_send.number);
    313 - strcpy(sdmf3, j->cid_send.name);
    314 + strlcpy(sdmf1, j->cid_send.month, sizeof(sdmf1));
    315 + strlcat(sdmf1, j->cid_send.day, sizeof(sdmf1));
    316 + strlcat(sdmf1, j->cid_send.hour, sizeof(sdmf1));
    317 + strlcat(sdmf1, j->cid_send.min, sizeof(sdmf1));
    318 + strlcpy(sdmf2, j->cid_send.number, sizeof(sdmf2));
    319 + strlcpy(sdmf3, j->cid_send.name, sizeof(sdmf3));
    320
    321 len1 = strlen(sdmf1);
    322 len2 = strlen(sdmf2);
    323 @@ -3340,12 +3340,12 @@ static void ixj_write_cidcw(IXJ *j)
    324 ixj_pre_cid(j);
    325 }
    326 j->flags.cidcw_ack = 0;
    327 - strcpy(sdmf1, j->cid_send.month);
    328 - strcat(sdmf1, j->cid_send.day);
    329 - strcat(sdmf1, j->cid_send.hour);
    330 - strcat(sdmf1, j->cid_send.min);
    331 - strcpy(sdmf2, j->cid_send.number);
    332 - strcpy(sdmf3, j->cid_send.name);
    333 + strlcpy(sdmf1, j->cid_send.month, sizeof(sdmf1));
    334 + strlcat(sdmf1, j->cid_send.day, sizeof(sdmf1));
    335 + strlcat(sdmf1, j->cid_send.hour, sizeof(sdmf1));
    336 + strlcat(sdmf1, j->cid_send.min, sizeof(sdmf1));
    337 + strlcpy(sdmf2, j->cid_send.number, sizeof(sdmf2));
    338 + strlcpy(sdmf3, j->cid_send.name, sizeof(sdmf3));
    339
    340 len1 = strlen(sdmf1);
    341 len2 = strlen(sdmf2);
    342 diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
    343 index 6e49ec6..8d809a8 100644
    344 --- a/drivers/usb/class/cdc-acm.c
    345 +++ b/drivers/usb/class/cdc-acm.c
    346 @@ -787,6 +787,10 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info)
    347 tmp.flags = ASYNC_LOW_LATENCY;
    348 tmp.xmit_fifo_size = acm->writesize;
    349 tmp.baud_base = le32_to_cpu(acm->line.dwDTERate);
    350 + tmp.close_delay = acm->port.close_delay / 10;
    351 + tmp.closing_wait = acm->port.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
    352 + ASYNC_CLOSING_WAIT_NONE :
    353 + acm->port.closing_wait / 10;
    354
    355 if (copy_to_user(info, &tmp, sizeof(tmp)))
    356 return -EFAULT;
    357 @@ -794,6 +798,37 @@ static int get_serial_info(struct acm *acm, struct serial_struct __user *info)
    358 return 0;
    359 }
    360
    361 +static int set_serial_info(struct acm *acm,
    362 + struct serial_struct __user *newinfo)
    363 +{
    364 + struct serial_struct new_serial;
    365 + unsigned int closing_wait, close_delay;
    366 + int retval = 0;
    367 +
    368 + if (copy_from_user(&new_serial, newinfo, sizeof(new_serial)))
    369 + return -EFAULT;
    370 +
    371 + close_delay = new_serial.close_delay * 10;
    372 + closing_wait = new_serial.closing_wait == ASYNC_CLOSING_WAIT_NONE ?
    373 + ASYNC_CLOSING_WAIT_NONE : new_serial.closing_wait * 10;
    374 +
    375 + mutex_lock(&acm->port.mutex);
    376 +
    377 + if (!capable(CAP_SYS_ADMIN)) {
    378 + if ((close_delay != acm->port.close_delay) ||
    379 + (closing_wait != acm->port.closing_wait))
    380 + retval = -EPERM;
    381 + else
    382 + retval = -EOPNOTSUPP;
    383 + } else {
    384 + acm->port.close_delay = close_delay;
    385 + acm->port.closing_wait = closing_wait;
    386 + }
    387 +
    388 + mutex_unlock(&acm->port.mutex);
    389 + return retval;
    390 +}
    391 +
    392 static int acm_tty_ioctl(struct tty_struct *tty,
    393 unsigned int cmd, unsigned long arg)
    394 {
    395 @@ -804,6 +839,9 @@ static int acm_tty_ioctl(struct tty_struct *tty,
    396 case TIOCGSERIAL: /* gets serial port data */
    397 rv = get_serial_info(acm, (struct serial_struct __user *) arg);
    398 break;
    399 + case TIOCSSERIAL:
    400 + rv = set_serial_info(acm, (struct serial_struct __user *) arg);
    401 + break;
    402 }
    403
    404 return rv;
    405 diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c
    406 index 4b66374..3d98902 100644
    407 --- a/drivers/usb/host/ehci-q.c
    408 +++ b/drivers/usb/host/ehci-q.c
    409 @@ -264,15 +264,9 @@ ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
    410 __releases(ehci->lock)
    411 __acquires(ehci->lock)
    412 {
    413 - if (likely (urb->hcpriv != NULL)) {
    414 - struct ehci_qh *qh = (struct ehci_qh *) urb->hcpriv;
    415 -
    416 - /* S-mask in a QH means it's an interrupt urb */
    417 - if ((qh->hw->hw_info2 & cpu_to_hc32(ehci, QH_SMASK)) != 0) {
    418 -
    419 - /* ... update hc-wide periodic stats (for usbfs) */
    420 - ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
    421 - }
    422 + if (usb_pipetype(urb->pipe) == PIPE_INTERRUPT) {
    423 + /* ... update hc-wide periodic stats */
    424 + ehci_to_hcd(ehci)->self.bandwidth_int_reqs--;
    425 }
    426
    427 if (unlikely(urb->unlinked)) {
    428 diff --git a/drivers/usb/host/ehci-sched.c b/drivers/usb/host/ehci-sched.c
    429 index 7cf3da7..528a540 100644
    430 --- a/drivers/usb/host/ehci-sched.c
    431 +++ b/drivers/usb/host/ehci-sched.c
    432 @@ -1646,7 +1646,7 @@ static void itd_link_urb(
    433
    434 /* don't need that schedule data any more */
    435 iso_sched_free (stream, iso_sched);
    436 - urb->hcpriv = NULL;
    437 + urb->hcpriv = stream;
    438
    439 ++ehci->isoc_count;
    440 enable_periodic(ehci);
    441 @@ -2045,7 +2045,7 @@ static void sitd_link_urb(
    442
    443 /* don't need that schedule data any more */
    444 iso_sched_free (stream, sched);
    445 - urb->hcpriv = NULL;
    446 + urb->hcpriv = stream;
    447
    448 ++ehci->isoc_count;
    449 enable_periodic(ehci);
    450 diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c
    451 index c5a1ea9..9d00d47 100644
    452 --- a/drivers/usb/host/ohci-q.c
    453 +++ b/drivers/usb/host/ohci-q.c
    454 @@ -1128,6 +1128,25 @@ dl_done_list (struct ohci_hcd *ohci)
    455
    456 while (td) {
    457 struct td *td_next = td->next_dl_td;
    458 + struct ed *ed = td->ed;
    459 +
    460 + /*
    461 + * Some OHCI controllers (NVIDIA for sure, maybe others)
    462 + * occasionally forget to add TDs to the done queue. Since
    463 + * TDs for a given endpoint are always processed in order,
    464 + * if we find a TD on the donelist then all of its
    465 + * predecessors must be finished as well.
    466 + */
    467 + for (;;) {
    468 + struct td *td2;
    469 +
    470 + td2 = list_first_entry(&ed->td_list, struct td,
    471 + td_list);
    472 + if (td2 == td)
    473 + break;
    474 + takeback_td(ohci, td2);
    475 + }
    476 +
    477 takeback_td(ohci, td);
    478 td = td_next;
    479 }
    480 diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
    481 index 8345d7c..dcb72f7 100644
    482 --- a/drivers/usb/host/xhci-pci.c
    483 +++ b/drivers/usb/host/xhci-pci.c
    484 @@ -29,6 +29,7 @@
    485 /* Device for a quirk */
    486 #define PCI_VENDOR_ID_FRESCO_LOGIC 0x1b73
    487 #define PCI_DEVICE_ID_FRESCO_LOGIC_PDK 0x1000
    488 +#define PCI_DEVICE_ID_FRESCO_LOGIC_FL1400 0x1400
    489
    490 #define PCI_VENDOR_ID_ETRON 0x1b6f
    491 #define PCI_DEVICE_ID_ASROCK_P67 0x7023
    492 @@ -58,8 +59,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
    493
    494 /* Look for vendor-specific quirks */
    495 if (pdev->vendor == PCI_VENDOR_ID_FRESCO_LOGIC &&
    496 - pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK) {
    497 - if (pdev->revision == 0x0) {
    498 + (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK ||
    499 + pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_FL1400)) {
    500 + if (pdev->device == PCI_DEVICE_ID_FRESCO_LOGIC_PDK &&
    501 + pdev->revision == 0x0) {
    502 xhci->quirks |= XHCI_RESET_EP_QUIRK;
    503 xhci_dbg(xhci, "QUIRK: Fresco Logic xHC needs configure"
    504 " endpoint cmd after reset endpoint\n");
    505 diff --git a/drivers/usb/misc/Kconfig b/drivers/usb/misc/Kconfig
    506 index a8f0523..fecde69 100644
    507 --- a/drivers/usb/misc/Kconfig
    508 +++ b/drivers/usb/misc/Kconfig
    509 @@ -246,6 +246,7 @@ config USB_YUREX
    510
    511 config USB_EZUSB_FX2
    512 tristate "Functions for loading firmware on EZUSB chips"
    513 + depends on USB
    514 help
    515 Say Y here if you need EZUSB device support.
    516 (Cypress FX/FX2/FX2LP microcontrollers)
    517 diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c
    518 index eb033fc..402e597 100644
    519 --- a/drivers/usb/serial/cp210x.c
    520 +++ b/drivers/usb/serial/cp210x.c
    521 @@ -118,6 +118,7 @@ static const struct usb_device_id id_table[] = {
    522 { USB_DEVICE(0x10C4, 0x8477) }, /* Balluff RFID */
    523 { USB_DEVICE(0x10C4, 0x85EA) }, /* AC-Services IBUS-IF */
    524 { USB_DEVICE(0x10C4, 0x85EB) }, /* AC-Services CIS-IBUS */
    525 + { USB_DEVICE(0x10C4, 0x85F8) }, /* Virtenio Preon32 */
    526 { USB_DEVICE(0x10C4, 0x8664) }, /* AC-Services CAN-IF */
    527 { USB_DEVICE(0x10C4, 0x8665) }, /* AC-Services OBD-IF */
    528 { USB_DEVICE(0x10C4, 0xEA60) }, /* Silicon Labs factory default */
    529 diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
    530 index be84587..2641d36 100644
    531 --- a/drivers/usb/serial/ftdi_sio.c
    532 +++ b/drivers/usb/serial/ftdi_sio.c
    533 @@ -192,6 +192,7 @@ static struct usb_device_id id_table_combined [] = {
    534 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_THROTTLE_PID) },
    535 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GATEWAY_PID) },
    536 { USB_DEVICE(FTDI_VID, FTDI_OPENDCC_GBM_PID) },
    537 + { USB_DEVICE(NEWPORT_VID, NEWPORT_AGILIS_PID) },
    538 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_IOBOARD_PID) },
    539 { USB_DEVICE(INTERBIOMETRICS_VID, INTERBIOMETRICS_MINI_IOBOARD_PID) },
    540 { USB_DEVICE(FTDI_VID, FTDI_SPROG_II) },
    541 @@ -1781,7 +1782,7 @@ static int ftdi_8u2232c_probe(struct usb_serial *serial)
    542 struct usb_device *udev = serial->dev;
    543
    544 if ((udev->manufacturer && !strcmp(udev->manufacturer, "CALAO Systems")) ||
    545 - (udev->product && !strcmp(udev->product, "BeagleBone/XDS100")))
    546 + (udev->product && !strcmp(udev->product, "BeagleBone/XDS100V2")))
    547 return ftdi_jtag_probe(serial);
    548
    549 return 0;
    550 diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h
    551 index 57c12ef..049b6e7 100644
    552 --- a/drivers/usb/serial/ftdi_sio_ids.h
    553 +++ b/drivers/usb/serial/ftdi_sio_ids.h
    554 @@ -752,6 +752,12 @@
    555 #define TTI_VID 0x103E /* Vendor Id */
    556 #define TTI_QL355P_PID 0x03E8 /* TTi QL355P power supply */
    557
    558 +/*
    559 + * Newport Cooperation (www.newport.com)
    560 + */
    561 +#define NEWPORT_VID 0x104D
    562 +#define NEWPORT_AGILIS_PID 0x3000
    563 +
    564 /* Interbiometrics USB I/O Board */
    565 /* Developed for Interbiometrics by Rudolf Gugler */
    566 #define INTERBIOMETRICS_VID 0x1209
    567 diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
    568 index edc64bb..da36dc7 100644
    569 --- a/drivers/usb/serial/option.c
    570 +++ b/drivers/usb/serial/option.c
    571 @@ -81,6 +81,7 @@ static void option_instat_callback(struct urb *urb);
    572 #define OPTION_PRODUCT_GTM380_MODEM 0x7201
    573
    574 #define HUAWEI_VENDOR_ID 0x12D1
    575 +#define HUAWEI_PRODUCT_E173 0x140C
    576 #define HUAWEI_PRODUCT_K4505 0x1464
    577 #define HUAWEI_PRODUCT_K3765 0x1465
    578 #define HUAWEI_PRODUCT_K4605 0x14C6
    579 @@ -553,6 +554,8 @@ static const struct usb_device_id option_ids[] = {
    580 { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLX) },
    581 { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GKE) },
    582 { USB_DEVICE(QUANTA_VENDOR_ID, QUANTA_PRODUCT_GLE) },
    583 + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173, 0xff, 0xff, 0xff),
    584 + .driver_info = (kernel_ulong_t) &net_intf1_blacklist },
    585 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K4505, 0xff, 0xff, 0xff),
    586 .driver_info = (kernel_ulong_t) &huawei_cdc12_blacklist },
    587 { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff),
    588 @@ -884,6 +887,10 @@ static const struct usb_device_id option_ids[] = {
    589 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0126, 0xff, 0xff, 0xff),
    590 .driver_info = (kernel_ulong_t)&net_intf5_blacklist },
    591 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0128, 0xff, 0xff, 0xff) },
    592 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0135, 0xff, 0xff, 0xff) },
    593 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0136, 0xff, 0xff, 0xff) },
    594 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0137, 0xff, 0xff, 0xff) },
    595 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0139, 0xff, 0xff, 0xff) },
    596 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0142, 0xff, 0xff, 0xff) },
    597 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0143, 0xff, 0xff, 0xff) },
    598 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0144, 0xff, 0xff, 0xff) },
    599 @@ -904,20 +911,34 @@ static const struct usb_device_id option_ids[] = {
    600 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) },
    601 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff),
    602 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    603 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0189, 0xff, 0xff, 0xff) },
    604 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0191, 0xff, 0xff, 0xff), /* ZTE EuFi890 */
    605 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    606 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0196, 0xff, 0xff, 0xff) },
    607 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0197, 0xff, 0xff, 0xff) },
    608 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0199, 0xff, 0xff, 0xff), /* ZTE MF820S */
    609 .driver_info = (kernel_ulong_t)&net_intf1_blacklist },
    610 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0200, 0xff, 0xff, 0xff) },
    611 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0201, 0xff, 0xff, 0xff) },
    612 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0254, 0xff, 0xff, 0xff) },
    613 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0257, 0xff, 0xff, 0xff), /* ZTE MF821 */
    614 .driver_info = (kernel_ulong_t)&net_intf3_blacklist },
    615 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0265, 0xff, 0xff, 0xff) },
    616 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0284, 0xff, 0xff, 0xff) },
    617 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0317, 0xff, 0xff, 0xff) },
    618 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0326, 0xff, 0xff, 0xff),
    619 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    620 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0330, 0xff, 0xff, 0xff) },
    621 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0395, 0xff, 0xff, 0xff) },
    622 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0414, 0xff, 0xff, 0xff) },
    623 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0417, 0xff, 0xff, 0xff) },
    624 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff),
    625 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    626 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff),
    627 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    628 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff),
    629 .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
    630 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1018, 0xff, 0xff, 0xff) },
    631 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1021, 0xff, 0xff, 0xff),
    632 .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
    633 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1057, 0xff, 0xff, 0xff) },
    634 @@ -1097,6 +1118,10 @@ static const struct usb_device_id option_ids[] = {
    635 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1298, 0xff, 0xff, 0xff) },
    636 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1299, 0xff, 0xff, 0xff) },
    637 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1300, 0xff, 0xff, 0xff) },
    638 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1301, 0xff, 0xff, 0xff) },
    639 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1302, 0xff, 0xff, 0xff) },
    640 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1303, 0xff, 0xff, 0xff) },
    641 + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1333, 0xff, 0xff, 0xff) },
    642 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1401, 0xff, 0xff, 0xff),
    643 .driver_info = (kernel_ulong_t)&net_intf2_blacklist },
    644 { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1402, 0xff, 0xff, 0xff),
    645 diff --git a/drivers/usb/storage/Kconfig b/drivers/usb/storage/Kconfig
    646 index 0ae7bb6..eab04a6 100644
    647 --- a/drivers/usb/storage/Kconfig
    648 +++ b/drivers/usb/storage/Kconfig
    649 @@ -203,7 +203,7 @@ config USB_STORAGE_ENE_UB6250
    650
    651 config USB_UAS
    652 tristate "USB Attached SCSI"
    653 - depends on USB && SCSI
    654 + depends on USB && SCSI && BROKEN
    655 help
    656 The USB Attached SCSI protocol is supported by some USB
    657 storage devices. It permits higher performance by supporting
    658 diff --git a/kernel/rcutree.c b/kernel/rcutree.c
    659 index 74df86b..2682295 100644
    660 --- a/kernel/rcutree.c
    661 +++ b/kernel/rcutree.c
    662 @@ -212,13 +212,13 @@ DEFINE_PER_CPU(struct rcu_dynticks, rcu_dynticks) = {
    663 #endif
    664 };
    665
    666 -static int blimit = 10; /* Maximum callbacks per rcu_do_batch. */
    667 -static int qhimark = 10000; /* If this many pending, ignore blimit. */
    668 -static int qlowmark = 100; /* Once only this many pending, use blimit. */
    669 +static long blimit = 10; /* Maximum callbacks per rcu_do_batch. */
    670 +static long qhimark = 10000; /* If this many pending, ignore blimit. */
    671 +static long qlowmark = 100; /* Once only this many pending, use blimit. */
    672
    673 -module_param(blimit, int, 0444);
    674 -module_param(qhimark, int, 0444);
    675 -module_param(qlowmark, int, 0444);
    676 +module_param(blimit, long, 0444);
    677 +module_param(qhimark, long, 0444);
    678 +module_param(qlowmark, long, 0444);
    679
    680 int rcu_cpu_stall_suppress __read_mostly; /* 1 = suppress stall warnings. */
    681 int rcu_cpu_stall_timeout __read_mostly = CONFIG_RCU_CPU_STALL_TIMEOUT;
    682 @@ -1769,7 +1769,8 @@ static void rcu_do_batch(struct rcu_state *rsp, struct rcu_data *rdp)
    683 {
    684 unsigned long flags;
    685 struct rcu_head *next, *list, **tail;
    686 - int bl, count, count_lazy, i;
    687 + long bl, count, count_lazy;
    688 + int i;
    689
    690 /* If no callbacks are ready, just return.*/
    691 if (!cpu_has_callbacks_ready_to_invoke(rdp)) {
    692 diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
    693 index 9dcf15d..51b7159 100644
    694 --- a/kernel/trace/ftrace.c
    695 +++ b/kernel/trace/ftrace.c
    696 @@ -2437,7 +2437,7 @@ static void reset_iter_read(struct ftrace_iterator *iter)
    697 {
    698 iter->pos = 0;
    699 iter->func_pos = 0;
    700 - iter->flags &= ~(FTRACE_ITER_PRINTALL & FTRACE_ITER_HASH);
    701 + iter->flags &= ~(FTRACE_ITER_PRINTALL | FTRACE_ITER_HASH);
    702 }
    703
    704 static void *t_start(struct seq_file *m, loff_t *pos)
    705 diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c
    706 index b979426..4cb5e51 100644
    707 --- a/kernel/trace/ring_buffer.c
    708 +++ b/kernel/trace/ring_buffer.c
    709 @@ -1396,6 +1396,8 @@ rb_insert_pages(struct ring_buffer_per_cpu *cpu_buffer)
    710 struct list_head *head_page_with_bit;
    711
    712 head_page = &rb_set_head_page(cpu_buffer)->list;
    713 + if (!head_page)
    714 + break;
    715 prev_page = head_page->prev;
    716
    717 first_page = pages->next;
    718 @@ -2934,7 +2936,7 @@ unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
    719 unsigned long flags;
    720 struct ring_buffer_per_cpu *cpu_buffer;
    721 struct buffer_page *bpage;
    722 - unsigned long ret;
    723 + unsigned long ret = 0;
    724
    725 if (!cpumask_test_cpu(cpu, buffer->cpumask))
    726 return 0;
    727 @@ -2949,7 +2951,8 @@ unsigned long ring_buffer_oldest_event_ts(struct ring_buffer *buffer, int cpu)
    728 bpage = cpu_buffer->reader_page;
    729 else
    730 bpage = rb_set_head_page(cpu_buffer);
    731 - ret = bpage->page->time_stamp;
    732 + if (bpage)
    733 + ret = bpage->page->time_stamp;
    734 raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
    735
    736 return ret;
    737 @@ -3260,6 +3263,8 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer)
    738 * Splice the empty reader page into the list around the head.
    739 */
    740 reader = rb_set_head_page(cpu_buffer);
    741 + if (!reader)
    742 + goto out;
    743 cpu_buffer->reader_page->list.next = rb_list_head(reader->list.next);
    744 cpu_buffer->reader_page->list.prev = reader->list.prev;
    745
    746 @@ -3778,12 +3783,17 @@ void
    747 ring_buffer_read_finish(struct ring_buffer_iter *iter)
    748 {
    749 struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer;
    750 + unsigned long flags;
    751
    752 /*
    753 * Ring buffer is disabled from recording, here's a good place
    754 - * to check the integrity of the ring buffer.
    755 + * to check the integrity of the ring buffer.
    756 + * Must prevent readers from trying to read, as the check
    757 + * clears the HEAD page and readers require it.
    758 */
    759 + raw_spin_lock_irqsave(&cpu_buffer->reader_lock, flags);
    760 rb_check_pages(cpu_buffer);
    761 + raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags);
    762
    763 atomic_dec(&cpu_buffer->record_disabled);
    764 atomic_dec(&cpu_buffer->buffer->resize_disabled);
    765 diff --git a/mm/dmapool.c b/mm/dmapool.c
    766 index c5ab33b..da1b0f0 100644
    767 --- a/mm/dmapool.c
    768 +++ b/mm/dmapool.c
    769 @@ -50,7 +50,6 @@ struct dma_pool { /* the pool */
    770 size_t allocation;
    771 size_t boundary;
    772 char name[32];
    773 - wait_queue_head_t waitq;
    774 struct list_head pools;
    775 };
    776
    777 @@ -62,8 +61,6 @@ struct dma_page { /* cacheable header for 'allocation' bytes */
    778 unsigned int offset;
    779 };
    780
    781 -#define POOL_TIMEOUT_JIFFIES ((100 /* msec */ * HZ) / 1000)
    782 -
    783 static DEFINE_MUTEX(pools_lock);
    784
    785 static ssize_t
    786 @@ -172,7 +169,6 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev,
    787 retval->size = size;
    788 retval->boundary = boundary;
    789 retval->allocation = allocation;
    790 - init_waitqueue_head(&retval->waitq);
    791
    792 if (dev) {
    793 int ret;
    794 @@ -227,7 +223,6 @@ static struct dma_page *pool_alloc_page(struct dma_pool *pool, gfp_t mem_flags)
    795 memset(page->vaddr, POOL_POISON_FREED, pool->allocation);
    796 #endif
    797 pool_initialise_page(pool, page);
    798 - list_add(&page->page_list, &pool->page_list);
    799 page->in_use = 0;
    800 page->offset = 0;
    801 } else {
    802 @@ -315,30 +310,21 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
    803 might_sleep_if(mem_flags & __GFP_WAIT);
    804
    805 spin_lock_irqsave(&pool->lock, flags);
    806 - restart:
    807 list_for_each_entry(page, &pool->page_list, page_list) {
    808 if (page->offset < pool->allocation)
    809 goto ready;
    810 }
    811 - page = pool_alloc_page(pool, GFP_ATOMIC);
    812 - if (!page) {
    813 - if (mem_flags & __GFP_WAIT) {
    814 - DECLARE_WAITQUEUE(wait, current);
    815
    816 - __set_current_state(TASK_UNINTERRUPTIBLE);
    817 - __add_wait_queue(&pool->waitq, &wait);
    818 - spin_unlock_irqrestore(&pool->lock, flags);
    819 + /* pool_alloc_page() might sleep, so temporarily drop &pool->lock */
    820 + spin_unlock_irqrestore(&pool->lock, flags);
    821
    822 - schedule_timeout(POOL_TIMEOUT_JIFFIES);
    823 + page = pool_alloc_page(pool, mem_flags);
    824 + if (!page)
    825 + return NULL;
    826
    827 - spin_lock_irqsave(&pool->lock, flags);
    828 - __remove_wait_queue(&pool->waitq, &wait);
    829 - goto restart;
    830 - }
    831 - retval = NULL;
    832 - goto done;
    833 - }
    834 + spin_lock_irqsave(&pool->lock, flags);
    835
    836 + list_add(&page->page_list, &pool->page_list);
    837 ready:
    838 page->in_use++;
    839 offset = page->offset;
    840 @@ -348,7 +334,6 @@ void *dma_pool_alloc(struct dma_pool *pool, gfp_t mem_flags,
    841 #ifdef DMAPOOL_DEBUG
    842 memset(retval, POOL_POISON_ALLOCATED, pool->size);
    843 #endif
    844 - done:
    845 spin_unlock_irqrestore(&pool->lock, flags);
    846 return retval;
    847 }
    848 @@ -435,8 +420,6 @@ void dma_pool_free(struct dma_pool *pool, void *vaddr, dma_addr_t dma)
    849 page->in_use--;
    850 *(int *)vaddr = page->offset;
    851 page->offset = offset;
    852 - if (waitqueue_active(&pool->waitq))
    853 - wake_up_locked(&pool->waitq);
    854 /*
    855 * Resist a temptation to do
    856 * if (!is_page_busy(page)) pool_free_page(pool, page);
    857 diff --git a/tools/perf/builtin-test.c b/tools/perf/builtin-test.c
    858 index 5acd6e8..20b0e9e 100644
    859 --- a/tools/perf/builtin-test.c
    860 +++ b/tools/perf/builtin-test.c
    861 @@ -604,19 +604,13 @@ out_free_threads:
    862 #undef nsyscalls
    863 }
    864
    865 -static int sched__get_first_possible_cpu(pid_t pid, cpu_set_t **maskp,
    866 - size_t *sizep)
    867 +static int sched__get_first_possible_cpu(pid_t pid, cpu_set_t *maskp)
    868 {
    869 - cpu_set_t *mask;
    870 - size_t size;
    871 int i, cpu = -1, nrcpus = 1024;
    872 realloc:
    873 - mask = CPU_ALLOC(nrcpus);
    874 - size = CPU_ALLOC_SIZE(nrcpus);
    875 - CPU_ZERO_S(size, mask);
    876 + CPU_ZERO(maskp);
    877
    878 - if (sched_getaffinity(pid, size, mask) == -1) {
    879 - CPU_FREE(mask);
    880 + if (sched_getaffinity(pid, sizeof(*maskp), maskp) == -1) {
    881 if (errno == EINVAL && nrcpus < (1024 << 8)) {
    882 nrcpus = nrcpus << 2;
    883 goto realloc;
    884 @@ -626,19 +620,14 @@ realloc:
    885 }
    886
    887 for (i = 0; i < nrcpus; i++) {
    888 - if (CPU_ISSET_S(i, size, mask)) {
    889 - if (cpu == -1) {
    890 + if (CPU_ISSET(i, maskp)) {
    891 + if (cpu == -1)
    892 cpu = i;
    893 - *maskp = mask;
    894 - *sizep = size;
    895 - } else
    896 - CPU_CLR_S(i, size, mask);
    897 + else
    898 + CPU_CLR(i, maskp);
    899 }
    900 }
    901
    902 - if (cpu == -1)
    903 - CPU_FREE(mask);
    904 -
    905 return cpu;
    906 }
    907
    908 @@ -653,8 +642,8 @@ static int test__PERF_RECORD(void)
    909 .freq = 10,
    910 .mmap_pages = 256,
    911 };
    912 - cpu_set_t *cpu_mask = NULL;
    913 - size_t cpu_mask_size = 0;
    914 + cpu_set_t cpu_mask;
    915 + size_t cpu_mask_size = sizeof(cpu_mask);
    916 struct perf_evlist *evlist = perf_evlist__new(NULL, NULL);
    917 struct perf_evsel *evsel;
    918 struct perf_sample sample;
    919 @@ -718,8 +707,7 @@ static int test__PERF_RECORD(void)
    920 evsel->attr.sample_type |= PERF_SAMPLE_TIME;
    921 perf_evlist__config_attrs(evlist, &opts);
    922
    923 - err = sched__get_first_possible_cpu(evlist->workload.pid, &cpu_mask,
    924 - &cpu_mask_size);
    925 + err = sched__get_first_possible_cpu(evlist->workload.pid, &cpu_mask);
    926 if (err < 0) {
    927 pr_debug("sched__get_first_possible_cpu: %s\n", strerror(errno));
    928 goto out_delete_evlist;
    929 @@ -730,9 +718,9 @@ static int test__PERF_RECORD(void)
    930 /*
    931 * So that we can check perf_sample.cpu on all the samples.
    932 */
    933 - if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, cpu_mask) < 0) {
    934 + if (sched_setaffinity(evlist->workload.pid, cpu_mask_size, &cpu_mask) < 0) {
    935 pr_debug("sched_setaffinity: %s\n", strerror(errno));
    936 - goto out_free_cpu_mask;
    937 + goto out_delete_evlist;
    938 }
    939
    940 /*
    941 @@ -916,8 +904,6 @@ found_exit:
    942 }
    943 out_err:
    944 perf_evlist__munmap(evlist);
    945 -out_free_cpu_mask:
    946 - CPU_FREE(cpu_mask);
    947 out_delete_evlist:
    948 perf_evlist__delete(evlist);
    949 out: