diff options
Diffstat (limited to 'drivers')
2532 files changed, 5558 insertions, 2211 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index b6ed60b57b0d..56205a0b85df 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 30 | #ifdef CONFIG_ACPI_PROCFS_POWER | 31 | #ifdef CONFIG_ACPI_PROCFS_POWER |
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 3597d73f28f6..d98571385656 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/memory_hotplug.h> | 32 | #include <linux/memory_hotplug.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <acpi/acpi_drivers.h> | 34 | #include <acpi/acpi_drivers.h> |
| 34 | 35 | ||
| 35 | #define ACPI_MEMORY_DEVICE_CLASS "memory" | 36 | #define ACPI_MEMORY_DEVICE_CLASS "memory" |
diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c index 7e52295f1ecc..19dacfd43163 100644 --- a/drivers/acpi/acpi_pad.c +++ b/drivers/acpi/acpi_pad.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/freezer.h> | 27 | #include <linux/freezer.h> |
| 28 | #include <linux/cpu.h> | 28 | #include <linux/cpu.h> |
| 29 | #include <linux/clockchips.h> | 29 | #include <linux/clockchips.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <acpi/acpi_bus.h> | 31 | #include <acpi/acpi_bus.h> |
| 31 | #include <acpi/acpi_drivers.h> | 32 | #include <acpi/acpi_drivers.h> |
| 32 | 33 | ||
diff --git a/drivers/acpi/acpica/evgpe.c b/drivers/acpi/acpica/evgpe.c index 837de669743a..78c55508aff5 100644 --- a/drivers/acpi/acpica/evgpe.c +++ b/drivers/acpi/acpica/evgpe.c | |||
| @@ -117,19 +117,14 @@ acpi_status acpi_ev_enable_gpe(struct acpi_gpe_event_info *gpe_event_info) | |||
| 117 | if (ACPI_FAILURE(status)) | 117 | if (ACPI_FAILURE(status)) |
| 118 | return_ACPI_STATUS(status); | 118 | return_ACPI_STATUS(status); |
| 119 | 119 | ||
| 120 | /* Mark wake-enabled or HW enable, or both */ | 120 | /* Clear the GPE (of stale events), then enable it */ |
| 121 | 121 | status = acpi_hw_clear_gpe(gpe_event_info); | |
| 122 | if (gpe_event_info->runtime_count) { | 122 | if (ACPI_FAILURE(status)) |
| 123 | /* Clear the GPE (of stale events), then enable it */ | 123 | return_ACPI_STATUS(status); |
| 124 | status = acpi_hw_clear_gpe(gpe_event_info); | ||
| 125 | if (ACPI_FAILURE(status)) | ||
| 126 | return_ACPI_STATUS(status); | ||
| 127 | |||
| 128 | /* Enable the requested runtime GPE */ | ||
| 129 | status = acpi_hw_write_gpe_enable_reg(gpe_event_info); | ||
| 130 | } | ||
| 131 | 124 | ||
| 132 | return_ACPI_STATUS(AE_OK); | 125 | /* Enable the requested GPE */ |
| 126 | status = acpi_hw_write_gpe_enable_reg(gpe_event_info); | ||
| 127 | return_ACPI_STATUS(status); | ||
| 133 | } | 128 | } |
| 134 | 129 | ||
| 135 | /******************************************************************************* | 130 | /******************************************************************************* |
diff --git a/drivers/acpi/acpica/exprep.c b/drivers/acpi/acpica/exprep.c index edf62bf5b266..a610ebe18edd 100644 --- a/drivers/acpi/acpica/exprep.c +++ b/drivers/acpi/acpica/exprep.c | |||
| @@ -468,6 +468,18 @@ acpi_status acpi_ex_prep_field_value(struct acpi_create_field_info *info) | |||
| 468 | 468 | ||
| 469 | acpi_ut_add_reference(obj_desc->field.region_obj); | 469 | acpi_ut_add_reference(obj_desc->field.region_obj); |
| 470 | 470 | ||
| 471 | /* allow full data read from EC address space */ | ||
| 472 | if (obj_desc->field.region_obj->region.space_id == | ||
| 473 | ACPI_ADR_SPACE_EC) { | ||
| 474 | if (obj_desc->common_field.bit_length > 8) | ||
| 475 | obj_desc->common_field.access_bit_width = | ||
| 476 | ACPI_ROUND_UP(obj_desc->common_field. | ||
| 477 | bit_length, 8); | ||
| 478 | obj_desc->common_field.access_byte_width = | ||
| 479 | ACPI_DIV_8(obj_desc->common_field. | ||
| 480 | access_bit_width); | ||
| 481 | } | ||
| 482 | |||
| 471 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, | 483 | ACPI_DEBUG_PRINT((ACPI_DB_BFIELD, |
| 472 | "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n", | 484 | "RegionField: BitOff %X, Off %X, Gran %X, Region %p\n", |
| 473 | obj_desc->field.start_field_bit_offset, | 485 | obj_desc->field.start_field_bit_offset, |
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index 75f39f2c166d..3026e3fa83ef 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/jiffies.h> | 32 | #include <linux/jiffies.h> |
| 33 | #include <linux/async.h> | 33 | #include <linux/async.h> |
| 34 | #include <linux/dmi.h> | 34 | #include <linux/dmi.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #ifdef CONFIG_ACPI_PROCFS_POWER | 37 | #ifdef CONFIG_ACPI_PROCFS_POWER |
| 37 | #include <linux/proc_fs.h> | 38 | #include <linux/proc_fs.h> |
| @@ -567,13 +568,13 @@ static int acpi_battery_update(struct acpi_battery *battery) | |||
| 567 | result = acpi_battery_get_status(battery); | 568 | result = acpi_battery_get_status(battery); |
| 568 | if (result) | 569 | if (result) |
| 569 | return result; | 570 | return result; |
| 570 | #ifdef CONFIG_ACPI_SYSFS_POWER | ||
| 571 | if (!acpi_battery_present(battery)) { | 571 | if (!acpi_battery_present(battery)) { |
| 572 | #ifdef CONFIG_ACPI_SYSFS_POWER | ||
| 572 | sysfs_remove_battery(battery); | 573 | sysfs_remove_battery(battery); |
| 574 | #endif | ||
| 573 | battery->update_time = 0; | 575 | battery->update_time = 0; |
| 574 | return 0; | 576 | return 0; |
| 575 | } | 577 | } |
| 576 | #endif | ||
| 577 | if (!battery->update_time || | 578 | if (!battery->update_time || |
| 578 | old_present != acpi_battery_present(battery)) { | 579 | old_present != acpi_battery_present(battery)) { |
| 579 | result = acpi_battery_get_info(battery); | 580 | result = acpi_battery_get_info(battery); |
| @@ -879,7 +880,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) | |||
| 879 | #ifdef CONFIG_ACPI_SYSFS_POWER | 880 | #ifdef CONFIG_ACPI_SYSFS_POWER |
| 880 | /* acpi_battery_update could remove power_supply object */ | 881 | /* acpi_battery_update could remove power_supply object */ |
| 881 | if (battery->bat.dev) | 882 | if (battery->bat.dev) |
| 882 | kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE); | 883 | power_supply_changed(&battery->bat); |
| 883 | #endif | 884 | #endif |
| 884 | } | 885 | } |
| 885 | 886 | ||
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index b70cd3756142..37132dc2da03 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 33 | #include <linux/proc_fs.h> | 33 | #include <linux/proc_fs.h> |
| 34 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #ifdef CONFIG_X86 | 36 | #ifdef CONFIG_X86 |
| 36 | #include <asm/mpspec.h> | 37 | #include <asm/mpspec.h> |
| 37 | #endif | 38 | #endif |
diff --git a/drivers/acpi/button.c b/drivers/acpi/button.c index f53fbe307c9d..fd51c4ab4829 100644 --- a/drivers/acpi/button.c +++ b/drivers/acpi/button.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
| 31 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 32 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <acpi/acpi_bus.h> | 34 | #include <acpi/acpi_bus.h> |
| 34 | #include <acpi/acpi_drivers.h> | 35 | #include <acpi/acpi_drivers.h> |
| 35 | 36 | ||
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 5faf6c21257d..45cd03b4630e 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 33 | #include <linux/acpi.h> | 34 | #include <linux/acpi.h> |
| 34 | #include <acpi/acpi_bus.h> | 35 | #include <acpi/acpi_bus.h> |
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index cc421b7ae166..146135e7a6a1 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/moduleparam.h> | 10 | #include <linux/moduleparam.h> |
| 11 | #include <linux/debugfs.h> | 11 | #include <linux/debugfs.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 13 | #include <acpi/acpi_drivers.h> | 14 | #include <acpi/acpi_drivers.h> |
| 14 | 15 | ||
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index d9a85f1ddde6..3fe29e992be8 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 28 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 29 | #include <linux/notifier.h> | 30 | #include <linux/notifier.h> |
| @@ -1025,13 +1026,10 @@ static int dock_remove(struct dock_station *ds) | |||
| 1025 | static acpi_status | 1026 | static acpi_status |
| 1026 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) | 1027 | find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) |
| 1027 | { | 1028 | { |
| 1028 | acpi_status status = AE_OK; | ||
| 1029 | |||
| 1030 | if (is_dock(handle)) | 1029 | if (is_dock(handle)) |
| 1031 | if (dock_add(handle) >= 0) | 1030 | dock_add(handle); |
| 1032 | status = AE_CTRL_TERMINATE; | ||
| 1033 | 1031 | ||
| 1034 | return status; | 1032 | return AE_OK; |
| 1035 | } | 1033 | } |
| 1036 | 1034 | ||
| 1037 | static acpi_status | 1035 | static acpi_status |
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 1ac28c6a672e..f2234db85da0 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/list.h> | 40 | #include <linux/list.h> |
| 41 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <asm/io.h> | 43 | #include <asm/io.h> |
| 43 | #include <acpi/acpi_bus.h> | 44 | #include <acpi/acpi_bus.h> |
| 44 | #include <acpi/acpi_drivers.h> | 45 | #include <acpi/acpi_drivers.h> |
| @@ -628,12 +629,12 @@ static u32 acpi_ec_gpe_handler(void *data) | |||
| 628 | 629 | ||
| 629 | static acpi_status | 630 | static acpi_status |
| 630 | acpi_ec_space_handler(u32 function, acpi_physical_address address, | 631 | acpi_ec_space_handler(u32 function, acpi_physical_address address, |
| 631 | u32 bits, u64 *value, | 632 | u32 bits, u64 *value64, |
| 632 | void *handler_context, void *region_context) | 633 | void *handler_context, void *region_context) |
| 633 | { | 634 | { |
| 634 | struct acpi_ec *ec = handler_context; | 635 | struct acpi_ec *ec = handler_context; |
| 635 | int result = 0, i; | 636 | int result = 0, i, bytes = bits / 8; |
| 636 | u8 temp = 0; | 637 | u8 *value = (u8 *)value64; |
| 637 | 638 | ||
| 638 | if ((address > 0xFF) || !value || !handler_context) | 639 | if ((address > 0xFF) || !value || !handler_context) |
| 639 | return AE_BAD_PARAMETER; | 640 | return AE_BAD_PARAMETER; |
| @@ -641,32 +642,15 @@ acpi_ec_space_handler(u32 function, acpi_physical_address address, | |||
| 641 | if (function != ACPI_READ && function != ACPI_WRITE) | 642 | if (function != ACPI_READ && function != ACPI_WRITE) |
| 642 | return AE_BAD_PARAMETER; | 643 | return AE_BAD_PARAMETER; |
| 643 | 644 | ||
| 644 | if (bits != 8 && acpi_strict) | 645 | if (EC_FLAGS_MSI || bits > 8) |
| 645 | return AE_BAD_PARAMETER; | ||
| 646 | |||
| 647 | if (EC_FLAGS_MSI) | ||
| 648 | acpi_ec_burst_enable(ec); | 646 | acpi_ec_burst_enable(ec); |
| 649 | 647 | ||
| 650 | if (function == ACPI_READ) { | 648 | for (i = 0; i < bytes; ++i, ++address, ++value) |
| 651 | result = acpi_ec_read(ec, address, &temp); | 649 | result = (function == ACPI_READ) ? |
| 652 | *value = temp; | 650 | acpi_ec_read(ec, address, value) : |
| 653 | } else { | 651 | acpi_ec_write(ec, address, *value); |
| 654 | temp = 0xff & (*value); | ||
| 655 | result = acpi_ec_write(ec, address, temp); | ||
| 656 | } | ||
| 657 | |||
| 658 | for (i = 8; unlikely(bits - i > 0); i += 8) { | ||
| 659 | ++address; | ||
| 660 | if (function == ACPI_READ) { | ||
| 661 | result = acpi_ec_read(ec, address, &temp); | ||
| 662 | (*value) |= ((u64)temp) << i; | ||
| 663 | } else { | ||
| 664 | temp = 0xff & ((*value) >> i); | ||
| 665 | result = acpi_ec_write(ec, address, temp); | ||
| 666 | } | ||
| 667 | } | ||
| 668 | 652 | ||
| 669 | if (EC_FLAGS_MSI) | 653 | if (EC_FLAGS_MSI || bits > 8) |
| 670 | acpi_ec_burst_disable(ec); | 654 | acpi_ec_burst_disable(ec); |
| 671 | 655 | ||
| 672 | switch (result) { | 656 | switch (result) { |
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index c511071bfd79..d439314a75d8 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/proc_fs.h> | 10 | #include <linux/proc_fs.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/poll.h> | 12 | #include <linux/poll.h> |
| 13 | #include <linux/gfp.h> | ||
| 13 | #include <acpi/acpi_drivers.h> | 14 | #include <acpi/acpi_drivers.h> |
| 14 | #include <net/netlink.h> | 15 | #include <net/netlink.h> |
| 15 | #include <net/genetlink.h> | 16 | #include <net/genetlink.h> |
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 6d5b64b7d526..4af6301601e7 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/list.h> | 10 | #include <linux/list.h> |
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/rwsem.h> | 13 | #include <linux/rwsem.h> |
| 13 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 14 | 15 | ||
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c index b8725461d887..b0337d314604 100644 --- a/drivers/acpi/numa.c +++ b/drivers/acpi/numa.c | |||
| @@ -61,8 +61,10 @@ int node_to_pxm(int node) | |||
| 61 | 61 | ||
| 62 | void __acpi_map_pxm_to_node(int pxm, int node) | 62 | void __acpi_map_pxm_to_node(int pxm, int node) |
| 63 | { | 63 | { |
| 64 | pxm_to_node_map[pxm] = node; | 64 | if (pxm_to_node_map[pxm] == NUMA_NO_NODE || node < pxm_to_node_map[pxm]) |
| 65 | node_to_pxm_map[node] = pxm; | 65 | pxm_to_node_map[pxm] = node; |
| 66 | if (node_to_pxm_map[node] == PXM_INVAL || pxm < node_to_pxm_map[node]) | ||
| 67 | node_to_pxm_map[node] = pxm; | ||
| 66 | } | 68 | } |
| 67 | 69 | ||
| 68 | int acpi_map_pxm_to_node(int pxm) | 70 | int acpi_map_pxm_to_node(int pxm) |
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 8e6d8665f0ae..7594f65800cf 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
| @@ -758,7 +758,14 @@ static acpi_status __acpi_os_execute(acpi_execute_type type, | |||
| 758 | queue = hp ? kacpi_hotplug_wq : | 758 | queue = hp ? kacpi_hotplug_wq : |
| 759 | (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq); | 759 | (type == OSL_NOTIFY_HANDLER ? kacpi_notify_wq : kacpid_wq); |
| 760 | dpc->wait = hp ? 1 : 0; | 760 | dpc->wait = hp ? 1 : 0; |
| 761 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); | 761 | |
| 762 | if (queue == kacpi_hotplug_wq) | ||
| 763 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); | ||
| 764 | else if (queue == kacpi_notify_wq) | ||
| 765 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); | ||
| 766 | else | ||
| 767 | INIT_WORK(&dpc->work, acpi_os_execute_deferred); | ||
| 768 | |||
| 762 | ret = queue_work(queue, &dpc->work); | 769 | ret = queue_work(queue, &dpc->work); |
| 763 | 770 | ||
| 764 | if (!ret) { | 771 | if (!ret) { |
| @@ -1151,16 +1158,10 @@ int acpi_check_resource_conflict(const struct resource *res) | |||
| 1151 | 1158 | ||
| 1152 | if (clash) { | 1159 | if (clash) { |
| 1153 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { | 1160 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) { |
| 1154 | printk("%sACPI: %s resource %s [0x%llx-0x%llx]" | 1161 | printk(KERN_WARNING "ACPI: resource %s %pR" |
| 1155 | " conflicts with ACPI region %s" | 1162 | " conflicts with ACPI region %s %pR\n", |
| 1156 | " [0x%llx-0x%llx]\n", | 1163 | res->name, res, res_list_elem->name, |
| 1157 | acpi_enforce_resources == ENFORCE_RESOURCES_LAX | 1164 | res_list_elem); |
| 1158 | ? KERN_WARNING : KERN_ERR, | ||
| 1159 | ioport ? "I/O" : "Memory", res->name, | ||
| 1160 | (long long) res->start, (long long) res->end, | ||
| 1161 | res_list_elem->name, | ||
| 1162 | (long long) res_list_elem->start, | ||
| 1163 | (long long) res_list_elem->end); | ||
| 1164 | if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) | 1165 | if (acpi_enforce_resources == ENFORCE_RESOURCES_LAX) |
| 1165 | printk(KERN_NOTICE "ACPI: This conflict may" | 1166 | printk(KERN_NOTICE "ACPI: This conflict may" |
| 1166 | " cause random problems and system" | 1167 | " cause random problems and system" |
diff --git a/drivers/acpi/pci_irq.c b/drivers/acpi/pci_irq.c index 843699ed93f2..b0a71ecee682 100644 --- a/drivers/acpi/pci_irq.c +++ b/drivers/acpi/pci_irq.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/pm.h> | 37 | #include <linux/pm.h> |
| 38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 39 | #include <linux/acpi.h> | 39 | #include <linux/acpi.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <acpi/acpi_bus.h> | 41 | #include <acpi/acpi_bus.h> |
| 41 | #include <acpi/acpi_drivers.h> | 42 | #include <acpi/acpi_drivers.h> |
| 42 | 43 | ||
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 04b0f007c9b7..8d47a5846aeb 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/pm.h> | 39 | #include <linux/pm.h> |
| 40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
| 41 | #include <linux/mutex.h> | 41 | #include <linux/mutex.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <acpi/acpi_bus.h> | 44 | #include <acpi/acpi_bus.h> |
| 44 | #include <acpi/acpi_drivers.h> | 45 | #include <acpi/acpi_drivers.h> |
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index d724736d56c8..aefce33f2a09 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/pci-acpi.h> | 35 | #include <linux/pci-acpi.h> |
| 36 | #include <linux/acpi.h> | 36 | #include <linux/acpi.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <acpi/acpi_bus.h> | 38 | #include <acpi/acpi_bus.h> |
| 38 | #include <acpi/acpi_drivers.h> | 39 | #include <acpi/acpi_drivers.h> |
| 39 | 40 | ||
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index 11f219743204..07f7fea8a4e2 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 30 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 31 | #include <linux/acpi.h> | 32 | #include <linux/acpi.h> |
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index 0f30c3c1eea4..ddc76787b842 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/proc_fs.h> | 43 | #include <linux/proc_fs.h> |
| 43 | #include <linux/seq_file.h> | 44 | #include <linux/seq_file.h> |
| 44 | #include <acpi/acpi_bus.h> | 45 | #include <acpi/acpi_bus.h> |
diff --git a/drivers/acpi/power_meter.c b/drivers/acpi/power_meter.c index 834c5af0de4b..e8c32a49f14e 100644 --- a/drivers/acpi/power_meter.c +++ b/drivers/acpi/power_meter.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/jiffies.h> | 25 | #include <linux/jiffies.h> |
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | #include <linux/dmi.h> | 27 | #include <linux/dmi.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
| 29 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 30 | #include <linux/time.h> | 31 | #include <linux/time.h> |
diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 791ac7b0f8df..51284351418f 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * - Added _PDC for platforms with Intel CPUs | 8 | * - Added _PDC for platforms with Intel CPUs |
| 9 | */ | 9 | */ |
| 10 | #include <linux/dmi.h> | 10 | #include <linux/dmi.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | 12 | ||
| 12 | #include <acpi/acpi_drivers.h> | 13 | #include <acpi/acpi_drivers.h> |
| 13 | #include <acpi/processor.h> | 14 | #include <acpi/processor.h> |
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c index b5658cdce27f..5675d9747e87 100644 --- a/drivers/acpi/processor_driver.c +++ b/drivers/acpi/processor_driver.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/dmi.h> | 45 | #include <linux/dmi.h> |
| 46 | #include <linux/moduleparam.h> | 46 | #include <linux/moduleparam.h> |
| 47 | #include <linux/cpuidle.h> | 47 | #include <linux/cpuidle.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | 49 | ||
| 49 | #include <asm/io.h> | 50 | #include <asm/io.h> |
| 50 | #include <asm/system.h> | 51 | #include <asm/system.h> |
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index 37dfce749398..5939e7f7d8e9 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/cpufreq.h> | 34 | #include <linux/cpufreq.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/proc_fs.h> | 36 | #include <linux/proc_fs.h> |
| 36 | #include <linux/seq_file.h> | 37 | #include <linux/seq_file.h> |
| 37 | #include <linux/acpi.h> | 38 | #include <linux/acpi.h> |
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index d648a9860b88..ba1bd263d903 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/cpufreq.h> | 32 | #include <linux/cpufreq.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #ifdef CONFIG_X86 | 35 | #ifdef CONFIG_X86 |
| 35 | #include <asm/cpufeature.h> | 36 | #include <asm/cpufeature.h> |
diff --git a/drivers/acpi/processor_throttling.c b/drivers/acpi/processor_throttling.c index 29c6f5766dcf..9ade1a5b32ed 100644 --- a/drivers/acpi/processor_throttling.c +++ b/drivers/acpi/processor_throttling.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 32 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 33 | #include <linux/cpufreq.h> | 34 | #include <linux/cpufreq.h> |
diff --git a/drivers/acpi/sbs.c b/drivers/acpi/sbs.c index 89ad11138e48..4ff76e8174eb 100644 --- a/drivers/acpi/sbs.c +++ b/drivers/acpi/sbs.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 29 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
| 30 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
diff --git a/drivers/acpi/sbshc.c b/drivers/acpi/sbshc.c index fd09229282ea..36704b887ccf 100644 --- a/drivers/acpi/sbshc.c +++ b/drivers/acpi/sbshc.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <acpi/acpi_bus.h> | 11 | #include <acpi/acpi_bus.h> |
| 12 | #include <acpi/acpi_drivers.h> | 12 | #include <acpi/acpi_drivers.h> |
| 13 | #include <linux/wait.h> | 13 | #include <linux/wait.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 16 | #include "sbshc.h" | 17 | #include "sbshc.h" |
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 189cbc2585fa..0338f513a010 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 8 | #include <linux/acpi.h> | 9 | #include <linux/acpi.h> |
| 9 | #include <linux/signal.h> | 10 | #include <linux/signal.h> |
| @@ -1080,12 +1081,6 @@ static void acpi_device_set_id(struct acpi_device *device) | |||
| 1080 | if (ACPI_IS_ROOT_DEVICE(device)) { | 1081 | if (ACPI_IS_ROOT_DEVICE(device)) { |
| 1081 | acpi_add_id(device, ACPI_SYSTEM_HID); | 1082 | acpi_add_id(device, ACPI_SYSTEM_HID); |
| 1082 | break; | 1083 | break; |
| 1083 | } else if (ACPI_IS_ROOT_DEVICE(device->parent)) { | ||
| 1084 | /* \_SB_, the only root-level namespace device */ | ||
| 1085 | acpi_add_id(device, ACPI_BUS_HID); | ||
| 1086 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); | ||
| 1087 | strcpy(device->pnp.device_class, ACPI_BUS_CLASS); | ||
| 1088 | break; | ||
| 1089 | } | 1084 | } |
| 1090 | 1085 | ||
| 1091 | status = acpi_get_object_info(device->handle, &info); | 1086 | status = acpi_get_object_info(device->handle, &info); |
| @@ -1120,6 +1115,12 @@ static void acpi_device_set_id(struct acpi_device *device) | |||
| 1120 | acpi_add_id(device, ACPI_DOCK_HID); | 1115 | acpi_add_id(device, ACPI_DOCK_HID); |
| 1121 | else if (!acpi_ibm_smbus_match(device)) | 1116 | else if (!acpi_ibm_smbus_match(device)) |
| 1122 | acpi_add_id(device, ACPI_SMBUS_IBM_HID); | 1117 | acpi_add_id(device, ACPI_SMBUS_IBM_HID); |
| 1118 | else if (!acpi_device_hid(device) && | ||
| 1119 | ACPI_IS_ROOT_DEVICE(device->parent)) { | ||
| 1120 | acpi_add_id(device, ACPI_BUS_HID); /* \_SB, LNXSYBUS */ | ||
| 1121 | strcpy(device->pnp.device_name, ACPI_BUS_DEVICE_NAME); | ||
| 1122 | strcpy(device->pnp.device_class, ACPI_BUS_CLASS); | ||
| 1123 | } | ||
| 1123 | 1124 | ||
| 1124 | break; | 1125 | break; |
| 1125 | case ACPI_BUS_TYPE_POWER: | 1126 | case ACPI_BUS_TYPE_POWER: |
diff --git a/drivers/acpi/system.c b/drivers/acpi/system.c index 743f2445e2a1..4aaf24976138 100644 --- a/drivers/acpi/system.c +++ b/drivers/acpi/system.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
| 27 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index 5d3893558cf7..efad1f33aeb5 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/dmi.h> | 36 | #include <linux/dmi.h> |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <linux/types.h> | 39 | #include <linux/types.h> |
| 39 | #include <linux/proc_fs.h> | 40 | #include <linux/proc_fs.h> |
| 40 | #include <linux/jiffies.h> | 41 | #include <linux/jiffies.h> |
diff --git a/drivers/acpi/utils.c b/drivers/acpi/utils.c index c9a49f4747e6..b002a471c5d4 100644 --- a/drivers/acpi/utils.c +++ b/drivers/acpi/utils.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 30 | #include <acpi/acpi_bus.h> | 31 | #include <acpi/acpi_bus.h> |
diff --git a/drivers/acpi/video.c b/drivers/acpi/video.c index cbe6f3924a10..a0c93b321482 100644 --- a/drivers/acpi/video.c +++ b/drivers/acpi/video.c | |||
| @@ -39,10 +39,12 @@ | |||
| 39 | #include <linux/sort.h> | 39 | #include <linux/sort.h> |
| 40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
| 41 | #include <linux/pci_ids.h> | 41 | #include <linux/pci_ids.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
| 43 | #include <linux/dmi.h> | 44 | #include <linux/dmi.h> |
| 44 | #include <acpi/acpi_bus.h> | 45 | #include <acpi/acpi_bus.h> |
| 45 | #include <acpi/acpi_drivers.h> | 46 | #include <acpi/acpi_drivers.h> |
| 47 | #include <linux/suspend.h> | ||
| 46 | 48 | ||
| 47 | #define PREFIX "ACPI: " | 49 | #define PREFIX "ACPI: " |
| 48 | 50 | ||
| @@ -88,7 +90,6 @@ module_param(allow_duplicates, bool, 0644); | |||
| 88 | static int register_count = 0; | 90 | static int register_count = 0; |
| 89 | static int acpi_video_bus_add(struct acpi_device *device); | 91 | static int acpi_video_bus_add(struct acpi_device *device); |
| 90 | static int acpi_video_bus_remove(struct acpi_device *device, int type); | 92 | static int acpi_video_bus_remove(struct acpi_device *device, int type); |
| 91 | static int acpi_video_resume(struct acpi_device *device); | ||
| 92 | static void acpi_video_bus_notify(struct acpi_device *device, u32 event); | 93 | static void acpi_video_bus_notify(struct acpi_device *device, u32 event); |
| 93 | 94 | ||
| 94 | static const struct acpi_device_id video_device_ids[] = { | 95 | static const struct acpi_device_id video_device_ids[] = { |
| @@ -104,7 +105,6 @@ static struct acpi_driver acpi_video_bus = { | |||
| 104 | .ops = { | 105 | .ops = { |
| 105 | .add = acpi_video_bus_add, | 106 | .add = acpi_video_bus_add, |
| 106 | .remove = acpi_video_bus_remove, | 107 | .remove = acpi_video_bus_remove, |
| 107 | .resume = acpi_video_resume, | ||
| 108 | .notify = acpi_video_bus_notify, | 108 | .notify = acpi_video_bus_notify, |
| 109 | }, | 109 | }, |
| 110 | }; | 110 | }; |
| @@ -159,6 +159,7 @@ struct acpi_video_bus { | |||
| 159 | struct proc_dir_entry *dir; | 159 | struct proc_dir_entry *dir; |
| 160 | struct input_dev *input; | 160 | struct input_dev *input; |
| 161 | char phys[32]; /* for input device */ | 161 | char phys[32]; /* for input device */ |
| 162 | struct notifier_block pm_nb; | ||
| 162 | }; | 163 | }; |
| 163 | 164 | ||
| 164 | struct acpi_video_device_flags { | 165 | struct acpi_video_device_flags { |
| @@ -1020,6 +1021,13 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device) | |||
| 1020 | if (IS_ERR(device->backlight)) | 1021 | if (IS_ERR(device->backlight)) |
| 1021 | return; | 1022 | return; |
| 1022 | 1023 | ||
| 1024 | /* | ||
| 1025 | * Save current brightness level in case we have to restore it | ||
| 1026 | * before acpi_video_device_lcd_set_level() is called next time. | ||
| 1027 | */ | ||
| 1028 | device->backlight->props.brightness = | ||
| 1029 | acpi_video_get_brightness(device->backlight); | ||
| 1030 | |||
| 1023 | result = sysfs_create_link(&device->backlight->dev.kobj, | 1031 | result = sysfs_create_link(&device->backlight->dev.kobj, |
| 1024 | &device->dev->dev.kobj, "device"); | 1032 | &device->dev->dev.kobj, "device"); |
| 1025 | if (result) | 1033 | if (result) |
| @@ -2122,7 +2130,7 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event) | |||
| 2122 | { | 2130 | { |
| 2123 | struct acpi_video_bus *video = acpi_driver_data(device); | 2131 | struct acpi_video_bus *video = acpi_driver_data(device); |
| 2124 | struct input_dev *input; | 2132 | struct input_dev *input; |
| 2125 | int keycode; | 2133 | int keycode = 0; |
| 2126 | 2134 | ||
| 2127 | if (!video) | 2135 | if (!video) |
| 2128 | return; | 2136 | return; |
| @@ -2158,17 +2166,19 @@ static void acpi_video_bus_notify(struct acpi_device *device, u32 event) | |||
| 2158 | break; | 2166 | break; |
| 2159 | 2167 | ||
| 2160 | default: | 2168 | default: |
| 2161 | keycode = KEY_UNKNOWN; | ||
| 2162 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 2169 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 2163 | "Unsupported event [0x%x]\n", event)); | 2170 | "Unsupported event [0x%x]\n", event)); |
| 2164 | break; | 2171 | break; |
| 2165 | } | 2172 | } |
| 2166 | 2173 | ||
| 2167 | acpi_notifier_call_chain(device, event, 0); | 2174 | acpi_notifier_call_chain(device, event, 0); |
| 2168 | input_report_key(input, keycode, 1); | 2175 | |
| 2169 | input_sync(input); | 2176 | if (keycode) { |
| 2170 | input_report_key(input, keycode, 0); | 2177 | input_report_key(input, keycode, 1); |
| 2171 | input_sync(input); | 2178 | input_sync(input); |
| 2179 | input_report_key(input, keycode, 0); | ||
| 2180 | input_sync(input); | ||
| 2181 | } | ||
| 2172 | 2182 | ||
| 2173 | return; | 2183 | return; |
| 2174 | } | 2184 | } |
| @@ -2179,7 +2189,7 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) | |||
| 2179 | struct acpi_device *device = NULL; | 2189 | struct acpi_device *device = NULL; |
| 2180 | struct acpi_video_bus *bus; | 2190 | struct acpi_video_bus *bus; |
| 2181 | struct input_dev *input; | 2191 | struct input_dev *input; |
| 2182 | int keycode; | 2192 | int keycode = 0; |
| 2183 | 2193 | ||
| 2184 | if (!video_device) | 2194 | if (!video_device) |
| 2185 | return; | 2195 | return; |
| @@ -2220,39 +2230,48 @@ static void acpi_video_device_notify(acpi_handle handle, u32 event, void *data) | |||
| 2220 | keycode = KEY_DISPLAY_OFF; | 2230 | keycode = KEY_DISPLAY_OFF; |
| 2221 | break; | 2231 | break; |
| 2222 | default: | 2232 | default: |
| 2223 | keycode = KEY_UNKNOWN; | ||
| 2224 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | 2233 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, |
| 2225 | "Unsupported event [0x%x]\n", event)); | 2234 | "Unsupported event [0x%x]\n", event)); |
| 2226 | break; | 2235 | break; |
| 2227 | } | 2236 | } |
| 2228 | 2237 | ||
| 2229 | acpi_notifier_call_chain(device, event, 0); | 2238 | acpi_notifier_call_chain(device, event, 0); |
| 2230 | input_report_key(input, keycode, 1); | 2239 | |
| 2231 | input_sync(input); | 2240 | if (keycode) { |
| 2232 | input_report_key(input, keycode, 0); | 2241 | input_report_key(input, keycode, 1); |
| 2233 | input_sync(input); | 2242 | input_sync(input); |
| 2243 | input_report_key(input, keycode, 0); | ||
| 2244 | input_sync(input); | ||
| 2245 | } | ||
| 2234 | 2246 | ||
| 2235 | return; | 2247 | return; |
| 2236 | } | 2248 | } |
| 2237 | 2249 | ||
| 2238 | static int instance; | 2250 | static int acpi_video_resume(struct notifier_block *nb, |
| 2239 | static int acpi_video_resume(struct acpi_device *device) | 2251 | unsigned long val, void *ign) |
| 2240 | { | 2252 | { |
| 2241 | struct acpi_video_bus *video; | 2253 | struct acpi_video_bus *video; |
| 2242 | struct acpi_video_device *video_device; | 2254 | struct acpi_video_device *video_device; |
| 2243 | int i; | 2255 | int i; |
| 2244 | 2256 | ||
| 2245 | if (!device || !acpi_driver_data(device)) | 2257 | switch (val) { |
| 2246 | return -EINVAL; | 2258 | case PM_HIBERNATION_PREPARE: |
| 2259 | case PM_SUSPEND_PREPARE: | ||
| 2260 | case PM_RESTORE_PREPARE: | ||
| 2261 | return NOTIFY_DONE; | ||
| 2262 | } | ||
| 2247 | 2263 | ||
| 2248 | video = acpi_driver_data(device); | 2264 | video = container_of(nb, struct acpi_video_bus, pm_nb); |
| 2265 | |||
| 2266 | dev_info(&video->device->dev, "Restoring backlight state\n"); | ||
| 2249 | 2267 | ||
| 2250 | for (i = 0; i < video->attached_count; i++) { | 2268 | for (i = 0; i < video->attached_count; i++) { |
| 2251 | video_device = video->attached_array[i].bind_info; | 2269 | video_device = video->attached_array[i].bind_info; |
| 2252 | if (video_device && video_device->backlight) | 2270 | if (video_device && video_device->backlight) |
| 2253 | acpi_video_set_brightness(video_device->backlight); | 2271 | acpi_video_set_brightness(video_device->backlight); |
| 2254 | } | 2272 | } |
| 2255 | return AE_OK; | 2273 | |
| 2274 | return NOTIFY_OK; | ||
| 2256 | } | 2275 | } |
| 2257 | 2276 | ||
| 2258 | static acpi_status | 2277 | static acpi_status |
| @@ -2276,6 +2295,8 @@ acpi_video_bus_match(acpi_handle handle, u32 level, void *context, | |||
| 2276 | return AE_OK; | 2295 | return AE_OK; |
| 2277 | } | 2296 | } |
| 2278 | 2297 | ||
| 2298 | static int instance; | ||
| 2299 | |||
| 2279 | static int acpi_video_bus_add(struct acpi_device *device) | 2300 | static int acpi_video_bus_add(struct acpi_device *device) |
| 2280 | { | 2301 | { |
| 2281 | struct acpi_video_bus *video; | 2302 | struct acpi_video_bus *video; |
| @@ -2357,7 +2378,6 @@ static int acpi_video_bus_add(struct acpi_device *device) | |||
| 2357 | set_bit(KEY_BRIGHTNESSDOWN, input->keybit); | 2378 | set_bit(KEY_BRIGHTNESSDOWN, input->keybit); |
| 2358 | set_bit(KEY_BRIGHTNESS_ZERO, input->keybit); | 2379 | set_bit(KEY_BRIGHTNESS_ZERO, input->keybit); |
| 2359 | set_bit(KEY_DISPLAY_OFF, input->keybit); | 2380 | set_bit(KEY_DISPLAY_OFF, input->keybit); |
| 2360 | set_bit(KEY_UNKNOWN, input->keybit); | ||
| 2361 | 2381 | ||
| 2362 | error = input_register_device(input); | 2382 | error = input_register_device(input); |
| 2363 | if (error) | 2383 | if (error) |
| @@ -2369,6 +2389,10 @@ static int acpi_video_bus_add(struct acpi_device *device) | |||
| 2369 | video->flags.rom ? "yes" : "no", | 2389 | video->flags.rom ? "yes" : "no", |
| 2370 | video->flags.post ? "yes" : "no"); | 2390 | video->flags.post ? "yes" : "no"); |
| 2371 | 2391 | ||
| 2392 | video->pm_nb.notifier_call = acpi_video_resume; | ||
| 2393 | video->pm_nb.priority = 0; | ||
| 2394 | register_pm_notifier(&video->pm_nb); | ||
| 2395 | |||
| 2372 | return 0; | 2396 | return 0; |
| 2373 | 2397 | ||
| 2374 | err_free_input_dev: | 2398 | err_free_input_dev: |
| @@ -2395,6 +2419,8 @@ static int acpi_video_bus_remove(struct acpi_device *device, int type) | |||
| 2395 | 2419 | ||
| 2396 | video = acpi_driver_data(device); | 2420 | video = acpi_driver_data(device); |
| 2397 | 2421 | ||
| 2422 | unregister_pm_notifier(&video->pm_nb); | ||
| 2423 | |||
| 2398 | acpi_video_bus_stop_devices(video); | 2424 | acpi_video_bus_stop_devices(video); |
| 2399 | acpi_video_bus_put_devices(video); | 2425 | acpi_video_bus_put_devices(video); |
| 2400 | acpi_video_bus_remove_fs(device); | 2426 | acpi_video_bus_remove_fs(device); |
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index fdc9bcbe55a2..5326af28a410 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
| 43 | #include <linux/device.h> | 43 | #include <linux/device.h> |
| 44 | #include <linux/dmi.h> | 44 | #include <linux/dmi.h> |
| 45 | #include <linux/gfp.h> | ||
| 45 | #include <scsi/scsi_host.h> | 46 | #include <scsi/scsi_host.h> |
| 46 | #include <scsi/scsi_cmnd.h> | 47 | #include <scsi/scsi_cmnd.h> |
| 47 | #include <linux/libata.h> | 48 | #include <linux/libata.h> |
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c index c33806654e46..83bc49fac9bb 100644 --- a/drivers/ata/ata_piix.c +++ b/drivers/ata/ata_piix.c | |||
| @@ -90,6 +90,7 @@ | |||
| 90 | #include <linux/blkdev.h> | 90 | #include <linux/blkdev.h> |
| 91 | #include <linux/delay.h> | 91 | #include <linux/delay.h> |
| 92 | #include <linux/device.h> | 92 | #include <linux/device.h> |
| 93 | #include <linux/gfp.h> | ||
| 93 | #include <scsi/scsi_host.h> | 94 | #include <scsi/scsi_host.h> |
| 94 | #include <linux/libata.h> | 95 | #include <linux/libata.h> |
| 95 | #include <linux/dmi.h> | 96 | #include <linux/dmi.h> |
diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c index 292fdbc0431a..7b5eea7e01dc 100644 --- a/drivers/ata/libata-acpi.c +++ b/drivers/ata/libata-acpi.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/acpi.h> | 15 | #include <linux/acpi.h> |
| 16 | #include <linux/libata.h> | 16 | #include <linux/libata.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <scsi/scsi_device.h> | 19 | #include <scsi/scsi_device.h> |
| 19 | #include "libata.h" | 20 | #include "libata.h" |
| 20 | 21 | ||
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 4a28420efff2..3f6771e63230 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/io.h> | 58 | #include <linux/io.h> |
| 59 | #include <linux/async.h> | 59 | #include <linux/async.h> |
| 60 | #include <linux/log2.h> | 60 | #include <linux/log2.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <scsi/scsi.h> | 62 | #include <scsi/scsi.h> |
| 62 | #include <scsi/scsi_cmnd.h> | 63 | #include <scsi/scsi_cmnd.h> |
| 63 | #include <scsi/scsi_host.h> | 64 | #include <scsi/scsi_host.h> |
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c index 51f0ffb78cbd..00305f41ed86 100644 --- a/drivers/ata/libata-pmp.c +++ b/drivers/ata/libata-pmp.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/libata.h> | 11 | #include <linux/libata.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include "libata.h" | 13 | #include "libata.h" |
| 13 | 14 | ||
| 14 | const struct ata_port_operations sata_pmp_port_ops = { | 15 | const struct ata_port_operations sata_pmp_port_ops = { |
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index bea003a24d27..0088cdeb0b1e 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 37 | #include <linux/blkdev.h> | 38 | #include <linux/blkdev.h> |
| 38 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c index 277477251a86..6411e0c7b9fe 100644 --- a/drivers/ata/libata-sff.c +++ b/drivers/ata/libata-sff.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/gfp.h> | ||
| 36 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 37 | #include <linux/libata.h> | 38 | #include <linux/libata.h> |
| 38 | #include <linux/highmem.h> | 39 | #include <linux/highmem.h> |
diff --git a/drivers/ata/pata_acpi.c b/drivers/ata/pata_acpi.c index 8e5e13210426..1ea2be0f4b94 100644 --- a/drivers/ata/pata_acpi.c +++ b/drivers/ata/pata_acpi.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/blkdev.h> | 11 | #include <linux/blkdev.h> |
| 12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <scsi/scsi_host.h> | 15 | #include <scsi/scsi_host.h> |
| 15 | #include <acpi/acpi_bus.h> | 16 | #include <acpi/acpi_bus.h> |
| 16 | 17 | ||
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c index 5c129f99a7e3..66ce6a526f27 100644 --- a/drivers/ata/pata_at32.c +++ b/drivers/ata/pata_at32.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <scsi/scsi_host.h> | 22 | #include <scsi/scsi_host.h> |
| 22 | #include <linux/ata.h> | 23 | #include <linux/ata.h> |
| 23 | #include <linux/libata.h> | 24 | #include <linux/libata.h> |
diff --git a/drivers/ata/pata_at91.c b/drivers/ata/pata_at91.c index 376dd380b43c..c6a946aa252c 100644 --- a/drivers/ata/pata_at91.c +++ b/drivers/ata/pata_at91.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/blkdev.h> | 21 | #include <linux/blkdev.h> |
| 22 | #include <linux/gfp.h> | ||
| 22 | #include <scsi/scsi_host.h> | 23 | #include <scsi/scsi_host.h> |
| 23 | #include <linux/ata.h> | 24 | #include <linux/ata.h> |
| 24 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
diff --git a/drivers/ata/pata_atp867x.c b/drivers/ata/pata_atp867x.c index 6fe7ded40c6a..bb6e0746e07d 100644 --- a/drivers/ata/pata_atp867x.c +++ b/drivers/ata/pata_atp867x.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/blkdev.h> | 33 | #include <linux/blkdev.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/device.h> | 35 | #include <linux/device.h> |
| 36 | #include <linux/gfp.h> | ||
| 36 | #include <scsi/scsi_host.h> | 37 | #include <scsi/scsi_host.h> |
| 37 | #include <linux/libata.h> | 38 | #include <linux/libata.h> |
| 38 | 39 | ||
diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c index 6cd5d5dd9e3b..45896b3c6538 100644 --- a/drivers/ata/pata_cmd640.c +++ b/drivers/ata/pata_cmd640.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/blkdev.h> | 19 | #include <linux/blkdev.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/gfp.h> | ||
| 21 | #include <scsi/scsi_host.h> | 22 | #include <scsi/scsi_host.h> |
| 22 | #include <linux/libata.h> | 23 | #include <linux/libata.h> |
| 23 | 24 | ||
diff --git a/drivers/ata/pata_icside.c b/drivers/ata/pata_icside.c index b663b7ffae4b..fa812e206eeb 100644 --- a/drivers/ata/pata_icside.c +++ b/drivers/ata/pata_icside.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 3 | #include <linux/init.h> | 3 | #include <linux/init.h> |
| 4 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 5 | #include <linux/gfp.h> | ||
| 5 | #include <scsi/scsi_host.h> | 6 | #include <scsi/scsi_host.h> |
| 6 | #include <linux/ata.h> | 7 | #include <linux/ata.h> |
| 7 | #include <linux/libata.h> | 8 | #include <linux/libata.h> |
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c index 9bde1cb5f981..5cb286fd839e 100644 --- a/drivers/ata/pata_it821x.c +++ b/drivers/ata/pata_it821x.c | |||
| @@ -75,6 +75,7 @@ | |||
| 75 | #include <linux/init.h> | 75 | #include <linux/init.h> |
| 76 | #include <linux/blkdev.h> | 76 | #include <linux/blkdev.h> |
| 77 | #include <linux/delay.h> | 77 | #include <linux/delay.h> |
| 78 | #include <linux/slab.h> | ||
| 78 | #include <scsi/scsi_host.h> | 79 | #include <scsi/scsi_host.h> |
| 79 | #include <linux/libata.h> | 80 | #include <linux/libata.h> |
| 80 | 81 | ||
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c index 4cc7bbd10ec2..211b6438b3a0 100644 --- a/drivers/ata/pata_macio.c +++ b/drivers/ata/pata_macio.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/pmu.h> | 21 | #include <linux/pmu.h> |
| 22 | #include <linux/scatterlist.h> | 22 | #include <linux/scatterlist.h> |
| 23 | #include <linux/of.h> | 23 | #include <linux/of.h> |
| 24 | #include <linux/gfp.h> | ||
| 24 | 25 | ||
| 25 | #include <scsi/scsi.h> | 26 | #include <scsi/scsi.h> |
| 26 | #include <scsi/scsi_host.h> | 27 | #include <scsi/scsi_host.h> |
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c index 2bc2dbe30e8f..9f5b053611dd 100644 --- a/drivers/ata/pata_mpc52xx.c +++ b/drivers/ata/pata_mpc52xx.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/gfp.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/libata.h> | 21 | #include <linux/libata.h> |
| 22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c index 37ef416c1242..005a44483a7b 100644 --- a/drivers/ata/pata_octeon_cf.c +++ b/drivers/ata/pata_octeon_cf.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/libata.h> | 14 | #include <linux/libata.h> |
| 15 | #include <linux/irq.h> | 15 | #include <linux/irq.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 17 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
| 18 | #include <scsi/scsi_host.h> | 19 | #include <scsi/scsi_host.h> |
diff --git a/drivers/ata/pata_pcmcia.c b/drivers/ata/pata_pcmcia.c index 147de2fd66d2..3c3172d3c34e 100644 --- a/drivers/ata/pata_pcmcia.c +++ b/drivers/ata/pata_pcmcia.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/blkdev.h> | 30 | #include <linux/blkdev.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <scsi/scsi_host.h> | 33 | #include <scsi/scsi_host.h> |
| 33 | #include <linux/ata.h> | 34 | #include <linux/ata.h> |
| 34 | #include <linux/libata.h> | 35 | #include <linux/libata.h> |
diff --git a/drivers/ata/pata_rb532_cf.c b/drivers/ata/pata_rb532_cf.c index 45f1e10f917b..0ffd631000b7 100644 --- a/drivers/ata/pata_rb532_cf.c +++ b/drivers/ata/pata_rb532_cf.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/gfp.h> | ||
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
diff --git a/drivers/ata/pata_rdc.c b/drivers/ata/pata_rdc.c index 237a24d41a2d..37092cfd7bc6 100644 --- a/drivers/ata/pata_rdc.c +++ b/drivers/ata/pata_rdc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/blkdev.h> | 28 | #include <linux/blkdev.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 31 | #include <linux/gfp.h> | ||
| 31 | #include <scsi/scsi_host.h> | 32 | #include <scsi/scsi_host.h> |
| 32 | #include <linux/libata.h> | 33 | #include <linux/libata.h> |
| 33 | #include <linux/dmi.h> | 34 | #include <linux/dmi.h> |
diff --git a/drivers/ata/pata_via.c b/drivers/ata/pata_via.c index c59b40710fbd..741e7cb69d8c 100644 --- a/drivers/ata/pata_via.c +++ b/drivers/ata/pata_via.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/init.h> | 58 | #include <linux/init.h> |
| 59 | #include <linux/blkdev.h> | 59 | #include <linux/blkdev.h> |
| 60 | #include <linux/delay.h> | 60 | #include <linux/delay.h> |
| 61 | #include <linux/gfp.h> | ||
| 61 | #include <scsi/scsi_host.h> | 62 | #include <scsi/scsi_host.h> |
| 62 | #include <linux/libata.h> | 63 | #include <linux/libata.h> |
| 63 | #include <linux/dmi.h> | 64 | #include <linux/dmi.h> |
diff --git a/drivers/ata/pdc_adma.c b/drivers/ata/pdc_adma.c index 6c65b0776a2c..5904cfdb8dbe 100644 --- a/drivers/ata/pdc_adma.c +++ b/drivers/ata/pdc_adma.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/gfp.h> | ||
| 37 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 38 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 39 | #include <linux/blkdev.h> | 40 | #include <linux/blkdev.h> |
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c index ce4136eea08f..a69192b38b43 100644 --- a/drivers/ata/sata_fsl.c +++ b/drivers/ata/sata_fsl.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <scsi/scsi_host.h> | 23 | #include <scsi/scsi_host.h> |
| 23 | #include <scsi/scsi_cmnd.h> | 24 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c index 4406902b4293..27dc6c86a4cd 100644 --- a/drivers/ata/sata_inic162x.c +++ b/drivers/ata/sata_inic162x.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | * happy to assist. | 39 | * happy to assist. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/gfp.h> | ||
| 42 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 43 | #include <linux/module.h> | 44 | #include <linux/module.h> |
| 44 | #include <linux/pci.h> | 45 | #include <linux/pci.h> |
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index df8ee325d3ca..71cc0d42f9e1 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/ata_platform.h> | 64 | #include <linux/ata_platform.h> |
| 65 | #include <linux/mbus.h> | 65 | #include <linux/mbus.h> |
| 66 | #include <linux/bitops.h> | 66 | #include <linux/bitops.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | #include <scsi/scsi_host.h> | 68 | #include <scsi/scsi_host.h> |
| 68 | #include <scsi/scsi_cmnd.h> | 69 | #include <scsi/scsi_cmnd.h> |
| 69 | #include <scsi/scsi_device.h> | 70 | #include <scsi/scsi_device.h> |
diff --git a/drivers/ata/sata_nv.c b/drivers/ata/sata_nv.c index 684fe04dbbb7..2a98b09ab735 100644 --- a/drivers/ata/sata_nv.c +++ b/drivers/ata/sata_nv.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 41 | #include <linux/gfp.h> | ||
| 41 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 42 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 43 | #include <linux/blkdev.h> | 44 | #include <linux/blkdev.h> |
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index 63306285c843..5356ec00d2b4 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/gfp.h> | ||
| 36 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 37 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 38 | #include <linux/blkdev.h> | 39 | #include <linux/blkdev.h> |
diff --git a/drivers/ata/sata_qstor.c b/drivers/ata/sata_qstor.c index 326c0cfc29b3..92ba45e6689b 100644 --- a/drivers/ata/sata_qstor.c +++ b/drivers/ata/sata_qstor.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 33 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 34 | #include <linux/blkdev.h> | 35 | #include <linux/blkdev.h> |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 1370df6c420c..433b6b89c795 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/gfp.h> | ||
| 22 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 23 | #include <linux/blkdev.h> | 24 | #include <linux/blkdev.h> |
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
diff --git a/drivers/ata/sata_sx4.c b/drivers/ata/sata_sx4.c index bbcf970068ad..232468f2ea90 100644 --- a/drivers/ata/sata_sx4.c +++ b/drivers/ata/sata_sx4.c | |||
| @@ -81,6 +81,7 @@ | |||
| 81 | #include <linux/kernel.h> | 81 | #include <linux/kernel.h> |
| 82 | #include <linux/module.h> | 82 | #include <linux/module.h> |
| 83 | #include <linux/pci.h> | 83 | #include <linux/pci.h> |
| 84 | #include <linux/slab.h> | ||
| 84 | #include <linux/init.h> | 85 | #include <linux/init.h> |
| 85 | #include <linux/blkdev.h> | 86 | #include <linux/blkdev.h> |
| 86 | #include <linux/delay.h> | 87 | #include <linux/delay.h> |
diff --git a/drivers/ata/sata_uli.c b/drivers/ata/sata_uli.c index e5bff47e8aa1..011e098590d1 100644 --- a/drivers/ata/sata_uli.c +++ b/drivers/ata/sata_uli.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/gfp.h> | ||
| 29 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/blkdev.h> | 32 | #include <linux/blkdev.h> |
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index 5effec6f5458..6d44f07b69f8 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/mm.h> | 13 | #include <linux/mm.h> |
| 14 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <asm/io.h> | 17 | #include <asm/io.h> |
| 17 | #include <asm/byteorder.h> | 18 | #include <asm/byteorder.h> |
| 18 | #include <asm/uaccess.h> | 19 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/ambassador.c b/drivers/atm/ambassador.c index 8af23411743c..9d18644c897e 100644 --- a/drivers/atm/ambassador.c +++ b/drivers/atm/ambassador.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
| 37 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
| 38 | #include <linux/ihex.h> | 38 | #include <linux/ihex.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/atomic.h> | 41 | #include <asm/atomic.h> |
| 41 | #include <asm/io.h> | 42 | #include <asm/io.h> |
diff --git a/drivers/atm/atmtcp.c b/drivers/atm/atmtcp.c index 02ad83d6b562..b86712167eb8 100644 --- a/drivers/atm/atmtcp.c +++ b/drivers/atm/atmtcp.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/atm_tcp.h> | 9 | #include <linux/atm_tcp.h> |
| 10 | #include <linux/bitops.h> | 10 | #include <linux/bitops.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 13 | #include <asm/atomic.h> | 14 | #include <asm/atomic.h> |
| 14 | 15 | ||
diff --git a/drivers/atm/eni.c b/drivers/atm/eni.c index 0c3026145443..719ec5a0dca5 100644 --- a/drivers/atm/eni.c +++ b/drivers/atm/eni.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/atm_eni.h> | 19 | #include <linux/atm_eni.h> |
| 20 | #include <linux/bitops.h> | 20 | #include <linux/bitops.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <asm/system.h> | 22 | #include <asm/system.h> |
| 22 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 23 | #include <asm/atomic.h> | 24 | #include <asm/atomic.h> |
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index cd5049af47a9..6e600afd06ae 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 47 | #include <linux/capability.h> | 47 | #include <linux/capability.h> |
| 48 | #include <linux/bitops.h> | 48 | #include <linux/bitops.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <asm/byteorder.h> | 50 | #include <asm/byteorder.h> |
| 50 | #include <asm/system.h> | 51 | #include <asm/system.h> |
| 51 | #include <asm/string.h> | 52 | #include <asm/string.h> |
diff --git a/drivers/atm/he.c b/drivers/atm/he.c index e8c6529dc366..c213e0da0343 100644 --- a/drivers/atm/he.c +++ b/drivers/atm/he.c | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | #include <linux/timer.h> | 67 | #include <linux/timer.h> |
| 68 | #include <linux/interrupt.h> | 68 | #include <linux/interrupt.h> |
| 69 | #include <linux/dma-mapping.h> | 69 | #include <linux/dma-mapping.h> |
| 70 | #include <linux/slab.h> | ||
| 70 | #include <asm/io.h> | 71 | #include <asm/io.h> |
| 71 | #include <asm/byteorder.h> | 72 | #include <asm/byteorder.h> |
| 72 | #include <asm/uaccess.h> | 73 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/horizon.c b/drivers/atm/horizon.c index 4e49021e67ee..54720baa7363 100644 --- a/drivers/atm/horizon.c +++ b/drivers/atm/horizon.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/ioport.h> | 41 | #include <linux/ioport.h> |
| 42 | #include <linux/wait.h> | 42 | #include <linux/wait.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
| 45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
diff --git a/drivers/atm/idt77105.c b/drivers/atm/idt77105.c index 84672dc57f7a..dab5cf5274fb 100644 --- a/drivers/atm/idt77105.c +++ b/drivers/atm/idt77105.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/capability.h> | 15 | #include <linux/capability.h> |
| 16 | #include <linux/atm_idt77105.h> | 16 | #include <linux/atm_idt77105.h> |
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/system.h> | 19 | #include <asm/system.h> |
| 19 | #include <asm/param.h> | 20 | #include <asm/param.h> |
| 20 | #include <asm/uaccess.h> | 21 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index 01f36c08cb52..98657a6a330d 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/wait.h> | 41 | #include <linux/wait.h> |
| 42 | #include <linux/jiffies.h> | 42 | #include <linux/jiffies.h> |
| 43 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 46 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/iphase.c b/drivers/atm/iphase.c index 25a4c86f839b..ee9ddeb53417 100644 --- a/drivers/atm/iphase.c +++ b/drivers/atm/iphase.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include <linux/uio.h> | 54 | #include <linux/uio.h> |
| 55 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 56 | #include <linux/wait.h> | 56 | #include <linux/wait.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | #include <asm/system.h> | 58 | #include <asm/system.h> |
| 58 | #include <asm/io.h> | 59 | #include <asm/io.h> |
| 59 | #include <asm/atomic.h> | 60 | #include <asm/atomic.h> |
diff --git a/drivers/atm/lanai.c b/drivers/atm/lanai.c index 23d95054705b..cbe15a86c669 100644 --- a/drivers/atm/lanai.c +++ b/drivers/atm/lanai.c | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 58 | #include <linux/slab.h> | ||
| 58 | #include <linux/mm.h> | 59 | #include <linux/mm.h> |
| 59 | #include <linux/atmdev.h> | 60 | #include <linux/atmdev.h> |
| 60 | #include <asm/io.h> | 61 | #include <asm/io.h> |
diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c index 50838407b117..b7473a6110a7 100644 --- a/drivers/atm/nicstar.c +++ b/drivers/atm/nicstar.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/timer.h> | 49 | #include <linux/timer.h> |
| 50 | #include <linux/interrupt.h> | 50 | #include <linux/interrupt.h> |
| 51 | #include <linux/bitops.h> | 51 | #include <linux/bitops.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <asm/io.h> | 53 | #include <asm/io.h> |
| 53 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
| 54 | #include <asm/atomic.h> | 55 | #include <asm/atomic.h> |
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index 51eed679a059..ded76c4c9f4f 100644 --- a/drivers/atm/solos-pci.c +++ b/drivers/atm/solos-pci.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/firmware.h> | 40 | #include <linux/firmware.h> |
| 41 | #include <linux/ctype.h> | 41 | #include <linux/ctype.h> |
| 42 | #include <linux/swab.h> | 42 | #include <linux/swab.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #define VERSION "0.07" | 45 | #define VERSION "0.07" |
| 45 | #define PTAG "solos-pci" | 46 | #define PTAG "solos-pci" |
diff --git a/drivers/atm/suni.c b/drivers/atm/suni.c index 6dd3f5919968..da4b91ffa53e 100644 --- a/drivers/atm/suni.c +++ b/drivers/atm/suni.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/capability.h> | 22 | #include <linux/capability.h> |
| 23 | #include <linux/atm_suni.h> | 23 | #include <linux/atm_suni.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 25 | #include <asm/param.h> | 26 | #include <asm/param.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
diff --git a/drivers/atm/uPD98402.c b/drivers/atm/uPD98402.c index fc8cb07c2477..c45ae0573bbd 100644 --- a/drivers/atm/uPD98402.c +++ b/drivers/atm/uPD98402.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/atmdev.h> | 9 | #include <linux/atmdev.h> |
| 10 | #include <linux/sonet.h> | 10 | #include <linux/sonet.h> |
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 13 | #include <asm/atomic.h> | 14 | #include <asm/atomic.h> |
| 14 | 15 | ||
diff --git a/drivers/atm/zatm.c b/drivers/atm/zatm.c index 2e9635be048c..702accec89e9 100644 --- a/drivers/atm/zatm.c +++ b/drivers/atm/zatm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/capability.h> | 21 | #include <linux/capability.h> |
| 22 | #include <linux/bitops.h> | 22 | #include <linux/bitops.h> |
| 23 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/byteorder.h> | 25 | #include <asm/byteorder.h> |
| 25 | #include <asm/system.h> | 26 | #include <asm/system.h> |
| 26 | #include <asm/string.h> | 27 | #include <asm/string.h> |
diff --git a/drivers/auxdisplay/cfag12864b.c b/drivers/auxdisplay/cfag12864b.c index eacb175f6bd3..49758593a5ba 100644 --- a/drivers/auxdisplay/cfag12864b.c +++ b/drivers/auxdisplay/cfag12864b.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/cdev.h> | 31 | #include <linux/cdev.h> |
| 31 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 32 | #include <linux/device.h> | 33 | #include <linux/device.h> |
diff --git a/drivers/auxdisplay/cfag12864bfb.c b/drivers/auxdisplay/cfag12864bfb.c index b0ca5a47f47d..3fecfb446d90 100644 --- a/drivers/auxdisplay/cfag12864bfb.c +++ b/drivers/auxdisplay/cfag12864bfb.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/fb.h> | 31 | #include <linux/fb.h> |
| 32 | #include <linux/mm.h> | 32 | #include <linux/mm.h> |
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 36 | #include <linux/uaccess.h> | 35 | #include <linux/uaccess.h> |
| 37 | #include <linux/cfag12864b.h> | 36 | #include <linux/cfag12864b.h> |
diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c index b9cda053d3c0..8fc200b2e2c0 100644 --- a/drivers/base/attribute_container.c +++ b/drivers/base/attribute_container.c | |||
| @@ -328,6 +328,7 @@ attribute_container_add_attrs(struct device *classdev) | |||
| 328 | return sysfs_create_group(&classdev->kobj, cont->grp); | 328 | return sysfs_create_group(&classdev->kobj, cont->grp); |
| 329 | 329 | ||
| 330 | for (i = 0; attrs[i]; i++) { | 330 | for (i = 0; attrs[i]; i++) { |
| 331 | sysfs_attr_init(&attrs[i]->attr); | ||
| 331 | error = device_create_file(classdev, attrs[i]); | 332 | error = device_create_file(classdev, attrs[i]); |
| 332 | if (error) | 333 | if (error) |
| 333 | return error; | 334 | return error; |
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 71f6af5c8b0b..12eec3f633b1 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 17 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 18 | #include "base.h" | 19 | #include "base.h" |
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index b5242e1e8bc4..f35719aab3c1 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/topology.h> | 10 | #include <linux/topology.h> |
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include <linux/node.h> | 12 | #include <linux/node.h> |
| 13 | #include <linux/gfp.h> | ||
| 13 | 14 | ||
| 14 | #include "base.h" | 15 | #include "base.h" |
| 15 | 16 | ||
diff --git a/drivers/base/devres.c b/drivers/base/devres.c index 05dd307e8f02..cf7a0c788052 100644 --- a/drivers/base/devres.c +++ b/drivers/base/devres.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/device.h> | 10 | #include <linux/device.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #include "base.h" | 14 | #include "base.h" |
| 14 | 15 | ||
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index dac478c6e460..057cf11326bf 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/cred.h> | 23 | #include <linux/cred.h> |
| 24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 25 | #include <linux/init_task.h> | 25 | #include <linux/init_task.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | static struct vfsmount *dev_mnt; | 28 | static struct vfsmount *dev_mnt; |
| 28 | 29 | ||
diff --git a/drivers/base/dma-coherent.c b/drivers/base/dma-coherent.c index 962a3b574f21..d4d8ce53886a 100644 --- a/drivers/base/dma-coherent.c +++ b/drivers/base/dma-coherent.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * Coherent per-device memory handling. | 2 | * Coherent per-device memory handling. |
| 3 | * Borrowed from i386 | 3 | * Borrowed from i386 |
| 4 | */ | 4 | */ |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 6 | #include <linux/dma-mapping.h> | 7 | #include <linux/dma-mapping.h> |
| 7 | 8 | ||
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c index ca9186f70a69..763d59c1eb65 100644 --- a/drivers/base/dma-mapping.c +++ b/drivers/base/dma-mapping.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/dma-mapping.h> | 10 | #include <linux/dma-mapping.h> |
| 11 | #include <linux/gfp.h> | ||
| 11 | 12 | ||
| 12 | /* | 13 | /* |
| 13 | * Managed DMA API | 14 | * Managed DMA API |
diff --git a/drivers/base/driver.c b/drivers/base/driver.c index 90c9fff09ead..b631f7c59453 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 17 | #include "base.h" | 18 | #include "base.h" |
| 18 | 19 | ||
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c index 18518ba13c81..985da11174e7 100644 --- a/drivers/base/firmware_class.c +++ b/drivers/base/firmware_class.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
| 20 | #include <linux/highmem.h> | 20 | #include <linux/highmem.h> |
| 21 | #include <linux/firmware.h> | 21 | #include <linux/firmware.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define to_dev(obj) container_of(obj, struct device, kobj) | 24 | #define to_dev(obj) container_of(obj, struct device, kobj) |
| 24 | 25 | ||
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index db0848e54cc6..4f4aa5897b4c 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <linux/stat.h> | 24 | #include <linux/stat.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <asm/atomic.h> | 27 | #include <asm/atomic.h> |
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
diff --git a/drivers/base/module.c b/drivers/base/module.c index 103be9cacb05..f32f2f9b7be5 100644 --- a/drivers/base/module.c +++ b/drivers/base/module.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/device.h> | 7 | #include <linux/device.h> |
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 11 | #include "base.h" | 12 | #include "base.h" |
| 12 | 13 | ||
diff --git a/drivers/base/node.c b/drivers/base/node.c index 93b3ac65c2d4..985abd7f49a7 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/cpu.h> | 15 | #include <linux/cpu.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/swap.h> | 17 | #include <linux/swap.h> |
| 18 | #include <linux/gfp.h> | ||
| 18 | 19 | ||
| 19 | static struct sysdev_class_attribute *node_state_attrs[]; | 20 | static struct sysdev_class_attribute *node_state_attrs[]; |
| 20 | 21 | ||
diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 8980feec5d14..9354dc10a363 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 22 | #include <linux/pm.h> | 21 | #include <linux/pm.h> |
| 23 | #include <linux/device.h> | 22 | #include <linux/device.h> |
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 055225839024..0182a22c423a 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | */ | 54 | */ |
| 55 | 55 | ||
| 56 | #include <linux/module.h> | 56 | #include <linux/module.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | 58 | ||
| 58 | #include <linux/fd.h> | 59 | #include <linux/fd.h> |
| 59 | #include <linux/hdreg.h> | 60 | #include <linux/hdreg.h> |
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index 3af97d4da2db..035cefe4045a 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/backing-dev.h> | 9 | #include <linux/backing-dev.h> |
| 10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
| 11 | #include <linux/ioctl.h> | 11 | #include <linux/ioctl.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/genhd.h> | 13 | #include <linux/genhd.h> |
| 13 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
| 14 | #include "aoe.h" | 15 | #include "aoe.h" |
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 62141ec09a22..4a1b9e7464aa 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <linux/completion.h> | 9 | #include <linux/completion.h> |
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/smp_lock.h> | 12 | #include <linux/smp_lock.h> |
| 12 | #include <linux/skbuff.h> | 13 | #include <linux/skbuff.h> |
| 13 | #include "aoe.h" | 14 | #include "aoe.h" |
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index 64a223b0cc22..5674bd01d96d 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/ata.h> | 7 | #include <linux/ata.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | #include <linux/hdreg.h> | 9 | #include <linux/hdreg.h> |
| 9 | #include <linux/blkdev.h> | 10 | #include <linux/blkdev.h> |
| 10 | #include <linux/skbuff.h> | 11 | #include <linux/skbuff.h> |
diff --git a/drivers/block/aoe/aoedev.c b/drivers/block/aoe/aoedev.c index fa67027789aa..0849280bfc1c 100644 --- a/drivers/block/aoe/aoedev.c +++ b/drivers/block/aoe/aoedev.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <linux/netdevice.h> | 9 | #include <linux/netdevice.h> |
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include "aoe.h" | 12 | #include "aoe.h" |
| 12 | 13 | ||
| 13 | static void dummy_timer(ulong); | 14 | static void dummy_timer(ulong); |
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index ce0d62cd71b2..4d3bc0d49df5 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * Ethernet portion of AoE driver | 4 | * Ethernet portion of AoE driver |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/gfp.h> | ||
| 7 | #include <linux/hdreg.h> | 8 | #include <linux/hdreg.h> |
| 8 | #include <linux/blkdev.h> | 9 | #include <linux/blkdev.h> |
| 9 | #include <linux/netdevice.h> | 10 | #include <linux/netdevice.h> |
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index c6ddeacb77fd..6081e81d5738 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c | |||
| @@ -15,9 +15,9 @@ | |||
| 15 | #include <linux/blkdev.h> | 15 | #include <linux/blkdev.h> |
| 16 | #include <linux/bio.h> | 16 | #include <linux/bio.h> |
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/gfp.h> | ||
| 19 | #include <linux/radix-tree.h> | 18 | #include <linux/radix-tree.h> |
| 20 | #include <linux/buffer_head.h> /* invalidate_bh_lrus() */ | 19 | #include <linux/buffer_head.h> /* invalidate_bh_lrus() */ |
| 20 | #include <linux/slab.h> | ||
| 21 | 21 | ||
| 22 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 23 | 23 | ||
diff --git a/drivers/block/drbd/drbd_bitmap.c b/drivers/block/drbd/drbd_bitmap.c index b61057e77882..3d6f3d988949 100644 --- a/drivers/block/drbd/drbd_bitmap.c +++ b/drivers/block/drbd/drbd_bitmap.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 27 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 28 | #include <linux/drbd.h> | 28 | #include <linux/drbd.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/kmap_types.h> | 30 | #include <asm/kmap_types.h> |
| 30 | #include "drbd_int.h" | 31 | #include "drbd_int.h" |
| 31 | 32 | ||
diff --git a/drivers/block/drbd/drbd_proc.c b/drivers/block/drbd/drbd_proc.c index df8ad9660d8f..be3374b68460 100644 --- a/drivers/block/drbd/drbd_proc.c +++ b/drivers/block/drbd/drbd_proc.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 29 | #include <linux/fs.h> | 29 | #include <linux/fs.h> |
| 30 | #include <linux/file.h> | 30 | #include <linux/file.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/proc_fs.h> | 31 | #include <linux/proc_fs.h> |
| 33 | #include <linux/seq_file.h> | 32 | #include <linux/seq_file.h> |
| 34 | #include <linux/drbd.h> | 33 | #include <linux/drbd.h> |
diff --git a/drivers/block/hd.c b/drivers/block/hd.c index 5116c65c07cb..034e6dfc878c 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/genhd.h> | 36 | #include <linux/genhd.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 39 | #include <linux/ioport.h> | 38 | #include <linux/ioport.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index bd112c8c7bcd..cb69929d917a 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -71,7 +71,6 @@ | |||
| 71 | #include <linux/buffer_head.h> /* for invalidate_bdev() */ | 71 | #include <linux/buffer_head.h> /* for invalidate_bdev() */ |
| 72 | #include <linux/completion.h> | 72 | #include <linux/completion.h> |
| 73 | #include <linux/highmem.h> | 73 | #include <linux/highmem.h> |
| 74 | #include <linux/gfp.h> | ||
| 75 | #include <linux/kthread.h> | 74 | #include <linux/kthread.h> |
| 76 | #include <linux/splice.h> | 75 | #include <linux/splice.h> |
| 77 | 76 | ||
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 5416c9a606e4..28db925dbdad 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 25 | #include <linux/mg_disk.h> | 25 | #include <linux/mg_disk.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #define MG_RES_SEC (CONFIG_MG_DISK_RES << 1) | 28 | #define MG_RES_SEC (CONFIG_MG_DISK_RES << 1) |
| 28 | 29 | ||
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index cc923a5b430c..218d091f3c52 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/compiler.h> | 27 | #include <linux/compiler.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <net/sock.h> | 31 | #include <net/sock.h> |
| 31 | #include <linux/net.h> | 32 | #include <linux/net.h> |
| 32 | #include <linux/kthread.h> | 33 | #include <linux/kthread.h> |
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c index eb2091aa1c19..6cd8b705b11b 100644 --- a/drivers/block/osdblk.c +++ b/drivers/block/osdblk.c | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | #include <linux/device.h> | 63 | #include <linux/device.h> |
| 64 | #include <linux/module.h> | 64 | #include <linux/module.h> |
| 65 | #include <linux/fs.h> | 65 | #include <linux/fs.h> |
| 66 | #include <linux/slab.h> | ||
| 66 | #include <scsi/osd_initiator.h> | 67 | #include <scsi/osd_initiator.h> |
| 67 | #include <scsi/osd_attributes.h> | 68 | #include <scsi/osd_attributes.h> |
| 68 | #include <scsi/osd_sec.h> | 69 | #include <scsi/osd_sec.h> |
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index e712cd51af15..c1e5cd029b23 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
| @@ -145,6 +145,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV}; | |||
| 145 | 145 | ||
| 146 | #include <linux/init.h> | 146 | #include <linux/init.h> |
| 147 | #include <linux/module.h> | 147 | #include <linux/module.h> |
| 148 | #include <linux/gfp.h> | ||
| 148 | #include <linux/fs.h> | 149 | #include <linux/fs.h> |
| 149 | #include <linux/delay.h> | 150 | #include <linux/delay.h> |
| 150 | #include <linux/hdreg.h> | 151 | #include <linux/hdreg.h> |
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index 39c8514442eb..ddf19425245d 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #include <linux/miscdevice.h> | 57 | #include <linux/miscdevice.h> |
| 58 | #include <linux/freezer.h> | 58 | #include <linux/freezer.h> |
| 59 | #include <linux/mutex.h> | 59 | #include <linux/mutex.h> |
| 60 | #include <linux/slab.h> | ||
| 60 | #include <scsi/scsi_cmnd.h> | 61 | #include <scsi/scsi_cmnd.h> |
| 61 | #include <scsi/scsi_ioctl.h> | 62 | #include <scsi/scsi_ioctl.h> |
| 62 | #include <scsi/scsi.h> | 63 | #include <scsi/scsi.h> |
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index bc95469d33c1..3b419e3fffa1 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/ata.h> | 21 | #include <linux/ata.h> |
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/lv1call.h> | 25 | #include <asm/lv1call.h> |
| 25 | #include <asm/ps3stor.h> | 26 | #include <asm/ps3stor.h> |
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index e44608229972..b3bdb8af89cf 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 13 | #include <linux/proc_fs.h> | 13 | #include <linux/proc_fs.h> |
| 14 | #include <linux/seq_file.h> | 14 | #include <linux/seq_file.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/cell-regs.h> | 17 | #include <asm/cell-regs.h> |
| 17 | #include <asm/firmware.h> | 18 | #include <asm/firmware.h> |
diff --git a/drivers/block/swim.c b/drivers/block/swim.c index 821c2833f9cf..e463657569ff 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/fd.h> | 20 | #include <linux/fd.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 22 | #include <linux/hdreg.h> | 23 | #include <linux/hdreg.h> |
| 23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index 2e889838e819..0536b5b29adc 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/blkdev.h> | 27 | #include <linux/blkdev.h> |
| 28 | #include <linux/timer.h> | 28 | #include <linux/timer.h> |
| 29 | #include <linux/scatterlist.h> | 29 | #include <linux/scatterlist.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
| 31 | 32 | ||
| 32 | #define DRV_NAME "ub" | 33 | #define DRV_NAME "ub" |
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index ad1ba393801a..2f9470ff8f7c 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -40,13 +40,13 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/mm.h> | 41 | #include <linux/mm.h> |
| 42 | #include <linux/mman.h> | 42 | #include <linux/mman.h> |
| 43 | #include <linux/gfp.h> | ||
| 43 | #include <linux/ioctl.h> | 44 | #include <linux/ioctl.h> |
| 44 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 45 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 46 | #include <linux/interrupt.h> | 47 | #include <linux/interrupt.h> |
| 47 | #include <linux/timer.h> | 48 | #include <linux/timer.h> |
| 48 | #include <linux/pci.h> | 49 | #include <linux/pci.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/dma-mapping.h> | 50 | #include <linux/dma-mapping.h> |
| 51 | 51 | ||
| 52 | #include <linux/fcntl.h> /* O_ACCMODE */ | 52 | #include <linux/fcntl.h> /* O_ACCMODE */ |
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 3c64af05fa82..4b12b820c9a6 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | //#define DEBUG | 1 | //#define DEBUG |
| 2 | #include <linux/spinlock.h> | 2 | #include <linux/spinlock.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 4 | #include <linux/hdreg.h> | 5 | #include <linux/hdreg.h> |
| 5 | #include <linux/virtio.h> | 6 | #include <linux/virtio.h> |
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index 1a325fb05c92..18a80ff57ce8 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/blkpg.h> | 49 | #include <linux/blkpg.h> |
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/io.h> | 51 | #include <linux/io.h> |
| 52 | #include <linux/gfp.h> | ||
| 52 | 53 | ||
| 53 | #include <asm/system.h> | 54 | #include <asm/system.h> |
| 54 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index 9c09694b2520..82ed403147c0 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/hdreg.h> | 40 | #include <linux/hdreg.h> |
| 41 | #include <linux/cdrom.h> | 41 | #include <linux/cdrom.h> |
| 42 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <linux/scatterlist.h> | 44 | #include <linux/scatterlist.h> |
| 44 | 45 | ||
| 45 | #include <xen/xen.h> | 46 | #include <xen/xen.h> |
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index 64f941e0f14b..9114654b54d9 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/blkdev.h> | 34 | #include <linux/blkdev.h> |
| 35 | #include <linux/bitops.h> | 35 | #include <linux/bitops.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/setup.h> | 38 | #include <asm/setup.h> |
| 38 | #include <asm/amigahw.h> | 39 | #include <asm/amigahw.h> |
diff --git a/drivers/bluetooth/btmrvl_debugfs.c b/drivers/bluetooth/btmrvl_debugfs.c index 3126a3d0c45c..b50b41d97a7f 100644 --- a/drivers/bluetooth/btmrvl_debugfs.c +++ b/drivers/bluetooth/btmrvl_debugfs.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | **/ | 19 | **/ |
| 20 | 20 | ||
| 21 | #include <linux/debugfs.h> | 21 | #include <linux/debugfs.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <net/bluetooth/bluetooth.h> | 24 | #include <net/bluetooth/bluetooth.h> |
| 24 | #include <net/bluetooth/hci_core.h> | 25 | #include <net/bluetooth/hci_core.h> |
diff --git a/drivers/bluetooth/btmrvl_drv.h b/drivers/bluetooth/btmrvl_drv.h index 523d197b9824..204727586ee9 100644 --- a/drivers/bluetooth/btmrvl_drv.h +++ b/drivers/bluetooth/btmrvl_drv.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
| 23 | #include <linux/bitops.h> | 23 | #include <linux/bitops.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <net/bluetooth/bluetooth.h> | 25 | #include <net/bluetooth/bluetooth.h> |
| 25 | 26 | ||
| 26 | #define BTM_HEADER_LEN 4 | 27 | #define BTM_HEADER_LEN 4 |
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 94f1f55f81f0..0dba76aa2232 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | **/ | 19 | **/ |
| 20 | 20 | ||
| 21 | #include <linux/firmware.h> | 21 | #include <linux/firmware.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/mmc/sdio_ids.h> | 24 | #include <linux/mmc/sdio_ids.h> |
| 24 | #include <linux/mmc/sdio_func.h> | 25 | #include <linux/mmc/sdio_func.h> |
diff --git a/drivers/char/agp/amd-k7-agp.c b/drivers/char/agp/amd-k7-agp.c index 73dbf40c874d..a7637d72cef6 100644 --- a/drivers/char/agp/amd-k7-agp.c +++ b/drivers/char/agp/amd-k7-agp.c | |||
| @@ -6,9 +6,9 @@ | |||
| 6 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/agp_backend.h> | 8 | #include <linux/agp_backend.h> |
| 9 | #include <linux/gfp.h> | ||
| 10 | #include <linux/page-flags.h> | 9 | #include <linux/page-flags.h> |
| 11 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/slab.h> | ||
| 12 | #include "agp.h" | 12 | #include "agp.h" |
| 13 | 13 | ||
| 14 | #define AMD_MMBASE 0x14 | 14 | #define AMD_MMBASE 0x14 |
diff --git a/drivers/char/agp/backend.c b/drivers/char/agp/backend.c index c3ab46da51a3..ee4f855611b6 100644 --- a/drivers/char/agp/backend.c +++ b/drivers/char/agp/backend.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/pagemap.h> | 34 | #include <linux/pagemap.h> |
| 34 | #include <linux/miscdevice.h> | 35 | #include <linux/miscdevice.h> |
| 35 | #include <linux/pm.h> | 36 | #include <linux/pm.h> |
diff --git a/drivers/char/agp/compat_ioctl.c b/drivers/char/agp/compat_ioctl.c index 58c57cb2518c..9d2c97a69cdd 100644 --- a/drivers/char/agp/compat_ioctl.c +++ b/drivers/char/agp/compat_ioctl.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
| 32 | #include <linux/agpgart.h> | 32 | #include <linux/agpgart.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
| 34 | #include "agp.h" | 35 | #include "agp.h" |
| 35 | #include "compat_ioctl.h" | 36 | #include "compat_ioctl.h" |
diff --git a/drivers/char/agp/generic.c b/drivers/char/agp/generic.c index c50543966eb2..fb86708e47ed 100644 --- a/drivers/char/agp/generic.c +++ b/drivers/char/agp/generic.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
| 39 | #include <linux/mm.h> | 39 | #include <linux/mm.h> |
| 40 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <asm/io.h> | 42 | #include <asm/io.h> |
| 42 | #include <asm/cacheflush.h> | 43 | #include <asm/cacheflush.h> |
| 43 | #include <asm/pgtable.h> | 44 | #include <asm/pgtable.h> |
diff --git a/drivers/char/agp/hp-agp.c b/drivers/char/agp/hp-agp.c index 58752b70efea..056b289a1e89 100644 --- a/drivers/char/agp/hp-agp.c +++ b/drivers/char/agp/hp-agp.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/agp_backend.h> | 16 | #include <linux/agp_backend.h> |
| 17 | #include <linux/log2.h> | 17 | #include <linux/log2.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/acpi-ext.h> | 20 | #include <asm/acpi-ext.h> |
| 20 | 21 | ||
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index b78d5c381efe..d41331bc2aa7 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/pci.h> | 6 | #include <linux/pci.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <linux/init.h> | 8 | #include <linux/init.h> |
| 8 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 9 | #include <linux/pagemap.h> | 10 | #include <linux/pagemap.h> |
diff --git a/drivers/char/agp/nvidia-agp.c b/drivers/char/agp/nvidia-agp.c index 7e36d2b4f9d4..10f24e349a26 100644 --- a/drivers/char/agp/nvidia-agp.c +++ b/drivers/char/agp/nvidia-agp.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/agp_backend.h> | 10 | #include <linux/agp_backend.h> |
| 11 | #include <linux/gfp.h> | ||
| 12 | #include <linux/page-flags.h> | 11 | #include <linux/page-flags.h> |
| 13 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 14 | #include <linux/jiffies.h> | 13 | #include <linux/jiffies.h> |
diff --git a/drivers/char/agp/sgi-agp.c b/drivers/char/agp/sgi-agp.c index 0d426ae39c85..ffa888cd1c88 100644 --- a/drivers/char/agp/sgi-agp.c +++ b/drivers/char/agp/sgi-agp.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <linux/agp_backend.h> | 19 | #include <linux/agp_backend.h> |
| 19 | #include <asm/sn/addrs.h> | 20 | #include <asm/sn/addrs.h> |
diff --git a/drivers/char/agp/uninorth-agp.c b/drivers/char/agp/uninorth-agp.c index d89da4ac061f..6f48931ac1ce 100644 --- a/drivers/char/agp/uninorth-agp.c +++ b/drivers/char/agp/uninorth-agp.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 5 | #include <linux/pci.h> | 5 | #include <linux/pci.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 7 | #include <linux/pagemap.h> | 8 | #include <linux/pagemap.h> |
| 8 | #include <linux/agp_backend.h> | 9 | #include <linux/agp_backend.h> |
diff --git a/drivers/char/bfin_jtag_comm.c b/drivers/char/bfin_jtag_comm.c index 2628c7415ea8..e397df3ad98e 100644 --- a/drivers/char/bfin_jtag_comm.c +++ b/drivers/char/bfin_jtag_comm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/tty.h> | 25 | #include <linux/tty.h> |
| 25 | #include <linux/tty_driver.h> | 26 | #include <linux/tty_driver.h> |
| 26 | #include <linux/tty_flip.h> | 27 | #include <linux/tty_flip.h> |
diff --git a/drivers/char/briq_panel.c b/drivers/char/briq_panel.c index d8cff909001c..555cd93c2ee5 100644 --- a/drivers/char/briq_panel.c +++ b/drivers/char/briq_panel.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/ioport.h> | 17 | #include <linux/ioport.h> |
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/miscdevice.h> | 19 | #include <linux/miscdevice.h> |
diff --git a/drivers/char/bsr.c b/drivers/char/bsr.c index c02db01f736e..7fef305774de 100644 --- a/drivers/char/bsr.c +++ b/drivers/char/bsr.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/cdev.h> | 27 | #include <linux/cdev.h> |
| 28 | #include <linux/list.h> | 28 | #include <linux/list.h> |
| 29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <asm/pgtable.h> | 31 | #include <asm/pgtable.h> |
| 31 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 32 | 33 | ||
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index b861c08263a4..9824b4162904 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | #include <linux/bitops.h> | 79 | #include <linux/bitops.h> |
| 80 | #include <linux/firmware.h> | 80 | #include <linux/firmware.h> |
| 81 | #include <linux/device.h> | 81 | #include <linux/device.h> |
| 82 | #include <linux/slab.h> | ||
| 82 | 83 | ||
| 83 | #include <linux/io.h> | 84 | #include <linux/io.h> |
| 84 | #include <linux/uaccess.h> | 85 | #include <linux/uaccess.h> |
diff --git a/drivers/char/dsp56k.c b/drivers/char/dsp56k.c index 85832ab924e6..8a1b28a10ef0 100644 --- a/drivers/char/dsp56k.c +++ b/drivers/char/dsp56k.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> /* for kmalloc() and kfree() */ | ||
| 28 | #include <linux/major.h> | 27 | #include <linux/major.h> |
| 29 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 30 | #include <linux/errno.h> | 29 | #include <linux/errno.h> |
diff --git a/drivers/char/epca.c b/drivers/char/epca.c index 17b044a71e02..6f5ffe1320f7 100644 --- a/drivers/char/epca.c +++ b/drivers/char/epca.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/ctype.h> | 36 | #include <linux/ctype.h> |
| 37 | #include <linux/tty.h> | 37 | #include <linux/tty.h> |
| 38 | #include <linux/tty_flip.h> | 38 | #include <linux/tty_flip.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/smp_lock.h> | 39 | #include <linux/smp_lock.h> |
| 41 | #include <linux/ioport.h> | 40 | #include <linux/ioport.h> |
| 42 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
diff --git a/drivers/char/generic_serial.c b/drivers/char/generic_serial.c index d400cbd280f2..5954ee1dc953 100644 --- a/drivers/char/generic_serial.c +++ b/drivers/char/generic_serial.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/tty_flip.h> | 30 | #include <linux/tty_flip.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
| 33 | 34 | ||
| 34 | #define DEBUG | 35 | #define DEBUG |
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c index 9c5eea3ea4de..9ded667625ac 100644 --- a/drivers/char/hpet.c +++ b/drivers/char/hpet.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 32 | #include <linux/bitops.h> | 32 | #include <linux/bitops.h> |
| 33 | #include <linux/clocksource.h> | 33 | #include <linux/clocksource.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/current.h> | 36 | #include <asm/current.h> |
| 36 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c index ba55bba151b9..d3890e8d30e1 100644 --- a/drivers/char/hvc_console.c +++ b/drivers/char/hvc_console.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| 40 | #include <linux/freezer.h> | 40 | #include <linux/freezer.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
| 43 | 44 | ||
diff --git a/drivers/char/hvc_iucv.c b/drivers/char/hvc_iucv.c index 37b0542a4eeb..5a80ad68ef22 100644 --- a/drivers/char/hvc_iucv.c +++ b/drivers/char/hvc_iucv.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 13 | 13 | ||
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <asm/ebcdic.h> | 16 | #include <asm/ebcdic.h> |
| 16 | #include <linux/ctype.h> | 17 | #include <linux/ctype.h> |
| 17 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c index 266b858b8f85..bedc6c1b6fa5 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c | |||
| @@ -74,6 +74,7 @@ | |||
| 74 | #include <linux/module.h> | 74 | #include <linux/module.h> |
| 75 | #include <linux/moduleparam.h> | 75 | #include <linux/moduleparam.h> |
| 76 | #include <linux/sched.h> | 76 | #include <linux/sched.h> |
| 77 | #include <linux/slab.h> | ||
| 77 | #include <linux/spinlock.h> | 78 | #include <linux/spinlock.h> |
| 78 | #include <linux/stat.h> | 79 | #include <linux/stat.h> |
| 79 | #include <linux/tty.h> | 80 | #include <linux/tty.h> |
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c index 91b53eb1c053..86fe45c19968 100644 --- a/drivers/char/hw_random/intel-rng.c +++ b/drivers/char/hw_random/intel-rng.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/stop_machine.h> | 31 | #include <linux/stop_machine.h> |
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | 35 | ||
| 35 | 36 | ||
diff --git a/drivers/char/hw_random/octeon-rng.c b/drivers/char/hw_random/octeon-rng.c index 54b0d9ba65cf..9cd0feca318c 100644 --- a/drivers/char/hw_random/octeon-rng.c +++ b/drivers/char/hw_random/octeon-rng.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/hw_random.h> | 16 | #include <linux/hw_random.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/gfp.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/octeon/octeon.h> | 20 | #include <asm/octeon/octeon.h> |
| 20 | #include <asm/octeon/cvmx-rnm-defs.h> | 21 | #include <asm/octeon/cvmx-rnm-defs.h> |
diff --git a/drivers/char/hw_random/tx4939-rng.c b/drivers/char/hw_random/tx4939-rng.c index 544d9085a8e8..0bc0cb70210b 100644 --- a/drivers/char/hw_random/tx4939-rng.c +++ b/drivers/char/hw_random/tx4939-rng.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/hw_random.h> | 16 | #include <linux/hw_random.h> |
| 17 | #include <linux/gfp.h> | ||
| 17 | 18 | ||
| 18 | #define TX4939_RNG_RCSR 0x00000000 | 19 | #define TX4939_RNG_RCSR 0x00000000 |
| 19 | #define TX4939_RNG_ROR(n) (0x00000018 + (n) * 8) | 20 | #define TX4939_RNG_ROR(n) (0x00000018 + (n) * 8) |
diff --git a/drivers/char/isicom.c b/drivers/char/isicom.c index be2e8f9a27c3..0fa2e4a0835d 100644 --- a/drivers/char/isicom.c +++ b/drivers/char/isicom.c | |||
| @@ -130,6 +130,7 @@ | |||
| 130 | #include <linux/timer.h> | 130 | #include <linux/timer.h> |
| 131 | #include <linux/delay.h> | 131 | #include <linux/delay.h> |
| 132 | #include <linux/ioport.h> | 132 | #include <linux/ioport.h> |
| 133 | #include <linux/slab.h> | ||
| 133 | 134 | ||
| 134 | #include <linux/uaccess.h> | 135 | #include <linux/uaccess.h> |
| 135 | #include <linux/io.h> | 136 | #include <linux/io.h> |
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c index 87c67b42bc08..83bef4efe376 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/uio.h> | 26 | #include <linux/uio.h> |
| 27 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 28 | #include <linux/smp_lock.h> | 28 | #include <linux/smp_lock.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 31 | #include <asm/system.h> | 32 | #include <asm/system.h> |
diff --git a/drivers/char/misc.c b/drivers/char/misc.c index 94a136e96c06..92ab03d28294 100644 --- a/drivers/char/misc.c +++ b/drivers/char/misc.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/miscdevice.h> | 40 | #include <linux/miscdevice.h> |
| 41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 42 | #include <linux/major.h> | 42 | #include <linux/major.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
| 45 | #include <linux/proc_fs.h> | 44 | #include <linux/proc_fs.h> |
| 46 | #include <linux/seq_file.h> | 45 | #include <linux/seq_file.h> |
| @@ -49,6 +48,7 @@ | |||
| 49 | #include <linux/device.h> | 48 | #include <linux/device.h> |
| 50 | #include <linux/tty.h> | 49 | #include <linux/tty.h> |
| 51 | #include <linux/kmod.h> | 50 | #include <linux/kmod.h> |
| 51 | #include <linux/gfp.h> | ||
| 52 | 52 | ||
| 53 | /* | 53 | /* |
| 54 | * Head entry for the doubly linked miscdevice list | 54 | * Head entry for the doubly linked miscdevice list |
diff --git a/drivers/char/mmtimer.c b/drivers/char/mmtimer.c index 04fd0d843b3b..ea7c99fa978f 100644 --- a/drivers/char/mmtimer.c +++ b/drivers/char/mmtimer.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/time.h> | 33 | #include <linux/time.h> |
| 34 | #include <linux/math64.h> | 34 | #include <linux/math64.h> |
| 35 | #include <linux/smp_lock.h> | 35 | #include <linux/smp_lock.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
| 38 | #include <asm/sn/addrs.h> | 39 | #include <asm/sn/addrs.h> |
diff --git a/drivers/char/moxa.c b/drivers/char/moxa.c index 166495d6a1d7..107b0bd58d19 100644 --- a/drivers/char/moxa.c +++ b/drivers/char/moxa.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/pci.h> | 43 | #include <linux/pci.h> |
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/bitops.h> | 45 | #include <linux/bitops.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | 47 | ||
| 47 | #include <asm/system.h> | 48 | #include <asm/system.h> |
| 48 | #include <asm/io.h> | 49 | #include <asm/io.h> |
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c index e0c5d2a69046..95c9f54f3d30 100644 --- a/drivers/char/mxser.c +++ b/drivers/char/mxser.c | |||
| @@ -33,12 +33,12 @@ | |||
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/fcntl.h> | 34 | #include <linux/fcntl.h> |
| 35 | #include <linux/ptrace.h> | 35 | #include <linux/ptrace.h> |
| 36 | #include <linux/gfp.h> | ||
| 37 | #include <linux/ioport.h> | 36 | #include <linux/ioport.h> |
| 38 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 40 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 41 | #include <linux/bitops.h> | 40 | #include <linux/bitops.h> |
| 41 | #include <linux/slab.h> | ||
| 42 | 42 | ||
| 43 | #include <asm/system.h> | 43 | #include <asm/system.h> |
| 44 | #include <asm/io.h> | 44 | #include <asm/io.h> |
diff --git a/drivers/char/nozomi.c b/drivers/char/nozomi.c index a3f32a15fde4..a6638003f530 100644 --- a/drivers/char/nozomi.c +++ b/drivers/char/nozomi.c | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 56 | #include <linux/kfifo.h> | 56 | #include <linux/kfifo.h> |
| 57 | #include <linux/uaccess.h> | 57 | #include <linux/uaccess.h> |
| 58 | #include <linux/slab.h> | ||
| 58 | #include <asm/byteorder.h> | 59 | #include <asm/byteorder.h> |
| 59 | 60 | ||
| 60 | #include <linux/delay.h> | 61 | #include <linux/delay.h> |
diff --git a/drivers/char/nvram.c b/drivers/char/nvram.c index 5eb83c3ca20d..47e8f7b0e4c1 100644 --- a/drivers/char/nvram.c +++ b/drivers/char/nvram.c | |||
| @@ -100,7 +100,6 @@ | |||
| 100 | #include <linux/types.h> | 100 | #include <linux/types.h> |
| 101 | #include <linux/errno.h> | 101 | #include <linux/errno.h> |
| 102 | #include <linux/miscdevice.h> | 102 | #include <linux/miscdevice.h> |
| 103 | #include <linux/slab.h> | ||
| 104 | #include <linux/ioport.h> | 103 | #include <linux/ioport.h> |
| 105 | #include <linux/fcntl.h> | 104 | #include <linux/fcntl.h> |
| 106 | #include <linux/mc146818rtc.h> | 105 | #include <linux/mc146818rtc.h> |
diff --git a/drivers/char/pcmcia/ipwireless/network.c b/drivers/char/pcmcia/ipwireless/network.c index 590762a7f217..65920163f53d 100644 --- a/drivers/char/pcmcia/ipwireless/network.c +++ b/drivers/char/pcmcia/ipwireless/network.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 22 | #include <linux/ppp_channel.h> | 22 | #include <linux/ppp_channel.h> |
| 23 | #include <linux/ppp_defs.h> | 23 | #include <linux/ppp_defs.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/if_ppp.h> | 25 | #include <linux/if_ppp.h> |
| 25 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
| 26 | 27 | ||
diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c index 432655bcb04c..fdd37543aa79 100644 --- a/drivers/char/ppdev.c +++ b/drivers/char/ppdev.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/parport.h> | 64 | #include <linux/parport.h> |
| 65 | #include <linux/ctype.h> | 65 | #include <linux/ctype.h> |
| 66 | #include <linux/poll.h> | 66 | #include <linux/poll.h> |
| 67 | #include <linux/slab.h> | ||
| 67 | #include <linux/major.h> | 68 | #include <linux/major.h> |
| 68 | #include <linux/ppdev.h> | 69 | #include <linux/ppdev.h> |
| 69 | #include <linux/smp_lock.h> | 70 | #include <linux/smp_lock.h> |
diff --git a/drivers/char/ps3flash.c b/drivers/char/ps3flash.c index f424d394a286..606048b72bcf 100644 --- a/drivers/char/ps3flash.c +++ b/drivers/char/ps3flash.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/fs.h> | 21 | #include <linux/fs.h> |
| 22 | #include <linux/miscdevice.h> | 22 | #include <linux/miscdevice.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/uaccess.h> | 24 | #include <linux/uaccess.h> |
| 24 | 25 | ||
| 25 | #include <asm/lv1call.h> | 26 | #include <asm/lv1call.h> |
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 5ee424817263..d83a43130df4 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
| 30 | #include <linux/bitops.h> | 30 | #include <linux/bitops.h> |
| 31 | #include <linux/devpts_fs.h> | 31 | #include <linux/devpts_fs.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/system.h> | 34 | #include <asm/system.h> |
| 34 | 35 | ||
diff --git a/drivers/char/raw.c b/drivers/char/raw.c index 64acd05f71c8..d331c59b571c 100644 --- a/drivers/char/raw.c +++ b/drivers/char/raw.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/smp_lock.h> | 22 | #include <linux/smp_lock.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/uaccess.h> | 25 | #include <asm/uaccess.h> |
| 25 | 26 | ||
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index be0ba401966e..24a282bb89d4 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index 71f87600907c..2e71aecae206 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
| 37 | #include <linux/tty_flip.h> | 36 | #include <linux/tty_flip.h> |
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index d687c17be152..6415f3f32a72 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/tty.h> | 35 | #include <linux/tty.h> |
| 37 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index 706c2a25f7aa..f9b936ac3394 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| 37 | #include <asm/system.h> | 36 | #include <asm/system.h> |
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index 47fab7c33073..8a90393faf3c 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | 34 | ||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 39 | #include <linux/tty.h> | 38 | #include <linux/tty.h> |
| 40 | #include <linux/string.h> | 39 | #include <linux/string.h> |
diff --git a/drivers/char/serial167.c b/drivers/char/serial167.c index 1ec3d5cd748f..8dfd24721a82 100644 --- a/drivers/char/serial167.c +++ b/drivers/char/serial167.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/module.h> | 64 | #include <linux/module.h> |
| 65 | #include <linux/bitops.h> | 65 | #include <linux/bitops.h> |
| 66 | #include <linux/tty_flip.h> | 66 | #include <linux/tty_flip.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | 68 | ||
| 68 | #include <asm/system.h> | 69 | #include <asm/system.h> |
| 69 | #include <asm/io.h> | 70 | #include <asm/io.h> |
diff --git a/drivers/char/snsc_event.c b/drivers/char/snsc_event.c index 55a95892ccf9..ee156948b9f8 100644 --- a/drivers/char/snsc_event.c +++ b/drivers/char/snsc_event.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 21 | #include <asm/sn/sn_sal.h> | 22 | #include <asm/sn/sn_sal.h> |
| 22 | #include <asm/unaligned.h> | 23 | #include <asm/unaligned.h> |
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index bba727c3807e..73f66d03624d 100644 --- a/drivers/char/sonypi.c +++ b/drivers/char/sonypi.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/err.h> | 50 | #include <linux/err.h> |
| 51 | #include <linux/kfifo.h> | 51 | #include <linux/kfifo.h> |
| 52 | #include <linux/platform_device.h> | 52 | #include <linux/platform_device.h> |
| 53 | #include <linux/gfp.h> | ||
| 53 | 54 | ||
| 54 | #include <asm/uaccess.h> | 55 | #include <asm/uaccess.h> |
| 55 | #include <asm/io.h> | 56 | #include <asm/io.h> |
diff --git a/drivers/char/specialix.c b/drivers/char/specialix.c index 07ac14d949ce..2c24fcdc722a 100644 --- a/drivers/char/specialix.c +++ b/drivers/char/specialix.c | |||
| @@ -94,6 +94,7 @@ | |||
| 94 | #include <linux/pci.h> | 94 | #include <linux/pci.h> |
| 95 | #include <linux/init.h> | 95 | #include <linux/init.h> |
| 96 | #include <linux/uaccess.h> | 96 | #include <linux/uaccess.h> |
| 97 | #include <linux/gfp.h> | ||
| 97 | 98 | ||
| 98 | #include "specialix_io8.h" | 99 | #include "specialix_io8.h" |
| 99 | #include "cd1865.h" | 100 | #include "cd1865.h" |
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 1ae2de7d8b4f..59de2525d303 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
| 39 | #include <linux/hrtimer.h> | 39 | #include <linux/hrtimer.h> |
| 40 | #include <linux/oom.h> | 40 | #include <linux/oom.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/ptrace.h> | 43 | #include <asm/ptrace.h> |
| 43 | #include <asm/irq_regs.h> | 44 | #include <asm/irq_regs.h> |
diff --git a/drivers/char/tpm/tpm.c b/drivers/char/tpm/tpm.c index f06bb37defb1..068c816e6942 100644 --- a/drivers/char/tpm/tpm.c +++ b/drivers/char/tpm/tpm.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 28 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 29 | 30 | ||
diff --git a/drivers/char/tpm/tpm_bios.c b/drivers/char/tpm/tpm_bios.c index bf2170fb1cdd..0636520fa9bf 100644 --- a/drivers/char/tpm/tpm_bios.c +++ b/drivers/char/tpm/tpm_bios.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/fs.h> | 22 | #include <linux/fs.h> |
| 23 | #include <linux/security.h> | 23 | #include <linux/security.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <acpi/acpi.h> | 26 | #include <acpi/acpi.h> |
| 26 | #include "tpm.h" | 27 | #include "tpm.h" |
| 27 | 28 | ||
diff --git a/drivers/char/tpm/tpm_nsc.c b/drivers/char/tpm/tpm_nsc.c index 70efba2ee053..a605cb7dd898 100644 --- a/drivers/char/tpm/tpm_nsc.c +++ b/drivers/char/tpm/tpm_nsc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "tpm.h" | 24 | #include "tpm.h" |
| 24 | 25 | ||
| 25 | /* National definitions */ | 26 | /* National definitions */ |
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 2405f17b29dd..94345994f8a6 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/moduleparam.h> | 23 | #include <linux/moduleparam.h> |
| 24 | #include <linux/pnp.h> | 24 | #include <linux/pnp.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 26 | #include <linux/wait.h> | 27 | #include <linux/wait.h> |
| 27 | #include "tpm.h" | 28 | #include "tpm.h" |
diff --git a/drivers/char/tty_audit.c b/drivers/char/tty_audit.c index 283a15bc84e3..1b8ee590b4ca 100644 --- a/drivers/char/tty_audit.c +++ b/drivers/char/tty_audit.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/audit.h> | 12 | #include <linux/audit.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
| 14 | 15 | ||
| 15 | struct tty_audit_buf { | 16 | struct tty_audit_buf { |
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index a42c466f7092..6da962c9b21c 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c | |||
| @@ -1423,6 +1423,8 @@ static void release_one_tty(struct work_struct *work) | |||
| 1423 | list_del_init(&tty->tty_files); | 1423 | list_del_init(&tty->tty_files); |
| 1424 | file_list_unlock(); | 1424 | file_list_unlock(); |
| 1425 | 1425 | ||
| 1426 | put_pid(tty->pgrp); | ||
| 1427 | put_pid(tty->session); | ||
| 1426 | free_tty_struct(tty); | 1428 | free_tty_struct(tty); |
| 1427 | } | 1429 | } |
| 1428 | 1430 | ||
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c index 042c8149a6d1..1144a04cda6e 100644 --- a/drivers/char/viotape.c +++ b/drivers/char/viotape.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/proc_fs.h> | 47 | #include <linux/proc_fs.h> |
| 48 | #include <linux/seq_file.h> | 48 | #include <linux/seq_file.h> |
| 49 | #include <linux/smp_lock.h> | 49 | #include <linux/smp_lock.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include <asm/uaccess.h> | 52 | #include <asm/uaccess.h> |
| 52 | #include <asm/ioctls.h> | 53 | #include <asm/ioctls.h> |
diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index 44288ce0cb45..026ea6c27e07 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/list.h> | 25 | #include <linux/list.h> |
| 26 | #include <linux/poll.h> | 26 | #include <linux/poll.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 29 | #include <linux/virtio.h> | 30 | #include <linux/virtio.h> |
| 30 | #include <linux/virtio_console.h> | 31 | #include <linux/virtio_console.h> |
diff --git a/drivers/char/vme_scc.c b/drivers/char/vme_scc.c index 8b24729fec89..12de1202d22c 100644 --- a/drivers/char/vme_scc.c +++ b/drivers/char/vme_scc.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/fcntl.h> | 27 | #include <linux/fcntl.h> |
| 28 | #include <linux/major.h> | 28 | #include <linux/major.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/miscdevice.h> | 30 | #include <linux/miscdevice.h> |
| 32 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c index 4846d50199f3..7261b8d9087c 100644 --- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c +++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c | |||
| @@ -86,6 +86,7 @@ | |||
| 86 | #include <linux/fs.h> | 86 | #include <linux/fs.h> |
| 87 | #include <linux/cdev.h> | 87 | #include <linux/cdev.h> |
| 88 | #include <linux/platform_device.h> | 88 | #include <linux/platform_device.h> |
| 89 | #include <linux/slab.h> | ||
| 89 | 90 | ||
| 90 | #include <asm/io.h> | 91 | #include <asm/io.h> |
| 91 | #include <asm/uaccess.h> | 92 | #include <asm/uaccess.h> |
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 578595c4425d..744f748cc84b 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/clocksource.h> | 29 | #include <linux/clocksource.h> |
| 30 | #include <linux/clockchips.h> | 30 | #include <linux/clockchips.h> |
| 31 | #include <linux/sh_timer.h> | 31 | #include <linux/sh_timer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | struct sh_cmt_priv { | 34 | struct sh_cmt_priv { |
| 34 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index 4c8a759e60cd..5fb78bfd73bb 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/clockchips.h> | 30 | #include <linux/clockchips.h> |
| 31 | #include <linux/sh_timer.h> | 31 | #include <linux/sh_timer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | struct sh_mtu2_priv { | 34 | struct sh_mtu2_priv { |
| 34 | void __iomem *mapbase; | 35 | void __iomem *mapbase; |
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 961f5b5ef6a3..fc9ff1e5b770 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/clocksource.h> | 30 | #include <linux/clocksource.h> |
| 31 | #include <linux/clockchips.h> | 31 | #include <linux/clockchips.h> |
| 32 | #include <linux/sh_timer.h> | 32 | #include <linux/sh_timer.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | struct sh_tmu_priv { | 35 | struct sh_tmu_priv { |
| 35 | void __iomem *mapbase; | 36 | void __iomem *mapbase; |
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index 60697909ebdb..a7f046b0096c 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/ktime.h> | 27 | #include <linux/ktime.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/connector.h> | 29 | #include <linux/connector.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | #include <asm/atomic.h> | 31 | #include <asm/atomic.h> |
| 31 | #include <asm/unaligned.h> | 32 | #include <asm/unaligned.h> |
| 32 | 33 | ||
diff --git a/drivers/connector/connector.c b/drivers/connector/connector.c index 537c29ac4487..1d48f40342cb 100644 --- a/drivers/connector/connector.c +++ b/drivers/connector/connector.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/netlink.h> | 26 | #include <linux/netlink.h> |
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/connector.h> | 28 | #include <linux/connector.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 30 | #include <linux/proc_fs.h> | 31 | #include <linux/proc_fs.h> |
| 31 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
diff --git a/drivers/cpufreq/cpufreq_stats.c b/drivers/cpufreq/cpufreq_stats.c index 5a62d678dd19..00d73fc8e4e2 100644 --- a/drivers/cpufreq/cpufreq_stats.c +++ b/drivers/cpufreq/cpufreq_stats.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/sysdev.h> | 14 | #include <linux/sysdev.h> |
| 14 | #include <linux/cpu.h> | 15 | #include <linux/cpu.h> |
| 15 | #include <linux/sysfs.h> | 16 | #include <linux/sysfs.h> |
diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c index 8719b36e1a4d..0ba9c8b8ee74 100644 --- a/drivers/cpuidle/sysfs.c +++ b/drivers/cpuidle/sysfs.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/cpuidle.h> | 10 | #include <linux/cpuidle.h> |
| 11 | #include <linux/sysfs.h> | 11 | #include <linux/sysfs.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/cpu.h> | 13 | #include <linux/cpu.h> |
| 13 | 14 | ||
| 14 | #include "cpuidle.h" | 15 | #include "cpuidle.h" |
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c index 1c3849f6b7a2..6c4c8b7ce3aa 100644 --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/of_platform.h> | 30 | #include <linux/of_platform.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <asm/dcr.h> | 32 | #include <asm/dcr.h> |
| 32 | #include <asm/dcr-regs.h> | 33 | #include <asm/dcr-regs.h> |
| 33 | #include <asm/cacheflush.h> | 34 | #include <asm/cacheflush.h> |
diff --git a/drivers/crypto/ixp4xx_crypto.c b/drivers/crypto/ixp4xx_crypto.c index 6c6656d3b1e2..f17ddf37a1ed 100644 --- a/drivers/crypto/ixp4xx_crypto.c +++ b/drivers/crypto/ixp4xx_crypto.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/rtnetlink.h> | 17 | #include <linux/rtnetlink.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | 21 | ||
| 21 | #include <crypto/ctr.h> | 22 | #include <crypto/ctr.h> |
| 22 | #include <crypto/des.h> | 23 | #include <crypto/des.h> |
diff --git a/drivers/crypto/mv_cesa.c b/drivers/crypto/mv_cesa.c index b21ef635f352..6f29012bcc43 100644 --- a/drivers/crypto/mv_cesa.c +++ b/drivers/crypto/mv_cesa.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kthread.h> | 14 | #include <linux/kthread.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/scatterlist.h> | 16 | #include <linux/scatterlist.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #include "mv_cesa.h" | 19 | #include "mv_cesa.h" |
| 19 | /* | 20 | /* |
diff --git a/drivers/crypto/padlock-aes.c b/drivers/crypto/padlock-aes.c index 8c2f3703ec85..2e992bc8015b 100644 --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/percpu.h> | 18 | #include <linux/percpu.h> |
| 19 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <asm/byteorder.h> | 21 | #include <asm/byteorder.h> |
| 21 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
| 22 | #include <asm/i387.h> | 23 | #include <asm/i387.h> |
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index fd529d68c5ba..dc558a097311 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/rtnetlink.h> | 39 | #include <linux/rtnetlink.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include <crypto/algapi.h> | 42 | #include <crypto/algapi.h> |
| 42 | #include <crypto/aes.h> | 43 | #include <crypto/aes.h> |
diff --git a/drivers/dca/dca-core.c b/drivers/dca/dca-core.c index 52e6bb70a490..8661c84a105d 100644 --- a/drivers/dca/dca-core.c +++ b/drivers/dca/dca-core.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/notifier.h> | 27 | #include <linux/notifier.h> |
| 28 | #include <linux/device.h> | 28 | #include <linux/device.h> |
| 29 | #include <linux/dca.h> | 29 | #include <linux/dca.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #define DCA_VERSION "1.12.1" | 32 | #define DCA_VERSION "1.12.1" |
| 32 | 33 | ||
diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c index ee916c9857ee..5e8f335e6f6e 100644 --- a/drivers/dca/dca-sysfs.c +++ b/drivers/dca/dca-sysfs.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kdev_t.h> | 26 | #include <linux/kdev_t.h> |
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/dca.h> | 28 | #include <linux/dca.h> |
| 29 | #include <linux/gfp.h> | ||
| 29 | 30 | ||
| 30 | static struct class *dca_class; | 31 | static struct class *dca_class; |
| 31 | static struct idr dca_idr; | 32 | static struct idr dca_idr; |
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index efc1a61ca231..278cf5bceef2 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "at_hdmac_regs.h" | 27 | #include "at_hdmac_regs.h" |
| 27 | 28 | ||
diff --git a/drivers/dma/coh901318_lli.c b/drivers/dma/coh901318_lli.c index 71d58c1a1e86..9f7e0e6a7eea 100644 --- a/drivers/dma/coh901318_lli.c +++ b/drivers/dma/coh901318_lli.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 12 | #include <linux/dmapool.h> | 12 | #include <linux/dmapool.h> |
| 13 | #include <linux/memory.h> | 13 | #include <linux/memory.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <mach/coh901318.h> | 15 | #include <mach/coh901318.h> |
| 15 | 16 | ||
| 16 | #include "coh901318_lli.h" | 17 | #include "coh901318_lli.h" |
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index 87399cafce37..d18b5d069d7e 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/jiffies.h> | 58 | #include <linux/jiffies.h> |
| 59 | #include <linux/rculist.h> | 59 | #include <linux/rculist.h> |
| 60 | #include <linux/idr.h> | 60 | #include <linux/idr.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | 62 | ||
| 62 | static DEFINE_MUTEX(dma_list_mutex); | 63 | static DEFINE_MUTEX(dma_list_mutex); |
| 63 | static LIST_HEAD(dma_device_list); | 64 | static LIST_HEAD(dma_device_list); |
diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 6fa55fe3dd24..68d58c414cf0 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/moduleparam.h> | 15 | #include <linux/moduleparam.h> |
| 16 | #include <linux/random.h> | 16 | #include <linux/random.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/wait.h> | 18 | #include <linux/wait.h> |
| 18 | 19 | ||
| 19 | static unsigned int test_buf_size = 16384; | 20 | static unsigned int test_buf_size = 16384; |
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c index bbb4be5a3ff4..88f470f0d820 100644 --- a/drivers/dma/fsldma.c +++ b/drivers/dma/fsldma.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 31 | #include <linux/dmaengine.h> | 32 | #include <linux/dmaengine.h> |
| 32 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 0099340b9616..3e5a8005c62b 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 31 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 32 | #include <linux/dmaengine.h> | 33 | #include <linux/dmaengine.h> |
diff --git a/drivers/dma/ioat/dma_v2.c b/drivers/dma/ioat/dma_v2.c index 1ed5d66d7dca..b5ae56c211e6 100644 --- a/drivers/dma/ioat/dma_v2.c +++ b/drivers/dma/ioat/dma_v2.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 31 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 32 | #include <linux/dmaengine.h> | 33 | #include <linux/dmaengine.h> |
diff --git a/drivers/dma/ioat/dma_v3.c b/drivers/dma/ioat/dma_v3.c index 26febc56dab1..6740e319c9cf 100644 --- a/drivers/dma/ioat/dma_v3.c +++ b/drivers/dma/ioat/dma_v3.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #include <linux/pci.h> | 59 | #include <linux/pci.h> |
| 60 | #include <linux/gfp.h> | ||
| 60 | #include <linux/dmaengine.h> | 61 | #include <linux/dmaengine.h> |
| 61 | #include <linux/dma-mapping.h> | 62 | #include <linux/dma-mapping.h> |
| 62 | #include "registers.h" | 63 | #include "registers.h" |
diff --git a/drivers/dma/ioat/pci.c b/drivers/dma/ioat/pci.c index d545fae30f37..99ec26725bae 100644 --- a/drivers/dma/ioat/pci.c +++ b/drivers/dma/ioat/pci.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/dca.h> | 32 | #include <linux/dca.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include "dma.h" | 34 | #include "dma.h" |
| 34 | #include "dma_v2.h" | 35 | #include "dma_v2.h" |
| 35 | #include "registers.h" | 36 | #include "registers.h" |
diff --git a/drivers/dma/iop-adma.c b/drivers/dma/iop-adma.c index ca6e6a0cb793..1ebc801678b0 100644 --- a/drivers/dma/iop-adma.c +++ b/drivers/dma/iop-adma.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/memory.h> | 32 | #include <linux/memory.h> |
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/raid/pq.h> | 34 | #include <linux/raid/pq.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <mach/adma.h> | 37 | #include <mach/adma.h> |
| 37 | 38 | ||
diff --git a/drivers/dma/iovlock.c b/drivers/dma/iovlock.c index c0a272c73682..bb48a57c2fc1 100644 --- a/drivers/dma/iovlock.c +++ b/drivers/dma/iovlock.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/dmaengine.h> | 28 | #include <linux/dmaengine.h> |
| 29 | #include <linux/pagemap.h> | 29 | #include <linux/pagemap.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <net/tcp.h> /* for memcpy_toiovec */ | 31 | #include <net/tcp.h> /* for memcpy_toiovec */ |
| 31 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
diff --git a/drivers/dma/mpc512x_dma.c b/drivers/dma/mpc512x_dma.c index 3fdf1f46bd63..bbbd58566625 100644 --- a/drivers/dma/mpc512x_dma.c +++ b/drivers/dma/mpc512x_dma.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 38 | #include <linux/interrupt.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/io.h> | 39 | #include <linux/io.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/of_device.h> | 41 | #include <linux/of_device.h> |
| 41 | #include <linux/of_platform.h> | 42 | #include <linux/of_platform.h> |
| 42 | 43 | ||
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 466ab10c1ff1..e2fd34da64f2 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 22 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
| 23 | #include <linux/spinlock.h> | 24 | #include <linux/spinlock.h> |
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c index e69d87f24a25..d44626fa35ad 100644 --- a/drivers/dma/ppc4xx/adma.c +++ b/drivers/dma/ppc4xx/adma.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
| 39 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
| 40 | #include <linux/interrupt.h> | 40 | #include <linux/interrupt.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/uaccess.h> | 42 | #include <linux/uaccess.h> |
| 42 | #include <linux/proc_fs.h> | 43 | #include <linux/proc_fs.h> |
| 43 | #include <linux/of.h> | 44 | #include <linux/of.h> |
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c index 5d17e09cb625..7cc31b3f40d8 100644 --- a/drivers/dma/shdma.c +++ b/drivers/dma/shdma.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 23 | #include <linux/dmaengine.h> | 24 | #include <linux/dmaengine.h> |
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
diff --git a/drivers/edac/amd76x_edac.c b/drivers/edac/amd76x_edac.c index 2b95f1a3edfc..f2330f81cb5e 100644 --- a/drivers/edac/amd76x_edac.c +++ b/drivers/edac/amd76x_edac.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/pci_ids.h> | 18 | #include <linux/pci_ids.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/edac.h> | 19 | #include <linux/edac.h> |
| 21 | #include "edac_core.h" | 20 | #include "edac_core.h" |
| 22 | 21 | ||
diff --git a/drivers/edac/cpc925_edac.c b/drivers/edac/cpc925_edac.c index 3d50274f1348..1609a19df495 100644 --- a/drivers/edac/cpc925_edac.c +++ b/drivers/edac/cpc925_edac.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/edac.h> | 25 | #include <linux/edac.h> |
| 26 | #include <linux/of.h> | 26 | #include <linux/of.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/gfp.h> | ||
| 28 | 29 | ||
| 29 | #include "edac_core.h" | 30 | #include "edac_core.h" |
| 30 | #include "edac_module.h" | 31 | #include "edac_module.h" |
diff --git a/drivers/edac/e752x_edac.c b/drivers/edac/e752x_edac.c index 243e9aacad69..ae3f80c54198 100644 --- a/drivers/edac/e752x_edac.c +++ b/drivers/edac/e752x_edac.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/pci_ids.h> | 23 | #include <linux/pci_ids.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/edac.h> | 24 | #include <linux/edac.h> |
| 26 | #include "edac_core.h" | 25 | #include "edac_core.h" |
| 27 | 26 | ||
diff --git a/drivers/edac/e7xxx_edac.c b/drivers/edac/e7xxx_edac.c index c7d11cc4e21a..1731d7245816 100644 --- a/drivers/edac/e7xxx_edac.c +++ b/drivers/edac/e7xxx_edac.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/pci_ids.h> | 28 | #include <linux/pci_ids.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/edac.h> | 29 | #include <linux/edac.h> |
| 31 | #include "edac_core.h" | 30 | #include "edac_core.h" |
| 32 | 31 | ||
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c index 5fdedbc0f545..070968178a24 100644 --- a/drivers/edac/edac_device_sysfs.c +++ b/drivers/edac/edac_device_sysfs.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/ctype.h> | 13 | #include <linux/ctype.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include "edac_core.h" | 17 | #include "edac_core.h" |
| 17 | #include "edac_module.h" | 18 | #include "edac_module.h" |
diff --git a/drivers/edac/edac_mc_sysfs.c b/drivers/edac/edac_mc_sysfs.c index 88840e9fa3e0..418b65f1a1da 100644 --- a/drivers/edac/edac_mc_sysfs.c +++ b/drivers/edac/edac_mc_sysfs.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/ctype.h> | 12 | #include <linux/ctype.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/bug.h> | 14 | #include <linux/bug.h> |
| 14 | 15 | ||
| 15 | #include "edac_core.h" | 16 | #include "edac_core.h" |
diff --git a/drivers/edac/edac_pci_sysfs.c b/drivers/edac/edac_pci_sysfs.c index bef94e3d9944..c39697df9cb4 100644 --- a/drivers/edac/edac_pci_sysfs.c +++ b/drivers/edac/edac_pci_sysfs.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/sysdev.h> | 10 | #include <linux/sysdev.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/ctype.h> | 12 | #include <linux/ctype.h> |
| 12 | 13 | ||
| 13 | #include "edac_core.h" | 14 | #include "edac_core.h" |
diff --git a/drivers/edac/i3000_edac.c b/drivers/edac/i3000_edac.c index 6c9a0f2a593c..c0510b3d7035 100644 --- a/drivers/edac/i3000_edac.c +++ b/drivers/edac/i3000_edac.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/pci_ids.h> | 15 | #include <linux/pci_ids.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
| 18 | #include "edac_core.h" | 17 | #include "edac_core.h" |
| 19 | 18 | ||
diff --git a/drivers/edac/i3200_edac.c b/drivers/edac/i3200_edac.c index fde4db91c4d2..d41f9002da45 100644 --- a/drivers/edac/i3200_edac.c +++ b/drivers/edac/i3200_edac.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/pci_ids.h> | 13 | #include <linux/pci_ids.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/edac.h> | 14 | #include <linux/edac.h> |
| 16 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 17 | #include "edac_core.h" | 16 | #include "edac_core.h" |
diff --git a/drivers/edac/i5100_edac.c b/drivers/edac/i5100_edac.c index 7785d8ffa404..ee9753cf362c 100644 --- a/drivers/edac/i5100_edac.c +++ b/drivers/edac/i5100_edac.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/pci_ids.h> | 21 | #include <linux/pci_ids.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/edac.h> | 22 | #include <linux/edac.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/mmzone.h> | 24 | #include <linux/mmzone.h> |
diff --git a/drivers/edac/i82443bxgx_edac.c b/drivers/edac/i82443bxgx_edac.c index 577760a82a0f..7f3884fcbd46 100644 --- a/drivers/edac/i82443bxgx_edac.c +++ b/drivers/edac/i82443bxgx_edac.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/pci_ids.h> | 28 | #include <linux/pci_ids.h> |
| 29 | 29 | ||
| 30 | #include <linux/slab.h> | ||
| 31 | 30 | ||
| 32 | #include <linux/edac.h> | 31 | #include <linux/edac.h> |
| 33 | #include "edac_core.h" | 32 | #include "edac_core.h" |
diff --git a/drivers/edac/i82860_edac.c b/drivers/edac/i82860_edac.c index c0088ba9672b..b8a95cf50718 100644 --- a/drivers/edac/i82860_edac.c +++ b/drivers/edac/i82860_edac.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/pci_ids.h> | 15 | #include <linux/pci_ids.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
| 18 | #include "edac_core.h" | 17 | #include "edac_core.h" |
| 19 | 18 | ||
diff --git a/drivers/edac/i82875p_edac.c b/drivers/edac/i82875p_edac.c index b2d83b95033d..b2fd1e899142 100644 --- a/drivers/edac/i82875p_edac.c +++ b/drivers/edac/i82875p_edac.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/pci_ids.h> | 19 | #include <linux/pci_ids.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/edac.h> | 20 | #include <linux/edac.h> |
| 22 | #include "edac_core.h" | 21 | #include "edac_core.h" |
| 23 | 22 | ||
diff --git a/drivers/edac/i82975x_edac.c b/drivers/edac/i82975x_edac.c index 2eed3ea2cf62..3218819b7286 100644 --- a/drivers/edac/i82975x_edac.c +++ b/drivers/edac/i82975x_edac.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/pci_ids.h> | 15 | #include <linux/pci_ids.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
| 18 | #include "edac_core.h" | 17 | #include "edac_core.h" |
| 19 | 18 | ||
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c index 94cac0aacea3..4471647b4807 100644 --- a/drivers/edac/mpc85xx_edac.c +++ b/drivers/edac/mpc85xx_edac.c | |||
| @@ -11,13 +11,13 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 16 | #include <linux/ctype.h> | 15 | #include <linux/ctype.h> |
| 17 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 18 | #include <linux/mod_devicetable.h> | 17 | #include <linux/mod_devicetable.h> |
| 19 | #include <linux/edac.h> | 18 | #include <linux/edac.h> |
| 20 | #include <linux/smp.h> | 19 | #include <linux/smp.h> |
| 20 | #include <linux/gfp.h> | ||
| 21 | 21 | ||
| 22 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
| 23 | #include <linux/of_device.h> | 23 | #include <linux/of_device.h> |
diff --git a/drivers/edac/mv64x60_edac.c b/drivers/edac/mv64x60_edac.c index a6b9fec13a74..7e5ff367705c 100644 --- a/drivers/edac/mv64x60_edac.c +++ b/drivers/edac/mv64x60_edac.c | |||
| @@ -12,10 +12,10 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 17 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 18 | #include <linux/edac.h> | 17 | #include <linux/edac.h> |
| 18 | #include <linux/gfp.h> | ||
| 19 | 19 | ||
| 20 | #include "edac_core.h" | 20 | #include "edac_core.h" |
| 21 | #include "edac_module.h" | 21 | #include "edac_module.h" |
diff --git a/drivers/edac/pasemi_edac.c b/drivers/edac/pasemi_edac.c index 8e6b91bd2e99..7f71ee436744 100644 --- a/drivers/edac/pasemi_edac.c +++ b/drivers/edac/pasemi_edac.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/pci_ids.h> | 27 | #include <linux/pci_ids.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/edac.h> | 28 | #include <linux/edac.h> |
| 30 | #include "edac_core.h" | 29 | #include "edac_core.h" |
| 31 | 30 | ||
diff --git a/drivers/edac/r82600_edac.c b/drivers/edac/r82600_edac.c index 9900675e9598..d55f8e9de788 100644 --- a/drivers/edac/r82600_edac.c +++ b/drivers/edac/r82600_edac.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/pci_ids.h> | 21 | #include <linux/pci_ids.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/edac.h> | 22 | #include <linux/edac.h> |
| 24 | #include "edac_core.h" | 23 | #include "edac_core.h" |
| 25 | 24 | ||
diff --git a/drivers/edac/x38_edac.c b/drivers/edac/x38_edac.c index d4ec60593176..b6f47de152f3 100644 --- a/drivers/edac/x38_edac.c +++ b/drivers/edac/x38_edac.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/pci_ids.h> | 15 | #include <linux/pci_ids.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/edac.h> | 16 | #include <linux/edac.h> |
| 18 | #include "edac_core.h" | 17 | #include "edac_core.h" |
| 19 | 18 | ||
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 8be720b278b7..702dcc98c074 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
| 35 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
| 36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 38 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 39 | #include <linux/time.h> | 40 | #include <linux/time.h> |
diff --git a/drivers/firewire/core-device.c b/drivers/firewire/core-device.c index 882472d1e144..4b8523f00dce 100644 --- a/drivers/firewire/core-device.c +++ b/drivers/firewire/core-device.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
| 35 | #include <linux/rwsem.h> | 35 | #include <linux/rwsem.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
| 37 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 38 | #include <linux/workqueue.h> | 39 | #include <linux/workqueue.h> |
diff --git a/drivers/firewire/core-iso.c b/drivers/firewire/core-iso.c index 99c20f1b613a..3784a47865b7 100644 --- a/drivers/firewire/core-iso.c +++ b/drivers/firewire/core-iso.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/firewire-constants.h> | 26 | #include <linux/firewire-constants.h> |
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 30 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
| 31 | 32 | ||
diff --git a/drivers/firewire/net.c b/drivers/firewire/net.c index 2d3dc7ded0a9..7142eeec8074 100644 --- a/drivers/firewire/net.c +++ b/drivers/firewire/net.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
| 23 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 25 | 26 | ||
| 26 | #include <asm/unaligned.h> | 27 | #include <asm/unaligned.h> |
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c index e33917bf97d2..0cf4d7f562c5 100644 --- a/drivers/firewire/ohci.c +++ b/drivers/firewire/ohci.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 25 | #include <linux/firewire.h> | 25 | #include <linux/firewire.h> |
| 26 | #include <linux/firewire-constants.h> | 26 | #include <linux/firewire-constants.h> |
| 27 | #include <linux/gfp.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 30 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| @@ -35,6 +34,7 @@ | |||
| 35 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 36 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 37 | #include <linux/pci_ids.h> | 36 | #include <linux/pci_ids.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 40 | 40 | ||
diff --git a/drivers/firmware/dcdbas.c b/drivers/firmware/dcdbas.c index 18d65fb42ee7..fb09bb3c0ad6 100644 --- a/drivers/firmware/dcdbas.c +++ b/drivers/firmware/dcdbas.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/gfp.h> | ||
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 27 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 28 | #include <linux/mc146818rtc.h> | 29 | #include <linux/mc146818rtc.h> |
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index b3a0cf57442e..3a4460265b10 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | */ | 36 | */ |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 40 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 41 | #include <linux/blkdev.h> | 42 | #include <linux/blkdev.h> |
diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index dbdf6fadfc79..a777a35381d2 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/dmi.h> | 12 | #include <linux/dmi.h> |
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | struct dmi_device_attribute{ | 16 | struct dmi_device_attribute{ |
| 16 | struct device_attribute dev_attr; | 17 | struct device_attribute dev_attr; |
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 31b983d9462c..d46467271349 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/dmi.h> | 5 | #include <linux/dmi.h> |
| 6 | #include <linux/efi.h> | 6 | #include <linux/efi.h> |
| 7 | #include <linux/bootmem.h> | 7 | #include <linux/bootmem.h> |
| 8 | #include <linux/slab.h> | ||
| 9 | #include <asm/dmi.h> | 8 | #include <asm/dmi.h> |
| 10 | 9 | ||
| 11 | /* | 10 | /* |
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 082f06ecd327..81b70bd07586 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c | |||
| @@ -77,6 +77,7 @@ | |||
| 77 | #include <linux/sysfs.h> | 77 | #include <linux/sysfs.h> |
| 78 | #include <linux/kobject.h> | 78 | #include <linux/kobject.h> |
| 79 | #include <linux/device.h> | 79 | #include <linux/device.h> |
| 80 | #include <linux/slab.h> | ||
| 80 | 81 | ||
| 81 | #include <asm/uaccess.h> | 82 | #include <asm/uaccess.h> |
| 82 | 83 | ||
diff --git a/drivers/firmware/iscsi_ibft_find.c b/drivers/firmware/iscsi_ibft_find.c index dfb15c06c88f..134dd7328397 100644 --- a/drivers/firmware/iscsi_ibft_find.c +++ b/drivers/firmware/iscsi_ibft_find.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/limits.h> | 27 | #include <linux/limits.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/stat.h> | 30 | #include <linux/stat.h> |
| 32 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 33 | #include <linux/types.h> | 32 | #include <linux/types.h> |
diff --git a/drivers/firmware/memmap.c b/drivers/firmware/memmap.c index d59f7cad2269..adc07102a20d 100644 --- a/drivers/firmware/memmap.c +++ b/drivers/firmware/memmap.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/bootmem.h> | 22 | #include <linux/bootmem.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | /* | 25 | /* |
| 25 | * Data types ------------------------------------------------------------------ | 26 | * Data types ------------------------------------------------------------------ |
diff --git a/drivers/gpio/adp5520-gpio.c b/drivers/gpio/adp5520-gpio.c index 0f93105873cd..9f2781537001 100644 --- a/drivers/gpio/adp5520-gpio.c +++ b/drivers/gpio/adp5520-gpio.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 11 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 12 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
diff --git a/drivers/gpio/adp5588-gpio.c b/drivers/gpio/adp5588-gpio.c index afc097a16b33..2e8e9e24f887 100644 --- a/drivers/gpio/adp5588-gpio.c +++ b/drivers/gpio/adp5588-gpio.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 13 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 14 | #include <linux/gpio.h> | 15 | #include <linux/gpio.h> |
diff --git a/drivers/gpio/bt8xxgpio.c b/drivers/gpio/bt8xxgpio.c index 2559f2289409..aa4f09ad3ced 100644 --- a/drivers/gpio/bt8xxgpio.c +++ b/drivers/gpio/bt8xxgpio.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/pci.h> | 47 | #include <linux/pci.h> |
| 48 | #include <linux/spinlock.h> | 48 | #include <linux/spinlock.h> |
| 49 | #include <linux/gpio.h> | 49 | #include <linux/gpio.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | /* Steal the hardware definitions from the bttv driver. */ | 52 | /* Steal the hardware definitions from the bttv driver. */ |
| 52 | #include "../media/video/bt8xx/bt848.h" | 53 | #include "../media/video/bt8xx/bt848.h" |
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c index 6d1b86661e63..76be229c814d 100644 --- a/drivers/gpio/gpiolib.c +++ b/drivers/gpio/gpiolib.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/seq_file.h> | 9 | #include <linux/seq_file.h> |
| 10 | #include <linux/gpio.h> | 10 | #include <linux/gpio.h> |
| 11 | #include <linux/idr.h> | 11 | #include <linux/idr.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | 14 | ||
| 14 | /* Optional implementation infrastructure for GPIO interfaces. | 15 | /* Optional implementation infrastructure for GPIO interfaces. |
diff --git a/drivers/gpio/langwell_gpio.c b/drivers/gpio/langwell_gpio.c index 6c0ebbdc659e..00c3a14127af 100644 --- a/drivers/gpio/langwell_gpio.c +++ b/drivers/gpio/langwell_gpio.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/irq.h> | 29 | #include <linux/irq.h> |
| 30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | struct lnw_gpio_register { | 34 | struct lnw_gpio_register { |
| 34 | u32 GPLR[2]; | 35 | u32 GPLR[2]; |
diff --git a/drivers/gpio/max7300.c b/drivers/gpio/max7300.c index 9d74eef1157a..962f661c18c7 100644 --- a/drivers/gpio/max7300.c +++ b/drivers/gpio/max7300.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/spi/max7301.h> | 18 | #include <linux/spi/max7301.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | static int max7300_i2c_write(struct device *dev, unsigned int reg, | 21 | static int max7300_i2c_write(struct device *dev, unsigned int reg, |
| 21 | unsigned int val) | 22 | unsigned int val) |
diff --git a/drivers/gpio/max7301.c b/drivers/gpio/max7301.c index 965d9b1ea13e..92a100ddef6b 100644 --- a/drivers/gpio/max7301.c +++ b/drivers/gpio/max7301.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/spi/spi.h> | 20 | #include <linux/spi/spi.h> |
| 20 | #include <linux/spi/max7301.h> | 21 | #include <linux/spi/max7301.h> |
| 21 | 22 | ||
diff --git a/drivers/gpio/max730x.c b/drivers/gpio/max730x.c index 4a7d662ff9b7..7696a5625d58 100644 --- a/drivers/gpio/max730x.c +++ b/drivers/gpio/max730x.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/mutex.h> | 38 | #include <linux/mutex.h> |
| 39 | #include <linux/spi/max7301.h> | 39 | #include <linux/spi/max7301.h> |
| 40 | #include <linux/gpio.h> | 40 | #include <linux/gpio.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | /* | 43 | /* |
| 43 | * Pin configurations, see MAX7301 datasheet page 6 | 44 | * Pin configurations, see MAX7301 datasheet page 6 |
diff --git a/drivers/gpio/mc33880.c b/drivers/gpio/mc33880.c index e7d01bd8fdb3..935479da6705 100644 --- a/drivers/gpio/mc33880.c +++ b/drivers/gpio/mc33880.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
| 26 | #include <linux/spi/mc33880.h> | 26 | #include <linux/spi/mc33880.h> |
| 27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #define DRIVER_NAME "mc33880" | 30 | #define DRIVER_NAME "mc33880" |
| 30 | 31 | ||
diff --git a/drivers/gpio/mcp23s08.c b/drivers/gpio/mcp23s08.c index cd651ec8d034..69f6f1955a31 100644 --- a/drivers/gpio/mcp23s08.c +++ b/drivers/gpio/mcp23s08.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/gpio.h> | 9 | #include <linux/gpio.h> |
| 10 | #include <linux/spi/spi.h> | 10 | #include <linux/spi/spi.h> |
| 11 | #include <linux/spi/mcp23s08.h> | 11 | #include <linux/spi/mcp23s08.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | 14 | ||
| 14 | /* Registers are all 8 bits wide. | 15 | /* Registers are all 8 bits wide. |
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index ab5daab14bc2..7d521e1d17e1 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/i2c/pca953x.h> | 20 | #include <linux/i2c/pca953x.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #ifdef CONFIG_OF_GPIO | 22 | #ifdef CONFIG_OF_GPIO |
| 22 | #include <linux/of_platform.h> | 23 | #include <linux/of_platform.h> |
| 23 | #include <linux/of_gpio.h> | 24 | #include <linux/of_gpio.h> |
diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c index 3ad1eeb49609..5ad8f778ced4 100644 --- a/drivers/gpio/pl061.c +++ b/drivers/gpio/pl061.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 25 | #include <linux/amba/bus.h> | 25 | #include <linux/amba/bus.h> |
| 26 | #include <linux/amba/pl061.h> | 26 | #include <linux/amba/pl061.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #define GPIODIR 0x400 | 29 | #define GPIODIR 0x400 |
| 29 | #define GPIOIS 0x404 | 30 | #define GPIOIS 0x404 |
diff --git a/drivers/gpio/timbgpio.c b/drivers/gpio/timbgpio.c index d4295fa5369e..ac4d0f0ea02b 100644 --- a/drivers/gpio/timbgpio.c +++ b/drivers/gpio/timbgpio.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/timb_gpio.h> | 28 | #include <linux/timb_gpio.h> |
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #define DRIVER_NAME "timb-gpio" | 32 | #define DRIVER_NAME "timb-gpio" |
| 32 | 33 | ||
diff --git a/drivers/gpio/twl4030-gpio.c b/drivers/gpio/twl4030-gpio.c index 7fe881e2bdfb..57635ac35a73 100644 --- a/drivers/gpio/twl4030-gpio.c +++ b/drivers/gpio/twl4030-gpio.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/irq.h> | 32 | #include <linux/irq.h> |
| 33 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | 35 | ||
| 37 | #include <linux/i2c/twl.h> | 36 | #include <linux/i2c/twl.h> |
| 38 | 37 | ||
diff --git a/drivers/gpio/wm831x-gpio.c b/drivers/gpio/wm831x-gpio.c index d09021f4a7d3..1fa449a1a4cb 100644 --- a/drivers/gpio/wm831x-gpio.c +++ b/drivers/gpio/wm831x-gpio.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/mfd/core.h> | 19 | #include <linux/mfd/core.h> |
diff --git a/drivers/gpio/wm8350-gpiolib.c b/drivers/gpio/wm8350-gpiolib.c index 511840d1c7ba..359999290f55 100644 --- a/drivers/gpio/wm8350-gpiolib.c +++ b/drivers/gpio/wm8350-gpiolib.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/mfd/core.h> | 19 | #include <linux/mfd/core.h> |
diff --git a/drivers/gpio/wm8994-gpio.c b/drivers/gpio/wm8994-gpio.c index de28b4a470ea..7607cc61e1dd 100644 --- a/drivers/gpio/wm8994-gpio.c +++ b/drivers/gpio/wm8994-gpio.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/mfd/core.h> | 19 | #include <linux/mfd/core.h> |
diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c index 3c1177abebd3..b8fa65b5bfca 100644 --- a/drivers/gpio/xilinx_gpio.c +++ b/drivers/gpio/xilinx_gpio.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/of_gpio.h> | 19 | #include <linux/of_gpio.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | /* Register Offset Definitions */ | 24 | /* Register Offset Definitions */ |
| 24 | #define XGPIO_DATA_OFFSET (0x0) /* Data register */ | 25 | #define XGPIO_DATA_OFFSET (0x0) /* Data register */ |
diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupport.c index d68888fe3df9..ba38e0147220 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include "drmP.h" | 34 | #include "drmP.h" |
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #if __OS_HAS_AGP | 38 | #if __OS_HAS_AGP |
| 38 | 39 | ||
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 8417cc4c43f1..f7ba82ebf65a 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/log2.h> | 38 | #include <linux/log2.h> |
| 38 | #include <asm/shmparam.h> | 39 | #include <asm/shmparam.h> |
| 39 | #include "drmP.h" | 40 | #include "drmP.h" |
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index d91fb8c0b7b3..61b9bcfdf040 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * Jesse Barnes <jesse.barnes@intel.com> | 30 | * Jesse Barnes <jesse.barnes@intel.com> |
| 31 | */ | 31 | */ |
| 32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include "drm.h" | 34 | #include "drm.h" |
| 34 | #include "drmP.h" | 35 | #include "drmP.h" |
| 35 | #include "drm_crtc.h" | 36 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c index f2aaf39be398..51103aa469f8 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c | |||
| @@ -104,6 +104,7 @@ int drm_helper_probe_single_connector_modes(struct drm_connector *connector, | |||
| 104 | if (connector->status == connector_status_disconnected) { | 104 | if (connector->status == connector_status_disconnected) { |
| 105 | DRM_DEBUG_KMS("%s is disconnected\n", | 105 | DRM_DEBUG_KMS("%s is disconnected\n", |
| 106 | drm_get_connector_name(connector)); | 106 | drm_get_connector_name(connector)); |
| 107 | drm_mode_connector_update_edid_property(connector, NULL); | ||
| 107 | goto prune; | 108 | goto prune; |
| 108 | } | 109 | } |
| 109 | 110 | ||
diff --git a/drivers/gpu/drm/drm_debugfs.c b/drivers/gpu/drm/drm_debugfs.c index 9903f270e440..677b275fa721 100644 --- a/drivers/gpu/drm/drm_debugfs.c +++ b/drivers/gpu/drm/drm_debugfs.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/debugfs.h> | 33 | #include <linux/debugfs.h> |
| 34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include "drmP.h" | 36 | #include "drmP.h" |
| 36 | 37 | ||
| 37 | #if defined(CONFIG_DEBUG_FS) | 38 | #if defined(CONFIG_DEBUG_FS) |
diff --git a/drivers/gpu/drm/drm_dp_i2c_helper.c b/drivers/gpu/drm/drm_dp_i2c_helper.c index 548887c8506f..f7eba0a0973a 100644 --- a/drivers/gpu/drm/drm_dp_i2c_helper.c +++ b/drivers/gpu/drm/drm_dp_i2c_helper.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index f3c58e2bd75c..4a66201edaec 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | */ | 47 | */ |
| 48 | 48 | ||
| 49 | #include <linux/debugfs.h> | 49 | #include <linux/debugfs.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | #include "drmP.h" | 51 | #include "drmP.h" |
| 51 | #include "drm_core.h" | 52 | #include "drm_core.h" |
| 52 | 53 | ||
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f97e7c42ac8e..2cc6e87d849d 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | * DEALINGS IN THE SOFTWARE. | 27 | * DEALINGS IN THE SOFTWARE. |
| 28 | */ | 28 | */ |
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/i2c.h> | 31 | #include <linux/i2c.h> |
| 31 | #include <linux/i2c-algo-bit.h> | 32 | #include <linux/i2c-algo-bit.h> |
| 32 | #include "drmP.h" | 33 | #include "drmP.h" |
| @@ -707,15 +708,6 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev, | |||
| 707 | mode->vsync_end = mode->vsync_start + vsync_pulse_width; | 708 | mode->vsync_end = mode->vsync_start + vsync_pulse_width; |
| 708 | mode->vtotal = mode->vdisplay + vblank; | 709 | mode->vtotal = mode->vdisplay + vblank; |
| 709 | 710 | ||
| 710 | /* perform the basic check for the detailed timing */ | ||
| 711 | if (mode->hsync_end > mode->htotal || | ||
| 712 | mode->vsync_end > mode->vtotal) { | ||
| 713 | drm_mode_destroy(dev, mode); | ||
| 714 | DRM_DEBUG_KMS("Incorrect detailed timing. " | ||
| 715 | "Sync is beyond the blank.\n"); | ||
| 716 | return NULL; | ||
| 717 | } | ||
| 718 | |||
| 719 | /* Some EDIDs have bogus h/vtotal values */ | 711 | /* Some EDIDs have bogus h/vtotal values */ |
| 720 | if (mode->hsync_end > mode->htotal) | 712 | if (mode->hsync_end > mode->htotal) |
| 721 | mode->htotal = mode->hsync_end + 1; | 713 | mode->htotal = mode->hsync_end + 1; |
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 50549703584f..288ea2f32772 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/sysrq.h> | 31 | #include <linux/sysrq.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/fb.h> | 33 | #include <linux/fb.h> |
| 33 | #include "drmP.h" | 34 | #include "drmP.h" |
| 34 | #include "drm_crtc.h" | 35 | #include "drm_crtc.h" |
| @@ -283,6 +284,8 @@ static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { | |||
| 283 | .help_msg = "force-fb(V)", | 284 | .help_msg = "force-fb(V)", |
| 284 | .action_msg = "Restore framebuffer console", | 285 | .action_msg = "Restore framebuffer console", |
| 285 | }; | 286 | }; |
| 287 | #else | ||
| 288 | static struct sysrq_key_op sysrq_drm_fb_helper_restore_op = { }; | ||
| 286 | #endif | 289 | #endif |
| 287 | 290 | ||
| 288 | static void drm_fb_helper_on(struct fb_info *info) | 291 | static void drm_fb_helper_on(struct fb_info *info) |
diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c index 08d14df3bb42..9d532d7fdf59 100644 --- a/drivers/gpu/drm/drm_fops.c +++ b/drivers/gpu/drm/drm_fops.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | 36 | ||
| 37 | #include "drmP.h" | 37 | #include "drmP.h" |
| 38 | #include <linux/poll.h> | 38 | #include <linux/poll.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <linux/smp_lock.h> | 40 | #include <linux/smp_lock.h> |
| 40 | 41 | ||
| 41 | static int drm_open_helper(struct inode *inode, struct file *filp, | 42 | static int drm_open_helper(struct inode *inode, struct file *filp, |
| @@ -140,14 +141,16 @@ int drm_open(struct inode *inode, struct file *filp) | |||
| 140 | spin_unlock(&dev->count_lock); | 141 | spin_unlock(&dev->count_lock); |
| 141 | } | 142 | } |
| 142 | out: | 143 | out: |
| 143 | mutex_lock(&dev->struct_mutex); | 144 | if (!retcode) { |
| 144 | if (minor->type == DRM_MINOR_LEGACY) { | 145 | mutex_lock(&dev->struct_mutex); |
| 145 | BUG_ON((dev->dev_mapping != NULL) && | 146 | if (minor->type == DRM_MINOR_LEGACY) { |
| 146 | (dev->dev_mapping != inode->i_mapping)); | 147 | if (dev->dev_mapping == NULL) |
| 147 | if (dev->dev_mapping == NULL) | 148 | dev->dev_mapping = inode->i_mapping; |
| 148 | dev->dev_mapping = inode->i_mapping; | 149 | else if (dev->dev_mapping != inode->i_mapping) |
| 150 | retcode = -ENODEV; | ||
| 151 | } | ||
| 152 | mutex_unlock(&dev->struct_mutex); | ||
| 149 | } | 153 | } |
| 150 | mutex_unlock(&dev->struct_mutex); | ||
| 151 | 154 | ||
| 152 | return retcode; | 155 | return retcode; |
| 153 | } | 156 | } |
diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index f36b21c5b2e1..a93d7b4ddaa6 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include "drmP.h" | 35 | #include "drmP.h" |
| 36 | #include "drm_hashtab.h" | 36 | #include "drm_hashtab.h" |
| 37 | #include <linux/hash.h> | 37 | #include <linux/hash.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | int drm_ht_create(struct drm_open_hash *ht, unsigned int order) | 40 | int drm_ht_create(struct drm_open_hash *ht, unsigned int order) |
| 40 | { | 41 | { |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index b98384dbd9a7..3bd872761567 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "drmP.h" | 36 | #include "drmP.h" |
| 37 | 37 | ||
| 38 | #include <linux/interrupt.h> /* For task queue support */ | 38 | #include <linux/interrupt.h> /* For task queue support */ |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <linux/vgaarb.h> | 41 | #include <linux/vgaarb.h> |
| 41 | /** | 42 | /** |
diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index e68ebf92fa2a..2ea9ad4a8d69 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/dma-mapping.h> | 41 | #include <linux/dma-mapping.h> |
| 41 | #include "drmP.h" | 42 | #include "drmP.h" |
| 42 | 43 | ||
diff --git a/drivers/gpu/drm/drm_proc.c b/drivers/gpu/drm/drm_proc.c index d379c4f2892f..a9ba6b69ad35 100644 --- a/drivers/gpu/drm/drm_proc.c +++ b/drivers/gpu/drm/drm_proc.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/seq_file.h> | 40 | #include <linux/seq_file.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include "drmP.h" | 42 | #include "drmP.h" |
| 42 | 43 | ||
| 43 | /*************************************************** | 44 | /*************************************************** |
diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index c7823c863d4f..9034c4c6100d 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include "drmP.h" | 36 | #include "drmP.h" |
| 36 | 37 | ||
| 37 | #define DEBUG_SCATTER 0 | 38 | #define DEBUG_SCATTER 0 |
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c index ad73e141afdb..b743411d8144 100644 --- a/drivers/gpu/drm/drm_stub.c +++ b/drivers/gpu/drm/drm_stub.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include "drmP.h" | 37 | #include "drmP.h" |
| 37 | #include "drm_core.h" | 38 | #include "drm_core.h" |
| 38 | 39 | ||
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 014ce24761b9..1a1825b29f5f 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
| 17 | #include <linux/gfp.h> | ||
| 17 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 18 | 19 | ||
| 19 | #include "drm_sysfs.h" | 20 | #include "drm_sysfs.h" |
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 4ac900f4647f..c3b13fb41d0c 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "drmP.h" | 36 | #include "drmP.h" |
| 37 | #if defined(__ia64__) | 37 | #if defined(__ia64__) |
| 38 | #include <linux/efi.h> | 38 | #include <linux/efi.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #endif | 40 | #endif |
| 40 | 41 | ||
| 41 | static void drm_vm_open(struct vm_area_struct *vma); | 42 | static void drm_vm_open(struct vm_area_struct *vma); |
diff --git a/drivers/gpu/drm/i810/i810_dma.c b/drivers/gpu/drm/i810/i810_dma.c index de32d22a8c39..997d91707ad2 100644 --- a/drivers/gpu/drm/i810/i810_dma.c +++ b/drivers/gpu/drm/i810/i810_dma.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include "i810_drv.h" | 36 | #include "i810_drv.h" |
| 37 | #include <linux/interrupt.h> /* For task queue support */ | 37 | #include <linux/interrupt.h> /* For task queue support */ |
| 38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <linux/pagemap.h> | 40 | #include <linux/pagemap.h> |
| 40 | 41 | ||
| 41 | #define I810_BUF_FREE 2 | 42 | #define I810_BUF_FREE 2 |
diff --git a/drivers/gpu/drm/i830/i830_dma.c b/drivers/gpu/drm/i830/i830_dma.c index 06bd732e6463..65759a9a85c8 100644 --- a/drivers/gpu/drm/i830/i830_dma.c +++ b/drivers/gpu/drm/i830/i830_dma.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/interrupt.h> /* For task queue support */ | 38 | #include <linux/interrupt.h> /* For task queue support */ |
| 39 | #include <linux/pagemap.h> | 39 | #include <linux/pagemap.h> |
| 40 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
| 42 | 43 | ||
| 43 | #define I830_BUF_FREE 2 | 44 | #define I830_BUF_FREE 2 |
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index 1376dfe44c95..b574503dddd0 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
| 30 | #include <linux/debugfs.h> | 30 | #include <linux/debugfs.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include "drmP.h" | 32 | #include "drmP.h" |
| 32 | #include "drm.h" | 33 | #include "drm.h" |
| 33 | #include "i915_drm.h" | 34 | #include "i915_drm.h" |
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index a9f8589490cf..2dc93939507d 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/acpi.h> | 38 | #include <linux/acpi.h> |
| 39 | #include <linux/pnp.h> | 39 | #include <linux/pnp.h> |
| 40 | #include <linux/vga_switcheroo.h> | 40 | #include <linux/vga_switcheroo.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | /* Really want an OS-independent resettable timer. Would like to have | 43 | /* Really want an OS-independent resettable timer. Would like to have |
| 43 | * this loop run for (eg) 3 sec, but have the timer reset every time | 44 | * this loop run for (eg) 3 sec, but have the timer reset every time |
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 933e865a8929..368d726853d1 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "i915_drv.h" | 31 | #include "i915_drv.h" |
| 32 | #include "i915_trace.h" | 32 | #include "i915_trace.h" |
| 33 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/swap.h> | 35 | #include <linux/swap.h> |
| 35 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 36 | 37 | ||
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index 5388354da0d1..49c458bc6502 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/sysrq.h> | 29 | #include <linux/sysrq.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include "drmP.h" | 31 | #include "drmP.h" |
| 31 | #include "drm.h" | 32 | #include "drm.h" |
| 32 | #include "i915_drm.h" | 33 | #include "i915_drm.h" |
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c index fccf07470c8f..38110ce742a5 100644 --- a/drivers/gpu/drm/i915/intel_crt.c +++ b/drivers/gpu/drm/i915/intel_crt.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "drmP.h" | 29 | #include "drmP.h" |
| 29 | #include "drm.h" | 30 | #include "drm.h" |
| 30 | #include "drm_crtc.h" | 31 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 58fc7fa0eb1d..e7e753b2845f 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include "drmP.h" | 32 | #include "drmP.h" |
| 32 | #include "intel_drv.h" | 33 | #include "intel_drv.h" |
| 33 | #include "i915_drm.h" | 34 | #include "i915_drm.h" |
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 3ef3a0d0edd0..8e283f75941d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "drm.h" | 31 | #include "drm.h" |
| 31 | #include "drm_crtc.h" | 32 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c index a4d2606de778..0427ca5a2514 100644 --- a/drivers/gpu/drm/i915/intel_dvo.c +++ b/drivers/gpu/drm/i915/intel_dvo.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | * Eric Anholt <eric@anholt.net> | 25 | * Eric Anholt <eric@anholt.net> |
| 26 | */ | 26 | */ |
| 27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "drmP.h" | 29 | #include "drmP.h" |
| 29 | #include "drm.h" | 30 | #include "drm.h" |
| 30 | #include "drm_crtc.h" | 31 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/i915/intel_fb.c b/drivers/gpu/drm/i915/intel_fb.c index 8cd791dc5b29..69bbef92f130 100644 --- a/drivers/gpu/drm/i915/intel_fb.c +++ b/drivers/gpu/drm/i915/intel_fb.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/sysrq.h> | 33 | #include <linux/sysrq.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/fb.h> | 35 | #include <linux/fb.h> |
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c index a30f8bfc1985..1ed02f641258 100644 --- a/drivers/gpu/drm/i915/intel_hdmi.c +++ b/drivers/gpu/drm/i915/intel_hdmi.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 31 | #include "drmP.h" | 32 | #include "drmP.h" |
| 32 | #include "drm.h" | 33 | #include "drm.h" |
diff --git a/drivers/gpu/drm/i915/intel_i2c.c b/drivers/gpu/drm/i915/intel_i2c.c index fcc753ca5d94..c2649c7df14c 100644 --- a/drivers/gpu/drm/i915/intel_i2c.c +++ b/drivers/gpu/drm/i915/intel_i2c.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * Eric Anholt <eric@anholt.net> | 26 | * Eric Anholt <eric@anholt.net> |
| 27 | */ | 27 | */ |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/i2c-id.h> | 30 | #include <linux/i2c-id.h> |
| 30 | #include <linux/i2c-algo-bit.h> | 31 | #include <linux/i2c-algo-bit.h> |
| 31 | #include "drmP.h" | 32 | #include "drmP.h" |
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c index 2b3fa7a3c028..216e9f52b6e0 100644 --- a/drivers/gpu/drm/i915/intel_lvds.c +++ b/drivers/gpu/drm/i915/intel_lvds.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <acpi/button.h> | 30 | #include <acpi/button.h> |
| 31 | #include <linux/dmi.h> | 31 | #include <linux/dmi.h> |
| 32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include "drmP.h" | 34 | #include "drmP.h" |
| 34 | #include "drm.h" | 35 | #include "drm.h" |
| 35 | #include "drm_crtc.h" | 36 | #include "drm_crtc.h" |
diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 67e2f4632a24..89d303d1d3fb 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * DEALINGS IN THE SOFTWARE. | 23 | * DEALINGS IN THE SOFTWARE. |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 27 | #include <linux/fb.h> | 28 | #include <linux/fb.h> |
| 28 | #include "drmP.h" | 29 | #include "drmP.h" |
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c index 48daee5c9c63..26e13a0bf30b 100644 --- a/drivers/gpu/drm/i915/intel_sdvo.c +++ b/drivers/gpu/drm/i915/intel_sdvo.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * Eric Anholt <eric@anholt.net> | 26 | * Eric Anholt <eric@anholt.net> |
| 27 | */ | 27 | */ |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 30 | #include "drmP.h" | 31 | #include "drmP.h" |
| 31 | #include "drm.h" | 32 | #include "drm.h" |
diff --git a/drivers/gpu/drm/nouveau/Makefile b/drivers/gpu/drm/nouveau/Makefile index 32db806f3b5a..7f0d807a0d0d 100644 --- a/drivers/gpu/drm/nouveau/Makefile +++ b/drivers/gpu/drm/nouveau/Makefile | |||
| @@ -12,7 +12,7 @@ nouveau-y := nouveau_drv.o nouveau_state.o nouveau_channel.o nouveau_mem.o \ | |||
| 12 | nouveau_dp.o nouveau_grctx.o \ | 12 | nouveau_dp.o nouveau_grctx.o \ |
| 13 | nv04_timer.o \ | 13 | nv04_timer.o \ |
| 14 | nv04_mc.o nv40_mc.o nv50_mc.o \ | 14 | nv04_mc.o nv40_mc.o nv50_mc.o \ |
| 15 | nv04_fb.o nv10_fb.o nv40_fb.o \ | 15 | nv04_fb.o nv10_fb.o nv40_fb.o nv50_fb.o \ |
| 16 | nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ | 16 | nv04_fifo.o nv10_fifo.o nv40_fifo.o nv50_fifo.o \ |
| 17 | nv04_graph.o nv10_graph.o nv20_graph.o \ | 17 | nv04_graph.o nv10_graph.o nv20_graph.o \ |
| 18 | nv40_graph.o nv50_graph.o \ | 18 | nv40_graph.o nv50_graph.o \ |
diff --git a/drivers/gpu/drm/nouveau/nouveau_acpi.c b/drivers/gpu/drm/nouveau/nouveau_acpi.c index 0e0730a53137..e13f6af0037a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/drivers/gpu/drm/nouveau/nouveau_acpi.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/pci.h> | 1 | #include <linux/pci.h> |
| 2 | #include <linux/acpi.h> | 2 | #include <linux/acpi.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <acpi/acpi_drivers.h> | 4 | #include <acpi/acpi_drivers.h> |
| 4 | #include <acpi/acpi_bus.h> | 5 | #include <acpi/acpi_bus.h> |
| 5 | 6 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 75bceee76044..b5a9336a2e88 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
| @@ -5211,6 +5211,21 @@ divine_connector_type(struct nvbios *bios, int index) | |||
| 5211 | } | 5211 | } |
| 5212 | 5212 | ||
| 5213 | static void | 5213 | static void |
| 5214 | apply_dcb_connector_quirks(struct nvbios *bios, int idx) | ||
| 5215 | { | ||
| 5216 | struct dcb_connector_table_entry *cte = &bios->dcb.connector.entry[idx]; | ||
| 5217 | struct drm_device *dev = bios->dev; | ||
| 5218 | |||
| 5219 | /* Gigabyte NX85T */ | ||
| 5220 | if ((dev->pdev->device == 0x0421) && | ||
| 5221 | (dev->pdev->subsystem_vendor == 0x1458) && | ||
| 5222 | (dev->pdev->subsystem_device == 0x344c)) { | ||
| 5223 | if (cte->type == DCB_CONNECTOR_HDMI_1) | ||
| 5224 | cte->type = DCB_CONNECTOR_DVI_I; | ||
| 5225 | } | ||
| 5226 | } | ||
| 5227 | |||
| 5228 | static void | ||
| 5214 | parse_dcb_connector_table(struct nvbios *bios) | 5229 | parse_dcb_connector_table(struct nvbios *bios) |
| 5215 | { | 5230 | { |
| 5216 | struct drm_device *dev = bios->dev; | 5231 | struct drm_device *dev = bios->dev; |
| @@ -5238,13 +5253,14 @@ parse_dcb_connector_table(struct nvbios *bios) | |||
| 5238 | entry = conntab + conntab[1]; | 5253 | entry = conntab + conntab[1]; |
| 5239 | cte = &ct->entry[0]; | 5254 | cte = &ct->entry[0]; |
| 5240 | for (i = 0; i < conntab[2]; i++, entry += conntab[3], cte++) { | 5255 | for (i = 0; i < conntab[2]; i++, entry += conntab[3], cte++) { |
| 5256 | cte->index = i; | ||
| 5241 | if (conntab[3] == 2) | 5257 | if (conntab[3] == 2) |
| 5242 | cte->entry = ROM16(entry[0]); | 5258 | cte->entry = ROM16(entry[0]); |
| 5243 | else | 5259 | else |
| 5244 | cte->entry = ROM32(entry[0]); | 5260 | cte->entry = ROM32(entry[0]); |
| 5245 | 5261 | ||
| 5246 | cte->type = (cte->entry & 0x000000ff) >> 0; | 5262 | cte->type = (cte->entry & 0x000000ff) >> 0; |
| 5247 | cte->index = (cte->entry & 0x00000f00) >> 8; | 5263 | cte->index2 = (cte->entry & 0x00000f00) >> 8; |
| 5248 | switch (cte->entry & 0x00033000) { | 5264 | switch (cte->entry & 0x00033000) { |
| 5249 | case 0x00001000: | 5265 | case 0x00001000: |
| 5250 | cte->gpio_tag = 0x07; | 5266 | cte->gpio_tag = 0x07; |
| @@ -5266,6 +5282,8 @@ parse_dcb_connector_table(struct nvbios *bios) | |||
| 5266 | if (cte->type == 0xff) | 5282 | if (cte->type == 0xff) |
| 5267 | continue; | 5283 | continue; |
| 5268 | 5284 | ||
| 5285 | apply_dcb_connector_quirks(bios, i); | ||
| 5286 | |||
| 5269 | NV_INFO(dev, " %d: 0x%08x: type 0x%02x idx %d tag 0x%02x\n", | 5287 | NV_INFO(dev, " %d: 0x%08x: type 0x%02x idx %d tag 0x%02x\n", |
| 5270 | i, cte->entry, cte->type, cte->index, cte->gpio_tag); | 5288 | i, cte->entry, cte->type, cte->index, cte->gpio_tag); |
| 5271 | 5289 | ||
| @@ -5287,10 +5305,16 @@ parse_dcb_connector_table(struct nvbios *bios) | |||
| 5287 | break; | 5305 | break; |
| 5288 | default: | 5306 | default: |
| 5289 | cte->type = divine_connector_type(bios, cte->index); | 5307 | cte->type = divine_connector_type(bios, cte->index); |
| 5290 | NV_WARN(dev, "unknown type, using 0x%02x", cte->type); | 5308 | NV_WARN(dev, "unknown type, using 0x%02x\n", cte->type); |
| 5291 | break; | 5309 | break; |
| 5292 | } | 5310 | } |
| 5293 | 5311 | ||
| 5312 | if (nouveau_override_conntype) { | ||
| 5313 | int type = divine_connector_type(bios, cte->index); | ||
| 5314 | if (type != cte->type) | ||
| 5315 | NV_WARN(dev, " -> type 0x%02x\n", cte->type); | ||
| 5316 | } | ||
| 5317 | |||
| 5294 | } | 5318 | } |
| 5295 | } | 5319 | } |
| 5296 | 5320 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.h b/drivers/gpu/drm/nouveau/nouveau_bios.h index 9f688aa9a655..4f88e6924d27 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.h +++ b/drivers/gpu/drm/nouveau/nouveau_bios.h | |||
| @@ -72,9 +72,10 @@ enum dcb_connector_type { | |||
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | struct dcb_connector_table_entry { | 74 | struct dcb_connector_table_entry { |
| 75 | uint8_t index; | ||
| 75 | uint32_t entry; | 76 | uint32_t entry; |
| 76 | enum dcb_connector_type type; | 77 | enum dcb_connector_type type; |
| 77 | uint8_t index; | 78 | uint8_t index2; |
| 78 | uint8_t gpio_tag; | 79 | uint8_t gpio_tag; |
| 79 | }; | 80 | }; |
| 80 | 81 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 028719fddf76..9042dd7fb058 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include "nouveau_dma.h" | 34 | #include "nouveau_dma.h" |
| 35 | 35 | ||
| 36 | #include <linux/log2.h> | 36 | #include <linux/log2.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | static void | 39 | static void |
| 39 | nouveau_bo_del_ttm(struct ttm_buffer_object *bo) | 40 | nouveau_bo_del_ttm(struct ttm_buffer_object *bo) |
| @@ -439,8 +440,7 @@ nouveau_bo_evict_flags(struct ttm_buffer_object *bo, struct ttm_placement *pl) | |||
| 439 | 440 | ||
| 440 | switch (bo->mem.mem_type) { | 441 | switch (bo->mem.mem_type) { |
| 441 | case TTM_PL_VRAM: | 442 | case TTM_PL_VRAM: |
| 442 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_TT | | 443 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_TT); |
| 443 | TTM_PL_FLAG_SYSTEM); | ||
| 444 | break; | 444 | break; |
| 445 | default: | 445 | default: |
| 446 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_SYSTEM); | 446 | nouveau_bo_placement_set(nvbo, TTM_PL_FLAG_SYSTEM); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c index 24327f468c4b..14afe1e47e57 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.c +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c | |||
| @@ -302,7 +302,7 @@ nouveau_connector_detect(struct drm_connector *connector) | |||
| 302 | 302 | ||
| 303 | detect_analog: | 303 | detect_analog: |
| 304 | nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); | 304 | nv_encoder = find_encoder_by_type(connector, OUTPUT_ANALOG); |
| 305 | if (!nv_encoder) | 305 | if (!nv_encoder && !nouveau_tv_disable) |
| 306 | nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); | 306 | nv_encoder = find_encoder_by_type(connector, OUTPUT_TV); |
| 307 | if (nv_encoder) { | 307 | if (nv_encoder) { |
| 308 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); | 308 | struct drm_encoder *encoder = to_drm_encoder(nv_encoder); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_dma.c b/drivers/gpu/drm/nouveau/nouveau_dma.c index c8482a108a78..65c441a1999f 100644 --- a/drivers/gpu/drm/nouveau/nouveau_dma.c +++ b/drivers/gpu/drm/nouveau/nouveau_dma.c | |||
| @@ -190,6 +190,11 @@ nv50_dma_push(struct nouveau_channel *chan, struct nouveau_bo *bo, | |||
| 190 | nouveau_bo_wr32(pb, ip++, upper_32_bits(offset) | length << 8); | 190 | nouveau_bo_wr32(pb, ip++, upper_32_bits(offset) | length << 8); |
| 191 | 191 | ||
| 192 | chan->dma.ib_put = (chan->dma.ib_put + 1) & chan->dma.ib_max; | 192 | chan->dma.ib_put = (chan->dma.ib_put + 1) & chan->dma.ib_max; |
| 193 | |||
| 194 | DRM_MEMORYBARRIER(); | ||
| 195 | /* Flush writes. */ | ||
| 196 | nouveau_bo_rd32(pb, 0); | ||
| 197 | |||
| 193 | nvchan_wr32(chan, 0x8c, chan->dma.ib_put); | 198 | nvchan_wr32(chan, 0x8c, chan->dma.ib_put); |
| 194 | chan->dma.ib_free--; | 199 | chan->dma.ib_free--; |
| 195 | } | 200 | } |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.c b/drivers/gpu/drm/nouveau/nouveau_drv.c index 30cc09e8a709..1de974acbc65 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.c +++ b/drivers/gpu/drm/nouveau/nouveau_drv.c | |||
| @@ -83,6 +83,14 @@ MODULE_PARM_DESC(nofbaccel, "Disable fbcon acceleration"); | |||
| 83 | int nouveau_nofbaccel = 0; | 83 | int nouveau_nofbaccel = 0; |
| 84 | module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400); | 84 | module_param_named(nofbaccel, nouveau_nofbaccel, int, 0400); |
| 85 | 85 | ||
| 86 | MODULE_PARM_DESC(override_conntype, "Ignore DCB connector type"); | ||
| 87 | int nouveau_override_conntype = 0; | ||
| 88 | module_param_named(override_conntype, nouveau_override_conntype, int, 0400); | ||
| 89 | |||
| 90 | MODULE_PARM_DESC(tv_disable, "Disable TV-out detection\n"); | ||
| 91 | int nouveau_tv_disable = 0; | ||
| 92 | module_param_named(tv_disable, nouveau_tv_disable, int, 0400); | ||
| 93 | |||
| 86 | MODULE_PARM_DESC(tv_norm, "Default TV norm.\n" | 94 | MODULE_PARM_DESC(tv_norm, "Default TV norm.\n" |
| 87 | "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n" | 95 | "\t\tSupported: PAL, PAL-M, PAL-N, PAL-Nc, NTSC-M, NTSC-J,\n" |
| 88 | "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n" | 96 | "\t\t\thd480i, hd480p, hd576i, hd576p, hd720p, hd1080i.\n" |
| @@ -154,9 +162,11 @@ nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state) | |||
| 154 | if (pm_state.event == PM_EVENT_PRETHAW) | 162 | if (pm_state.event == PM_EVENT_PRETHAW) |
| 155 | return 0; | 163 | return 0; |
| 156 | 164 | ||
| 165 | NV_INFO(dev, "Disabling fbcon acceleration...\n"); | ||
| 157 | fbdev_flags = dev_priv->fbdev_info->flags; | 166 | fbdev_flags = dev_priv->fbdev_info->flags; |
| 158 | dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED; | 167 | dev_priv->fbdev_info->flags |= FBINFO_HWACCEL_DISABLED; |
| 159 | 168 | ||
| 169 | NV_INFO(dev, "Unpinning framebuffer(s)...\n"); | ||
| 160 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { | 170 | list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) { |
| 161 | struct nouveau_framebuffer *nouveau_fb; | 171 | struct nouveau_framebuffer *nouveau_fb; |
| 162 | 172 | ||
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 4b9aaf2a8d0f..d8b559011777 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
| @@ -681,6 +681,7 @@ extern int nouveau_uscript_tmds; | |||
| 681 | extern int nouveau_vram_pushbuf; | 681 | extern int nouveau_vram_pushbuf; |
| 682 | extern int nouveau_vram_notify; | 682 | extern int nouveau_vram_notify; |
| 683 | extern int nouveau_fbpercrtc; | 683 | extern int nouveau_fbpercrtc; |
| 684 | extern int nouveau_tv_disable; | ||
| 684 | extern char *nouveau_tv_norm; | 685 | extern char *nouveau_tv_norm; |
| 685 | extern int nouveau_reg_debug; | 686 | extern int nouveau_reg_debug; |
| 686 | extern char *nouveau_vbios; | 687 | extern char *nouveau_vbios; |
| @@ -688,6 +689,7 @@ extern int nouveau_ctxfw; | |||
| 688 | extern int nouveau_ignorelid; | 689 | extern int nouveau_ignorelid; |
| 689 | extern int nouveau_nofbaccel; | 690 | extern int nouveau_nofbaccel; |
| 690 | extern int nouveau_noaccel; | 691 | extern int nouveau_noaccel; |
| 692 | extern int nouveau_override_conntype; | ||
| 691 | 693 | ||
| 692 | extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state); | 694 | extern int nouveau_pci_suspend(struct pci_dev *pdev, pm_message_t pm_state); |
| 693 | extern int nouveau_pci_resume(struct pci_dev *pdev); | 695 | extern int nouveau_pci_resume(struct pci_dev *pdev); |
| @@ -926,6 +928,10 @@ extern void nv40_fb_takedown(struct drm_device *); | |||
| 926 | extern void nv40_fb_set_region_tiling(struct drm_device *, int, uint32_t, | 928 | extern void nv40_fb_set_region_tiling(struct drm_device *, int, uint32_t, |
| 927 | uint32_t, uint32_t); | 929 | uint32_t, uint32_t); |
| 928 | 930 | ||
| 931 | /* nv50_fb.c */ | ||
| 932 | extern int nv50_fb_init(struct drm_device *); | ||
| 933 | extern void nv50_fb_takedown(struct drm_device *); | ||
| 934 | |||
| 929 | /* nv04_fifo.c */ | 935 | /* nv04_fifo.c */ |
| 930 | extern int nv04_fifo_init(struct drm_device *); | 936 | extern int nv04_fifo_init(struct drm_device *); |
| 931 | extern void nv04_fifo_disable(struct drm_device *); | 937 | extern void nv04_fifo_disable(struct drm_device *); |
diff --git a/drivers/gpu/drm/nouveau/nouveau_fbcon.c b/drivers/gpu/drm/nouveau/nouveau_fbcon.c index 68cedd9194fe..8e7dc1d4912a 100644 --- a/drivers/gpu/drm/nouveau/nouveau_fbcon.c +++ b/drivers/gpu/drm/nouveau/nouveau_fbcon.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/sysrq.h> | 33 | #include <linux/sysrq.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/fb.h> | 35 | #include <linux/fb.h> |
diff --git a/drivers/gpu/drm/nouveau/nouveau_grctx.c b/drivers/gpu/drm/nouveau/nouveau_grctx.c index c7ebec696747..32f0e495464c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_grctx.c +++ b/drivers/gpu/drm/nouveau/nouveau_grctx.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "drmP.h" | 28 | #include "drmP.h" |
| 28 | #include "nouveau_drv.h" | 29 | #include "nouveau_drv.h" |
diff --git a/drivers/gpu/drm/nouveau/nouveau_irq.c b/drivers/gpu/drm/nouveau/nouveau_irq.c index 95220ddebb45..2bd59a92fee5 100644 --- a/drivers/gpu/drm/nouveau/nouveau_irq.c +++ b/drivers/gpu/drm/nouveau/nouveau_irq.c | |||
| @@ -311,6 +311,31 @@ nouveau_print_bitfield_names_(uint32_t value, | |||
| 311 | #define nouveau_print_bitfield_names(val, namelist) \ | 311 | #define nouveau_print_bitfield_names(val, namelist) \ |
| 312 | nouveau_print_bitfield_names_((val), (namelist), ARRAY_SIZE(namelist)) | 312 | nouveau_print_bitfield_names_((val), (namelist), ARRAY_SIZE(namelist)) |
| 313 | 313 | ||
| 314 | struct nouveau_enum_names { | ||
| 315 | uint32_t value; | ||
| 316 | const char *name; | ||
| 317 | }; | ||
| 318 | |||
| 319 | static void | ||
| 320 | nouveau_print_enum_names_(uint32_t value, | ||
| 321 | const struct nouveau_enum_names *namelist, | ||
| 322 | const int namelist_len) | ||
| 323 | { | ||
| 324 | /* | ||
| 325 | * Caller must have already printed the KERN_* log level for us. | ||
| 326 | * Also the caller is responsible for adding the newline. | ||
| 327 | */ | ||
| 328 | int i; | ||
| 329 | for (i = 0; i < namelist_len; ++i) { | ||
| 330 | if (value == namelist[i].value) { | ||
| 331 | printk("%s", namelist[i].name); | ||
| 332 | return; | ||
| 333 | } | ||
| 334 | } | ||
| 335 | printk("unknown value 0x%08x", value); | ||
| 336 | } | ||
| 337 | #define nouveau_print_enum_names(val, namelist) \ | ||
| 338 | nouveau_print_enum_names_((val), (namelist), ARRAY_SIZE(namelist)) | ||
| 314 | 339 | ||
| 315 | static int | 340 | static int |
| 316 | nouveau_graph_chid_from_grctx(struct drm_device *dev) | 341 | nouveau_graph_chid_from_grctx(struct drm_device *dev) |
| @@ -427,14 +452,16 @@ nouveau_graph_dump_trap_info(struct drm_device *dev, const char *id, | |||
| 427 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 452 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
| 428 | uint32_t nsource = trap->nsource, nstatus = trap->nstatus; | 453 | uint32_t nsource = trap->nsource, nstatus = trap->nstatus; |
| 429 | 454 | ||
| 430 | NV_INFO(dev, "%s - nSource:", id); | 455 | if (dev_priv->card_type < NV_50) { |
| 431 | nouveau_print_bitfield_names(nsource, nsource_names); | 456 | NV_INFO(dev, "%s - nSource:", id); |
| 432 | printk(", nStatus:"); | 457 | nouveau_print_bitfield_names(nsource, nsource_names); |
| 433 | if (dev_priv->card_type < NV_10) | 458 | printk(", nStatus:"); |
| 434 | nouveau_print_bitfield_names(nstatus, nstatus_names); | 459 | if (dev_priv->card_type < NV_10) |
| 435 | else | 460 | nouveau_print_bitfield_names(nstatus, nstatus_names); |
| 436 | nouveau_print_bitfield_names(nstatus, nstatus_names_nv10); | 461 | else |
| 437 | printk("\n"); | 462 | nouveau_print_bitfield_names(nstatus, nstatus_names_nv10); |
| 463 | printk("\n"); | ||
| 464 | } | ||
| 438 | 465 | ||
| 439 | NV_INFO(dev, "%s - Ch %d/%d Class 0x%04x Mthd 0x%04x " | 466 | NV_INFO(dev, "%s - Ch %d/%d Class 0x%04x Mthd 0x%04x " |
| 440 | "Data 0x%08x:0x%08x\n", | 467 | "Data 0x%08x:0x%08x\n", |
| @@ -578,27 +605,502 @@ nouveau_pgraph_irq_handler(struct drm_device *dev) | |||
| 578 | } | 605 | } |
| 579 | 606 | ||
| 580 | static void | 607 | static void |
| 608 | nv50_pfb_vm_trap(struct drm_device *dev, int display, const char *name) | ||
| 609 | { | ||
| 610 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 611 | uint32_t trap[6]; | ||
| 612 | int i, ch; | ||
| 613 | uint32_t idx = nv_rd32(dev, 0x100c90); | ||
| 614 | if (idx & 0x80000000) { | ||
| 615 | idx &= 0xffffff; | ||
| 616 | if (display) { | ||
| 617 | for (i = 0; i < 6; i++) { | ||
| 618 | nv_wr32(dev, 0x100c90, idx | i << 24); | ||
| 619 | trap[i] = nv_rd32(dev, 0x100c94); | ||
| 620 | } | ||
| 621 | for (ch = 0; ch < dev_priv->engine.fifo.channels; ch++) { | ||
| 622 | struct nouveau_channel *chan = dev_priv->fifos[ch]; | ||
| 623 | |||
| 624 | if (!chan || !chan->ramin) | ||
| 625 | continue; | ||
| 626 | |||
| 627 | if (trap[1] == chan->ramin->instance >> 12) | ||
| 628 | break; | ||
| 629 | } | ||
| 630 | NV_INFO(dev, "%s - VM: Trapped %s at %02x%04x%04x status %08x %08x channel %d\n", | ||
| 631 | name, (trap[5]&0x100?"read":"write"), | ||
| 632 | trap[5]&0xff, trap[4]&0xffff, | ||
| 633 | trap[3]&0xffff, trap[0], trap[2], ch); | ||
| 634 | } | ||
| 635 | nv_wr32(dev, 0x100c90, idx | 0x80000000); | ||
| 636 | } else if (display) { | ||
| 637 | NV_INFO(dev, "%s - no VM fault?\n", name); | ||
| 638 | } | ||
| 639 | } | ||
| 640 | |||
| 641 | static struct nouveau_enum_names nv50_mp_exec_error_names[] = | ||
| 642 | { | ||
| 643 | { 3, "STACK_UNDERFLOW" }, | ||
| 644 | { 4, "QUADON_ACTIVE" }, | ||
| 645 | { 8, "TIMEOUT" }, | ||
| 646 | { 0x10, "INVALID_OPCODE" }, | ||
| 647 | { 0x40, "BREAKPOINT" }, | ||
| 648 | }; | ||
| 649 | |||
| 650 | static void | ||
| 651 | nv50_pgraph_mp_trap(struct drm_device *dev, int tpid, int display) | ||
| 652 | { | ||
| 653 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 654 | uint32_t units = nv_rd32(dev, 0x1540); | ||
| 655 | uint32_t addr, mp10, status, pc, oplow, ophigh; | ||
| 656 | int i; | ||
| 657 | int mps = 0; | ||
| 658 | for (i = 0; i < 4; i++) { | ||
| 659 | if (!(units & 1 << (i+24))) | ||
| 660 | continue; | ||
| 661 | if (dev_priv->chipset < 0xa0) | ||
| 662 | addr = 0x408200 + (tpid << 12) + (i << 7); | ||
| 663 | else | ||
| 664 | addr = 0x408100 + (tpid << 11) + (i << 7); | ||
| 665 | mp10 = nv_rd32(dev, addr + 0x10); | ||
| 666 | status = nv_rd32(dev, addr + 0x14); | ||
| 667 | if (!status) | ||
| 668 | continue; | ||
| 669 | if (display) { | ||
| 670 | nv_rd32(dev, addr + 0x20); | ||
| 671 | pc = nv_rd32(dev, addr + 0x24); | ||
| 672 | oplow = nv_rd32(dev, addr + 0x70); | ||
| 673 | ophigh= nv_rd32(dev, addr + 0x74); | ||
| 674 | NV_INFO(dev, "PGRAPH_TRAP_MP_EXEC - " | ||
| 675 | "TP %d MP %d: ", tpid, i); | ||
| 676 | nouveau_print_enum_names(status, | ||
| 677 | nv50_mp_exec_error_names); | ||
| 678 | printk(" at %06x warp %d, opcode %08x %08x\n", | ||
| 679 | pc&0xffffff, pc >> 24, | ||
| 680 | oplow, ophigh); | ||
| 681 | } | ||
| 682 | nv_wr32(dev, addr + 0x10, mp10); | ||
| 683 | nv_wr32(dev, addr + 0x14, 0); | ||
| 684 | mps++; | ||
| 685 | } | ||
| 686 | if (!mps && display) | ||
| 687 | NV_INFO(dev, "PGRAPH_TRAP_MP_EXEC - TP %d: " | ||
| 688 | "No MPs claiming errors?\n", tpid); | ||
| 689 | } | ||
| 690 | |||
| 691 | static void | ||
| 692 | nv50_pgraph_tp_trap(struct drm_device *dev, int type, uint32_t ustatus_old, | ||
| 693 | uint32_t ustatus_new, int display, const char *name) | ||
| 694 | { | ||
| 695 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 696 | int tps = 0; | ||
| 697 | uint32_t units = nv_rd32(dev, 0x1540); | ||
| 698 | int i, r; | ||
| 699 | uint32_t ustatus_addr, ustatus; | ||
| 700 | for (i = 0; i < 16; i++) { | ||
| 701 | if (!(units & (1 << i))) | ||
| 702 | continue; | ||
| 703 | if (dev_priv->chipset < 0xa0) | ||
| 704 | ustatus_addr = ustatus_old + (i << 12); | ||
| 705 | else | ||
| 706 | ustatus_addr = ustatus_new + (i << 11); | ||
| 707 | ustatus = nv_rd32(dev, ustatus_addr) & 0x7fffffff; | ||
| 708 | if (!ustatus) | ||
| 709 | continue; | ||
| 710 | tps++; | ||
| 711 | switch (type) { | ||
| 712 | case 6: /* texture error... unknown for now */ | ||
| 713 | nv50_pfb_vm_trap(dev, display, name); | ||
| 714 | if (display) { | ||
| 715 | NV_ERROR(dev, "magic set %d:\n", i); | ||
| 716 | for (r = ustatus_addr + 4; r <= ustatus_addr + 0x10; r += 4) | ||
| 717 | NV_ERROR(dev, "\t0x%08x: 0x%08x\n", r, | ||
| 718 | nv_rd32(dev, r)); | ||
| 719 | } | ||
| 720 | break; | ||
| 721 | case 7: /* MP error */ | ||
| 722 | if (ustatus & 0x00010000) { | ||
| 723 | nv50_pgraph_mp_trap(dev, i, display); | ||
| 724 | ustatus &= ~0x00010000; | ||
| 725 | } | ||
| 726 | break; | ||
| 727 | case 8: /* TPDMA error */ | ||
| 728 | { | ||
| 729 | uint32_t e0c = nv_rd32(dev, ustatus_addr + 4); | ||
| 730 | uint32_t e10 = nv_rd32(dev, ustatus_addr + 8); | ||
| 731 | uint32_t e14 = nv_rd32(dev, ustatus_addr + 0xc); | ||
| 732 | uint32_t e18 = nv_rd32(dev, ustatus_addr + 0x10); | ||
| 733 | uint32_t e1c = nv_rd32(dev, ustatus_addr + 0x14); | ||
| 734 | uint32_t e20 = nv_rd32(dev, ustatus_addr + 0x18); | ||
| 735 | uint32_t e24 = nv_rd32(dev, ustatus_addr + 0x1c); | ||
| 736 | nv50_pfb_vm_trap(dev, display, name); | ||
| 737 | /* 2d engine destination */ | ||
| 738 | if (ustatus & 0x00000010) { | ||
| 739 | if (display) { | ||
| 740 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA_2D - TP %d - Unknown fault at address %02x%08x\n", | ||
| 741 | i, e14, e10); | ||
| 742 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA_2D - TP %d - e0c: %08x, e18: %08x, e1c: %08x, e20: %08x, e24: %08x\n", | ||
| 743 | i, e0c, e18, e1c, e20, e24); | ||
| 744 | } | ||
| 745 | ustatus &= ~0x00000010; | ||
| 746 | } | ||
| 747 | /* Render target */ | ||
| 748 | if (ustatus & 0x00000040) { | ||
| 749 | if (display) { | ||
| 750 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA_RT - TP %d - Unknown fault at address %02x%08x\n", | ||
| 751 | i, e14, e10); | ||
| 752 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA_RT - TP %d - e0c: %08x, e18: %08x, e1c: %08x, e20: %08x, e24: %08x\n", | ||
| 753 | i, e0c, e18, e1c, e20, e24); | ||
| 754 | } | ||
| 755 | ustatus &= ~0x00000040; | ||
| 756 | } | ||
| 757 | /* CUDA memory: l[], g[] or stack. */ | ||
| 758 | if (ustatus & 0x00000080) { | ||
| 759 | if (display) { | ||
| 760 | if (e18 & 0x80000000) { | ||
| 761 | /* g[] read fault? */ | ||
| 762 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA - TP %d - Global read fault at address %02x%08x\n", | ||
| 763 | i, e14, e10 | ((e18 >> 24) & 0x1f)); | ||
| 764 | e18 &= ~0x1f000000; | ||
| 765 | } else if (e18 & 0xc) { | ||
| 766 | /* g[] write fault? */ | ||
| 767 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA - TP %d - Global write fault at address %02x%08x\n", | ||
| 768 | i, e14, e10 | ((e18 >> 7) & 0x1f)); | ||
| 769 | e18 &= ~0x00000f80; | ||
| 770 | } else { | ||
| 771 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA - TP %d - Unknown CUDA fault at address %02x%08x\n", | ||
| 772 | i, e14, e10); | ||
| 773 | } | ||
| 774 | NV_INFO(dev, "PGRAPH_TRAP_TPDMA - TP %d - e0c: %08x, e18: %08x, e1c: %08x, e20: %08x, e24: %08x\n", | ||
| 775 | i, e0c, e18, e1c, e20, e24); | ||
| 776 | } | ||
| 777 | ustatus &= ~0x00000080; | ||
| 778 | } | ||
| 779 | } | ||
| 780 | break; | ||
| 781 | } | ||
| 782 | if (ustatus) { | ||
| 783 | if (display) | ||
| 784 | NV_INFO(dev, "%s - TP%d: Unhandled ustatus 0x%08x\n", name, i, ustatus); | ||
| 785 | } | ||
| 786 | nv_wr32(dev, ustatus_addr, 0xc0000000); | ||
| 787 | } | ||
| 788 | |||
| 789 | if (!tps && display) | ||
| 790 | NV_INFO(dev, "%s - No TPs claiming errors?\n", name); | ||
| 791 | } | ||
| 792 | |||
| 793 | static void | ||
| 794 | nv50_pgraph_trap_handler(struct drm_device *dev) | ||
| 795 | { | ||
| 796 | struct nouveau_pgraph_trap trap; | ||
| 797 | uint32_t status = nv_rd32(dev, 0x400108); | ||
| 798 | uint32_t ustatus; | ||
| 799 | int display = nouveau_ratelimit(); | ||
| 800 | |||
| 801 | |||
| 802 | if (!status && display) { | ||
| 803 | nouveau_graph_trap_info(dev, &trap); | ||
| 804 | nouveau_graph_dump_trap_info(dev, "PGRAPH_TRAP", &trap); | ||
| 805 | NV_INFO(dev, "PGRAPH_TRAP - no units reporting traps?\n"); | ||
| 806 | } | ||
| 807 | |||
| 808 | /* DISPATCH: Relays commands to other units and handles NOTIFY, | ||
| 809 | * COND, QUERY. If you get a trap from it, the command is still stuck | ||
| 810 | * in DISPATCH and you need to do something about it. */ | ||
| 811 | if (status & 0x001) { | ||
| 812 | ustatus = nv_rd32(dev, 0x400804) & 0x7fffffff; | ||
| 813 | if (!ustatus && display) { | ||
| 814 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH - no ustatus?\n"); | ||
| 815 | } | ||
| 816 | |||
| 817 | /* Known to be triggered by screwed up NOTIFY and COND... */ | ||
| 818 | if (ustatus & 0x00000001) { | ||
| 819 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_DISPATCH_FAULT"); | ||
| 820 | nv_wr32(dev, 0x400500, 0); | ||
| 821 | if (nv_rd32(dev, 0x400808) & 0x80000000) { | ||
| 822 | if (display) { | ||
| 823 | if (nouveau_graph_trapped_channel(dev, &trap.channel)) | ||
| 824 | trap.channel = -1; | ||
| 825 | trap.class = nv_rd32(dev, 0x400814); | ||
| 826 | trap.mthd = nv_rd32(dev, 0x400808) & 0x1ffc; | ||
| 827 | trap.subc = (nv_rd32(dev, 0x400808) >> 16) & 0x7; | ||
| 828 | trap.data = nv_rd32(dev, 0x40080c); | ||
| 829 | trap.data2 = nv_rd32(dev, 0x400810); | ||
| 830 | nouveau_graph_dump_trap_info(dev, | ||
| 831 | "PGRAPH_TRAP_DISPATCH_FAULT", &trap); | ||
| 832 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH_FAULT - 400808: %08x\n", nv_rd32(dev, 0x400808)); | ||
| 833 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH_FAULT - 400848: %08x\n", nv_rd32(dev, 0x400848)); | ||
| 834 | } | ||
| 835 | nv_wr32(dev, 0x400808, 0); | ||
| 836 | } else if (display) { | ||
| 837 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH_FAULT - No stuck command?\n"); | ||
| 838 | } | ||
| 839 | nv_wr32(dev, 0x4008e8, nv_rd32(dev, 0x4008e8) & 3); | ||
| 840 | nv_wr32(dev, 0x400848, 0); | ||
| 841 | ustatus &= ~0x00000001; | ||
| 842 | } | ||
| 843 | if (ustatus & 0x00000002) { | ||
| 844 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_DISPATCH_QUERY"); | ||
| 845 | nv_wr32(dev, 0x400500, 0); | ||
| 846 | if (nv_rd32(dev, 0x40084c) & 0x80000000) { | ||
| 847 | if (display) { | ||
| 848 | if (nouveau_graph_trapped_channel(dev, &trap.channel)) | ||
| 849 | trap.channel = -1; | ||
| 850 | trap.class = nv_rd32(dev, 0x400814); | ||
| 851 | trap.mthd = nv_rd32(dev, 0x40084c) & 0x1ffc; | ||
| 852 | trap.subc = (nv_rd32(dev, 0x40084c) >> 16) & 0x7; | ||
| 853 | trap.data = nv_rd32(dev, 0x40085c); | ||
| 854 | trap.data2 = 0; | ||
| 855 | nouveau_graph_dump_trap_info(dev, | ||
| 856 | "PGRAPH_TRAP_DISPATCH_QUERY", &trap); | ||
| 857 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH_QUERY - 40084c: %08x\n", nv_rd32(dev, 0x40084c)); | ||
| 858 | } | ||
| 859 | nv_wr32(dev, 0x40084c, 0); | ||
| 860 | } else if (display) { | ||
| 861 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH_QUERY - No stuck command?\n"); | ||
| 862 | } | ||
| 863 | ustatus &= ~0x00000002; | ||
| 864 | } | ||
| 865 | if (ustatus && display) | ||
| 866 | NV_INFO(dev, "PGRAPH_TRAP_DISPATCH - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 867 | nv_wr32(dev, 0x400804, 0xc0000000); | ||
| 868 | nv_wr32(dev, 0x400108, 0x001); | ||
| 869 | status &= ~0x001; | ||
| 870 | } | ||
| 871 | |||
| 872 | /* TRAPs other than dispatch use the "normal" trap regs. */ | ||
| 873 | if (status && display) { | ||
| 874 | nouveau_graph_trap_info(dev, &trap); | ||
| 875 | nouveau_graph_dump_trap_info(dev, | ||
| 876 | "PGRAPH_TRAP", &trap); | ||
| 877 | } | ||
| 878 | |||
| 879 | /* M2MF: Memory to memory copy engine. */ | ||
| 880 | if (status & 0x002) { | ||
| 881 | ustatus = nv_rd32(dev, 0x406800) & 0x7fffffff; | ||
| 882 | if (!ustatus && display) { | ||
| 883 | NV_INFO(dev, "PGRAPH_TRAP_M2MF - no ustatus?\n"); | ||
| 884 | } | ||
| 885 | if (ustatus & 0x00000001) { | ||
| 886 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_M2MF_NOTIFY"); | ||
| 887 | ustatus &= ~0x00000001; | ||
| 888 | } | ||
| 889 | if (ustatus & 0x00000002) { | ||
| 890 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_M2MF_IN"); | ||
| 891 | ustatus &= ~0x00000002; | ||
| 892 | } | ||
| 893 | if (ustatus & 0x00000004) { | ||
| 894 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_M2MF_OUT"); | ||
| 895 | ustatus &= ~0x00000004; | ||
| 896 | } | ||
| 897 | NV_INFO (dev, "PGRAPH_TRAP_M2MF - %08x %08x %08x %08x\n", | ||
| 898 | nv_rd32(dev, 0x406804), | ||
| 899 | nv_rd32(dev, 0x406808), | ||
| 900 | nv_rd32(dev, 0x40680c), | ||
| 901 | nv_rd32(dev, 0x406810)); | ||
| 902 | if (ustatus && display) | ||
| 903 | NV_INFO(dev, "PGRAPH_TRAP_M2MF - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 904 | /* No sane way found yet -- just reset the bugger. */ | ||
| 905 | nv_wr32(dev, 0x400040, 2); | ||
| 906 | nv_wr32(dev, 0x400040, 0); | ||
| 907 | nv_wr32(dev, 0x406800, 0xc0000000); | ||
| 908 | nv_wr32(dev, 0x400108, 0x002); | ||
| 909 | status &= ~0x002; | ||
| 910 | } | ||
| 911 | |||
| 912 | /* VFETCH: Fetches data from vertex buffers. */ | ||
| 913 | if (status & 0x004) { | ||
| 914 | ustatus = nv_rd32(dev, 0x400c04) & 0x7fffffff; | ||
| 915 | if (!ustatus && display) { | ||
| 916 | NV_INFO(dev, "PGRAPH_TRAP_VFETCH - no ustatus?\n"); | ||
| 917 | } | ||
| 918 | if (ustatus & 0x00000001) { | ||
| 919 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_VFETCH_FAULT"); | ||
| 920 | NV_INFO (dev, "PGRAPH_TRAP_VFETCH_FAULT - %08x %08x %08x %08x\n", | ||
| 921 | nv_rd32(dev, 0x400c00), | ||
| 922 | nv_rd32(dev, 0x400c08), | ||
| 923 | nv_rd32(dev, 0x400c0c), | ||
| 924 | nv_rd32(dev, 0x400c10)); | ||
| 925 | ustatus &= ~0x00000001; | ||
| 926 | } | ||
| 927 | if (ustatus && display) | ||
| 928 | NV_INFO(dev, "PGRAPH_TRAP_VFETCH - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 929 | nv_wr32(dev, 0x400c04, 0xc0000000); | ||
| 930 | nv_wr32(dev, 0x400108, 0x004); | ||
| 931 | status &= ~0x004; | ||
| 932 | } | ||
| 933 | |||
| 934 | /* STRMOUT: DirectX streamout / OpenGL transform feedback. */ | ||
| 935 | if (status & 0x008) { | ||
| 936 | ustatus = nv_rd32(dev, 0x401800) & 0x7fffffff; | ||
| 937 | if (!ustatus && display) { | ||
| 938 | NV_INFO(dev, "PGRAPH_TRAP_STRMOUT - no ustatus?\n"); | ||
| 939 | } | ||
| 940 | if (ustatus & 0x00000001) { | ||
| 941 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_STRMOUT_FAULT"); | ||
| 942 | NV_INFO (dev, "PGRAPH_TRAP_STRMOUT_FAULT - %08x %08x %08x %08x\n", | ||
| 943 | nv_rd32(dev, 0x401804), | ||
| 944 | nv_rd32(dev, 0x401808), | ||
| 945 | nv_rd32(dev, 0x40180c), | ||
| 946 | nv_rd32(dev, 0x401810)); | ||
| 947 | ustatus &= ~0x00000001; | ||
| 948 | } | ||
| 949 | if (ustatus && display) | ||
| 950 | NV_INFO(dev, "PGRAPH_TRAP_STRMOUT - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 951 | /* No sane way found yet -- just reset the bugger. */ | ||
| 952 | nv_wr32(dev, 0x400040, 0x80); | ||
| 953 | nv_wr32(dev, 0x400040, 0); | ||
| 954 | nv_wr32(dev, 0x401800, 0xc0000000); | ||
| 955 | nv_wr32(dev, 0x400108, 0x008); | ||
| 956 | status &= ~0x008; | ||
| 957 | } | ||
| 958 | |||
| 959 | /* CCACHE: Handles code and c[] caches and fills them. */ | ||
| 960 | if (status & 0x010) { | ||
| 961 | ustatus = nv_rd32(dev, 0x405018) & 0x7fffffff; | ||
| 962 | if (!ustatus && display) { | ||
| 963 | NV_INFO(dev, "PGRAPH_TRAP_CCACHE - no ustatus?\n"); | ||
| 964 | } | ||
| 965 | if (ustatus & 0x00000001) { | ||
| 966 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_CCACHE_FAULT"); | ||
| 967 | NV_INFO (dev, "PGRAPH_TRAP_CCACHE_FAULT - %08x %08x %08x %08x %08x %08x %08x\n", | ||
| 968 | nv_rd32(dev, 0x405800), | ||
| 969 | nv_rd32(dev, 0x405804), | ||
| 970 | nv_rd32(dev, 0x405808), | ||
| 971 | nv_rd32(dev, 0x40580c), | ||
| 972 | nv_rd32(dev, 0x405810), | ||
| 973 | nv_rd32(dev, 0x405814), | ||
| 974 | nv_rd32(dev, 0x40581c)); | ||
| 975 | ustatus &= ~0x00000001; | ||
| 976 | } | ||
| 977 | if (ustatus && display) | ||
| 978 | NV_INFO(dev, "PGRAPH_TRAP_CCACHE - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 979 | nv_wr32(dev, 0x405018, 0xc0000000); | ||
| 980 | nv_wr32(dev, 0x400108, 0x010); | ||
| 981 | status &= ~0x010; | ||
| 982 | } | ||
| 983 | |||
| 984 | /* Unknown, not seen yet... 0x402000 is the only trap status reg | ||
| 985 | * remaining, so try to handle it anyway. Perhaps related to that | ||
| 986 | * unknown DMA slot on tesla? */ | ||
| 987 | if (status & 0x20) { | ||
| 988 | nv50_pfb_vm_trap(dev, display, "PGRAPH_TRAP_UNKC04"); | ||
| 989 | ustatus = nv_rd32(dev, 0x402000) & 0x7fffffff; | ||
| 990 | if (display) | ||
| 991 | NV_INFO(dev, "PGRAPH_TRAP_UNKC04 - Unhandled ustatus 0x%08x\n", ustatus); | ||
| 992 | nv_wr32(dev, 0x402000, 0xc0000000); | ||
| 993 | /* no status modifiction on purpose */ | ||
| 994 | } | ||
| 995 | |||
| 996 | /* TEXTURE: CUDA texturing units */ | ||
| 997 | if (status & 0x040) { | ||
| 998 | nv50_pgraph_tp_trap (dev, 6, 0x408900, 0x408600, display, | ||
| 999 | "PGRAPH_TRAP_TEXTURE"); | ||
| 1000 | nv_wr32(dev, 0x400108, 0x040); | ||
| 1001 | status &= ~0x040; | ||
| 1002 | } | ||
| 1003 | |||
| 1004 | /* MP: CUDA execution engines. */ | ||
| 1005 | if (status & 0x080) { | ||
| 1006 | nv50_pgraph_tp_trap (dev, 7, 0x408314, 0x40831c, display, | ||
| 1007 | "PGRAPH_TRAP_MP"); | ||
| 1008 | nv_wr32(dev, 0x400108, 0x080); | ||
| 1009 | status &= ~0x080; | ||
| 1010 | } | ||
| 1011 | |||
| 1012 | /* TPDMA: Handles TP-initiated uncached memory accesses: | ||
| 1013 | * l[], g[], stack, 2d surfaces, render targets. */ | ||
| 1014 | if (status & 0x100) { | ||
| 1015 | nv50_pgraph_tp_trap (dev, 8, 0x408e08, 0x408708, display, | ||
| 1016 | "PGRAPH_TRAP_TPDMA"); | ||
| 1017 | nv_wr32(dev, 0x400108, 0x100); | ||
| 1018 | status &= ~0x100; | ||
| 1019 | } | ||
| 1020 | |||
| 1021 | if (status) { | ||
| 1022 | if (display) | ||
| 1023 | NV_INFO(dev, "PGRAPH_TRAP - Unknown trap 0x%08x\n", | ||
| 1024 | status); | ||
| 1025 | nv_wr32(dev, 0x400108, status); | ||
| 1026 | } | ||
| 1027 | } | ||
| 1028 | |||
| 1029 | /* There must be a *lot* of these. Will take some time to gather them up. */ | ||
| 1030 | static struct nouveau_enum_names nv50_data_error_names[] = | ||
| 1031 | { | ||
| 1032 | { 4, "INVALID_VALUE" }, | ||
| 1033 | { 5, "INVALID_ENUM" }, | ||
| 1034 | { 8, "INVALID_OBJECT" }, | ||
| 1035 | { 0xc, "INVALID_BITFIELD" }, | ||
| 1036 | { 0x28, "MP_NO_REG_SPACE" }, | ||
| 1037 | { 0x2b, "MP_BLOCK_SIZE_MISMATCH" }, | ||
| 1038 | }; | ||
| 1039 | |||
| 1040 | static void | ||
| 581 | nv50_pgraph_irq_handler(struct drm_device *dev) | 1041 | nv50_pgraph_irq_handler(struct drm_device *dev) |
| 582 | { | 1042 | { |
| 1043 | struct nouveau_pgraph_trap trap; | ||
| 1044 | int unhandled = 0; | ||
| 583 | uint32_t status; | 1045 | uint32_t status; |
| 584 | 1046 | ||
| 585 | while ((status = nv_rd32(dev, NV03_PGRAPH_INTR))) { | 1047 | while ((status = nv_rd32(dev, NV03_PGRAPH_INTR))) { |
| 586 | uint32_t nsource = nv_rd32(dev, NV03_PGRAPH_NSOURCE); | 1048 | /* NOTIFY: You've set a NOTIFY an a command and it's done. */ |
| 587 | |||
| 588 | if (status & 0x00000001) { | 1049 | if (status & 0x00000001) { |
| 589 | nouveau_pgraph_intr_notify(dev, nsource); | 1050 | nouveau_graph_trap_info(dev, &trap); |
| 1051 | if (nouveau_ratelimit()) | ||
| 1052 | nouveau_graph_dump_trap_info(dev, | ||
| 1053 | "PGRAPH_NOTIFY", &trap); | ||
| 590 | status &= ~0x00000001; | 1054 | status &= ~0x00000001; |
| 591 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000001); | 1055 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000001); |
| 592 | } | 1056 | } |
| 593 | 1057 | ||
| 594 | if (status & 0x00000010) { | 1058 | /* COMPUTE_QUERY: Purpose and exact cause unknown, happens |
| 595 | nouveau_pgraph_intr_error(dev, nsource | | 1059 | * when you write 0x200 to 0x50c0 method 0x31c. */ |
| 596 | NV03_PGRAPH_NSOURCE_ILLEGAL_MTHD); | 1060 | if (status & 0x00000002) { |
| 1061 | nouveau_graph_trap_info(dev, &trap); | ||
| 1062 | if (nouveau_ratelimit()) | ||
| 1063 | nouveau_graph_dump_trap_info(dev, | ||
| 1064 | "PGRAPH_COMPUTE_QUERY", &trap); | ||
| 1065 | status &= ~0x00000002; | ||
| 1066 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000002); | ||
| 1067 | } | ||
| 597 | 1068 | ||
| 1069 | /* Unknown, never seen: 0x4 */ | ||
| 1070 | |||
| 1071 | /* ILLEGAL_MTHD: You used a wrong method for this class. */ | ||
| 1072 | if (status & 0x00000010) { | ||
| 1073 | nouveau_graph_trap_info(dev, &trap); | ||
| 1074 | if (nouveau_pgraph_intr_swmthd(dev, &trap)) | ||
| 1075 | unhandled = 1; | ||
| 1076 | if (unhandled && nouveau_ratelimit()) | ||
| 1077 | nouveau_graph_dump_trap_info(dev, | ||
| 1078 | "PGRAPH_ILLEGAL_MTHD", &trap); | ||
| 598 | status &= ~0x00000010; | 1079 | status &= ~0x00000010; |
| 599 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000010); | 1080 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000010); |
| 600 | } | 1081 | } |
| 601 | 1082 | ||
| 1083 | /* ILLEGAL_CLASS: You used a wrong class. */ | ||
| 1084 | if (status & 0x00000020) { | ||
| 1085 | nouveau_graph_trap_info(dev, &trap); | ||
| 1086 | if (nouveau_ratelimit()) | ||
| 1087 | nouveau_graph_dump_trap_info(dev, | ||
| 1088 | "PGRAPH_ILLEGAL_CLASS", &trap); | ||
| 1089 | status &= ~0x00000020; | ||
| 1090 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000020); | ||
| 1091 | } | ||
| 1092 | |||
| 1093 | /* DOUBLE_NOTIFY: You tried to set a NOTIFY on another NOTIFY. */ | ||
| 1094 | if (status & 0x00000040) { | ||
| 1095 | nouveau_graph_trap_info(dev, &trap); | ||
| 1096 | if (nouveau_ratelimit()) | ||
| 1097 | nouveau_graph_dump_trap_info(dev, | ||
| 1098 | "PGRAPH_DOUBLE_NOTIFY", &trap); | ||
| 1099 | status &= ~0x00000040; | ||
| 1100 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00000040); | ||
| 1101 | } | ||
| 1102 | |||
| 1103 | /* CONTEXT_SWITCH: PGRAPH needs us to load a new context */ | ||
| 602 | if (status & 0x00001000) { | 1104 | if (status & 0x00001000) { |
| 603 | nv_wr32(dev, 0x400500, 0x00000000); | 1105 | nv_wr32(dev, 0x400500, 0x00000000); |
| 604 | nv_wr32(dev, NV03_PGRAPH_INTR, | 1106 | nv_wr32(dev, NV03_PGRAPH_INTR, |
| @@ -613,49 +1115,59 @@ nv50_pgraph_irq_handler(struct drm_device *dev) | |||
| 613 | status &= ~NV_PGRAPH_INTR_CONTEXT_SWITCH; | 1115 | status &= ~NV_PGRAPH_INTR_CONTEXT_SWITCH; |
| 614 | } | 1116 | } |
| 615 | 1117 | ||
| 616 | if (status & 0x00100000) { | 1118 | /* BUFFER_NOTIFY: Your m2mf transfer finished */ |
| 617 | nouveau_pgraph_intr_error(dev, nsource | | 1119 | if (status & 0x00010000) { |
| 618 | NV03_PGRAPH_NSOURCE_DATA_ERROR); | 1120 | nouveau_graph_trap_info(dev, &trap); |
| 1121 | if (nouveau_ratelimit()) | ||
| 1122 | nouveau_graph_dump_trap_info(dev, | ||
| 1123 | "PGRAPH_BUFFER_NOTIFY", &trap); | ||
| 1124 | status &= ~0x00010000; | ||
| 1125 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00010000); | ||
| 1126 | } | ||
| 619 | 1127 | ||
| 1128 | /* DATA_ERROR: Invalid value for this method, or invalid | ||
| 1129 | * state in current PGRAPH context for this operation */ | ||
| 1130 | if (status & 0x00100000) { | ||
| 1131 | nouveau_graph_trap_info(dev, &trap); | ||
| 1132 | if (nouveau_ratelimit()) { | ||
| 1133 | nouveau_graph_dump_trap_info(dev, | ||
| 1134 | "PGRAPH_DATA_ERROR", &trap); | ||
| 1135 | NV_INFO (dev, "PGRAPH_DATA_ERROR - "); | ||
| 1136 | nouveau_print_enum_names(nv_rd32(dev, 0x400110), | ||
| 1137 | nv50_data_error_names); | ||
| 1138 | printk("\n"); | ||
| 1139 | } | ||
| 620 | status &= ~0x00100000; | 1140 | status &= ~0x00100000; |
| 621 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00100000); | 1141 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00100000); |
| 622 | } | 1142 | } |
| 623 | 1143 | ||
| 1144 | /* TRAP: Something bad happened in the middle of command | ||
| 1145 | * execution. Has a billion types, subtypes, and even | ||
| 1146 | * subsubtypes. */ | ||
| 624 | if (status & 0x00200000) { | 1147 | if (status & 0x00200000) { |
| 625 | int r; | 1148 | nv50_pgraph_trap_handler(dev); |
| 626 | |||
| 627 | nouveau_pgraph_intr_error(dev, nsource | | ||
| 628 | NV03_PGRAPH_NSOURCE_PROTECTION_ERROR); | ||
| 629 | |||
| 630 | NV_ERROR(dev, "magic set 1:\n"); | ||
| 631 | for (r = 0x408900; r <= 0x408910; r += 4) | ||
| 632 | NV_ERROR(dev, "\t0x%08x: 0x%08x\n", r, | ||
| 633 | nv_rd32(dev, r)); | ||
| 634 | nv_wr32(dev, 0x408900, | ||
| 635 | nv_rd32(dev, 0x408904) | 0xc0000000); | ||
| 636 | for (r = 0x408e08; r <= 0x408e24; r += 4) | ||
| 637 | NV_ERROR(dev, "\t0x%08x: 0x%08x\n", r, | ||
| 638 | nv_rd32(dev, r)); | ||
| 639 | nv_wr32(dev, 0x408e08, | ||
| 640 | nv_rd32(dev, 0x408e08) | 0xc0000000); | ||
| 641 | |||
| 642 | NV_ERROR(dev, "magic set 2:\n"); | ||
| 643 | for (r = 0x409900; r <= 0x409910; r += 4) | ||
| 644 | NV_ERROR(dev, "\t0x%08x: 0x%08x\n", r, | ||
| 645 | nv_rd32(dev, r)); | ||
| 646 | nv_wr32(dev, 0x409900, | ||
| 647 | nv_rd32(dev, 0x409904) | 0xc0000000); | ||
| 648 | for (r = 0x409e08; r <= 0x409e24; r += 4) | ||
| 649 | NV_ERROR(dev, "\t0x%08x: 0x%08x\n", r, | ||
| 650 | nv_rd32(dev, r)); | ||
| 651 | nv_wr32(dev, 0x409e08, | ||
| 652 | nv_rd32(dev, 0x409e08) | 0xc0000000); | ||
| 653 | |||
| 654 | status &= ~0x00200000; | 1149 | status &= ~0x00200000; |
| 655 | nv_wr32(dev, NV03_PGRAPH_NSOURCE, nsource); | ||
| 656 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00200000); | 1150 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x00200000); |
| 657 | } | 1151 | } |
| 658 | 1152 | ||
| 1153 | /* Unknown, never seen: 0x00400000 */ | ||
| 1154 | |||
| 1155 | /* SINGLE_STEP: Happens on every method if you turned on | ||
| 1156 | * single stepping in 40008c */ | ||
| 1157 | if (status & 0x01000000) { | ||
| 1158 | nouveau_graph_trap_info(dev, &trap); | ||
| 1159 | if (nouveau_ratelimit()) | ||
| 1160 | nouveau_graph_dump_trap_info(dev, | ||
| 1161 | "PGRAPH_SINGLE_STEP", &trap); | ||
| 1162 | status &= ~0x01000000; | ||
| 1163 | nv_wr32(dev, NV03_PGRAPH_INTR, 0x01000000); | ||
| 1164 | } | ||
| 1165 | |||
| 1166 | /* 0x02000000 happens when you pause a ctxprog... | ||
| 1167 | * but the only way this can happen that I know is by | ||
| 1168 | * poking the relevant MMIO register, and we don't | ||
| 1169 | * do that. */ | ||
| 1170 | |||
| 659 | if (status) { | 1171 | if (status) { |
| 660 | NV_INFO(dev, "Unhandled PGRAPH_INTR - 0x%08x\n", | 1172 | NV_INFO(dev, "Unhandled PGRAPH_INTR - 0x%08x\n", |
| 661 | status); | 1173 | status); |
| @@ -672,7 +1184,8 @@ nv50_pgraph_irq_handler(struct drm_device *dev) | |||
| 672 | } | 1184 | } |
| 673 | 1185 | ||
| 674 | nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PGRAPH_PENDING); | 1186 | nv_wr32(dev, NV03_PMC_INTR_0, NV_PMC_INTR_0_PGRAPH_PENDING); |
| 675 | nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31)); | 1187 | if (nv_rd32(dev, 0x400824) & (1 << 31)) |
| 1188 | nv_wr32(dev, 0x400824, nv_rd32(dev, 0x400824) & ~(1 << 31)); | ||
| 676 | } | 1189 | } |
| 677 | 1190 | ||
| 678 | static void | 1191 | static void |
diff --git a/drivers/gpu/drm/nouveau/nouveau_sgdma.c b/drivers/gpu/drm/nouveau/nouveau_sgdma.c index ed1590577b6c..86785b8d42ed 100644 --- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c +++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include "drmP.h" | 1 | #include "drmP.h" |
| 2 | #include "nouveau_drv.h" | 2 | #include "nouveau_drv.h" |
| 3 | #include <linux/pagemap.h> | 3 | #include <linux/pagemap.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | 5 | ||
| 5 | #define NV_CTXDMA_PAGE_SHIFT 12 | 6 | #define NV_CTXDMA_PAGE_SHIFT 12 |
| 6 | #define NV_CTXDMA_PAGE_SIZE (1 << NV_CTXDMA_PAGE_SHIFT) | 7 | #define NV_CTXDMA_PAGE_SIZE (1 << NV_CTXDMA_PAGE_SHIFT) |
diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c index eb8f084d5f53..10656a6be8e6 100644 --- a/drivers/gpu/drm/nouveau/nouveau_state.c +++ b/drivers/gpu/drm/nouveau/nouveau_state.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/swab.h> | 26 | #include <linux/swab.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "drmP.h" | 28 | #include "drmP.h" |
| 28 | #include "drm.h" | 29 | #include "drm.h" |
| 29 | #include "drm_sarea.h" | 30 | #include "drm_sarea.h" |
| @@ -35,7 +36,6 @@ | |||
| 35 | #include "nouveau_drm.h" | 36 | #include "nouveau_drm.h" |
| 36 | #include "nv50_display.h" | 37 | #include "nv50_display.h" |
| 37 | 38 | ||
| 38 | static int nouveau_stub_init(struct drm_device *dev) { return 0; } | ||
| 39 | static void nouveau_stub_takedown(struct drm_device *dev) {} | 39 | static void nouveau_stub_takedown(struct drm_device *dev) {} |
| 40 | 40 | ||
| 41 | static int nouveau_init_engine_ptrs(struct drm_device *dev) | 41 | static int nouveau_init_engine_ptrs(struct drm_device *dev) |
| @@ -277,8 +277,8 @@ static int nouveau_init_engine_ptrs(struct drm_device *dev) | |||
| 277 | engine->timer.init = nv04_timer_init; | 277 | engine->timer.init = nv04_timer_init; |
| 278 | engine->timer.read = nv04_timer_read; | 278 | engine->timer.read = nv04_timer_read; |
| 279 | engine->timer.takedown = nv04_timer_takedown; | 279 | engine->timer.takedown = nv04_timer_takedown; |
| 280 | engine->fb.init = nouveau_stub_init; | 280 | engine->fb.init = nv50_fb_init; |
| 281 | engine->fb.takedown = nouveau_stub_takedown; | 281 | engine->fb.takedown = nv50_fb_takedown; |
| 282 | engine->graph.grclass = nv50_graph_grclass; | 282 | engine->graph.grclass = nv50_graph_grclass; |
| 283 | engine->graph.init = nv50_graph_init; | 283 | engine->graph.init = nv50_graph_init; |
| 284 | engine->graph.takedown = nv50_graph_takedown; | 284 | engine->graph.takedown = nv50_graph_takedown; |
diff --git a/drivers/gpu/drm/nouveau/nv04_crtc.c b/drivers/gpu/drm/nouveau/nv04_crtc.c index a1d1ebb073d9..eba687f1099e 100644 --- a/drivers/gpu/drm/nouveau/nv04_crtc.c +++ b/drivers/gpu/drm/nouveau/nv04_crtc.c | |||
| @@ -230,9 +230,9 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode) | |||
| 230 | struct drm_framebuffer *fb = crtc->fb; | 230 | struct drm_framebuffer *fb = crtc->fb; |
| 231 | 231 | ||
| 232 | /* Calculate our timings */ | 232 | /* Calculate our timings */ |
| 233 | int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; | 233 | int horizDisplay = (mode->crtc_hdisplay >> 3) - 1; |
| 234 | int horizStart = (mode->crtc_hsync_start >> 3) - 1; | 234 | int horizStart = (mode->crtc_hsync_start >> 3) + 1; |
| 235 | int horizEnd = (mode->crtc_hsync_end >> 3) - 1; | 235 | int horizEnd = (mode->crtc_hsync_end >> 3) + 1; |
| 236 | int horizTotal = (mode->crtc_htotal >> 3) - 5; | 236 | int horizTotal = (mode->crtc_htotal >> 3) - 5; |
| 237 | int horizBlankStart = (mode->crtc_hdisplay >> 3) - 1; | 237 | int horizBlankStart = (mode->crtc_hdisplay >> 3) - 1; |
| 238 | int horizBlankEnd = (mode->crtc_htotal >> 3) - 1; | 238 | int horizBlankEnd = (mode->crtc_htotal >> 3) - 1; |
diff --git a/drivers/gpu/drm/nouveau/nv04_fbcon.c b/drivers/gpu/drm/nouveau/nv04_fbcon.c index 3da90c2c4e63..813b25cec726 100644 --- a/drivers/gpu/drm/nouveau/nv04_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv04_fbcon.c | |||
| @@ -118,8 +118,8 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) | |||
| 118 | return; | 118 | return; |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | width = ALIGN(image->width, 32); | 121 | width = ALIGN(image->width, 8); |
| 122 | dsize = (width * image->height) >> 5; | 122 | dsize = ALIGN(width * image->height, 32) >> 5; |
| 123 | 123 | ||
| 124 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || | 124 | if (info->fix.visual == FB_VISUAL_TRUECOLOR || |
| 125 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) { | 125 | info->fix.visual == FB_VISUAL_DIRECTCOLOR) { |
| @@ -136,8 +136,8 @@ nv04_fbcon_imageblit(struct fb_info *info, const struct fb_image *image) | |||
| 136 | ((image->dx + image->width) & 0xffff)); | 136 | ((image->dx + image->width) & 0xffff)); |
| 137 | OUT_RING(chan, bg); | 137 | OUT_RING(chan, bg); |
| 138 | OUT_RING(chan, fg); | 138 | OUT_RING(chan, fg); |
| 139 | OUT_RING(chan, (image->height << 16) | image->width); | ||
| 140 | OUT_RING(chan, (image->height << 16) | width); | 139 | OUT_RING(chan, (image->height << 16) | width); |
| 140 | OUT_RING(chan, (image->height << 16) | image->width); | ||
| 141 | OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff)); | 141 | OUT_RING(chan, (image->dy << 16) | (image->dx & 0xffff)); |
| 142 | 142 | ||
| 143 | while (dsize) { | 143 | while (dsize) { |
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c index 61a89f2dc553..fac6c88a2b1f 100644 --- a/drivers/gpu/drm/nouveau/nv50_display.c +++ b/drivers/gpu/drm/nouveau/nv50_display.c | |||
| @@ -522,8 +522,8 @@ int nv50_display_create(struct drm_device *dev) | |||
| 522 | } | 522 | } |
| 523 | 523 | ||
| 524 | for (i = 0 ; i < dcb->connector.entries; i++) { | 524 | for (i = 0 ; i < dcb->connector.entries; i++) { |
| 525 | if (i != 0 && dcb->connector.entry[i].index == | 525 | if (i != 0 && dcb->connector.entry[i].index2 == |
| 526 | dcb->connector.entry[i - 1].index) | 526 | dcb->connector.entry[i - 1].index2) |
| 527 | continue; | 527 | continue; |
| 528 | nouveau_connector_create(dev, &dcb->connector.entry[i]); | 528 | nouveau_connector_create(dev, &dcb->connector.entry[i]); |
| 529 | } | 529 | } |
diff --git a/drivers/gpu/drm/nouveau/nv50_fb.c b/drivers/gpu/drm/nouveau/nv50_fb.c new file mode 100644 index 000000000000..a95e6941ba88 --- /dev/null +++ b/drivers/gpu/drm/nouveau/nv50_fb.c | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | #include "drmP.h" | ||
| 2 | #include "drm.h" | ||
| 3 | #include "nouveau_drv.h" | ||
| 4 | #include "nouveau_drm.h" | ||
| 5 | |||
| 6 | int | ||
| 7 | nv50_fb_init(struct drm_device *dev) | ||
| 8 | { | ||
| 9 | /* This is needed to get meaningful information from 100c90 | ||
| 10 | * on traps. No idea what these values mean exactly. */ | ||
| 11 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 12 | |||
| 13 | switch (dev_priv->chipset) { | ||
| 14 | case 0x50: | ||
| 15 | nv_wr32(dev, 0x100c90, 0x0707ff); | ||
| 16 | break; | ||
| 17 | case 0xa5: | ||
| 18 | case 0xa8: | ||
| 19 | nv_wr32(dev, 0x100c90, 0x0d0fff); | ||
| 20 | break; | ||
| 21 | default: | ||
| 22 | nv_wr32(dev, 0x100c90, 0x1d07ff); | ||
| 23 | break; | ||
| 24 | } | ||
| 25 | |||
| 26 | return 0; | ||
| 27 | } | ||
| 28 | |||
| 29 | void | ||
| 30 | nv50_fb_takedown(struct drm_device *dev) | ||
| 31 | { | ||
| 32 | } | ||
diff --git a/drivers/gpu/drm/nouveau/nv50_fbcon.c b/drivers/gpu/drm/nouveau/nv50_fbcon.c index 993c7126fbde..25a3cd8794f9 100644 --- a/drivers/gpu/drm/nouveau/nv50_fbcon.c +++ b/drivers/gpu/drm/nouveau/nv50_fbcon.c | |||
| @@ -233,7 +233,7 @@ nv50_fbcon_accel_init(struct fb_info *info) | |||
| 233 | BEGIN_RING(chan, NvSub2D, 0x0808, 3); | 233 | BEGIN_RING(chan, NvSub2D, 0x0808, 3); |
| 234 | OUT_RING(chan, 0); | 234 | OUT_RING(chan, 0); |
| 235 | OUT_RING(chan, 0); | 235 | OUT_RING(chan, 0); |
| 236 | OUT_RING(chan, 0); | 236 | OUT_RING(chan, 1); |
| 237 | BEGIN_RING(chan, NvSub2D, 0x081c, 1); | 237 | BEGIN_RING(chan, NvSub2D, 0x081c, 1); |
| 238 | OUT_RING(chan, 1); | 238 | OUT_RING(chan, 1); |
| 239 | BEGIN_RING(chan, NvSub2D, 0x0840, 4); | 239 | BEGIN_RING(chan, NvSub2D, 0x0840, 4); |
diff --git a/drivers/gpu/drm/nouveau/nv50_graph.c b/drivers/gpu/drm/nouveau/nv50_graph.c index 857a09671a39..c62b33a02f88 100644 --- a/drivers/gpu/drm/nouveau/nv50_graph.c +++ b/drivers/gpu/drm/nouveau/nv50_graph.c | |||
| @@ -56,6 +56,10 @@ nv50_graph_init_intr(struct drm_device *dev) | |||
| 56 | static void | 56 | static void |
| 57 | nv50_graph_init_regs__nv(struct drm_device *dev) | 57 | nv50_graph_init_regs__nv(struct drm_device *dev) |
| 58 | { | 58 | { |
| 59 | struct drm_nouveau_private *dev_priv = dev->dev_private; | ||
| 60 | uint32_t units = nv_rd32(dev, 0x1540); | ||
| 61 | int i; | ||
| 62 | |||
| 59 | NV_DEBUG(dev, "\n"); | 63 | NV_DEBUG(dev, "\n"); |
| 60 | 64 | ||
| 61 | nv_wr32(dev, 0x400804, 0xc0000000); | 65 | nv_wr32(dev, 0x400804, 0xc0000000); |
| @@ -65,6 +69,20 @@ nv50_graph_init_regs__nv(struct drm_device *dev) | |||
| 65 | nv_wr32(dev, 0x405018, 0xc0000000); | 69 | nv_wr32(dev, 0x405018, 0xc0000000); |
| 66 | nv_wr32(dev, 0x402000, 0xc0000000); | 70 | nv_wr32(dev, 0x402000, 0xc0000000); |
| 67 | 71 | ||
| 72 | for (i = 0; i < 16; i++) { | ||
| 73 | if (units & 1 << i) { | ||
| 74 | if (dev_priv->chipset < 0xa0) { | ||
| 75 | nv_wr32(dev, 0x408900 + (i << 12), 0xc0000000); | ||
| 76 | nv_wr32(dev, 0x408e08 + (i << 12), 0xc0000000); | ||
| 77 | nv_wr32(dev, 0x408314 + (i << 12), 0xc0000000); | ||
| 78 | } else { | ||
| 79 | nv_wr32(dev, 0x408600 + (i << 11), 0xc0000000); | ||
| 80 | nv_wr32(dev, 0x408708 + (i << 11), 0xc0000000); | ||
| 81 | nv_wr32(dev, 0x40831c + (i << 11), 0xc0000000); | ||
| 82 | } | ||
| 83 | } | ||
| 84 | } | ||
| 85 | |||
| 68 | nv_wr32(dev, 0x400108, 0xffffffff); | 86 | nv_wr32(dev, 0x400108, 0xffffffff); |
| 69 | 87 | ||
| 70 | nv_wr32(dev, 0x400824, 0x00004000); | 88 | nv_wr32(dev, 0x400824, 0x00004000); |
| @@ -229,10 +247,6 @@ nv50_graph_create_context(struct nouveau_channel *chan) | |||
| 229 | nouveau_grctx_vals_load(dev, ctx); | 247 | nouveau_grctx_vals_load(dev, ctx); |
| 230 | } | 248 | } |
| 231 | nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12); | 249 | nv_wo32(dev, ctx, 0x00000/4, chan->ramin->instance >> 12); |
| 232 | if ((dev_priv->chipset & 0xf0) == 0xa0) | ||
| 233 | nv_wo32(dev, ctx, 0x00004/4, 0x00000000); | ||
| 234 | else | ||
| 235 | nv_wo32(dev, ctx, 0x0011c/4, 0x00000000); | ||
| 236 | dev_priv->engine.instmem.finish_access(dev); | 250 | dev_priv->engine.instmem.finish_access(dev); |
| 237 | 251 | ||
| 238 | return 0; | 252 | return 0; |
diff --git a/drivers/gpu/drm/nouveau/nv50_grctx.c b/drivers/gpu/drm/nouveau/nv50_grctx.c index d105fcd42ca0..546b31949a30 100644 --- a/drivers/gpu/drm/nouveau/nv50_grctx.c +++ b/drivers/gpu/drm/nouveau/nv50_grctx.c | |||
| @@ -64,6 +64,9 @@ | |||
| 64 | #define CP_FLAG_ALWAYS ((2 * 32) + 13) | 64 | #define CP_FLAG_ALWAYS ((2 * 32) + 13) |
| 65 | #define CP_FLAG_ALWAYS_FALSE 0 | 65 | #define CP_FLAG_ALWAYS_FALSE 0 |
| 66 | #define CP_FLAG_ALWAYS_TRUE 1 | 66 | #define CP_FLAG_ALWAYS_TRUE 1 |
| 67 | #define CP_FLAG_INTR ((2 * 32) + 15) | ||
| 68 | #define CP_FLAG_INTR_NOT_PENDING 0 | ||
| 69 | #define CP_FLAG_INTR_PENDING 1 | ||
| 67 | 70 | ||
| 68 | #define CP_CTX 0x00100000 | 71 | #define CP_CTX 0x00100000 |
| 69 | #define CP_CTX_COUNT 0x000f0000 | 72 | #define CP_CTX_COUNT 0x000f0000 |
| @@ -214,6 +217,8 @@ nv50_grctx_init(struct nouveau_grctx *ctx) | |||
| 214 | cp_name(ctx, cp_setup_save); | 217 | cp_name(ctx, cp_setup_save); |
| 215 | cp_set (ctx, UNK1D, SET); | 218 | cp_set (ctx, UNK1D, SET); |
| 216 | cp_wait(ctx, STATUS, BUSY); | 219 | cp_wait(ctx, STATUS, BUSY); |
| 220 | cp_wait(ctx, INTR, PENDING); | ||
| 221 | cp_bra (ctx, STATUS, BUSY, cp_setup_save); | ||
| 217 | cp_set (ctx, UNK01, SET); | 222 | cp_set (ctx, UNK01, SET); |
| 218 | cp_set (ctx, SWAP_DIRECTION, SAVE); | 223 | cp_set (ctx, SWAP_DIRECTION, SAVE); |
| 219 | 224 | ||
| @@ -269,7 +274,7 @@ nv50_graph_construct_mmio(struct nouveau_grctx *ctx) | |||
| 269 | int offset, base; | 274 | int offset, base; |
| 270 | uint32_t units = nv_rd32 (ctx->dev, 0x1540); | 275 | uint32_t units = nv_rd32 (ctx->dev, 0x1540); |
| 271 | 276 | ||
| 272 | /* 0800 */ | 277 | /* 0800: DISPATCH */ |
| 273 | cp_ctx(ctx, 0x400808, 7); | 278 | cp_ctx(ctx, 0x400808, 7); |
| 274 | gr_def(ctx, 0x400814, 0x00000030); | 279 | gr_def(ctx, 0x400814, 0x00000030); |
| 275 | cp_ctx(ctx, 0x400834, 0x32); | 280 | cp_ctx(ctx, 0x400834, 0x32); |
| @@ -300,7 +305,7 @@ nv50_graph_construct_mmio(struct nouveau_grctx *ctx) | |||
| 300 | gr_def(ctx, 0x400b20, 0x0001629d); | 305 | gr_def(ctx, 0x400b20, 0x0001629d); |
| 301 | } | 306 | } |
| 302 | 307 | ||
| 303 | /* 0C00 */ | 308 | /* 0C00: VFETCH */ |
| 304 | cp_ctx(ctx, 0x400c08, 0x2); | 309 | cp_ctx(ctx, 0x400c08, 0x2); |
| 305 | gr_def(ctx, 0x400c08, 0x0000fe0c); | 310 | gr_def(ctx, 0x400c08, 0x0000fe0c); |
| 306 | 311 | ||
| @@ -326,7 +331,7 @@ nv50_graph_construct_mmio(struct nouveau_grctx *ctx) | |||
| 326 | cp_ctx(ctx, 0x401540, 0x5); | 331 | cp_ctx(ctx, 0x401540, 0x5); |
| 327 | gr_def(ctx, 0x401550, 0x00001018); | 332 | gr_def(ctx, 0x401550, 0x00001018); |
| 328 | 333 | ||
| 329 | /* 1800 */ | 334 | /* 1800: STREAMOUT */ |
| 330 | cp_ctx(ctx, 0x401814, 0x1); | 335 | cp_ctx(ctx, 0x401814, 0x1); |
| 331 | gr_def(ctx, 0x401814, 0x000000ff); | 336 | gr_def(ctx, 0x401814, 0x000000ff); |
| 332 | if (dev_priv->chipset == 0x50) { | 337 | if (dev_priv->chipset == 0x50) { |
| @@ -641,7 +646,7 @@ nv50_graph_construct_mmio(struct nouveau_grctx *ctx) | |||
| 641 | if (dev_priv->chipset == 0x50) | 646 | if (dev_priv->chipset == 0x50) |
| 642 | cp_ctx(ctx, 0x4063e0, 0x1); | 647 | cp_ctx(ctx, 0x4063e0, 0x1); |
| 643 | 648 | ||
| 644 | /* 6800 */ | 649 | /* 6800: M2MF */ |
| 645 | if (dev_priv->chipset < 0x90) { | 650 | if (dev_priv->chipset < 0x90) { |
| 646 | cp_ctx(ctx, 0x406814, 0x2b); | 651 | cp_ctx(ctx, 0x406814, 0x2b); |
| 647 | gr_def(ctx, 0x406818, 0x00000f80); | 652 | gr_def(ctx, 0x406818, 0x00000f80); |
diff --git a/drivers/gpu/drm/r128/r128_cce.c b/drivers/gpu/drm/r128/r128_cce.c index 4c39a407aa4a..e671d0e74d4c 100644 --- a/drivers/gpu/drm/r128/r128_cce.c +++ b/drivers/gpu/drm/r128/r128_cce.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/firmware.h> | 32 | #include <linux/firmware.h> |
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include "drmP.h" | 36 | #include "drmP.h" |
| 36 | #include "drm.h" | 37 | #include "drm.h" |
diff --git a/drivers/gpu/drm/radeon/Makefile b/drivers/gpu/drm/radeon/Makefile index ed38262d9985..3c91312dea9a 100644 --- a/drivers/gpu/drm/radeon/Makefile +++ b/drivers/gpu/drm/radeon/Makefile | |||
| @@ -50,7 +50,7 @@ $(obj)/r600_cs.o: $(obj)/r600_reg_safe.h | |||
| 50 | radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \ | 50 | radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o \ |
| 51 | radeon_irq.o r300_cmdbuf.o r600_cp.o | 51 | radeon_irq.o r300_cmdbuf.o r600_cp.o |
| 52 | # add KMS driver | 52 | # add KMS driver |
| 53 | radeon-y += radeon_device.o radeon_kms.o \ | 53 | radeon-y += radeon_device.o radeon_asic.o radeon_kms.o \ |
| 54 | radeon_atombios.o radeon_agp.o atombios_crtc.o radeon_combios.o \ | 54 | radeon_atombios.o radeon_agp.o atombios_crtc.o radeon_combios.o \ |
| 55 | atom.o radeon_fence.o radeon_ttm.o radeon_object.o radeon_gart.o \ | 55 | atom.o radeon_fence.o radeon_ttm.o radeon_object.o radeon_gart.o \ |
| 56 | radeon_legacy_crtc.o radeon_legacy_encoders.o radeon_connectors.o \ | 56 | radeon_legacy_crtc.o radeon_legacy_encoders.o radeon_connectors.o \ |
diff --git a/drivers/gpu/drm/radeon/atom.c b/drivers/gpu/drm/radeon/atom.c index d75788feac6c..07b7ebf1f466 100644 --- a/drivers/gpu/drm/radeon/atom.c +++ b/drivers/gpu/drm/radeon/atom.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <asm/unaligned.h> | 28 | #include <asm/unaligned.h> |
| 28 | 29 | ||
| 29 | #define ATOM_DEBUG | 30 | #define ATOM_DEBUG |
| @@ -52,15 +53,17 @@ | |||
| 52 | 53 | ||
| 53 | typedef struct { | 54 | typedef struct { |
| 54 | struct atom_context *ctx; | 55 | struct atom_context *ctx; |
| 55 | |||
| 56 | uint32_t *ps, *ws; | 56 | uint32_t *ps, *ws; |
| 57 | int ps_shift; | 57 | int ps_shift; |
| 58 | uint16_t start; | 58 | uint16_t start; |
| 59 | unsigned last_jump; | ||
| 60 | unsigned long last_jump_jiffies; | ||
| 61 | bool abort; | ||
| 59 | } atom_exec_context; | 62 | } atom_exec_context; |
| 60 | 63 | ||
| 61 | int atom_debug = 0; | 64 | int atom_debug = 0; |
| 62 | static void atom_execute_table_locked(struct atom_context *ctx, int index, uint32_t * params); | 65 | static int atom_execute_table_locked(struct atom_context *ctx, int index, uint32_t * params); |
| 63 | void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params); | 66 | int atom_execute_table(struct atom_context *ctx, int index, uint32_t * params); |
| 64 | 67 | ||
| 65 | static uint32_t atom_arg_mask[8] = | 68 | static uint32_t atom_arg_mask[8] = |
| 66 | { 0xFFFFFFFF, 0xFFFF, 0xFFFF00, 0xFFFF0000, 0xFF, 0xFF00, 0xFF0000, | 69 | { 0xFFFFFFFF, 0xFFFF, 0xFFFF00, 0xFFFF0000, 0xFF, 0xFF00, 0xFF0000, |
| @@ -604,12 +607,17 @@ static void atom_op_beep(atom_exec_context *ctx, int *ptr, int arg) | |||
| 604 | static void atom_op_calltable(atom_exec_context *ctx, int *ptr, int arg) | 607 | static void atom_op_calltable(atom_exec_context *ctx, int *ptr, int arg) |
| 605 | { | 608 | { |
| 606 | int idx = U8((*ptr)++); | 609 | int idx = U8((*ptr)++); |
| 610 | int r = 0; | ||
| 611 | |||
| 607 | if (idx < ATOM_TABLE_NAMES_CNT) | 612 | if (idx < ATOM_TABLE_NAMES_CNT) |
| 608 | SDEBUG(" table: %d (%s)\n", idx, atom_table_names[idx]); | 613 | SDEBUG(" table: %d (%s)\n", idx, atom_table_names[idx]); |
| 609 | else | 614 | else |
| 610 | SDEBUG(" table: %d\n", idx); | 615 | SDEBUG(" table: %d\n", idx); |
| 611 | if (U16(ctx->ctx->cmd_table + 4 + 2 * idx)) | 616 | if (U16(ctx->ctx->cmd_table + 4 + 2 * idx)) |
| 612 | atom_execute_table_locked(ctx->ctx, idx, ctx->ps + ctx->ps_shift); | 617 | r = atom_execute_table_locked(ctx->ctx, idx, ctx->ps + ctx->ps_shift); |
| 618 | if (r) { | ||
| 619 | ctx->abort = true; | ||
| 620 | } | ||
| 613 | } | 621 | } |
| 614 | 622 | ||
| 615 | static void atom_op_clear(atom_exec_context *ctx, int *ptr, int arg) | 623 | static void atom_op_clear(atom_exec_context *ctx, int *ptr, int arg) |
| @@ -673,6 +681,8 @@ static void atom_op_eot(atom_exec_context *ctx, int *ptr, int arg) | |||
| 673 | static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) | 681 | static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) |
| 674 | { | 682 | { |
| 675 | int execute = 0, target = U16(*ptr); | 683 | int execute = 0, target = U16(*ptr); |
| 684 | unsigned long cjiffies; | ||
| 685 | |||
| 676 | (*ptr) += 2; | 686 | (*ptr) += 2; |
| 677 | switch (arg) { | 687 | switch (arg) { |
| 678 | case ATOM_COND_ABOVE: | 688 | case ATOM_COND_ABOVE: |
| @@ -700,8 +710,25 @@ static void atom_op_jump(atom_exec_context *ctx, int *ptr, int arg) | |||
| 700 | if (arg != ATOM_COND_ALWAYS) | 710 | if (arg != ATOM_COND_ALWAYS) |
| 701 | SDEBUG(" taken: %s\n", execute ? "yes" : "no"); | 711 | SDEBUG(" taken: %s\n", execute ? "yes" : "no"); |
| 702 | SDEBUG(" target: 0x%04X\n", target); | 712 | SDEBUG(" target: 0x%04X\n", target); |
| 703 | if (execute) | 713 | if (execute) { |
| 714 | if (ctx->last_jump == (ctx->start + target)) { | ||
| 715 | cjiffies = jiffies; | ||
| 716 | if (time_after(cjiffies, ctx->last_jump_jiffies)) { | ||
| 717 | cjiffies -= ctx->last_jump_jiffies; | ||
| 718 | if ((jiffies_to_msecs(cjiffies) > 1000)) { | ||
| 719 | DRM_ERROR("atombios stuck in loop for more than 1sec aborting\n"); | ||
| 720 | ctx->abort = true; | ||
| 721 | } | ||
| 722 | } else { | ||
| 723 | /* jiffies wrap around we will just wait a little longer */ | ||
| 724 | ctx->last_jump_jiffies = jiffies; | ||
| 725 | } | ||
| 726 | } else { | ||
| 727 | ctx->last_jump = ctx->start + target; | ||
| 728 | ctx->last_jump_jiffies = jiffies; | ||
| 729 | } | ||
| 704 | *ptr = ctx->start + target; | 730 | *ptr = ctx->start + target; |
| 731 | } | ||
| 705 | } | 732 | } |
| 706 | 733 | ||
| 707 | static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) | 734 | static void atom_op_mask(atom_exec_context *ctx, int *ptr, int arg) |
| @@ -1104,7 +1131,7 @@ static struct { | |||
| 1104 | atom_op_shr, ATOM_ARG_MC}, { | 1131 | atom_op_shr, ATOM_ARG_MC}, { |
| 1105 | atom_op_debug, 0},}; | 1132 | atom_op_debug, 0},}; |
| 1106 | 1133 | ||
| 1107 | static void atom_execute_table_locked(struct atom_context *ctx, int index, uint32_t * params) | 1134 | static int atom_execute_table_locked(struct atom_context *ctx, int index, uint32_t * params) |
| 1108 | { | 1135 | { |
| 1109 | int base = CU16(ctx->cmd_table + 4 + 2 * index); | 1136 | int base = CU16(ctx->cmd_table + 4 + 2 * index); |
| 1110 | int len, ws, ps, ptr; | 1137 | int len, ws, ps, ptr; |
| @@ -1112,7 +1139,7 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3 | |||
| 1112 | atom_exec_context ectx; | 1139 | atom_exec_context ectx; |
| 1113 | 1140 | ||
| 1114 | if (!base) | 1141 | if (!base) |
| 1115 | return; | 1142 | return -EINVAL; |
| 1116 | 1143 | ||
| 1117 | len = CU16(base + ATOM_CT_SIZE_PTR); | 1144 | len = CU16(base + ATOM_CT_SIZE_PTR); |
| 1118 | ws = CU8(base + ATOM_CT_WS_PTR); | 1145 | ws = CU8(base + ATOM_CT_WS_PTR); |
| @@ -1125,6 +1152,8 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3 | |||
| 1125 | ectx.ps_shift = ps / 4; | 1152 | ectx.ps_shift = ps / 4; |
| 1126 | ectx.start = base; | 1153 | ectx.start = base; |
| 1127 | ectx.ps = params; | 1154 | ectx.ps = params; |
| 1155 | ectx.abort = false; | ||
| 1156 | ectx.last_jump = 0; | ||
| 1128 | if (ws) | 1157 | if (ws) |
| 1129 | ectx.ws = kzalloc(4 * ws, GFP_KERNEL); | 1158 | ectx.ws = kzalloc(4 * ws, GFP_KERNEL); |
| 1130 | else | 1159 | else |
| @@ -1137,6 +1166,11 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3 | |||
| 1137 | SDEBUG("%s @ 0x%04X\n", atom_op_names[op], ptr - 1); | 1166 | SDEBUG("%s @ 0x%04X\n", atom_op_names[op], ptr - 1); |
| 1138 | else | 1167 | else |
| 1139 | SDEBUG("[%d] @ 0x%04X\n", op, ptr - 1); | 1168 | SDEBUG("[%d] @ 0x%04X\n", op, ptr - 1); |
| 1169 | if (ectx.abort) { | ||
| 1170 | DRM_ERROR("atombios stuck executing %04X (len %d, WS %d, PS %d) @ 0x%04X\n", | ||
| 1171 | base, len, ws, ps, ptr - 1); | ||
| 1172 | return -EINVAL; | ||
| 1173 | } | ||
| 1140 | 1174 | ||
| 1141 | if (op < ATOM_OP_CNT && op > 0) | 1175 | if (op < ATOM_OP_CNT && op > 0) |
| 1142 | opcode_table[op].func(&ectx, &ptr, | 1176 | opcode_table[op].func(&ectx, &ptr, |
| @@ -1152,10 +1186,13 @@ static void atom_execute_table_locked(struct atom_context *ctx, int index, uint3 | |||
| 1152 | 1186 | ||
| 1153 | if (ws) | 1187 | if (ws) |
| 1154 | kfree(ectx.ws); | 1188 | kfree(ectx.ws); |
| 1189 | return 0; | ||
| 1155 | } | 1190 | } |
| 1156 | 1191 | ||
| 1157 | void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params) | 1192 | int atom_execute_table(struct atom_context *ctx, int index, uint32_t * params) |
| 1158 | { | 1193 | { |
| 1194 | int r; | ||
| 1195 | |||
| 1159 | mutex_lock(&ctx->mutex); | 1196 | mutex_lock(&ctx->mutex); |
| 1160 | /* reset reg block */ | 1197 | /* reset reg block */ |
| 1161 | ctx->reg_block = 0; | 1198 | ctx->reg_block = 0; |
| @@ -1163,8 +1200,9 @@ void atom_execute_table(struct atom_context *ctx, int index, uint32_t * params) | |||
| 1163 | ctx->fb_base = 0; | 1200 | ctx->fb_base = 0; |
| 1164 | /* reset io mode */ | 1201 | /* reset io mode */ |
| 1165 | ctx->io_mode = ATOM_IO_MM; | 1202 | ctx->io_mode = ATOM_IO_MM; |
| 1166 | atom_execute_table_locked(ctx, index, params); | 1203 | r = atom_execute_table_locked(ctx, index, params); |
| 1167 | mutex_unlock(&ctx->mutex); | 1204 | mutex_unlock(&ctx->mutex); |
| 1205 | return r; | ||
| 1168 | } | 1206 | } |
| 1169 | 1207 | ||
| 1170 | static int atom_iio_len[] = { 1, 2, 3, 3, 3, 3, 4, 4, 4, 3 }; | 1208 | static int atom_iio_len[] = { 1, 2, 3, 3, 3, 3, 4, 4, 4, 3 }; |
| @@ -1248,9 +1286,7 @@ int atom_asic_init(struct atom_context *ctx) | |||
| 1248 | 1286 | ||
| 1249 | if (!CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_INIT)) | 1287 | if (!CU16(ctx->cmd_table + 4 + 2 * ATOM_CMD_INIT)) |
| 1250 | return 1; | 1288 | return 1; |
| 1251 | atom_execute_table(ctx, ATOM_CMD_INIT, ps); | 1289 | return atom_execute_table(ctx, ATOM_CMD_INIT, ps); |
| 1252 | |||
| 1253 | return 0; | ||
| 1254 | } | 1290 | } |
| 1255 | 1291 | ||
| 1256 | void atom_destroy(struct atom_context *ctx) | 1292 | void atom_destroy(struct atom_context *ctx) |
| @@ -1260,12 +1296,16 @@ void atom_destroy(struct atom_context *ctx) | |||
| 1260 | kfree(ctx); | 1296 | kfree(ctx); |
| 1261 | } | 1297 | } |
| 1262 | 1298 | ||
| 1263 | void atom_parse_data_header(struct atom_context *ctx, int index, | 1299 | bool atom_parse_data_header(struct atom_context *ctx, int index, |
| 1264 | uint16_t * size, uint8_t * frev, uint8_t * crev, | 1300 | uint16_t * size, uint8_t * frev, uint8_t * crev, |
| 1265 | uint16_t * data_start) | 1301 | uint16_t * data_start) |
| 1266 | { | 1302 | { |
| 1267 | int offset = index * 2 + 4; | 1303 | int offset = index * 2 + 4; |
| 1268 | int idx = CU16(ctx->data_table + offset); | 1304 | int idx = CU16(ctx->data_table + offset); |
| 1305 | u16 *mdt = (u16 *)(ctx->bios + ctx->data_table + 4); | ||
| 1306 | |||
| 1307 | if (!mdt[index]) | ||
| 1308 | return false; | ||
| 1269 | 1309 | ||
| 1270 | if (size) | 1310 | if (size) |
| 1271 | *size = CU16(idx); | 1311 | *size = CU16(idx); |
| @@ -1274,38 +1314,42 @@ void atom_parse_data_header(struct atom_context *ctx, int index, | |||
| 1274 | if (crev) | 1314 | if (crev) |
| 1275 | *crev = CU8(idx + 3); | 1315 | *crev = CU8(idx + 3); |
| 1276 | *data_start = idx; | 1316 | *data_start = idx; |
| 1277 | return; | 1317 | return true; |
| 1278 | } | 1318 | } |
| 1279 | 1319 | ||
| 1280 | void atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t * frev, | 1320 | bool atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t * frev, |
| 1281 | uint8_t * crev) | 1321 | uint8_t * crev) |
| 1282 | { | 1322 | { |
| 1283 | int offset = index * 2 + 4; | 1323 | int offset = index * 2 + 4; |
| 1284 | int idx = CU16(ctx->cmd_table + offset); | 1324 | int idx = CU16(ctx->cmd_table + offset); |
| 1325 | u16 *mct = (u16 *)(ctx->bios + ctx->cmd_table + 4); | ||
| 1326 | |||
| 1327 | if (!mct[index]) | ||
| 1328 | return false; | ||
| 1285 | 1329 | ||
| 1286 | if (frev) | 1330 | if (frev) |
| 1287 | *frev = CU8(idx + 2); | 1331 | *frev = CU8(idx + 2); |
| 1288 | if (crev) | 1332 | if (crev) |
| 1289 | *crev = CU8(idx + 3); | 1333 | *crev = CU8(idx + 3); |
| 1290 | return; | 1334 | return true; |
| 1291 | } | 1335 | } |
| 1292 | 1336 | ||
| 1293 | int atom_allocate_fb_scratch(struct atom_context *ctx) | 1337 | int atom_allocate_fb_scratch(struct atom_context *ctx) |
| 1294 | { | 1338 | { |
| 1295 | int index = GetIndexIntoMasterTable(DATA, VRAM_UsageByFirmware); | 1339 | int index = GetIndexIntoMasterTable(DATA, VRAM_UsageByFirmware); |
| 1296 | uint16_t data_offset; | 1340 | uint16_t data_offset; |
| 1297 | int usage_bytes; | 1341 | int usage_bytes = 0; |
| 1298 | struct _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware_usage; | 1342 | struct _ATOM_VRAM_USAGE_BY_FIRMWARE *firmware_usage; |
| 1299 | 1343 | ||
| 1300 | atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset); | 1344 | if (atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) { |
| 1345 | firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset); | ||
| 1301 | 1346 | ||
| 1302 | firmware_usage = (struct _ATOM_VRAM_USAGE_BY_FIRMWARE *)(ctx->bios + data_offset); | 1347 | DRM_DEBUG("atom firmware requested %08x %dkb\n", |
| 1348 | firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware, | ||
| 1349 | firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb); | ||
| 1303 | 1350 | ||
| 1304 | DRM_DEBUG("atom firmware requested %08x %dkb\n", | 1351 | usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024; |
| 1305 | firmware_usage->asFirmwareVramReserveInfo[0].ulStartAddrUsedByFirmware, | 1352 | } |
| 1306 | firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb); | ||
| 1307 | |||
| 1308 | usage_bytes = firmware_usage->asFirmwareVramReserveInfo[0].usFirmwareUseInKb * 1024; | ||
| 1309 | if (usage_bytes == 0) | 1353 | if (usage_bytes == 0) |
| 1310 | usage_bytes = 20 * 1024; | 1354 | usage_bytes = 20 * 1024; |
| 1311 | /* allocate some scratch memory */ | 1355 | /* allocate some scratch memory */ |
diff --git a/drivers/gpu/drm/radeon/atom.h b/drivers/gpu/drm/radeon/atom.h index bc73781423a1..cd1b64ab5ca7 100644 --- a/drivers/gpu/drm/radeon/atom.h +++ b/drivers/gpu/drm/radeon/atom.h | |||
| @@ -140,11 +140,13 @@ struct atom_context { | |||
| 140 | extern int atom_debug; | 140 | extern int atom_debug; |
| 141 | 141 | ||
| 142 | struct atom_context *atom_parse(struct card_info *, void *); | 142 | struct atom_context *atom_parse(struct card_info *, void *); |
| 143 | void atom_execute_table(struct atom_context *, int, uint32_t *); | 143 | int atom_execute_table(struct atom_context *, int, uint32_t *); |
| 144 | int atom_asic_init(struct atom_context *); | 144 | int atom_asic_init(struct atom_context *); |
| 145 | void atom_destroy(struct atom_context *); | 145 | void atom_destroy(struct atom_context *); |
| 146 | void atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size, uint8_t *frev, uint8_t *crev, uint16_t *data_start); | 146 | bool atom_parse_data_header(struct atom_context *ctx, int index, uint16_t *size, |
| 147 | void atom_parse_cmd_header(struct atom_context *ctx, int index, uint8_t *frev, uint8_t *crev); | 147 | uint8_t *frev, uint8_t *crev, uint16_t *data_start); |
| 148 | bool atom_parse_cmd_header(struct atom_context *ctx, int index, | ||
| 149 | uint8_t *frev, uint8_t *crev); | ||
| 148 | int atom_allocate_fb_scratch(struct atom_context *ctx); | 150 | int atom_allocate_fb_scratch(struct atom_context *ctx); |
| 149 | #include "atom-types.h" | 151 | #include "atom-types.h" |
| 150 | #include "atombios.h" | 152 | #include "atombios.h" |
diff --git a/drivers/gpu/drm/radeon/atombios_crtc.c b/drivers/gpu/drm/radeon/atombios_crtc.c index dd9fdf560611..fd4ef6d18849 100644 --- a/drivers/gpu/drm/radeon/atombios_crtc.c +++ b/drivers/gpu/drm/radeon/atombios_crtc.c | |||
| @@ -353,12 +353,55 @@ static void atombios_crtc_set_timing(struct drm_crtc *crtc, | |||
| 353 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | 353 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); |
| 354 | } | 354 | } |
| 355 | 355 | ||
| 356 | static void atombios_disable_ss(struct drm_crtc *crtc) | ||
| 357 | { | ||
| 358 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); | ||
| 359 | struct drm_device *dev = crtc->dev; | ||
| 360 | struct radeon_device *rdev = dev->dev_private; | ||
| 361 | u32 ss_cntl; | ||
| 362 | |||
| 363 | if (ASIC_IS_DCE4(rdev)) { | ||
| 364 | switch (radeon_crtc->pll_id) { | ||
| 365 | case ATOM_PPLL1: | ||
| 366 | ss_cntl = RREG32(EVERGREEN_P1PLL_SS_CNTL); | ||
| 367 | ss_cntl &= ~EVERGREEN_PxPLL_SS_EN; | ||
| 368 | WREG32(EVERGREEN_P1PLL_SS_CNTL, ss_cntl); | ||
| 369 | break; | ||
| 370 | case ATOM_PPLL2: | ||
| 371 | ss_cntl = RREG32(EVERGREEN_P2PLL_SS_CNTL); | ||
| 372 | ss_cntl &= ~EVERGREEN_PxPLL_SS_EN; | ||
| 373 | WREG32(EVERGREEN_P2PLL_SS_CNTL, ss_cntl); | ||
| 374 | break; | ||
| 375 | case ATOM_DCPLL: | ||
| 376 | case ATOM_PPLL_INVALID: | ||
| 377 | return; | ||
| 378 | } | ||
| 379 | } else if (ASIC_IS_AVIVO(rdev)) { | ||
| 380 | switch (radeon_crtc->pll_id) { | ||
| 381 | case ATOM_PPLL1: | ||
| 382 | ss_cntl = RREG32(AVIVO_P1PLL_INT_SS_CNTL); | ||
| 383 | ss_cntl &= ~1; | ||
| 384 | WREG32(AVIVO_P1PLL_INT_SS_CNTL, ss_cntl); | ||
| 385 | break; | ||
| 386 | case ATOM_PPLL2: | ||
| 387 | ss_cntl = RREG32(AVIVO_P2PLL_INT_SS_CNTL); | ||
| 388 | ss_cntl &= ~1; | ||
| 389 | WREG32(AVIVO_P2PLL_INT_SS_CNTL, ss_cntl); | ||
| 390 | break; | ||
| 391 | case ATOM_DCPLL: | ||
| 392 | case ATOM_PPLL_INVALID: | ||
| 393 | return; | ||
| 394 | } | ||
| 395 | } | ||
| 396 | } | ||
| 397 | |||
| 398 | |||
| 356 | union atom_enable_ss { | 399 | union atom_enable_ss { |
| 357 | ENABLE_LVDS_SS_PARAMETERS legacy; | 400 | ENABLE_LVDS_SS_PARAMETERS legacy; |
| 358 | ENABLE_SPREAD_SPECTRUM_ON_PPLL_PS_ALLOCATION v1; | 401 | ENABLE_SPREAD_SPECTRUM_ON_PPLL_PS_ALLOCATION v1; |
| 359 | }; | 402 | }; |
| 360 | 403 | ||
| 361 | static void atombios_set_ss(struct drm_crtc *crtc, int enable) | 404 | static void atombios_enable_ss(struct drm_crtc *crtc) |
| 362 | { | 405 | { |
| 363 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); | 406 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); |
| 364 | struct drm_device *dev = crtc->dev; | 407 | struct drm_device *dev = crtc->dev; |
| @@ -387,9 +430,9 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) | |||
| 387 | step = dig->ss->step; | 430 | step = dig->ss->step; |
| 388 | delay = dig->ss->delay; | 431 | delay = dig->ss->delay; |
| 389 | range = dig->ss->range; | 432 | range = dig->ss->range; |
| 390 | } else if (enable) | 433 | } else |
| 391 | return; | 434 | return; |
| 392 | } else if (enable) | 435 | } else |
| 393 | return; | 436 | return; |
| 394 | break; | 437 | break; |
| 395 | } | 438 | } |
| @@ -406,13 +449,13 @@ static void atombios_set_ss(struct drm_crtc *crtc, int enable) | |||
| 406 | args.v1.ucSpreadSpectrumDelay = delay; | 449 | args.v1.ucSpreadSpectrumDelay = delay; |
| 407 | args.v1.ucSpreadSpectrumRange = range; | 450 | args.v1.ucSpreadSpectrumRange = range; |
| 408 | args.v1.ucPpll = radeon_crtc->crtc_id ? ATOM_PPLL2 : ATOM_PPLL1; | 451 | args.v1.ucPpll = radeon_crtc->crtc_id ? ATOM_PPLL2 : ATOM_PPLL1; |
| 409 | args.v1.ucEnable = enable; | 452 | args.v1.ucEnable = ATOM_ENABLE; |
| 410 | } else { | 453 | } else { |
| 411 | args.legacy.usSpreadSpectrumPercentage = cpu_to_le16(percentage); | 454 | args.legacy.usSpreadSpectrumPercentage = cpu_to_le16(percentage); |
| 412 | args.legacy.ucSpreadSpectrumType = type; | 455 | args.legacy.ucSpreadSpectrumType = type; |
| 413 | args.legacy.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2; | 456 | args.legacy.ucSpreadSpectrumStepSize_Delay = (step & 3) << 2; |
| 414 | args.legacy.ucSpreadSpectrumStepSize_Delay |= (delay & 7) << 4; | 457 | args.legacy.ucSpreadSpectrumStepSize_Delay |= (delay & 7) << 4; |
| 415 | args.legacy.ucEnable = enable; | 458 | args.legacy.ucEnable = ATOM_ENABLE; |
| 416 | } | 459 | } |
| 417 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | 460 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); |
| 418 | } | 461 | } |
| @@ -478,11 +521,6 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
| 478 | /* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */ | 521 | /* DVO wants 2x pixel clock if the DVO chip is in 12 bit mode */ |
| 479 | if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1) | 522 | if (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_KLDSCP_DVO1) |
| 480 | adjusted_clock = mode->clock * 2; | 523 | adjusted_clock = mode->clock * 2; |
| 481 | /* LVDS PLL quirks */ | ||
| 482 | if (encoder->encoder_type == DRM_MODE_ENCODER_LVDS) { | ||
| 483 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | ||
| 484 | pll->algo = dig->pll_algo; | ||
| 485 | } | ||
| 486 | } else { | 524 | } else { |
| 487 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC) | 525 | if (encoder->encoder_type != DRM_MODE_ENCODER_DAC) |
| 488 | pll->flags |= RADEON_PLL_NO_ODD_POST_DIV; | 526 | pll->flags |= RADEON_PLL_NO_ODD_POST_DIV; |
| @@ -503,8 +541,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
| 503 | int index; | 541 | int index; |
| 504 | 542 | ||
| 505 | index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll); | 543 | index = GetIndexIntoMasterTable(COMMAND, AdjustDisplayPll); |
| 506 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, | 544 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, |
| 507 | &crev); | 545 | &crev)) |
| 546 | return adjusted_clock; | ||
| 508 | 547 | ||
| 509 | memset(&args, 0, sizeof(args)); | 548 | memset(&args, 0, sizeof(args)); |
| 510 | 549 | ||
| @@ -542,11 +581,16 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, | |||
| 542 | } | 581 | } |
| 543 | } else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { | 582 | } else if (radeon_encoder->devices & (ATOM_DEVICE_LCD_SUPPORT)) { |
| 544 | /* may want to enable SS on DP/eDP eventually */ | 583 | /* may want to enable SS on DP/eDP eventually */ |
| 545 | args.v3.sInput.ucDispPllConfig |= | 584 | /*args.v3.sInput.ucDispPllConfig |= |
| 546 | DISPPLL_CONFIG_SS_ENABLE; | 585 | DISPPLL_CONFIG_SS_ENABLE;*/ |
| 547 | if (mode->clock > 165000) | 586 | if (encoder_mode == ATOM_ENCODER_MODE_DP) |
| 548 | args.v3.sInput.ucDispPllConfig |= | 587 | args.v3.sInput.ucDispPllConfig |= |
| 549 | DISPPLL_CONFIG_DUAL_LINK; | 588 | DISPPLL_CONFIG_COHERENT_MODE; |
| 589 | else { | ||
| 590 | if (mode->clock > 165000) | ||
| 591 | args.v3.sInput.ucDispPllConfig |= | ||
| 592 | DISPPLL_CONFIG_DUAL_LINK; | ||
| 593 | } | ||
| 550 | } | 594 | } |
| 551 | atom_execute_table(rdev->mode_info.atom_context, | 595 | atom_execute_table(rdev->mode_info.atom_context, |
| 552 | index, (uint32_t *)&args); | 596 | index, (uint32_t *)&args); |
| @@ -592,8 +636,9 @@ static void atombios_crtc_set_dcpll(struct drm_crtc *crtc) | |||
| 592 | memset(&args, 0, sizeof(args)); | 636 | memset(&args, 0, sizeof(args)); |
| 593 | 637 | ||
| 594 | index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); | 638 | index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); |
| 595 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, | 639 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, |
| 596 | &crev); | 640 | &crev)) |
| 641 | return; | ||
| 597 | 642 | ||
| 598 | switch (frev) { | 643 | switch (frev) { |
| 599 | case 1: | 644 | case 1: |
| @@ -667,8 +712,9 @@ static void atombios_crtc_set_pll(struct drm_crtc *crtc, struct drm_display_mode | |||
| 667 | &ref_div, &post_div); | 712 | &ref_div, &post_div); |
| 668 | 713 | ||
| 669 | index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); | 714 | index = GetIndexIntoMasterTable(COMMAND, SetPixelClock); |
| 670 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, | 715 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, |
| 671 | &crev); | 716 | &crev)) |
| 717 | return; | ||
| 672 | 718 | ||
| 673 | switch (frev) { | 719 | switch (frev) { |
| 674 | case 1: | 720 | case 1: |
| @@ -1083,15 +1129,12 @@ int atombios_crtc_mode_set(struct drm_crtc *crtc, | |||
| 1083 | 1129 | ||
| 1084 | /* TODO color tiling */ | 1130 | /* TODO color tiling */ |
| 1085 | 1131 | ||
| 1086 | /* pick pll */ | 1132 | atombios_disable_ss(crtc); |
| 1087 | radeon_crtc->pll_id = radeon_atom_pick_pll(crtc); | ||
| 1088 | |||
| 1089 | atombios_set_ss(crtc, 0); | ||
| 1090 | /* always set DCPLL */ | 1133 | /* always set DCPLL */ |
| 1091 | if (ASIC_IS_DCE4(rdev)) | 1134 | if (ASIC_IS_DCE4(rdev)) |
| 1092 | atombios_crtc_set_dcpll(crtc); | 1135 | atombios_crtc_set_dcpll(crtc); |
| 1093 | atombios_crtc_set_pll(crtc, adjusted_mode); | 1136 | atombios_crtc_set_pll(crtc, adjusted_mode); |
| 1094 | atombios_set_ss(crtc, 1); | 1137 | atombios_enable_ss(crtc); |
| 1095 | 1138 | ||
| 1096 | if (ASIC_IS_DCE4(rdev)) | 1139 | if (ASIC_IS_DCE4(rdev)) |
| 1097 | atombios_set_crtc_dtd_timing(crtc, adjusted_mode); | 1140 | atombios_set_crtc_dtd_timing(crtc, adjusted_mode); |
| @@ -1120,6 +1163,11 @@ static bool atombios_crtc_mode_fixup(struct drm_crtc *crtc, | |||
| 1120 | 1163 | ||
| 1121 | static void atombios_crtc_prepare(struct drm_crtc *crtc) | 1164 | static void atombios_crtc_prepare(struct drm_crtc *crtc) |
| 1122 | { | 1165 | { |
| 1166 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(crtc); | ||
| 1167 | |||
| 1168 | /* pick pll */ | ||
| 1169 | radeon_crtc->pll_id = radeon_atom_pick_pll(crtc); | ||
| 1170 | |||
| 1123 | atombios_lock_crtc(crtc, ATOM_ENABLE); | 1171 | atombios_lock_crtc(crtc, ATOM_ENABLE); |
| 1124 | atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); | 1172 | atombios_crtc_dpms(crtc, DRM_MODE_DPMS_OFF); |
| 1125 | } | 1173 | } |
diff --git a/drivers/gpu/drm/radeon/atombios_dp.c b/drivers/gpu/drm/radeon/atombios_dp.c index 8a133bda00a2..28b31c64f48d 100644 --- a/drivers/gpu/drm/radeon/atombios_dp.c +++ b/drivers/gpu/drm/radeon/atombios_dp.c | |||
| @@ -745,14 +745,14 @@ void dp_link_train(struct drm_encoder *encoder, | |||
| 745 | >> DP_TRAIN_PRE_EMPHASIS_SHIFT); | 745 | >> DP_TRAIN_PRE_EMPHASIS_SHIFT); |
| 746 | 746 | ||
| 747 | /* disable the training pattern on the sink */ | 747 | /* disable the training pattern on the sink */ |
| 748 | dp_set_training(radeon_connector, DP_TRAINING_PATTERN_DISABLE); | ||
| 749 | |||
| 750 | /* disable the training pattern on the source */ | ||
| 748 | if (ASIC_IS_DCE4(rdev)) | 751 | if (ASIC_IS_DCE4(rdev)) |
| 749 | atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_COMPLETE); | 752 | atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_LINK_TRAINING_COMPLETE); |
| 750 | else | 753 | else |
| 751 | radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE, | 754 | radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE, |
| 752 | dig_connector->dp_clock, enc_id, 0); | 755 | dig_connector->dp_clock, enc_id, 0); |
| 753 | |||
| 754 | radeon_dp_encoder_service(rdev, ATOM_DP_ACTION_TRAINING_COMPLETE, | ||
| 755 | dig_connector->dp_clock, enc_id, 0); | ||
| 756 | } | 756 | } |
| 757 | 757 | ||
| 758 | int radeon_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode, | 758 | int radeon_dp_i2c_aux_ch(struct i2c_adapter *adapter, int mode, |
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index bd2e7aa85c1d..e8f447e20507 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c | |||
| @@ -23,8 +23,10 @@ | |||
| 23 | */ | 23 | */ |
| 24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "drmP.h" | 27 | #include "drmP.h" |
| 27 | #include "radeon.h" | 28 | #include "radeon.h" |
| 29 | #include "radeon_asic.h" | ||
| 28 | #include "radeon_drm.h" | 30 | #include "radeon_drm.h" |
| 29 | #include "rv770d.h" | 31 | #include "rv770d.h" |
| 30 | #include "atom.h" | 32 | #include "atom.h" |
| @@ -436,7 +438,6 @@ static void evergreen_gpu_init(struct radeon_device *rdev) | |||
| 436 | 438 | ||
| 437 | int evergreen_mc_init(struct radeon_device *rdev) | 439 | int evergreen_mc_init(struct radeon_device *rdev) |
| 438 | { | 440 | { |
| 439 | fixed20_12 a; | ||
| 440 | u32 tmp; | 441 | u32 tmp; |
| 441 | int chansize, numchan; | 442 | int chansize, numchan; |
| 442 | 443 | ||
| @@ -481,12 +482,8 @@ int evergreen_mc_init(struct radeon_device *rdev) | |||
| 481 | rdev->mc.real_vram_size = rdev->mc.aper_size; | 482 | rdev->mc.real_vram_size = rdev->mc.aper_size; |
| 482 | } | 483 | } |
| 483 | r600_vram_gtt_location(rdev, &rdev->mc); | 484 | r600_vram_gtt_location(rdev, &rdev->mc); |
| 484 | /* FIXME: we should enforce default clock in case GPU is not in | 485 | radeon_update_bandwidth_info(rdev); |
| 485 | * default setup | 486 | |
| 486 | */ | ||
| 487 | a.full = rfixed_const(100); | ||
| 488 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 489 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 490 | return 0; | 487 | return 0; |
| 491 | } | 488 | } |
| 492 | 489 | ||
| @@ -746,6 +743,7 @@ int evergreen_init(struct radeon_device *rdev) | |||
| 746 | 743 | ||
| 747 | void evergreen_fini(struct radeon_device *rdev) | 744 | void evergreen_fini(struct radeon_device *rdev) |
| 748 | { | 745 | { |
| 746 | radeon_pm_fini(rdev); | ||
| 749 | evergreen_suspend(rdev); | 747 | evergreen_suspend(rdev); |
| 750 | #if 0 | 748 | #if 0 |
| 751 | r600_blit_fini(rdev); | 749 | r600_blit_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 91eb762eb3f9..c9580497ede4 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c | |||
| @@ -26,11 +26,13 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "drm.h" | 31 | #include "drm.h" |
| 31 | #include "radeon_drm.h" | 32 | #include "radeon_drm.h" |
| 32 | #include "radeon_reg.h" | 33 | #include "radeon_reg.h" |
| 33 | #include "radeon.h" | 34 | #include "radeon.h" |
| 35 | #include "radeon_asic.h" | ||
| 34 | #include "r100d.h" | 36 | #include "r100d.h" |
| 35 | #include "rs100d.h" | 37 | #include "rs100d.h" |
| 36 | #include "rv200d.h" | 38 | #include "rv200d.h" |
| @@ -235,9 +237,9 @@ int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) | |||
| 235 | 237 | ||
| 236 | void r100_pci_gart_fini(struct radeon_device *rdev) | 238 | void r100_pci_gart_fini(struct radeon_device *rdev) |
| 237 | { | 239 | { |
| 240 | radeon_gart_fini(rdev); | ||
| 238 | r100_pci_gart_disable(rdev); | 241 | r100_pci_gart_disable(rdev); |
| 239 | radeon_gart_table_ram_free(rdev); | 242 | radeon_gart_table_ram_free(rdev); |
| 240 | radeon_gart_fini(rdev); | ||
| 241 | } | 243 | } |
| 242 | 244 | ||
| 243 | int r100_irq_set(struct radeon_device *rdev) | 245 | int r100_irq_set(struct radeon_device *rdev) |
| @@ -312,10 +314,12 @@ int r100_irq_process(struct radeon_device *rdev) | |||
| 312 | /* Vertical blank interrupts */ | 314 | /* Vertical blank interrupts */ |
| 313 | if (status & RADEON_CRTC_VBLANK_STAT) { | 315 | if (status & RADEON_CRTC_VBLANK_STAT) { |
| 314 | drm_handle_vblank(rdev->ddev, 0); | 316 | drm_handle_vblank(rdev->ddev, 0); |
| 317 | rdev->pm.vblank_sync = true; | ||
| 315 | wake_up(&rdev->irq.vblank_queue); | 318 | wake_up(&rdev->irq.vblank_queue); |
| 316 | } | 319 | } |
| 317 | if (status & RADEON_CRTC2_VBLANK_STAT) { | 320 | if (status & RADEON_CRTC2_VBLANK_STAT) { |
| 318 | drm_handle_vblank(rdev->ddev, 1); | 321 | drm_handle_vblank(rdev->ddev, 1); |
| 322 | rdev->pm.vblank_sync = true; | ||
| 319 | wake_up(&rdev->irq.vblank_queue); | 323 | wake_up(&rdev->irq.vblank_queue); |
| 320 | } | 324 | } |
| 321 | if (status & RADEON_FP_DETECT_STAT) { | 325 | if (status & RADEON_FP_DETECT_STAT) { |
| @@ -741,6 +745,8 @@ int r100_cp_init(struct radeon_device *rdev, unsigned ring_size) | |||
| 741 | udelay(10); | 745 | udelay(10); |
| 742 | rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR); | 746 | rdev->cp.rptr = RREG32(RADEON_CP_RB_RPTR); |
| 743 | rdev->cp.wptr = RREG32(RADEON_CP_RB_WPTR); | 747 | rdev->cp.wptr = RREG32(RADEON_CP_RB_WPTR); |
| 748 | /* protect against crazy HW on resume */ | ||
| 749 | rdev->cp.wptr &= rdev->cp.ptr_mask; | ||
| 744 | /* Set cp mode to bus mastering & enable cp*/ | 750 | /* Set cp mode to bus mastering & enable cp*/ |
| 745 | WREG32(RADEON_CP_CSQ_MODE, | 751 | WREG32(RADEON_CP_CSQ_MODE, |
| 746 | REG_SET(RADEON_INDIRECT2_START, indirect2_start) | | 752 | REG_SET(RADEON_INDIRECT2_START, indirect2_start) | |
| @@ -1804,6 +1810,7 @@ void r100_set_common_regs(struct radeon_device *rdev) | |||
| 1804 | { | 1810 | { |
| 1805 | struct drm_device *dev = rdev->ddev; | 1811 | struct drm_device *dev = rdev->ddev; |
| 1806 | bool force_dac2 = false; | 1812 | bool force_dac2 = false; |
| 1813 | u32 tmp; | ||
| 1807 | 1814 | ||
| 1808 | /* set these so they don't interfere with anything */ | 1815 | /* set these so they don't interfere with anything */ |
| 1809 | WREG32(RADEON_OV0_SCALE_CNTL, 0); | 1816 | WREG32(RADEON_OV0_SCALE_CNTL, 0); |
| @@ -1875,6 +1882,12 @@ void r100_set_common_regs(struct radeon_device *rdev) | |||
| 1875 | WREG32(RADEON_DISP_HW_DEBUG, disp_hw_debug); | 1882 | WREG32(RADEON_DISP_HW_DEBUG, disp_hw_debug); |
| 1876 | WREG32(RADEON_DAC_CNTL2, dac2_cntl); | 1883 | WREG32(RADEON_DAC_CNTL2, dac2_cntl); |
| 1877 | } | 1884 | } |
| 1885 | |||
| 1886 | /* switch PM block to ACPI mode */ | ||
| 1887 | tmp = RREG32_PLL(RADEON_PLL_PWRMGT_CNTL); | ||
| 1888 | tmp &= ~RADEON_PM_MODE_SEL; | ||
| 1889 | WREG32_PLL(RADEON_PLL_PWRMGT_CNTL, tmp); | ||
| 1890 | |||
| 1878 | } | 1891 | } |
| 1879 | 1892 | ||
| 1880 | /* | 1893 | /* |
| @@ -2022,6 +2035,7 @@ void r100_mc_init(struct radeon_device *rdev) | |||
| 2022 | radeon_vram_location(rdev, &rdev->mc, base); | 2035 | radeon_vram_location(rdev, &rdev->mc, base); |
| 2023 | if (!(rdev->flags & RADEON_IS_AGP)) | 2036 | if (!(rdev->flags & RADEON_IS_AGP)) |
| 2024 | radeon_gtt_location(rdev, &rdev->mc); | 2037 | radeon_gtt_location(rdev, &rdev->mc); |
| 2038 | radeon_update_bandwidth_info(rdev); | ||
| 2025 | } | 2039 | } |
| 2026 | 2040 | ||
| 2027 | 2041 | ||
| @@ -2385,6 +2399,8 @@ void r100_bandwidth_update(struct radeon_device *rdev) | |||
| 2385 | uint32_t pixel_bytes1 = 0; | 2399 | uint32_t pixel_bytes1 = 0; |
| 2386 | uint32_t pixel_bytes2 = 0; | 2400 | uint32_t pixel_bytes2 = 0; |
| 2387 | 2401 | ||
| 2402 | radeon_update_display_priority(rdev); | ||
| 2403 | |||
| 2388 | if (rdev->mode_info.crtcs[0]->base.enabled) { | 2404 | if (rdev->mode_info.crtcs[0]->base.enabled) { |
| 2389 | mode1 = &rdev->mode_info.crtcs[0]->base.mode; | 2405 | mode1 = &rdev->mode_info.crtcs[0]->base.mode; |
| 2390 | pixel_bytes1 = rdev->mode_info.crtcs[0]->base.fb->bits_per_pixel / 8; | 2406 | pixel_bytes1 = rdev->mode_info.crtcs[0]->base.fb->bits_per_pixel / 8; |
| @@ -2413,11 +2429,8 @@ void r100_bandwidth_update(struct radeon_device *rdev) | |||
| 2413 | /* | 2429 | /* |
| 2414 | * determine is there is enough bw for current mode | 2430 | * determine is there is enough bw for current mode |
| 2415 | */ | 2431 | */ |
| 2416 | mclk_ff.full = rfixed_const(rdev->clock.default_mclk); | 2432 | sclk_ff = rdev->pm.sclk; |
| 2417 | temp_ff.full = rfixed_const(100); | 2433 | mclk_ff = rdev->pm.mclk; |
| 2418 | mclk_ff.full = rfixed_div(mclk_ff, temp_ff); | ||
| 2419 | sclk_ff.full = rfixed_const(rdev->clock.default_sclk); | ||
| 2420 | sclk_ff.full = rfixed_div(sclk_ff, temp_ff); | ||
| 2421 | 2434 | ||
| 2422 | temp = (rdev->mc.vram_width / 8) * (rdev->mc.vram_is_ddr ? 2 : 1); | 2435 | temp = (rdev->mc.vram_width / 8) * (rdev->mc.vram_is_ddr ? 2 : 1); |
| 2423 | temp_ff.full = rfixed_const(temp); | 2436 | temp_ff.full = rfixed_const(temp); |
| @@ -3440,6 +3453,7 @@ int r100_suspend(struct radeon_device *rdev) | |||
| 3440 | 3453 | ||
| 3441 | void r100_fini(struct radeon_device *rdev) | 3454 | void r100_fini(struct radeon_device *rdev) |
| 3442 | { | 3455 | { |
| 3456 | radeon_pm_fini(rdev); | ||
| 3443 | r100_cp_fini(rdev); | 3457 | r100_cp_fini(rdev); |
| 3444 | r100_wb_fini(rdev); | 3458 | r100_wb_fini(rdev); |
| 3445 | r100_ib_fini(rdev); | 3459 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/r200.c b/drivers/gpu/drm/radeon/r200.c index 1146c9909c2c..85617c311212 100644 --- a/drivers/gpu/drm/radeon/r200.c +++ b/drivers/gpu/drm/radeon/r200.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include "radeon_drm.h" | 30 | #include "radeon_drm.h" |
| 31 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
| 32 | #include "radeon.h" | 32 | #include "radeon.h" |
| 33 | #include "radeon_asic.h" | ||
| 33 | 34 | ||
| 34 | #include "r100d.h" | 35 | #include "r100d.h" |
| 35 | #include "r200_reg_safe.h" | 36 | #include "r200_reg_safe.h" |
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 4cef90cd74e5..561048a7c0a4 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c | |||
| @@ -26,10 +26,12 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "drm.h" | 31 | #include "drm.h" |
| 31 | #include "radeon_reg.h" | 32 | #include "radeon_reg.h" |
| 32 | #include "radeon.h" | 33 | #include "radeon.h" |
| 34 | #include "radeon_asic.h" | ||
| 33 | #include "radeon_drm.h" | 35 | #include "radeon_drm.h" |
| 34 | #include "r100_track.h" | 36 | #include "r100_track.h" |
| 35 | #include "r300d.h" | 37 | #include "r300d.h" |
| @@ -164,9 +166,9 @@ void rv370_pcie_gart_disable(struct radeon_device *rdev) | |||
| 164 | 166 | ||
| 165 | void rv370_pcie_gart_fini(struct radeon_device *rdev) | 167 | void rv370_pcie_gart_fini(struct radeon_device *rdev) |
| 166 | { | 168 | { |
| 169 | radeon_gart_fini(rdev); | ||
| 167 | rv370_pcie_gart_disable(rdev); | 170 | rv370_pcie_gart_disable(rdev); |
| 168 | radeon_gart_table_vram_free(rdev); | 171 | radeon_gart_table_vram_free(rdev); |
| 169 | radeon_gart_fini(rdev); | ||
| 170 | } | 172 | } |
| 171 | 173 | ||
| 172 | void r300_fence_ring_emit(struct radeon_device *rdev, | 174 | void r300_fence_ring_emit(struct radeon_device *rdev, |
| @@ -481,6 +483,7 @@ void r300_mc_init(struct radeon_device *rdev) | |||
| 481 | radeon_vram_location(rdev, &rdev->mc, base); | 483 | radeon_vram_location(rdev, &rdev->mc, base); |
| 482 | if (!(rdev->flags & RADEON_IS_AGP)) | 484 | if (!(rdev->flags & RADEON_IS_AGP)) |
| 483 | radeon_gtt_location(rdev, &rdev->mc); | 485 | radeon_gtt_location(rdev, &rdev->mc); |
| 486 | radeon_update_bandwidth_info(rdev); | ||
| 484 | } | 487 | } |
| 485 | 488 | ||
| 486 | void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes) | 489 | void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes) |
| @@ -1334,6 +1337,7 @@ int r300_suspend(struct radeon_device *rdev) | |||
| 1334 | 1337 | ||
| 1335 | void r300_fini(struct radeon_device *rdev) | 1338 | void r300_fini(struct radeon_device *rdev) |
| 1336 | { | 1339 | { |
| 1340 | radeon_pm_fini(rdev); | ||
| 1337 | r100_cp_fini(rdev); | 1341 | r100_cp_fini(rdev); |
| 1338 | r100_wb_fini(rdev); | 1342 | r100_wb_fini(rdev); |
| 1339 | r100_ib_fini(rdev); | 1343 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index c7593b8f58ee..3dc968c9f5a4 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c | |||
| @@ -26,9 +26,11 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "radeon_reg.h" | 31 | #include "radeon_reg.h" |
| 31 | #include "radeon.h" | 32 | #include "radeon.h" |
| 33 | #include "radeon_asic.h" | ||
| 32 | #include "atom.h" | 34 | #include "atom.h" |
| 33 | #include "r100d.h" | 35 | #include "r100d.h" |
| 34 | #include "r420d.h" | 36 | #include "r420d.h" |
| @@ -266,6 +268,7 @@ int r420_suspend(struct radeon_device *rdev) | |||
| 266 | 268 | ||
| 267 | void r420_fini(struct radeon_device *rdev) | 269 | void r420_fini(struct radeon_device *rdev) |
| 268 | { | 270 | { |
| 271 | radeon_pm_fini(rdev); | ||
| 269 | r100_cp_fini(rdev); | 272 | r100_cp_fini(rdev); |
| 270 | r100_wb_fini(rdev); | 273 | r100_wb_fini(rdev); |
| 271 | r100_ib_fini(rdev); | 274 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 2b8a5dd13516..3c44b8d39318 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #include "drmP.h" | 28 | #include "drmP.h" |
| 29 | #include "radeon.h" | 29 | #include "radeon.h" |
| 30 | #include "radeon_asic.h" | ||
| 30 | #include "atom.h" | 31 | #include "atom.h" |
| 31 | #include "r520d.h" | 32 | #include "r520d.h" |
| 32 | 33 | ||
| @@ -121,19 +122,13 @@ static void r520_vram_get_type(struct radeon_device *rdev) | |||
| 121 | 122 | ||
| 122 | void r520_mc_init(struct radeon_device *rdev) | 123 | void r520_mc_init(struct radeon_device *rdev) |
| 123 | { | 124 | { |
| 124 | fixed20_12 a; | ||
| 125 | 125 | ||
| 126 | r520_vram_get_type(rdev); | 126 | r520_vram_get_type(rdev); |
| 127 | r100_vram_init_sizes(rdev); | 127 | r100_vram_init_sizes(rdev); |
| 128 | radeon_vram_location(rdev, &rdev->mc, 0); | 128 | radeon_vram_location(rdev, &rdev->mc, 0); |
| 129 | if (!(rdev->flags & RADEON_IS_AGP)) | 129 | if (!(rdev->flags & RADEON_IS_AGP)) |
| 130 | radeon_gtt_location(rdev, &rdev->mc); | 130 | radeon_gtt_location(rdev, &rdev->mc); |
| 131 | /* FIXME: we should enforce default clock in case GPU is not in | 131 | radeon_update_bandwidth_info(rdev); |
| 132 | * default setup | ||
| 133 | */ | ||
| 134 | a.full = rfixed_const(100); | ||
| 135 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 136 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 137 | } | 132 | } |
| 138 | 133 | ||
| 139 | void r520_mc_program(struct radeon_device *rdev) | 134 | void r520_mc_program(struct radeon_device *rdev) |
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index c52290197292..8f3454e2056a 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c | |||
| @@ -25,12 +25,14 @@ | |||
| 25 | * Alex Deucher | 25 | * Alex Deucher |
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/seq_file.h> | 29 | #include <linux/seq_file.h> |
| 29 | #include <linux/firmware.h> | 30 | #include <linux/firmware.h> |
| 30 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
| 31 | #include "drmP.h" | 32 | #include "drmP.h" |
| 32 | #include "radeon_drm.h" | 33 | #include "radeon_drm.h" |
| 33 | #include "radeon.h" | 34 | #include "radeon.h" |
| 35 | #include "radeon_asic.h" | ||
| 34 | #include "radeon_mode.h" | 36 | #include "radeon_mode.h" |
| 35 | #include "r600d.h" | 37 | #include "r600d.h" |
| 36 | #include "atom.h" | 38 | #include "atom.h" |
| @@ -491,9 +493,9 @@ void r600_pcie_gart_disable(struct radeon_device *rdev) | |||
| 491 | 493 | ||
| 492 | void r600_pcie_gart_fini(struct radeon_device *rdev) | 494 | void r600_pcie_gart_fini(struct radeon_device *rdev) |
| 493 | { | 495 | { |
| 496 | radeon_gart_fini(rdev); | ||
| 494 | r600_pcie_gart_disable(rdev); | 497 | r600_pcie_gart_disable(rdev); |
| 495 | radeon_gart_table_vram_free(rdev); | 498 | radeon_gart_table_vram_free(rdev); |
| 496 | radeon_gart_fini(rdev); | ||
| 497 | } | 499 | } |
| 498 | 500 | ||
| 499 | void r600_agp_enable(struct radeon_device *rdev) | 501 | void r600_agp_enable(struct radeon_device *rdev) |
| @@ -675,7 +677,6 @@ void r600_vram_gtt_location(struct radeon_device *rdev, struct radeon_mc *mc) | |||
| 675 | 677 | ||
| 676 | int r600_mc_init(struct radeon_device *rdev) | 678 | int r600_mc_init(struct radeon_device *rdev) |
| 677 | { | 679 | { |
| 678 | fixed20_12 a; | ||
| 679 | u32 tmp; | 680 | u32 tmp; |
| 680 | int chansize, numchan; | 681 | int chansize, numchan; |
| 681 | 682 | ||
| @@ -719,14 +720,10 @@ int r600_mc_init(struct radeon_device *rdev) | |||
| 719 | rdev->mc.real_vram_size = rdev->mc.aper_size; | 720 | rdev->mc.real_vram_size = rdev->mc.aper_size; |
| 720 | } | 721 | } |
| 721 | r600_vram_gtt_location(rdev, &rdev->mc); | 722 | r600_vram_gtt_location(rdev, &rdev->mc); |
| 722 | /* FIXME: we should enforce default clock in case GPU is not in | 723 | |
| 723 | * default setup | ||
| 724 | */ | ||
| 725 | a.full = rfixed_const(100); | ||
| 726 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 727 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 728 | if (rdev->flags & RADEON_IS_IGP) | 724 | if (rdev->flags & RADEON_IS_IGP) |
| 729 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); | 725 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); |
| 726 | radeon_update_bandwidth_info(rdev); | ||
| 730 | return 0; | 727 | return 0; |
| 731 | } | 728 | } |
| 732 | 729 | ||
| @@ -1132,6 +1129,7 @@ void r600_gpu_init(struct radeon_device *rdev) | |||
| 1132 | /* Setup pipes */ | 1129 | /* Setup pipes */ |
| 1133 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1130 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1134 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | 1131 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); |
| 1132 | WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | ||
| 1135 | 1133 | ||
| 1136 | tmp = R6XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); | 1134 | tmp = R6XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); |
| 1137 | WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK); | 1135 | WREG32(VGT_OUT_DEALLOC_CNTL, (tmp * 4) & DEALLOC_DIST_MASK); |
| @@ -2119,6 +2117,7 @@ int r600_init(struct radeon_device *rdev) | |||
| 2119 | 2117 | ||
| 2120 | void r600_fini(struct radeon_device *rdev) | 2118 | void r600_fini(struct radeon_device *rdev) |
| 2121 | { | 2119 | { |
| 2120 | radeon_pm_fini(rdev); | ||
| 2122 | r600_audio_fini(rdev); | 2121 | r600_audio_fini(rdev); |
| 2123 | r600_blit_fini(rdev); | 2122 | r600_blit_fini(rdev); |
| 2124 | r600_cp_fini(rdev); | 2123 | r600_cp_fini(rdev); |
| @@ -2398,19 +2397,19 @@ static void r600_disable_interrupt_state(struct radeon_device *rdev) | |||
| 2398 | WREG32(DC_HPD4_INT_CONTROL, tmp); | 2397 | WREG32(DC_HPD4_INT_CONTROL, tmp); |
| 2399 | if (ASIC_IS_DCE32(rdev)) { | 2398 | if (ASIC_IS_DCE32(rdev)) { |
| 2400 | tmp = RREG32(DC_HPD5_INT_CONTROL) & DC_HPDx_INT_POLARITY; | 2399 | tmp = RREG32(DC_HPD5_INT_CONTROL) & DC_HPDx_INT_POLARITY; |
| 2401 | WREG32(DC_HPD5_INT_CONTROL, 0); | 2400 | WREG32(DC_HPD5_INT_CONTROL, tmp); |
| 2402 | tmp = RREG32(DC_HPD6_INT_CONTROL) & DC_HPDx_INT_POLARITY; | 2401 | tmp = RREG32(DC_HPD6_INT_CONTROL) & DC_HPDx_INT_POLARITY; |
| 2403 | WREG32(DC_HPD6_INT_CONTROL, 0); | 2402 | WREG32(DC_HPD6_INT_CONTROL, tmp); |
| 2404 | } | 2403 | } |
| 2405 | } else { | 2404 | } else { |
| 2406 | WREG32(DACA_AUTODETECT_INT_CONTROL, 0); | 2405 | WREG32(DACA_AUTODETECT_INT_CONTROL, 0); |
| 2407 | WREG32(DACB_AUTODETECT_INT_CONTROL, 0); | 2406 | WREG32(DACB_AUTODETECT_INT_CONTROL, 0); |
| 2408 | tmp = RREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; | 2407 | tmp = RREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; |
| 2409 | WREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL, 0); | 2408 | WREG32(DC_HOT_PLUG_DETECT1_INT_CONTROL, tmp); |
| 2410 | tmp = RREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; | 2409 | tmp = RREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; |
| 2411 | WREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL, 0); | 2410 | WREG32(DC_HOT_PLUG_DETECT2_INT_CONTROL, tmp); |
| 2412 | tmp = RREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; | 2411 | tmp = RREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL) & DC_HOT_PLUG_DETECTx_INT_POLARITY; |
| 2413 | WREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL, 0); | 2412 | WREG32(DC_HOT_PLUG_DETECT3_INT_CONTROL, tmp); |
| 2414 | } | 2413 | } |
| 2415 | } | 2414 | } |
| 2416 | 2415 | ||
| @@ -2765,6 +2764,7 @@ restart_ih: | |||
| 2765 | case 0: /* D1 vblank */ | 2764 | case 0: /* D1 vblank */ |
| 2766 | if (disp_int & LB_D1_VBLANK_INTERRUPT) { | 2765 | if (disp_int & LB_D1_VBLANK_INTERRUPT) { |
| 2767 | drm_handle_vblank(rdev->ddev, 0); | 2766 | drm_handle_vblank(rdev->ddev, 0); |
| 2767 | rdev->pm.vblank_sync = true; | ||
| 2768 | wake_up(&rdev->irq.vblank_queue); | 2768 | wake_up(&rdev->irq.vblank_queue); |
| 2769 | disp_int &= ~LB_D1_VBLANK_INTERRUPT; | 2769 | disp_int &= ~LB_D1_VBLANK_INTERRUPT; |
| 2770 | DRM_DEBUG("IH: D1 vblank\n"); | 2770 | DRM_DEBUG("IH: D1 vblank\n"); |
| @@ -2786,6 +2786,7 @@ restart_ih: | |||
| 2786 | case 0: /* D2 vblank */ | 2786 | case 0: /* D2 vblank */ |
| 2787 | if (disp_int & LB_D2_VBLANK_INTERRUPT) { | 2787 | if (disp_int & LB_D2_VBLANK_INTERRUPT) { |
| 2788 | drm_handle_vblank(rdev->ddev, 1); | 2788 | drm_handle_vblank(rdev->ddev, 1); |
| 2789 | rdev->pm.vblank_sync = true; | ||
| 2789 | wake_up(&rdev->irq.vblank_queue); | 2790 | wake_up(&rdev->irq.vblank_queue); |
| 2790 | disp_int &= ~LB_D2_VBLANK_INTERRUPT; | 2791 | disp_int &= ~LB_D2_VBLANK_INTERRUPT; |
| 2791 | DRM_DEBUG("IH: D2 vblank\n"); | 2792 | DRM_DEBUG("IH: D2 vblank\n"); |
| @@ -2834,14 +2835,14 @@ restart_ih: | |||
| 2834 | break; | 2835 | break; |
| 2835 | case 10: | 2836 | case 10: |
| 2836 | if (disp_int_cont2 & DC_HPD5_INTERRUPT) { | 2837 | if (disp_int_cont2 & DC_HPD5_INTERRUPT) { |
| 2837 | disp_int_cont &= ~DC_HPD5_INTERRUPT; | 2838 | disp_int_cont2 &= ~DC_HPD5_INTERRUPT; |
| 2838 | queue_hotplug = true; | 2839 | queue_hotplug = true; |
| 2839 | DRM_DEBUG("IH: HPD5\n"); | 2840 | DRM_DEBUG("IH: HPD5\n"); |
| 2840 | } | 2841 | } |
| 2841 | break; | 2842 | break; |
| 2842 | case 12: | 2843 | case 12: |
| 2843 | if (disp_int_cont2 & DC_HPD6_INTERRUPT) { | 2844 | if (disp_int_cont2 & DC_HPD6_INTERRUPT) { |
| 2844 | disp_int_cont &= ~DC_HPD6_INTERRUPT; | 2845 | disp_int_cont2 &= ~DC_HPD6_INTERRUPT; |
| 2845 | queue_hotplug = true; | 2846 | queue_hotplug = true; |
| 2846 | DRM_DEBUG("IH: HPD6\n"); | 2847 | DRM_DEBUG("IH: HPD6\n"); |
| 2847 | } | 2848 | } |
diff --git a/drivers/gpu/drm/radeon/r600_audio.c b/drivers/gpu/drm/radeon/r600_audio.c index db928016d034..dac7042b797e 100644 --- a/drivers/gpu/drm/radeon/r600_audio.c +++ b/drivers/gpu/drm/radeon/r600_audio.c | |||
| @@ -182,41 +182,6 @@ int r600_audio_init(struct radeon_device *rdev) | |||
| 182 | } | 182 | } |
| 183 | 183 | ||
| 184 | /* | 184 | /* |
| 185 | * determin how the encoders and audio interface is wired together | ||
| 186 | */ | ||
| 187 | int r600_audio_tmds_index(struct drm_encoder *encoder) | ||
| 188 | { | ||
| 189 | struct drm_device *dev = encoder->dev; | ||
| 190 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
| 191 | struct drm_encoder *other; | ||
| 192 | |||
| 193 | switch (radeon_encoder->encoder_id) { | ||
| 194 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | ||
| 195 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | ||
| 196 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | ||
| 197 | return 0; | ||
| 198 | |||
| 199 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | ||
| 200 | /* special case check if an TMDS1 is present */ | ||
| 201 | list_for_each_entry(other, &dev->mode_config.encoder_list, head) { | ||
| 202 | if (to_radeon_encoder(other)->encoder_id == | ||
| 203 | ENCODER_OBJECT_ID_INTERNAL_TMDS1) | ||
| 204 | return 1; | ||
| 205 | } | ||
| 206 | return 0; | ||
| 207 | |||
| 208 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | ||
| 209 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
| 210 | return 1; | ||
| 211 | |||
| 212 | default: | ||
| 213 | DRM_ERROR("Unsupported encoder type 0x%02X\n", | ||
| 214 | radeon_encoder->encoder_id); | ||
| 215 | return -1; | ||
| 216 | } | ||
| 217 | } | ||
| 218 | |||
| 219 | /* | ||
| 220 | * atach the audio codec to the clock source of the encoder | 185 | * atach the audio codec to the clock source of the encoder |
| 221 | */ | 186 | */ |
| 222 | void r600_audio_set_clock(struct drm_encoder *encoder, int clock) | 187 | void r600_audio_set_clock(struct drm_encoder *encoder, int clock) |
| @@ -224,6 +189,7 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) | |||
| 224 | struct drm_device *dev = encoder->dev; | 189 | struct drm_device *dev = encoder->dev; |
| 225 | struct radeon_device *rdev = dev->dev_private; | 190 | struct radeon_device *rdev = dev->dev_private; |
| 226 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 191 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 192 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | ||
| 227 | int base_rate = 48000; | 193 | int base_rate = 48000; |
| 228 | 194 | ||
| 229 | switch (radeon_encoder->encoder_id) { | 195 | switch (radeon_encoder->encoder_id) { |
| @@ -231,32 +197,34 @@ void r600_audio_set_clock(struct drm_encoder *encoder, int clock) | |||
| 231 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | 197 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: |
| 232 | WREG32_P(R600_AUDIO_TIMING, 0, ~0x301); | 198 | WREG32_P(R600_AUDIO_TIMING, 0, ~0x301); |
| 233 | break; | 199 | break; |
| 234 | |||
| 235 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 200 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
| 236 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | 201 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
| 237 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | 202 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
| 238 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | 203 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: |
| 239 | WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301); | 204 | WREG32_P(R600_AUDIO_TIMING, 0x100, ~0x301); |
| 240 | break; | 205 | break; |
| 241 | |||
| 242 | default: | 206 | default: |
| 243 | DRM_ERROR("Unsupported encoder type 0x%02X\n", | 207 | DRM_ERROR("Unsupported encoder type 0x%02X\n", |
| 244 | radeon_encoder->encoder_id); | 208 | radeon_encoder->encoder_id); |
| 245 | return; | 209 | return; |
| 246 | } | 210 | } |
| 247 | 211 | ||
| 248 | switch (r600_audio_tmds_index(encoder)) { | 212 | switch (dig->dig_encoder) { |
| 249 | case 0: | 213 | case 0: |
| 250 | WREG32(R600_AUDIO_PLL1_MUL, base_rate*50); | 214 | WREG32(R600_AUDIO_PLL1_MUL, base_rate * 50); |
| 251 | WREG32(R600_AUDIO_PLL1_DIV, clock*100); | 215 | WREG32(R600_AUDIO_PLL1_DIV, clock * 100); |
| 252 | WREG32(R600_AUDIO_CLK_SRCSEL, 0); | 216 | WREG32(R600_AUDIO_CLK_SRCSEL, 0); |
| 253 | break; | 217 | break; |
| 254 | 218 | ||
| 255 | case 1: | 219 | case 1: |
| 256 | WREG32(R600_AUDIO_PLL2_MUL, base_rate*50); | 220 | WREG32(R600_AUDIO_PLL2_MUL, base_rate * 50); |
| 257 | WREG32(R600_AUDIO_PLL2_DIV, clock*100); | 221 | WREG32(R600_AUDIO_PLL2_DIV, clock * 100); |
| 258 | WREG32(R600_AUDIO_CLK_SRCSEL, 1); | 222 | WREG32(R600_AUDIO_CLK_SRCSEL, 1); |
| 259 | break; | 223 | break; |
| 224 | default: | ||
| 225 | dev_err(rdev->dev, "Unsupported DIG on encoder 0x%02X\n", | ||
| 226 | radeon_encoder->encoder_id); | ||
| 227 | return; | ||
| 260 | } | 228 | } |
| 261 | } | 229 | } |
| 262 | 230 | ||
diff --git a/drivers/gpu/drm/radeon/r600_blit_shaders.c b/drivers/gpu/drm/radeon/r600_blit_shaders.c index a112c59f9d82..0271b53fa2dd 100644 --- a/drivers/gpu/drm/radeon/r600_blit_shaders.c +++ b/drivers/gpu/drm/radeon/r600_blit_shaders.c | |||
| @@ -1,7 +1,42 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2009 Advanced Micro Devices, Inc. | ||
| 3 | * | ||
| 4 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
| 5 | * copy of this software and associated documentation files (the "Software"), | ||
| 6 | * to deal in the Software without restriction, including without limitation | ||
| 7 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| 8 | * and/or sell copies of the Software, and to permit persons to whom the | ||
| 9 | * Software is furnished to do so, subject to the following conditions: | ||
| 10 | * | ||
| 11 | * The above copyright notice and this permission notice (including the next | ||
| 12 | * paragraph) shall be included in all copies or substantial portions of the | ||
| 13 | * Software. | ||
| 14 | * | ||
| 15 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 16 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 17 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| 18 | * THE COPYRIGHT HOLDER(S) AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
| 19 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| 20 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| 21 | * DEALINGS IN THE SOFTWARE. | ||
| 22 | * | ||
| 23 | * Authors: | ||
| 24 | * Alex Deucher <alexander.deucher@amd.com> | ||
| 25 | */ | ||
| 1 | 26 | ||
| 2 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 3 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 4 | 29 | ||
| 30 | /* | ||
| 31 | * R6xx+ cards need to use the 3D engine to blit data which requires | ||
| 32 | * quite a bit of hw state setup. Rather than pull the whole 3D driver | ||
| 33 | * (which normally generates the 3D state) into the DRM, we opt to use | ||
| 34 | * statically generated state tables. The regsiter state and shaders | ||
| 35 | * were hand generated to support blitting functionality. See the 3D | ||
| 36 | * driver or documentation for descriptions of the registers and | ||
| 37 | * shader instructions. | ||
| 38 | */ | ||
| 39 | |||
| 5 | const u32 r6xx_default_state[] = | 40 | const u32 r6xx_default_state[] = |
| 6 | { | 41 | { |
| 7 | 0xc0002400, | 42 | 0xc0002400, |
diff --git a/drivers/gpu/drm/radeon/r600_cp.c b/drivers/gpu/drm/radeon/r600_cp.c index 40416c068d9f..68e6f4349309 100644 --- a/drivers/gpu/drm/radeon/r600_cp.c +++ b/drivers/gpu/drm/radeon/r600_cp.c | |||
| @@ -1548,10 +1548,13 @@ static void r700_gfx_init(struct drm_device *dev, | |||
| 1548 | 1548 | ||
| 1549 | RADEON_WRITE(R600_CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1549 | RADEON_WRITE(R600_CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1550 | RADEON_WRITE(R600_CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | 1550 | RADEON_WRITE(R600_CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); |
| 1551 | RADEON_WRITE(R600_GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | ||
| 1551 | 1552 | ||
| 1552 | RADEON_WRITE(R700_CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 1553 | RADEON_WRITE(R700_CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 1553 | RADEON_WRITE(R700_CGTS_SYS_TCC_DISABLE, 0); | 1554 | RADEON_WRITE(R700_CGTS_SYS_TCC_DISABLE, 0); |
| 1554 | RADEON_WRITE(R700_CGTS_TCC_DISABLE, 0); | 1555 | RADEON_WRITE(R700_CGTS_TCC_DISABLE, 0); |
| 1556 | RADEON_WRITE(R700_CGTS_USER_SYS_TCC_DISABLE, 0); | ||
| 1557 | RADEON_WRITE(R700_CGTS_USER_TCC_DISABLE, 0); | ||
| 1555 | 1558 | ||
| 1556 | num_qd_pipes = | 1559 | num_qd_pipes = |
| 1557 | R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & R600_INACTIVE_QD_PIPES_MASK) >> 8); | 1560 | R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & R600_INACTIVE_QD_PIPES_MASK) >> 8); |
diff --git a/drivers/gpu/drm/radeon/r600_cs.c b/drivers/gpu/drm/radeon/r600_cs.c index cd2c63bce501..c39c1bc13016 100644 --- a/drivers/gpu/drm/radeon/r600_cs.c +++ b/drivers/gpu/drm/radeon/r600_cs.c | |||
| @@ -45,6 +45,7 @@ struct r600_cs_track { | |||
| 45 | u32 nbanks; | 45 | u32 nbanks; |
| 46 | u32 npipes; | 46 | u32 npipes; |
| 47 | /* value we track */ | 47 | /* value we track */ |
| 48 | u32 sq_config; | ||
| 48 | u32 nsamples; | 49 | u32 nsamples; |
| 49 | u32 cb_color_base_last[8]; | 50 | u32 cb_color_base_last[8]; |
| 50 | struct radeon_bo *cb_color_bo[8]; | 51 | struct radeon_bo *cb_color_bo[8]; |
| @@ -141,6 +142,8 @@ static void r600_cs_track_init(struct r600_cs_track *track) | |||
| 141 | { | 142 | { |
| 142 | int i; | 143 | int i; |
| 143 | 144 | ||
| 145 | /* assume DX9 mode */ | ||
| 146 | track->sq_config = DX9_CONSTS; | ||
| 144 | for (i = 0; i < 8; i++) { | 147 | for (i = 0; i < 8; i++) { |
| 145 | track->cb_color_base_last[i] = 0; | 148 | track->cb_color_base_last[i] = 0; |
| 146 | track->cb_color_size[i] = 0; | 149 | track->cb_color_size[i] = 0; |
| @@ -715,6 +718,9 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx | |||
| 715 | tmp =radeon_get_ib_value(p, idx); | 718 | tmp =radeon_get_ib_value(p, idx); |
| 716 | ib[idx] = 0; | 719 | ib[idx] = 0; |
| 717 | break; | 720 | break; |
| 721 | case SQ_CONFIG: | ||
| 722 | track->sq_config = radeon_get_ib_value(p, idx); | ||
| 723 | break; | ||
| 718 | case R_028800_DB_DEPTH_CONTROL: | 724 | case R_028800_DB_DEPTH_CONTROL: |
| 719 | track->db_depth_control = radeon_get_ib_value(p, idx); | 725 | track->db_depth_control = radeon_get_ib_value(p, idx); |
| 720 | break; | 726 | break; |
| @@ -869,6 +875,54 @@ static inline int r600_cs_check_reg(struct radeon_cs_parser *p, u32 reg, u32 idx | |||
| 869 | case SQ_PGM_START_VS: | 875 | case SQ_PGM_START_VS: |
| 870 | case SQ_PGM_START_GS: | 876 | case SQ_PGM_START_GS: |
| 871 | case SQ_PGM_START_PS: | 877 | case SQ_PGM_START_PS: |
| 878 | case SQ_ALU_CONST_CACHE_GS_0: | ||
| 879 | case SQ_ALU_CONST_CACHE_GS_1: | ||
| 880 | case SQ_ALU_CONST_CACHE_GS_2: | ||
| 881 | case SQ_ALU_CONST_CACHE_GS_3: | ||
| 882 | case SQ_ALU_CONST_CACHE_GS_4: | ||
| 883 | case SQ_ALU_CONST_CACHE_GS_5: | ||
| 884 | case SQ_ALU_CONST_CACHE_GS_6: | ||
| 885 | case SQ_ALU_CONST_CACHE_GS_7: | ||
| 886 | case SQ_ALU_CONST_CACHE_GS_8: | ||
| 887 | case SQ_ALU_CONST_CACHE_GS_9: | ||
| 888 | case SQ_ALU_CONST_CACHE_GS_10: | ||
| 889 | case SQ_ALU_CONST_CACHE_GS_11: | ||
| 890 | case SQ_ALU_CONST_CACHE_GS_12: | ||
| 891 | case SQ_ALU_CONST_CACHE_GS_13: | ||
| 892 | case SQ_ALU_CONST_CACHE_GS_14: | ||
| 893 | case SQ_ALU_CONST_CACHE_GS_15: | ||
| 894 | case SQ_ALU_CONST_CACHE_PS_0: | ||
| 895 | case SQ_ALU_CONST_CACHE_PS_1: | ||
| 896 | case SQ_ALU_CONST_CACHE_PS_2: | ||
| 897 | case SQ_ALU_CONST_CACHE_PS_3: | ||
| 898 | case SQ_ALU_CONST_CACHE_PS_4: | ||
| 899 | case SQ_ALU_CONST_CACHE_PS_5: | ||
| 900 | case SQ_ALU_CONST_CACHE_PS_6: | ||
| 901 | case SQ_ALU_CONST_CACHE_PS_7: | ||
| 902 | case SQ_ALU_CONST_CACHE_PS_8: | ||
| 903 | case SQ_ALU_CONST_CACHE_PS_9: | ||
| 904 | case SQ_ALU_CONST_CACHE_PS_10: | ||
| 905 | case SQ_ALU_CONST_CACHE_PS_11: | ||
| 906 | case SQ_ALU_CONST_CACHE_PS_12: | ||
| 907 | case SQ_ALU_CONST_CACHE_PS_13: | ||
| 908 | case SQ_ALU_CONST_CACHE_PS_14: | ||
| 909 | case SQ_ALU_CONST_CACHE_PS_15: | ||
| 910 | case SQ_ALU_CONST_CACHE_VS_0: | ||
| 911 | case SQ_ALU_CONST_CACHE_VS_1: | ||
| 912 | case SQ_ALU_CONST_CACHE_VS_2: | ||
| 913 | case SQ_ALU_CONST_CACHE_VS_3: | ||
| 914 | case SQ_ALU_CONST_CACHE_VS_4: | ||
| 915 | case SQ_ALU_CONST_CACHE_VS_5: | ||
| 916 | case SQ_ALU_CONST_CACHE_VS_6: | ||
| 917 | case SQ_ALU_CONST_CACHE_VS_7: | ||
| 918 | case SQ_ALU_CONST_CACHE_VS_8: | ||
| 919 | case SQ_ALU_CONST_CACHE_VS_9: | ||
| 920 | case SQ_ALU_CONST_CACHE_VS_10: | ||
| 921 | case SQ_ALU_CONST_CACHE_VS_11: | ||
| 922 | case SQ_ALU_CONST_CACHE_VS_12: | ||
| 923 | case SQ_ALU_CONST_CACHE_VS_13: | ||
| 924 | case SQ_ALU_CONST_CACHE_VS_14: | ||
| 925 | case SQ_ALU_CONST_CACHE_VS_15: | ||
| 872 | r = r600_cs_packet_next_reloc(p, &reloc); | 926 | r = r600_cs_packet_next_reloc(p, &reloc); |
| 873 | if (r) { | 927 | if (r) { |
| 874 | dev_warn(p->dev, "bad SET_CONTEXT_REG " | 928 | dev_warn(p->dev, "bad SET_CONTEXT_REG " |
| @@ -1226,13 +1280,15 @@ static int r600_packet3_check(struct radeon_cs_parser *p, | |||
| 1226 | } | 1280 | } |
| 1227 | break; | 1281 | break; |
| 1228 | case PACKET3_SET_ALU_CONST: | 1282 | case PACKET3_SET_ALU_CONST: |
| 1229 | start_reg = (idx_value << 2) + PACKET3_SET_ALU_CONST_OFFSET; | 1283 | if (track->sq_config & DX9_CONSTS) { |
| 1230 | end_reg = 4 * pkt->count + start_reg - 4; | 1284 | start_reg = (idx_value << 2) + PACKET3_SET_ALU_CONST_OFFSET; |
| 1231 | if ((start_reg < PACKET3_SET_ALU_CONST_OFFSET) || | 1285 | end_reg = 4 * pkt->count + start_reg - 4; |
| 1232 | (start_reg >= PACKET3_SET_ALU_CONST_END) || | 1286 | if ((start_reg < PACKET3_SET_ALU_CONST_OFFSET) || |
| 1233 | (end_reg >= PACKET3_SET_ALU_CONST_END)) { | 1287 | (start_reg >= PACKET3_SET_ALU_CONST_END) || |
| 1234 | DRM_ERROR("bad SET_ALU_CONST\n"); | 1288 | (end_reg >= PACKET3_SET_ALU_CONST_END)) { |
| 1235 | return -EINVAL; | 1289 | DRM_ERROR("bad SET_ALU_CONST\n"); |
| 1290 | return -EINVAL; | ||
| 1291 | } | ||
| 1236 | } | 1292 | } |
| 1237 | break; | 1293 | break; |
| 1238 | case PACKET3_SET_BOOL_CONST: | 1294 | case PACKET3_SET_BOOL_CONST: |
diff --git a/drivers/gpu/drm/radeon/r600_hdmi.c b/drivers/gpu/drm/radeon/r600_hdmi.c index fcc949df0e5d..029fa1406d1d 100644 --- a/drivers/gpu/drm/radeon/r600_hdmi.c +++ b/drivers/gpu/drm/radeon/r600_hdmi.c | |||
| @@ -42,13 +42,13 @@ enum r600_hdmi_color_format { | |||
| 42 | */ | 42 | */ |
| 43 | enum r600_hdmi_iec_status_bits { | 43 | enum r600_hdmi_iec_status_bits { |
| 44 | AUDIO_STATUS_DIG_ENABLE = 0x01, | 44 | AUDIO_STATUS_DIG_ENABLE = 0x01, |
| 45 | AUDIO_STATUS_V = 0x02, | 45 | AUDIO_STATUS_V = 0x02, |
| 46 | AUDIO_STATUS_VCFG = 0x04, | 46 | AUDIO_STATUS_VCFG = 0x04, |
| 47 | AUDIO_STATUS_EMPHASIS = 0x08, | 47 | AUDIO_STATUS_EMPHASIS = 0x08, |
| 48 | AUDIO_STATUS_COPYRIGHT = 0x10, | 48 | AUDIO_STATUS_COPYRIGHT = 0x10, |
| 49 | AUDIO_STATUS_NONAUDIO = 0x20, | 49 | AUDIO_STATUS_NONAUDIO = 0x20, |
| 50 | AUDIO_STATUS_PROFESSIONAL = 0x40, | 50 | AUDIO_STATUS_PROFESSIONAL = 0x40, |
| 51 | AUDIO_STATUS_LEVEL = 0x80 | 51 | AUDIO_STATUS_LEVEL = 0x80 |
| 52 | }; | 52 | }; |
| 53 | 53 | ||
| 54 | struct { | 54 | struct { |
| @@ -85,7 +85,7 @@ struct { | |||
| 85 | static void r600_hdmi_calc_CTS(uint32_t clock, int *CTS, int N, int freq) | 85 | static void r600_hdmi_calc_CTS(uint32_t clock, int *CTS, int N, int freq) |
| 86 | { | 86 | { |
| 87 | if (*CTS == 0) | 87 | if (*CTS == 0) |
| 88 | *CTS = clock*N/(128*freq)*1000; | 88 | *CTS = clock * N / (128 * freq) * 1000; |
| 89 | DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n", | 89 | DRM_DEBUG("Using ACR timing N=%d CTS=%d for frequency %d\n", |
| 90 | N, *CTS, freq); | 90 | N, *CTS, freq); |
| 91 | } | 91 | } |
| @@ -131,11 +131,11 @@ static void r600_hdmi_infoframe_checksum(uint8_t packetType, | |||
| 131 | uint8_t length, | 131 | uint8_t length, |
| 132 | uint8_t *frame) | 132 | uint8_t *frame) |
| 133 | { | 133 | { |
| 134 | int i; | 134 | int i; |
| 135 | frame[0] = packetType + versionNumber + length; | 135 | frame[0] = packetType + versionNumber + length; |
| 136 | for (i = 1; i <= length; i++) | 136 | for (i = 1; i <= length; i++) |
| 137 | frame[0] += frame[i]; | 137 | frame[0] += frame[i]; |
| 138 | frame[0] = 0x100 - frame[0]; | 138 | frame[0] = 0x100 - frame[0]; |
| 139 | } | 139 | } |
| 140 | 140 | ||
| 141 | /* | 141 | /* |
| @@ -417,90 +417,141 @@ void r600_hdmi_update_audio_settings(struct drm_encoder *encoder, | |||
| 417 | WREG32_P(offset+R600_HDMI_CNTL, 0x04000000, ~0x04000000); | 417 | WREG32_P(offset+R600_HDMI_CNTL, 0x04000000, ~0x04000000); |
| 418 | } | 418 | } |
| 419 | 419 | ||
| 420 | /* | 420 | static int r600_hdmi_find_free_block(struct drm_device *dev) |
| 421 | * enable/disable the HDMI engine | 421 | { |
| 422 | */ | 422 | struct radeon_device *rdev = dev->dev_private; |
| 423 | void r600_hdmi_enable(struct drm_encoder *encoder, int enable) | 423 | struct drm_encoder *encoder; |
| 424 | struct radeon_encoder *radeon_encoder; | ||
| 425 | bool free_blocks[3] = { true, true, true }; | ||
| 426 | |||
| 427 | list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) { | ||
| 428 | radeon_encoder = to_radeon_encoder(encoder); | ||
| 429 | switch (radeon_encoder->hdmi_offset) { | ||
| 430 | case R600_HDMI_BLOCK1: | ||
| 431 | free_blocks[0] = false; | ||
| 432 | break; | ||
| 433 | case R600_HDMI_BLOCK2: | ||
| 434 | free_blocks[1] = false; | ||
| 435 | break; | ||
| 436 | case R600_HDMI_BLOCK3: | ||
| 437 | free_blocks[2] = false; | ||
| 438 | break; | ||
| 439 | } | ||
| 440 | } | ||
| 441 | |||
| 442 | if (rdev->family == CHIP_RS600 || rdev->family == CHIP_RS690) { | ||
| 443 | return free_blocks[0] ? R600_HDMI_BLOCK1 : 0; | ||
| 444 | } else if (rdev->family >= CHIP_R600) { | ||
| 445 | if (free_blocks[0]) | ||
| 446 | return R600_HDMI_BLOCK1; | ||
| 447 | else if (free_blocks[1]) | ||
| 448 | return R600_HDMI_BLOCK2; | ||
| 449 | } | ||
| 450 | return 0; | ||
| 451 | } | ||
| 452 | |||
| 453 | static void r600_hdmi_assign_block(struct drm_encoder *encoder) | ||
| 424 | { | 454 | { |
| 425 | struct drm_device *dev = encoder->dev; | 455 | struct drm_device *dev = encoder->dev; |
| 426 | struct radeon_device *rdev = dev->dev_private; | 456 | struct radeon_device *rdev = dev->dev_private; |
| 427 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 457 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 428 | uint32_t offset = to_radeon_encoder(encoder)->hdmi_offset; | 458 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; |
| 429 | 459 | ||
| 430 | if (!offset) | 460 | if (!dig) { |
| 461 | dev_err(rdev->dev, "Enabling HDMI on non-dig encoder\n"); | ||
| 431 | return; | 462 | return; |
| 463 | } | ||
| 432 | 464 | ||
| 433 | DRM_DEBUG("%s HDMI interface @ 0x%04X\n", enable ? "Enabling" : "Disabling", offset); | 465 | if (ASIC_IS_DCE4(rdev)) { |
| 434 | 466 | /* TODO */ | |
| 435 | /* some version of atombios ignore the enable HDMI flag | 467 | } else if (ASIC_IS_DCE3(rdev)) { |
| 436 | * so enabling/disabling HDMI was moved here for TMDS1+2 */ | 468 | radeon_encoder->hdmi_offset = dig->dig_encoder ? |
| 437 | switch (radeon_encoder->encoder_id) { | 469 | R600_HDMI_BLOCK3 : R600_HDMI_BLOCK1; |
| 438 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | 470 | if (ASIC_IS_DCE32(rdev)) |
| 439 | WREG32_P(AVIVO_TMDSA_CNTL, enable ? 0x4 : 0x0, ~0x4); | 471 | radeon_encoder->hdmi_config_offset = dig->dig_encoder ? |
| 440 | WREG32(offset+R600_HDMI_ENABLE, enable ? 0x101 : 0x0); | 472 | R600_HDMI_CONFIG2 : R600_HDMI_CONFIG1; |
| 441 | break; | 473 | } else if (rdev->family >= CHIP_R600) { |
| 442 | 474 | radeon_encoder->hdmi_offset = r600_hdmi_find_free_block(dev); | |
| 443 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | ||
| 444 | WREG32_P(AVIVO_LVTMA_CNTL, enable ? 0x4 : 0x0, ~0x4); | ||
| 445 | WREG32(offset+R600_HDMI_ENABLE, enable ? 0x105 : 0x0); | ||
| 446 | break; | ||
| 447 | |||
| 448 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | ||
| 449 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | ||
| 450 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | ||
| 451 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | ||
| 452 | /* This part is doubtfull in my opinion */ | ||
| 453 | WREG32(offset+R600_HDMI_ENABLE, enable ? 0x110 : 0x0); | ||
| 454 | break; | ||
| 455 | |||
| 456 | default: | ||
| 457 | DRM_ERROR("unknown HDMI output type\n"); | ||
| 458 | break; | ||
| 459 | } | 475 | } |
| 460 | } | 476 | } |
| 461 | 477 | ||
| 462 | /* | 478 | /* |
| 463 | * determin at which register offset the HDMI encoder is | 479 | * enable the HDMI engine |
| 464 | */ | 480 | */ |
| 465 | void r600_hdmi_init(struct drm_encoder *encoder) | 481 | void r600_hdmi_enable(struct drm_encoder *encoder) |
| 466 | { | 482 | { |
| 483 | struct drm_device *dev = encoder->dev; | ||
| 484 | struct radeon_device *rdev = dev->dev_private; | ||
| 467 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 485 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 468 | 486 | ||
| 469 | switch (radeon_encoder->encoder_id) { | 487 | if (!radeon_encoder->hdmi_offset) { |
| 470 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | 488 | r600_hdmi_assign_block(encoder); |
| 471 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 489 | if (!radeon_encoder->hdmi_offset) { |
| 472 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | 490 | dev_warn(rdev->dev, "Could not find HDMI block for " |
| 473 | radeon_encoder->hdmi_offset = R600_HDMI_TMDS1; | 491 | "0x%x encoder\n", radeon_encoder->encoder_id); |
| 474 | break; | 492 | return; |
| 475 | 493 | } | |
| 476 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | 494 | } |
| 477 | switch (r600_audio_tmds_index(encoder)) { | 495 | |
| 478 | case 0: | 496 | if (ASIC_IS_DCE32(rdev) && !ASIC_IS_DCE4(rdev)) { |
| 479 | radeon_encoder->hdmi_offset = R600_HDMI_TMDS1; | 497 | WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0x1, ~0x1); |
| 498 | } else if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) { | ||
| 499 | int offset = radeon_encoder->hdmi_offset; | ||
| 500 | switch (radeon_encoder->encoder_id) { | ||
| 501 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | ||
| 502 | WREG32_P(AVIVO_TMDSA_CNTL, 0x4, ~0x4); | ||
| 503 | WREG32(offset + R600_HDMI_ENABLE, 0x101); | ||
| 480 | break; | 504 | break; |
| 481 | case 1: | 505 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: |
| 482 | radeon_encoder->hdmi_offset = R600_HDMI_TMDS2; | 506 | WREG32_P(AVIVO_LVTMA_CNTL, 0x4, ~0x4); |
| 507 | WREG32(offset + R600_HDMI_ENABLE, 0x105); | ||
| 483 | break; | 508 | break; |
| 484 | default: | 509 | default: |
| 485 | radeon_encoder->hdmi_offset = 0; | 510 | dev_err(rdev->dev, "Unknown HDMI output type\n"); |
| 486 | break; | 511 | break; |
| 487 | } | 512 | } |
| 488 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | 513 | } |
| 489 | radeon_encoder->hdmi_offset = R600_HDMI_TMDS2; | ||
| 490 | break; | ||
| 491 | 514 | ||
| 492 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_LVTMA: | 515 | DRM_DEBUG("Enabling HDMI interface @ 0x%04X for encoder 0x%x\n", |
| 493 | radeon_encoder->hdmi_offset = R600_HDMI_DIG; | 516 | radeon_encoder->hdmi_offset, radeon_encoder->encoder_id); |
| 494 | break; | 517 | } |
| 495 | 518 | ||
| 496 | default: | 519 | /* |
| 497 | radeon_encoder->hdmi_offset = 0; | 520 | * disable the HDMI engine |
| 498 | break; | 521 | */ |
| 522 | void r600_hdmi_disable(struct drm_encoder *encoder) | ||
| 523 | { | ||
| 524 | struct drm_device *dev = encoder->dev; | ||
| 525 | struct radeon_device *rdev = dev->dev_private; | ||
| 526 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
| 527 | |||
| 528 | if (!radeon_encoder->hdmi_offset) { | ||
| 529 | dev_err(rdev->dev, "Disabling not enabled HDMI\n"); | ||
| 530 | return; | ||
| 499 | } | 531 | } |
| 500 | 532 | ||
| 501 | DRM_DEBUG("using HDMI engine at offset 0x%04X for encoder 0x%x\n", | 533 | DRM_DEBUG("Disabling HDMI interface @ 0x%04X for encoder 0x%x\n", |
| 502 | radeon_encoder->hdmi_offset, radeon_encoder->encoder_id); | 534 | radeon_encoder->hdmi_offset, radeon_encoder->encoder_id); |
| 535 | |||
| 536 | if (ASIC_IS_DCE32(rdev) && !ASIC_IS_DCE4(rdev)) { | ||
| 537 | WREG32_P(radeon_encoder->hdmi_config_offset + 0x4, 0, ~0x1); | ||
| 538 | } else if (rdev->family >= CHIP_R600 && !ASIC_IS_DCE3(rdev)) { | ||
| 539 | int offset = radeon_encoder->hdmi_offset; | ||
| 540 | switch (radeon_encoder->encoder_id) { | ||
| 541 | case ENCODER_OBJECT_ID_INTERNAL_KLDSCP_TMDS1: | ||
| 542 | WREG32_P(AVIVO_TMDSA_CNTL, 0, ~0x4); | ||
| 543 | WREG32(offset + R600_HDMI_ENABLE, 0); | ||
| 544 | break; | ||
| 545 | case ENCODER_OBJECT_ID_INTERNAL_LVTM1: | ||
| 546 | WREG32_P(AVIVO_LVTMA_CNTL, 0, ~0x4); | ||
| 547 | WREG32(offset + R600_HDMI_ENABLE, 0); | ||
| 548 | break; | ||
| 549 | default: | ||
| 550 | dev_err(rdev->dev, "Unknown HDMI output type\n"); | ||
| 551 | break; | ||
| 552 | } | ||
| 553 | } | ||
| 503 | 554 | ||
| 504 | /* TODO: make this configureable */ | 555 | radeon_encoder->hdmi_offset = 0; |
| 505 | radeon_encoder->hdmi_audio_workaround = 0; | 556 | radeon_encoder->hdmi_config_offset = 0; |
| 506 | } | 557 | } |
diff --git a/drivers/gpu/drm/radeon/r600_reg.h b/drivers/gpu/drm/radeon/r600_reg.h index d0e28ffdeda9..7b1d22370f6e 100644 --- a/drivers/gpu/drm/radeon/r600_reg.h +++ b/drivers/gpu/drm/radeon/r600_reg.h | |||
| @@ -152,9 +152,9 @@ | |||
| 152 | #define R600_AUDIO_STATUS_BITS 0x73d8 | 152 | #define R600_AUDIO_STATUS_BITS 0x73d8 |
| 153 | 153 | ||
| 154 | /* HDMI base register addresses */ | 154 | /* HDMI base register addresses */ |
| 155 | #define R600_HDMI_TMDS1 0x7400 | 155 | #define R600_HDMI_BLOCK1 0x7400 |
| 156 | #define R600_HDMI_TMDS2 0x7700 | 156 | #define R600_HDMI_BLOCK2 0x7700 |
| 157 | #define R600_HDMI_DIG 0x7800 | 157 | #define R600_HDMI_BLOCK3 0x7800 |
| 158 | 158 | ||
| 159 | /* HDMI registers */ | 159 | /* HDMI registers */ |
| 160 | #define R600_HDMI_ENABLE 0x00 | 160 | #define R600_HDMI_ENABLE 0x00 |
| @@ -185,4 +185,8 @@ | |||
| 185 | #define R600_HDMI_AUDIO_DEBUG_2 0xe8 | 185 | #define R600_HDMI_AUDIO_DEBUG_2 0xe8 |
| 186 | #define R600_HDMI_AUDIO_DEBUG_3 0xec | 186 | #define R600_HDMI_AUDIO_DEBUG_3 0xec |
| 187 | 187 | ||
| 188 | /* HDMI additional config base register addresses */ | ||
| 189 | #define R600_HDMI_CONFIG1 0x7600 | ||
| 190 | #define R600_HDMI_CONFIG2 0x7a00 | ||
| 191 | |||
| 188 | #endif | 192 | #endif |
diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h index 5b2e4d442823..59c1f8793e60 100644 --- a/drivers/gpu/drm/radeon/r600d.h +++ b/drivers/gpu/drm/radeon/r600d.h | |||
| @@ -77,6 +77,55 @@ | |||
| 77 | #define CB_COLOR0_FRAG 0x280e0 | 77 | #define CB_COLOR0_FRAG 0x280e0 |
| 78 | #define CB_COLOR0_MASK 0x28100 | 78 | #define CB_COLOR0_MASK 0x28100 |
| 79 | 79 | ||
| 80 | #define SQ_ALU_CONST_CACHE_PS_0 0x28940 | ||
| 81 | #define SQ_ALU_CONST_CACHE_PS_1 0x28944 | ||
| 82 | #define SQ_ALU_CONST_CACHE_PS_2 0x28948 | ||
| 83 | #define SQ_ALU_CONST_CACHE_PS_3 0x2894c | ||
| 84 | #define SQ_ALU_CONST_CACHE_PS_4 0x28950 | ||
| 85 | #define SQ_ALU_CONST_CACHE_PS_5 0x28954 | ||
| 86 | #define SQ_ALU_CONST_CACHE_PS_6 0x28958 | ||
| 87 | #define SQ_ALU_CONST_CACHE_PS_7 0x2895c | ||
| 88 | #define SQ_ALU_CONST_CACHE_PS_8 0x28960 | ||
| 89 | #define SQ_ALU_CONST_CACHE_PS_9 0x28964 | ||
| 90 | #define SQ_ALU_CONST_CACHE_PS_10 0x28968 | ||
| 91 | #define SQ_ALU_CONST_CACHE_PS_11 0x2896c | ||
| 92 | #define SQ_ALU_CONST_CACHE_PS_12 0x28970 | ||
| 93 | #define SQ_ALU_CONST_CACHE_PS_13 0x28974 | ||
| 94 | #define SQ_ALU_CONST_CACHE_PS_14 0x28978 | ||
| 95 | #define SQ_ALU_CONST_CACHE_PS_15 0x2897c | ||
| 96 | #define SQ_ALU_CONST_CACHE_VS_0 0x28980 | ||
| 97 | #define SQ_ALU_CONST_CACHE_VS_1 0x28984 | ||
| 98 | #define SQ_ALU_CONST_CACHE_VS_2 0x28988 | ||
| 99 | #define SQ_ALU_CONST_CACHE_VS_3 0x2898c | ||
| 100 | #define SQ_ALU_CONST_CACHE_VS_4 0x28990 | ||
| 101 | #define SQ_ALU_CONST_CACHE_VS_5 0x28994 | ||
| 102 | #define SQ_ALU_CONST_CACHE_VS_6 0x28998 | ||
| 103 | #define SQ_ALU_CONST_CACHE_VS_7 0x2899c | ||
| 104 | #define SQ_ALU_CONST_CACHE_VS_8 0x289a0 | ||
| 105 | #define SQ_ALU_CONST_CACHE_VS_9 0x289a4 | ||
| 106 | #define SQ_ALU_CONST_CACHE_VS_10 0x289a8 | ||
| 107 | #define SQ_ALU_CONST_CACHE_VS_11 0x289ac | ||
| 108 | #define SQ_ALU_CONST_CACHE_VS_12 0x289b0 | ||
| 109 | #define SQ_ALU_CONST_CACHE_VS_13 0x289b4 | ||
| 110 | #define SQ_ALU_CONST_CACHE_VS_14 0x289b8 | ||
| 111 | #define SQ_ALU_CONST_CACHE_VS_15 0x289bc | ||
| 112 | #define SQ_ALU_CONST_CACHE_GS_0 0x289c0 | ||
| 113 | #define SQ_ALU_CONST_CACHE_GS_1 0x289c4 | ||
| 114 | #define SQ_ALU_CONST_CACHE_GS_2 0x289c8 | ||
| 115 | #define SQ_ALU_CONST_CACHE_GS_3 0x289cc | ||
| 116 | #define SQ_ALU_CONST_CACHE_GS_4 0x289d0 | ||
| 117 | #define SQ_ALU_CONST_CACHE_GS_5 0x289d4 | ||
| 118 | #define SQ_ALU_CONST_CACHE_GS_6 0x289d8 | ||
| 119 | #define SQ_ALU_CONST_CACHE_GS_7 0x289dc | ||
| 120 | #define SQ_ALU_CONST_CACHE_GS_8 0x289e0 | ||
| 121 | #define SQ_ALU_CONST_CACHE_GS_9 0x289e4 | ||
| 122 | #define SQ_ALU_CONST_CACHE_GS_10 0x289e8 | ||
| 123 | #define SQ_ALU_CONST_CACHE_GS_11 0x289ec | ||
| 124 | #define SQ_ALU_CONST_CACHE_GS_12 0x289f0 | ||
| 125 | #define SQ_ALU_CONST_CACHE_GS_13 0x289f4 | ||
| 126 | #define SQ_ALU_CONST_CACHE_GS_14 0x289f8 | ||
| 127 | #define SQ_ALU_CONST_CACHE_GS_15 0x289fc | ||
| 128 | |||
| 80 | #define CONFIG_MEMSIZE 0x5428 | 129 | #define CONFIG_MEMSIZE 0x5428 |
| 81 | #define CONFIG_CNTL 0x5424 | 130 | #define CONFIG_CNTL 0x5424 |
| 82 | #define CP_STAT 0x8680 | 131 | #define CP_STAT 0x8680 |
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 829e26e8a4bb..034218c3dbbb 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h | |||
| @@ -91,6 +91,8 @@ extern int radeon_tv; | |||
| 91 | extern int radeon_new_pll; | 91 | extern int radeon_new_pll; |
| 92 | extern int radeon_dynpm; | 92 | extern int radeon_dynpm; |
| 93 | extern int radeon_audio; | 93 | extern int radeon_audio; |
| 94 | extern int radeon_disp_priority; | ||
| 95 | extern int radeon_hw_i2c; | ||
| 94 | 96 | ||
| 95 | /* | 97 | /* |
| 96 | * Copy from radeon_drv.h so we don't have to include both and have conflicting | 98 | * Copy from radeon_drv.h so we don't have to include both and have conflicting |
| @@ -168,6 +170,7 @@ struct radeon_clock { | |||
| 168 | * Power management | 170 | * Power management |
| 169 | */ | 171 | */ |
| 170 | int radeon_pm_init(struct radeon_device *rdev); | 172 | int radeon_pm_init(struct radeon_device *rdev); |
| 173 | void radeon_pm_fini(struct radeon_device *rdev); | ||
| 171 | void radeon_pm_compute_clocks(struct radeon_device *rdev); | 174 | void radeon_pm_compute_clocks(struct radeon_device *rdev); |
| 172 | void radeon_combios_get_power_modes(struct radeon_device *rdev); | 175 | void radeon_combios_get_power_modes(struct radeon_device *rdev); |
| 173 | void radeon_atombios_get_power_modes(struct radeon_device *rdev); | 176 | void radeon_atombios_get_power_modes(struct radeon_device *rdev); |
| @@ -687,6 +690,7 @@ struct radeon_pm { | |||
| 687 | bool downclocked; | 690 | bool downclocked; |
| 688 | int active_crtcs; | 691 | int active_crtcs; |
| 689 | int req_vblank; | 692 | int req_vblank; |
| 693 | bool vblank_sync; | ||
| 690 | fixed20_12 max_bandwidth; | 694 | fixed20_12 max_bandwidth; |
| 691 | fixed20_12 igp_sideport_mclk; | 695 | fixed20_12 igp_sideport_mclk; |
| 692 | fixed20_12 igp_system_mclk; | 696 | fixed20_12 igp_system_mclk; |
| @@ -697,6 +701,7 @@ struct radeon_pm { | |||
| 697 | fixed20_12 ht_bandwidth; | 701 | fixed20_12 ht_bandwidth; |
| 698 | fixed20_12 core_bandwidth; | 702 | fixed20_12 core_bandwidth; |
| 699 | fixed20_12 sclk; | 703 | fixed20_12 sclk; |
| 704 | fixed20_12 mclk; | ||
| 700 | fixed20_12 needed_bandwidth; | 705 | fixed20_12 needed_bandwidth; |
| 701 | /* XXX: use a define for num power modes */ | 706 | /* XXX: use a define for num power modes */ |
| 702 | struct radeon_power_state power_state[8]; | 707 | struct radeon_power_state power_state[8]; |
| @@ -707,6 +712,7 @@ struct radeon_pm { | |||
| 707 | struct radeon_power_state *requested_power_state; | 712 | struct radeon_power_state *requested_power_state; |
| 708 | struct radeon_pm_clock_info *requested_clock_mode; | 713 | struct radeon_pm_clock_info *requested_clock_mode; |
| 709 | struct radeon_power_state *default_power_state; | 714 | struct radeon_power_state *default_power_state; |
| 715 | struct radeon_i2c_chan *i2c_bus; | ||
| 710 | }; | 716 | }; |
| 711 | 717 | ||
| 712 | 718 | ||
| @@ -729,8 +735,6 @@ int radeon_debugfs_add_files(struct radeon_device *rdev, | |||
| 729 | struct drm_info_list *files, | 735 | struct drm_info_list *files, |
| 730 | unsigned nfiles); | 736 | unsigned nfiles); |
| 731 | int radeon_debugfs_fence_init(struct radeon_device *rdev); | 737 | int radeon_debugfs_fence_init(struct radeon_device *rdev); |
| 732 | int r100_debugfs_rbbm_init(struct radeon_device *rdev); | ||
| 733 | int r100_debugfs_cp_init(struct radeon_device *rdev); | ||
| 734 | 738 | ||
| 735 | 739 | ||
| 736 | /* | 740 | /* |
| @@ -782,7 +786,7 @@ struct radeon_asic { | |||
| 782 | int (*set_surface_reg)(struct radeon_device *rdev, int reg, | 786 | int (*set_surface_reg)(struct radeon_device *rdev, int reg, |
| 783 | uint32_t tiling_flags, uint32_t pitch, | 787 | uint32_t tiling_flags, uint32_t pitch, |
| 784 | uint32_t offset, uint32_t obj_size); | 788 | uint32_t offset, uint32_t obj_size); |
| 785 | int (*clear_surface_reg)(struct radeon_device *rdev, int reg); | 789 | void (*clear_surface_reg)(struct radeon_device *rdev, int reg); |
| 786 | void (*bandwidth_update)(struct radeon_device *rdev); | 790 | void (*bandwidth_update)(struct radeon_device *rdev); |
| 787 | void (*hpd_init)(struct radeon_device *rdev); | 791 | void (*hpd_init)(struct radeon_device *rdev); |
| 788 | void (*hpd_fini)(struct radeon_device *rdev); | 792 | void (*hpd_fini)(struct radeon_device *rdev); |
| @@ -862,6 +866,12 @@ union radeon_asic_config { | |||
| 862 | struct rv770_asic rv770; | 866 | struct rv770_asic rv770; |
| 863 | }; | 867 | }; |
| 864 | 868 | ||
| 869 | /* | ||
| 870 | * asic initizalization from radeon_asic.c | ||
| 871 | */ | ||
| 872 | void radeon_agp_disable(struct radeon_device *rdev); | ||
| 873 | int radeon_asic_init(struct radeon_device *rdev); | ||
| 874 | |||
| 865 | 875 | ||
| 866 | /* | 876 | /* |
| 867 | * IOCTL. | 877 | * IOCTL. |
| @@ -1172,6 +1182,8 @@ extern void radeon_gart_restore(struct radeon_device *rdev); | |||
| 1172 | extern int radeon_modeset_init(struct radeon_device *rdev); | 1182 | extern int radeon_modeset_init(struct radeon_device *rdev); |
| 1173 | extern void radeon_modeset_fini(struct radeon_device *rdev); | 1183 | extern void radeon_modeset_fini(struct radeon_device *rdev); |
| 1174 | extern bool radeon_card_posted(struct radeon_device *rdev); | 1184 | extern bool radeon_card_posted(struct radeon_device *rdev); |
| 1185 | extern void radeon_update_bandwidth_info(struct radeon_device *rdev); | ||
| 1186 | extern void radeon_update_display_priority(struct radeon_device *rdev); | ||
| 1175 | extern bool radeon_boot_test_post_card(struct radeon_device *rdev); | 1187 | extern bool radeon_boot_test_post_card(struct radeon_device *rdev); |
| 1176 | extern int radeon_clocks_init(struct radeon_device *rdev); | 1188 | extern int radeon_clocks_init(struct radeon_device *rdev); |
| 1177 | extern void radeon_clocks_fini(struct radeon_device *rdev); | 1189 | extern void radeon_clocks_fini(struct radeon_device *rdev); |
| @@ -1188,51 +1200,6 @@ extern int radeon_resume_kms(struct drm_device *dev); | |||
| 1188 | extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state); | 1200 | extern int radeon_suspend_kms(struct drm_device *dev, pm_message_t state); |
| 1189 | 1201 | ||
| 1190 | /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ | 1202 | /* r100,rv100,rs100,rv200,rs200,r200,rv250,rs300,rv280 */ |
| 1191 | struct r100_mc_save { | ||
| 1192 | u32 GENMO_WT; | ||
| 1193 | u32 CRTC_EXT_CNTL; | ||
| 1194 | u32 CRTC_GEN_CNTL; | ||
| 1195 | u32 CRTC2_GEN_CNTL; | ||
| 1196 | u32 CUR_OFFSET; | ||
| 1197 | u32 CUR2_OFFSET; | ||
| 1198 | }; | ||
| 1199 | extern void r100_cp_disable(struct radeon_device *rdev); | ||
| 1200 | extern int r100_cp_init(struct radeon_device *rdev, unsigned ring_size); | ||
| 1201 | extern void r100_cp_fini(struct radeon_device *rdev); | ||
| 1202 | extern void r100_pci_gart_tlb_flush(struct radeon_device *rdev); | ||
| 1203 | extern int r100_pci_gart_init(struct radeon_device *rdev); | ||
| 1204 | extern void r100_pci_gart_fini(struct radeon_device *rdev); | ||
| 1205 | extern int r100_pci_gart_enable(struct radeon_device *rdev); | ||
| 1206 | extern void r100_pci_gart_disable(struct radeon_device *rdev); | ||
| 1207 | extern int r100_pci_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | ||
| 1208 | extern int r100_debugfs_mc_info_init(struct radeon_device *rdev); | ||
| 1209 | extern int r100_gui_wait_for_idle(struct radeon_device *rdev); | ||
| 1210 | extern void r100_ib_fini(struct radeon_device *rdev); | ||
| 1211 | extern int r100_ib_init(struct radeon_device *rdev); | ||
| 1212 | extern void r100_irq_disable(struct radeon_device *rdev); | ||
| 1213 | extern int r100_irq_set(struct radeon_device *rdev); | ||
| 1214 | extern void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save); | ||
| 1215 | extern void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save); | ||
| 1216 | extern void r100_vram_init_sizes(struct radeon_device *rdev); | ||
| 1217 | extern void r100_wb_disable(struct radeon_device *rdev); | ||
| 1218 | extern void r100_wb_fini(struct radeon_device *rdev); | ||
| 1219 | extern int r100_wb_init(struct radeon_device *rdev); | ||
| 1220 | extern void r100_hdp_reset(struct radeon_device *rdev); | ||
| 1221 | extern int r100_rb2d_reset(struct radeon_device *rdev); | ||
| 1222 | extern int r100_cp_reset(struct radeon_device *rdev); | ||
| 1223 | extern void r100_vga_render_disable(struct radeon_device *rdev); | ||
| 1224 | extern int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, | ||
| 1225 | struct radeon_cs_packet *pkt, | ||
| 1226 | struct radeon_bo *robj); | ||
| 1227 | extern int r100_cs_parse_packet0(struct radeon_cs_parser *p, | ||
| 1228 | struct radeon_cs_packet *pkt, | ||
| 1229 | const unsigned *auth, unsigned n, | ||
| 1230 | radeon_packet0_check_t check); | ||
| 1231 | extern int r100_cs_packet_parse(struct radeon_cs_parser *p, | ||
| 1232 | struct radeon_cs_packet *pkt, | ||
| 1233 | unsigned idx); | ||
| 1234 | extern void r100_enable_bm(struct radeon_device *rdev); | ||
| 1235 | extern void r100_set_common_regs(struct radeon_device *rdev); | ||
| 1236 | 1203 | ||
| 1237 | /* rv200,rv250,rv280 */ | 1204 | /* rv200,rv250,rv280 */ |
| 1238 | extern void r200_set_safe_registers(struct radeon_device *rdev); | 1205 | extern void r200_set_safe_registers(struct radeon_device *rdev); |
| @@ -1322,7 +1289,8 @@ extern int r600_audio_tmds_index(struct drm_encoder *encoder); | |||
| 1322 | extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock); | 1289 | extern void r600_audio_set_clock(struct drm_encoder *encoder, int clock); |
| 1323 | extern void r600_audio_fini(struct radeon_device *rdev); | 1290 | extern void r600_audio_fini(struct radeon_device *rdev); |
| 1324 | extern void r600_hdmi_init(struct drm_encoder *encoder); | 1291 | extern void r600_hdmi_init(struct drm_encoder *encoder); |
| 1325 | extern void r600_hdmi_enable(struct drm_encoder *encoder, int enable); | 1292 | extern void r600_hdmi_enable(struct drm_encoder *encoder); |
| 1293 | extern void r600_hdmi_disable(struct drm_encoder *encoder); | ||
| 1326 | extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode); | 1294 | extern void r600_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode *mode); |
| 1327 | extern int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); | 1295 | extern int r600_hdmi_buffer_status_changed(struct drm_encoder *encoder); |
| 1328 | extern void r600_hdmi_update_audio_settings(struct drm_encoder *encoder, | 1296 | extern void r600_hdmi_update_audio_settings(struct drm_encoder *encoder, |
diff --git a/drivers/gpu/drm/radeon/radeon_asic.c b/drivers/gpu/drm/radeon/radeon_asic.c new file mode 100644 index 000000000000..a4b4bc9fa322 --- /dev/null +++ b/drivers/gpu/drm/radeon/radeon_asic.c | |||
| @@ -0,0 +1,772 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2008 Advanced Micro Devices, Inc. | ||
| 3 | * Copyright 2008 Red Hat Inc. | ||
| 4 | * Copyright 2009 Jerome Glisse. | ||
| 5 | * | ||
| 6 | * Permission is hereby granted, free of charge, to any person obtaining a | ||
| 7 | * copy of this software and associated documentation files (the "Software"), | ||
| 8 | * to deal in the Software without restriction, including without limitation | ||
| 9 | * the rights to use, copy, modify, merge, publish, distribute, sublicense, | ||
| 10 | * and/or sell copies of the Software, and to permit persons to whom the | ||
| 11 | * Software is furnished to do so, subject to the following conditions: | ||
| 12 | * | ||
| 13 | * The above copyright notice and this permission notice shall be included in | ||
| 14 | * all copies or substantial portions of the Software. | ||
| 15 | * | ||
| 16 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 17 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 18 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL | ||
| 19 | * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR | ||
| 20 | * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, | ||
| 21 | * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR | ||
| 22 | * OTHER DEALINGS IN THE SOFTWARE. | ||
| 23 | * | ||
| 24 | * Authors: Dave Airlie | ||
| 25 | * Alex Deucher | ||
| 26 | * Jerome Glisse | ||
| 27 | */ | ||
| 28 | |||
| 29 | #include <linux/console.h> | ||
| 30 | #include <drm/drmP.h> | ||
| 31 | #include <drm/drm_crtc_helper.h> | ||
| 32 | #include <drm/radeon_drm.h> | ||
| 33 | #include <linux/vgaarb.h> | ||
| 34 | #include <linux/vga_switcheroo.h> | ||
| 35 | #include "radeon_reg.h" | ||
| 36 | #include "radeon.h" | ||
| 37 | #include "radeon_asic.h" | ||
| 38 | #include "atom.h" | ||
| 39 | |||
| 40 | /* | ||
| 41 | * Registers accessors functions. | ||
| 42 | */ | ||
| 43 | static uint32_t radeon_invalid_rreg(struct radeon_device *rdev, uint32_t reg) | ||
| 44 | { | ||
| 45 | DRM_ERROR("Invalid callback to read register 0x%04X\n", reg); | ||
| 46 | BUG_ON(1); | ||
| 47 | return 0; | ||
| 48 | } | ||
| 49 | |||
| 50 | static void radeon_invalid_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v) | ||
| 51 | { | ||
| 52 | DRM_ERROR("Invalid callback to write register 0x%04X with 0x%08X\n", | ||
| 53 | reg, v); | ||
| 54 | BUG_ON(1); | ||
| 55 | } | ||
| 56 | |||
| 57 | static void radeon_register_accessor_init(struct radeon_device *rdev) | ||
| 58 | { | ||
| 59 | rdev->mc_rreg = &radeon_invalid_rreg; | ||
| 60 | rdev->mc_wreg = &radeon_invalid_wreg; | ||
| 61 | rdev->pll_rreg = &radeon_invalid_rreg; | ||
| 62 | rdev->pll_wreg = &radeon_invalid_wreg; | ||
| 63 | rdev->pciep_rreg = &radeon_invalid_rreg; | ||
| 64 | rdev->pciep_wreg = &radeon_invalid_wreg; | ||
| 65 | |||
| 66 | /* Don't change order as we are overridding accessor. */ | ||
| 67 | if (rdev->family < CHIP_RV515) { | ||
| 68 | rdev->pcie_reg_mask = 0xff; | ||
| 69 | } else { | ||
| 70 | rdev->pcie_reg_mask = 0x7ff; | ||
| 71 | } | ||
| 72 | /* FIXME: not sure here */ | ||
| 73 | if (rdev->family <= CHIP_R580) { | ||
| 74 | rdev->pll_rreg = &r100_pll_rreg; | ||
| 75 | rdev->pll_wreg = &r100_pll_wreg; | ||
| 76 | } | ||
| 77 | if (rdev->family >= CHIP_R420) { | ||
| 78 | rdev->mc_rreg = &r420_mc_rreg; | ||
| 79 | rdev->mc_wreg = &r420_mc_wreg; | ||
| 80 | } | ||
| 81 | if (rdev->family >= CHIP_RV515) { | ||
| 82 | rdev->mc_rreg = &rv515_mc_rreg; | ||
| 83 | rdev->mc_wreg = &rv515_mc_wreg; | ||
| 84 | } | ||
| 85 | if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) { | ||
| 86 | rdev->mc_rreg = &rs400_mc_rreg; | ||
| 87 | rdev->mc_wreg = &rs400_mc_wreg; | ||
| 88 | } | ||
| 89 | if (rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) { | ||
| 90 | rdev->mc_rreg = &rs690_mc_rreg; | ||
| 91 | rdev->mc_wreg = &rs690_mc_wreg; | ||
| 92 | } | ||
| 93 | if (rdev->family == CHIP_RS600) { | ||
| 94 | rdev->mc_rreg = &rs600_mc_rreg; | ||
| 95 | rdev->mc_wreg = &rs600_mc_wreg; | ||
| 96 | } | ||
| 97 | if ((rdev->family >= CHIP_R600) && (rdev->family <= CHIP_RV740)) { | ||
| 98 | rdev->pciep_rreg = &r600_pciep_rreg; | ||
| 99 | rdev->pciep_wreg = &r600_pciep_wreg; | ||
| 100 | } | ||
| 101 | } | ||
| 102 | |||
| 103 | |||
| 104 | /* helper to disable agp */ | ||
| 105 | void radeon_agp_disable(struct radeon_device *rdev) | ||
| 106 | { | ||
| 107 | rdev->flags &= ~RADEON_IS_AGP; | ||
| 108 | if (rdev->family >= CHIP_R600) { | ||
| 109 | DRM_INFO("Forcing AGP to PCIE mode\n"); | ||
| 110 | rdev->flags |= RADEON_IS_PCIE; | ||
| 111 | } else if (rdev->family >= CHIP_RV515 || | ||
| 112 | rdev->family == CHIP_RV380 || | ||
| 113 | rdev->family == CHIP_RV410 || | ||
| 114 | rdev->family == CHIP_R423) { | ||
| 115 | DRM_INFO("Forcing AGP to PCIE mode\n"); | ||
| 116 | rdev->flags |= RADEON_IS_PCIE; | ||
| 117 | rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush; | ||
| 118 | rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; | ||
| 119 | } else { | ||
| 120 | DRM_INFO("Forcing AGP to PCI mode\n"); | ||
| 121 | rdev->flags |= RADEON_IS_PCI; | ||
| 122 | rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush; | ||
| 123 | rdev->asic->gart_set_page = &r100_pci_gart_set_page; | ||
| 124 | } | ||
| 125 | rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; | ||
| 126 | } | ||
| 127 | |||
| 128 | /* | ||
| 129 | * ASIC | ||
| 130 | */ | ||
| 131 | static struct radeon_asic r100_asic = { | ||
| 132 | .init = &r100_init, | ||
| 133 | .fini = &r100_fini, | ||
| 134 | .suspend = &r100_suspend, | ||
| 135 | .resume = &r100_resume, | ||
| 136 | .vga_set_state = &r100_vga_set_state, | ||
| 137 | .gpu_reset = &r100_gpu_reset, | ||
| 138 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | ||
| 139 | .gart_set_page = &r100_pci_gart_set_page, | ||
| 140 | .cp_commit = &r100_cp_commit, | ||
| 141 | .ring_start = &r100_ring_start, | ||
| 142 | .ring_test = &r100_ring_test, | ||
| 143 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 144 | .irq_set = &r100_irq_set, | ||
| 145 | .irq_process = &r100_irq_process, | ||
| 146 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 147 | .fence_ring_emit = &r100_fence_ring_emit, | ||
| 148 | .cs_parse = &r100_cs_parse, | ||
| 149 | .copy_blit = &r100_copy_blit, | ||
| 150 | .copy_dma = NULL, | ||
| 151 | .copy = &r100_copy_blit, | ||
| 152 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 153 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 154 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 155 | .set_memory_clock = NULL, | ||
| 156 | .get_pcie_lanes = NULL, | ||
| 157 | .set_pcie_lanes = NULL, | ||
| 158 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 159 | .set_surface_reg = r100_set_surface_reg, | ||
| 160 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 161 | .bandwidth_update = &r100_bandwidth_update, | ||
| 162 | .hpd_init = &r100_hpd_init, | ||
| 163 | .hpd_fini = &r100_hpd_fini, | ||
| 164 | .hpd_sense = &r100_hpd_sense, | ||
| 165 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 166 | .ioctl_wait_idle = NULL, | ||
| 167 | }; | ||
| 168 | |||
| 169 | static struct radeon_asic r200_asic = { | ||
| 170 | .init = &r100_init, | ||
| 171 | .fini = &r100_fini, | ||
| 172 | .suspend = &r100_suspend, | ||
| 173 | .resume = &r100_resume, | ||
| 174 | .vga_set_state = &r100_vga_set_state, | ||
| 175 | .gpu_reset = &r100_gpu_reset, | ||
| 176 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | ||
| 177 | .gart_set_page = &r100_pci_gart_set_page, | ||
| 178 | .cp_commit = &r100_cp_commit, | ||
| 179 | .ring_start = &r100_ring_start, | ||
| 180 | .ring_test = &r100_ring_test, | ||
| 181 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 182 | .irq_set = &r100_irq_set, | ||
| 183 | .irq_process = &r100_irq_process, | ||
| 184 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 185 | .fence_ring_emit = &r100_fence_ring_emit, | ||
| 186 | .cs_parse = &r100_cs_parse, | ||
| 187 | .copy_blit = &r100_copy_blit, | ||
| 188 | .copy_dma = &r200_copy_dma, | ||
| 189 | .copy = &r100_copy_blit, | ||
| 190 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 191 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 192 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 193 | .set_memory_clock = NULL, | ||
| 194 | .set_pcie_lanes = NULL, | ||
| 195 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 196 | .set_surface_reg = r100_set_surface_reg, | ||
| 197 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 198 | .bandwidth_update = &r100_bandwidth_update, | ||
| 199 | .hpd_init = &r100_hpd_init, | ||
| 200 | .hpd_fini = &r100_hpd_fini, | ||
| 201 | .hpd_sense = &r100_hpd_sense, | ||
| 202 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 203 | .ioctl_wait_idle = NULL, | ||
| 204 | }; | ||
| 205 | |||
| 206 | static struct radeon_asic r300_asic = { | ||
| 207 | .init = &r300_init, | ||
| 208 | .fini = &r300_fini, | ||
| 209 | .suspend = &r300_suspend, | ||
| 210 | .resume = &r300_resume, | ||
| 211 | .vga_set_state = &r100_vga_set_state, | ||
| 212 | .gpu_reset = &r300_gpu_reset, | ||
| 213 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | ||
| 214 | .gart_set_page = &r100_pci_gart_set_page, | ||
| 215 | .cp_commit = &r100_cp_commit, | ||
| 216 | .ring_start = &r300_ring_start, | ||
| 217 | .ring_test = &r100_ring_test, | ||
| 218 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 219 | .irq_set = &r100_irq_set, | ||
| 220 | .irq_process = &r100_irq_process, | ||
| 221 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 222 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 223 | .cs_parse = &r300_cs_parse, | ||
| 224 | .copy_blit = &r100_copy_blit, | ||
| 225 | .copy_dma = &r200_copy_dma, | ||
| 226 | .copy = &r100_copy_blit, | ||
| 227 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 228 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 229 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 230 | .set_memory_clock = NULL, | ||
| 231 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 232 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 233 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 234 | .set_surface_reg = r100_set_surface_reg, | ||
| 235 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 236 | .bandwidth_update = &r100_bandwidth_update, | ||
| 237 | .hpd_init = &r100_hpd_init, | ||
| 238 | .hpd_fini = &r100_hpd_fini, | ||
| 239 | .hpd_sense = &r100_hpd_sense, | ||
| 240 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 241 | .ioctl_wait_idle = NULL, | ||
| 242 | }; | ||
| 243 | |||
| 244 | static struct radeon_asic r300_asic_pcie = { | ||
| 245 | .init = &r300_init, | ||
| 246 | .fini = &r300_fini, | ||
| 247 | .suspend = &r300_suspend, | ||
| 248 | .resume = &r300_resume, | ||
| 249 | .vga_set_state = &r100_vga_set_state, | ||
| 250 | .gpu_reset = &r300_gpu_reset, | ||
| 251 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 252 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 253 | .cp_commit = &r100_cp_commit, | ||
| 254 | .ring_start = &r300_ring_start, | ||
| 255 | .ring_test = &r100_ring_test, | ||
| 256 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 257 | .irq_set = &r100_irq_set, | ||
| 258 | .irq_process = &r100_irq_process, | ||
| 259 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 260 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 261 | .cs_parse = &r300_cs_parse, | ||
| 262 | .copy_blit = &r100_copy_blit, | ||
| 263 | .copy_dma = &r200_copy_dma, | ||
| 264 | .copy = &r100_copy_blit, | ||
| 265 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 266 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 267 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 268 | .set_memory_clock = NULL, | ||
| 269 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 270 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 271 | .set_surface_reg = r100_set_surface_reg, | ||
| 272 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 273 | .bandwidth_update = &r100_bandwidth_update, | ||
| 274 | .hpd_init = &r100_hpd_init, | ||
| 275 | .hpd_fini = &r100_hpd_fini, | ||
| 276 | .hpd_sense = &r100_hpd_sense, | ||
| 277 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 278 | .ioctl_wait_idle = NULL, | ||
| 279 | }; | ||
| 280 | |||
| 281 | static struct radeon_asic r420_asic = { | ||
| 282 | .init = &r420_init, | ||
| 283 | .fini = &r420_fini, | ||
| 284 | .suspend = &r420_suspend, | ||
| 285 | .resume = &r420_resume, | ||
| 286 | .vga_set_state = &r100_vga_set_state, | ||
| 287 | .gpu_reset = &r300_gpu_reset, | ||
| 288 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 289 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 290 | .cp_commit = &r100_cp_commit, | ||
| 291 | .ring_start = &r300_ring_start, | ||
| 292 | .ring_test = &r100_ring_test, | ||
| 293 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 294 | .irq_set = &r100_irq_set, | ||
| 295 | .irq_process = &r100_irq_process, | ||
| 296 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 297 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 298 | .cs_parse = &r300_cs_parse, | ||
| 299 | .copy_blit = &r100_copy_blit, | ||
| 300 | .copy_dma = &r200_copy_dma, | ||
| 301 | .copy = &r100_copy_blit, | ||
| 302 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 303 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 304 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 305 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 306 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 307 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 308 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 309 | .set_surface_reg = r100_set_surface_reg, | ||
| 310 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 311 | .bandwidth_update = &r100_bandwidth_update, | ||
| 312 | .hpd_init = &r100_hpd_init, | ||
| 313 | .hpd_fini = &r100_hpd_fini, | ||
| 314 | .hpd_sense = &r100_hpd_sense, | ||
| 315 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 316 | .ioctl_wait_idle = NULL, | ||
| 317 | }; | ||
| 318 | |||
| 319 | static struct radeon_asic rs400_asic = { | ||
| 320 | .init = &rs400_init, | ||
| 321 | .fini = &rs400_fini, | ||
| 322 | .suspend = &rs400_suspend, | ||
| 323 | .resume = &rs400_resume, | ||
| 324 | .vga_set_state = &r100_vga_set_state, | ||
| 325 | .gpu_reset = &r300_gpu_reset, | ||
| 326 | .gart_tlb_flush = &rs400_gart_tlb_flush, | ||
| 327 | .gart_set_page = &rs400_gart_set_page, | ||
| 328 | .cp_commit = &r100_cp_commit, | ||
| 329 | .ring_start = &r300_ring_start, | ||
| 330 | .ring_test = &r100_ring_test, | ||
| 331 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 332 | .irq_set = &r100_irq_set, | ||
| 333 | .irq_process = &r100_irq_process, | ||
| 334 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 335 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 336 | .cs_parse = &r300_cs_parse, | ||
| 337 | .copy_blit = &r100_copy_blit, | ||
| 338 | .copy_dma = &r200_copy_dma, | ||
| 339 | .copy = &r100_copy_blit, | ||
| 340 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 341 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 342 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 343 | .set_memory_clock = NULL, | ||
| 344 | .get_pcie_lanes = NULL, | ||
| 345 | .set_pcie_lanes = NULL, | ||
| 346 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 347 | .set_surface_reg = r100_set_surface_reg, | ||
| 348 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 349 | .bandwidth_update = &r100_bandwidth_update, | ||
| 350 | .hpd_init = &r100_hpd_init, | ||
| 351 | .hpd_fini = &r100_hpd_fini, | ||
| 352 | .hpd_sense = &r100_hpd_sense, | ||
| 353 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 354 | .ioctl_wait_idle = NULL, | ||
| 355 | }; | ||
| 356 | |||
| 357 | static struct radeon_asic rs600_asic = { | ||
| 358 | .init = &rs600_init, | ||
| 359 | .fini = &rs600_fini, | ||
| 360 | .suspend = &rs600_suspend, | ||
| 361 | .resume = &rs600_resume, | ||
| 362 | .vga_set_state = &r100_vga_set_state, | ||
| 363 | .gpu_reset = &r300_gpu_reset, | ||
| 364 | .gart_tlb_flush = &rs600_gart_tlb_flush, | ||
| 365 | .gart_set_page = &rs600_gart_set_page, | ||
| 366 | .cp_commit = &r100_cp_commit, | ||
| 367 | .ring_start = &r300_ring_start, | ||
| 368 | .ring_test = &r100_ring_test, | ||
| 369 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 370 | .irq_set = &rs600_irq_set, | ||
| 371 | .irq_process = &rs600_irq_process, | ||
| 372 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 373 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 374 | .cs_parse = &r300_cs_parse, | ||
| 375 | .copy_blit = &r100_copy_blit, | ||
| 376 | .copy_dma = &r200_copy_dma, | ||
| 377 | .copy = &r100_copy_blit, | ||
| 378 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 379 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 380 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 381 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 382 | .get_pcie_lanes = NULL, | ||
| 383 | .set_pcie_lanes = NULL, | ||
| 384 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 385 | .set_surface_reg = r100_set_surface_reg, | ||
| 386 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 387 | .bandwidth_update = &rs600_bandwidth_update, | ||
| 388 | .hpd_init = &rs600_hpd_init, | ||
| 389 | .hpd_fini = &rs600_hpd_fini, | ||
| 390 | .hpd_sense = &rs600_hpd_sense, | ||
| 391 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 392 | .ioctl_wait_idle = NULL, | ||
| 393 | }; | ||
| 394 | |||
| 395 | static struct radeon_asic rs690_asic = { | ||
| 396 | .init = &rs690_init, | ||
| 397 | .fini = &rs690_fini, | ||
| 398 | .suspend = &rs690_suspend, | ||
| 399 | .resume = &rs690_resume, | ||
| 400 | .vga_set_state = &r100_vga_set_state, | ||
| 401 | .gpu_reset = &r300_gpu_reset, | ||
| 402 | .gart_tlb_flush = &rs400_gart_tlb_flush, | ||
| 403 | .gart_set_page = &rs400_gart_set_page, | ||
| 404 | .cp_commit = &r100_cp_commit, | ||
| 405 | .ring_start = &r300_ring_start, | ||
| 406 | .ring_test = &r100_ring_test, | ||
| 407 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 408 | .irq_set = &rs600_irq_set, | ||
| 409 | .irq_process = &rs600_irq_process, | ||
| 410 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 411 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 412 | .cs_parse = &r300_cs_parse, | ||
| 413 | .copy_blit = &r100_copy_blit, | ||
| 414 | .copy_dma = &r200_copy_dma, | ||
| 415 | .copy = &r200_copy_dma, | ||
| 416 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 417 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 418 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 419 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 420 | .get_pcie_lanes = NULL, | ||
| 421 | .set_pcie_lanes = NULL, | ||
| 422 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 423 | .set_surface_reg = r100_set_surface_reg, | ||
| 424 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 425 | .bandwidth_update = &rs690_bandwidth_update, | ||
| 426 | .hpd_init = &rs600_hpd_init, | ||
| 427 | .hpd_fini = &rs600_hpd_fini, | ||
| 428 | .hpd_sense = &rs600_hpd_sense, | ||
| 429 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 430 | .ioctl_wait_idle = NULL, | ||
| 431 | }; | ||
| 432 | |||
| 433 | static struct radeon_asic rv515_asic = { | ||
| 434 | .init = &rv515_init, | ||
| 435 | .fini = &rv515_fini, | ||
| 436 | .suspend = &rv515_suspend, | ||
| 437 | .resume = &rv515_resume, | ||
| 438 | .vga_set_state = &r100_vga_set_state, | ||
| 439 | .gpu_reset = &rv515_gpu_reset, | ||
| 440 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 441 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 442 | .cp_commit = &r100_cp_commit, | ||
| 443 | .ring_start = &rv515_ring_start, | ||
| 444 | .ring_test = &r100_ring_test, | ||
| 445 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 446 | .irq_set = &rs600_irq_set, | ||
| 447 | .irq_process = &rs600_irq_process, | ||
| 448 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 449 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 450 | .cs_parse = &r300_cs_parse, | ||
| 451 | .copy_blit = &r100_copy_blit, | ||
| 452 | .copy_dma = &r200_copy_dma, | ||
| 453 | .copy = &r100_copy_blit, | ||
| 454 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 455 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 456 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 457 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 458 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 459 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 460 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 461 | .set_surface_reg = r100_set_surface_reg, | ||
| 462 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 463 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 464 | .hpd_init = &rs600_hpd_init, | ||
| 465 | .hpd_fini = &rs600_hpd_fini, | ||
| 466 | .hpd_sense = &rs600_hpd_sense, | ||
| 467 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 468 | .ioctl_wait_idle = NULL, | ||
| 469 | }; | ||
| 470 | |||
| 471 | static struct radeon_asic r520_asic = { | ||
| 472 | .init = &r520_init, | ||
| 473 | .fini = &rv515_fini, | ||
| 474 | .suspend = &rv515_suspend, | ||
| 475 | .resume = &r520_resume, | ||
| 476 | .vga_set_state = &r100_vga_set_state, | ||
| 477 | .gpu_reset = &rv515_gpu_reset, | ||
| 478 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 479 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 480 | .cp_commit = &r100_cp_commit, | ||
| 481 | .ring_start = &rv515_ring_start, | ||
| 482 | .ring_test = &r100_ring_test, | ||
| 483 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 484 | .irq_set = &rs600_irq_set, | ||
| 485 | .irq_process = &rs600_irq_process, | ||
| 486 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 487 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 488 | .cs_parse = &r300_cs_parse, | ||
| 489 | .copy_blit = &r100_copy_blit, | ||
| 490 | .copy_dma = &r200_copy_dma, | ||
| 491 | .copy = &r100_copy_blit, | ||
| 492 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 493 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 494 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 495 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 496 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 497 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 498 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 499 | .set_surface_reg = r100_set_surface_reg, | ||
| 500 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 501 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 502 | .hpd_init = &rs600_hpd_init, | ||
| 503 | .hpd_fini = &rs600_hpd_fini, | ||
| 504 | .hpd_sense = &rs600_hpd_sense, | ||
| 505 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 506 | .ioctl_wait_idle = NULL, | ||
| 507 | }; | ||
| 508 | |||
| 509 | static struct radeon_asic r600_asic = { | ||
| 510 | .init = &r600_init, | ||
| 511 | .fini = &r600_fini, | ||
| 512 | .suspend = &r600_suspend, | ||
| 513 | .resume = &r600_resume, | ||
| 514 | .cp_commit = &r600_cp_commit, | ||
| 515 | .vga_set_state = &r600_vga_set_state, | ||
| 516 | .gpu_reset = &r600_gpu_reset, | ||
| 517 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 518 | .gart_set_page = &rs600_gart_set_page, | ||
| 519 | .ring_test = &r600_ring_test, | ||
| 520 | .ring_ib_execute = &r600_ring_ib_execute, | ||
| 521 | .irq_set = &r600_irq_set, | ||
| 522 | .irq_process = &r600_irq_process, | ||
| 523 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 524 | .fence_ring_emit = &r600_fence_ring_emit, | ||
| 525 | .cs_parse = &r600_cs_parse, | ||
| 526 | .copy_blit = &r600_copy_blit, | ||
| 527 | .copy_dma = &r600_copy_blit, | ||
| 528 | .copy = &r600_copy_blit, | ||
| 529 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 530 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 531 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 532 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 533 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 534 | .set_pcie_lanes = NULL, | ||
| 535 | .set_clock_gating = NULL, | ||
| 536 | .set_surface_reg = r600_set_surface_reg, | ||
| 537 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 538 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 539 | .hpd_init = &r600_hpd_init, | ||
| 540 | .hpd_fini = &r600_hpd_fini, | ||
| 541 | .hpd_sense = &r600_hpd_sense, | ||
| 542 | .hpd_set_polarity = &r600_hpd_set_polarity, | ||
| 543 | .ioctl_wait_idle = r600_ioctl_wait_idle, | ||
| 544 | }; | ||
| 545 | |||
| 546 | static struct radeon_asic rs780_asic = { | ||
| 547 | .init = &r600_init, | ||
| 548 | .fini = &r600_fini, | ||
| 549 | .suspend = &r600_suspend, | ||
| 550 | .resume = &r600_resume, | ||
| 551 | .cp_commit = &r600_cp_commit, | ||
| 552 | .vga_set_state = &r600_vga_set_state, | ||
| 553 | .gpu_reset = &r600_gpu_reset, | ||
| 554 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 555 | .gart_set_page = &rs600_gart_set_page, | ||
| 556 | .ring_test = &r600_ring_test, | ||
| 557 | .ring_ib_execute = &r600_ring_ib_execute, | ||
| 558 | .irq_set = &r600_irq_set, | ||
| 559 | .irq_process = &r600_irq_process, | ||
| 560 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 561 | .fence_ring_emit = &r600_fence_ring_emit, | ||
| 562 | .cs_parse = &r600_cs_parse, | ||
| 563 | .copy_blit = &r600_copy_blit, | ||
| 564 | .copy_dma = &r600_copy_blit, | ||
| 565 | .copy = &r600_copy_blit, | ||
| 566 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 567 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 568 | .get_memory_clock = NULL, | ||
| 569 | .set_memory_clock = NULL, | ||
| 570 | .get_pcie_lanes = NULL, | ||
| 571 | .set_pcie_lanes = NULL, | ||
| 572 | .set_clock_gating = NULL, | ||
| 573 | .set_surface_reg = r600_set_surface_reg, | ||
| 574 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 575 | .bandwidth_update = &rs690_bandwidth_update, | ||
| 576 | .hpd_init = &r600_hpd_init, | ||
| 577 | .hpd_fini = &r600_hpd_fini, | ||
| 578 | .hpd_sense = &r600_hpd_sense, | ||
| 579 | .hpd_set_polarity = &r600_hpd_set_polarity, | ||
| 580 | .ioctl_wait_idle = r600_ioctl_wait_idle, | ||
| 581 | }; | ||
| 582 | |||
| 583 | static struct radeon_asic rv770_asic = { | ||
| 584 | .init = &rv770_init, | ||
| 585 | .fini = &rv770_fini, | ||
| 586 | .suspend = &rv770_suspend, | ||
| 587 | .resume = &rv770_resume, | ||
| 588 | .cp_commit = &r600_cp_commit, | ||
| 589 | .gpu_reset = &rv770_gpu_reset, | ||
| 590 | .vga_set_state = &r600_vga_set_state, | ||
| 591 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 592 | .gart_set_page = &rs600_gart_set_page, | ||
| 593 | .ring_test = &r600_ring_test, | ||
| 594 | .ring_ib_execute = &r600_ring_ib_execute, | ||
| 595 | .irq_set = &r600_irq_set, | ||
| 596 | .irq_process = &r600_irq_process, | ||
| 597 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 598 | .fence_ring_emit = &r600_fence_ring_emit, | ||
| 599 | .cs_parse = &r600_cs_parse, | ||
| 600 | .copy_blit = &r600_copy_blit, | ||
| 601 | .copy_dma = &r600_copy_blit, | ||
| 602 | .copy = &r600_copy_blit, | ||
| 603 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 604 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 605 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 606 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 607 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 608 | .set_pcie_lanes = NULL, | ||
| 609 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 610 | .set_surface_reg = r600_set_surface_reg, | ||
| 611 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 612 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 613 | .hpd_init = &r600_hpd_init, | ||
| 614 | .hpd_fini = &r600_hpd_fini, | ||
| 615 | .hpd_sense = &r600_hpd_sense, | ||
| 616 | .hpd_set_polarity = &r600_hpd_set_polarity, | ||
| 617 | .ioctl_wait_idle = r600_ioctl_wait_idle, | ||
| 618 | }; | ||
| 619 | |||
| 620 | static struct radeon_asic evergreen_asic = { | ||
| 621 | .init = &evergreen_init, | ||
| 622 | .fini = &evergreen_fini, | ||
| 623 | .suspend = &evergreen_suspend, | ||
| 624 | .resume = &evergreen_resume, | ||
| 625 | .cp_commit = NULL, | ||
| 626 | .gpu_reset = &evergreen_gpu_reset, | ||
| 627 | .vga_set_state = &r600_vga_set_state, | ||
| 628 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 629 | .gart_set_page = &rs600_gart_set_page, | ||
| 630 | .ring_test = NULL, | ||
| 631 | .ring_ib_execute = NULL, | ||
| 632 | .irq_set = NULL, | ||
| 633 | .irq_process = NULL, | ||
| 634 | .get_vblank_counter = NULL, | ||
| 635 | .fence_ring_emit = NULL, | ||
| 636 | .cs_parse = NULL, | ||
| 637 | .copy_blit = NULL, | ||
| 638 | .copy_dma = NULL, | ||
| 639 | .copy = NULL, | ||
| 640 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 641 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 642 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 643 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 644 | .set_pcie_lanes = NULL, | ||
| 645 | .set_clock_gating = NULL, | ||
| 646 | .set_surface_reg = r600_set_surface_reg, | ||
| 647 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 648 | .bandwidth_update = &evergreen_bandwidth_update, | ||
| 649 | .hpd_init = &evergreen_hpd_init, | ||
| 650 | .hpd_fini = &evergreen_hpd_fini, | ||
| 651 | .hpd_sense = &evergreen_hpd_sense, | ||
| 652 | .hpd_set_polarity = &evergreen_hpd_set_polarity, | ||
| 653 | }; | ||
| 654 | |||
| 655 | int radeon_asic_init(struct radeon_device *rdev) | ||
| 656 | { | ||
| 657 | radeon_register_accessor_init(rdev); | ||
| 658 | switch (rdev->family) { | ||
| 659 | case CHIP_R100: | ||
| 660 | case CHIP_RV100: | ||
| 661 | case CHIP_RS100: | ||
| 662 | case CHIP_RV200: | ||
| 663 | case CHIP_RS200: | ||
| 664 | rdev->asic = &r100_asic; | ||
| 665 | break; | ||
| 666 | case CHIP_R200: | ||
| 667 | case CHIP_RV250: | ||
| 668 | case CHIP_RS300: | ||
| 669 | case CHIP_RV280: | ||
| 670 | rdev->asic = &r200_asic; | ||
| 671 | break; | ||
| 672 | case CHIP_R300: | ||
| 673 | case CHIP_R350: | ||
| 674 | case CHIP_RV350: | ||
| 675 | case CHIP_RV380: | ||
| 676 | if (rdev->flags & RADEON_IS_PCIE) | ||
| 677 | rdev->asic = &r300_asic_pcie; | ||
| 678 | else | ||
| 679 | rdev->asic = &r300_asic; | ||
| 680 | break; | ||
| 681 | case CHIP_R420: | ||
| 682 | case CHIP_R423: | ||
| 683 | case CHIP_RV410: | ||
| 684 | rdev->asic = &r420_asic; | ||
| 685 | break; | ||
| 686 | case CHIP_RS400: | ||
| 687 | case CHIP_RS480: | ||
| 688 | rdev->asic = &rs400_asic; | ||
| 689 | break; | ||
| 690 | case CHIP_RS600: | ||
| 691 | rdev->asic = &rs600_asic; | ||
| 692 | break; | ||
| 693 | case CHIP_RS690: | ||
| 694 | case CHIP_RS740: | ||
| 695 | rdev->asic = &rs690_asic; | ||
| 696 | break; | ||
| 697 | case CHIP_RV515: | ||
| 698 | rdev->asic = &rv515_asic; | ||
| 699 | break; | ||
| 700 | case CHIP_R520: | ||
| 701 | case CHIP_RV530: | ||
| 702 | case CHIP_RV560: | ||
| 703 | case CHIP_RV570: | ||
| 704 | case CHIP_R580: | ||
| 705 | rdev->asic = &r520_asic; | ||
| 706 | break; | ||
| 707 | case CHIP_R600: | ||
| 708 | case CHIP_RV610: | ||
| 709 | case CHIP_RV630: | ||
| 710 | case CHIP_RV620: | ||
| 711 | case CHIP_RV635: | ||
| 712 | case CHIP_RV670: | ||
| 713 | rdev->asic = &r600_asic; | ||
| 714 | break; | ||
| 715 | case CHIP_RS780: | ||
| 716 | case CHIP_RS880: | ||
| 717 | rdev->asic = &rs780_asic; | ||
| 718 | break; | ||
| 719 | case CHIP_RV770: | ||
| 720 | case CHIP_RV730: | ||
| 721 | case CHIP_RV710: | ||
| 722 | case CHIP_RV740: | ||
| 723 | rdev->asic = &rv770_asic; | ||
| 724 | break; | ||
| 725 | case CHIP_CEDAR: | ||
| 726 | case CHIP_REDWOOD: | ||
| 727 | case CHIP_JUNIPER: | ||
| 728 | case CHIP_CYPRESS: | ||
| 729 | case CHIP_HEMLOCK: | ||
| 730 | rdev->asic = &evergreen_asic; | ||
| 731 | break; | ||
| 732 | default: | ||
| 733 | /* FIXME: not supported yet */ | ||
| 734 | return -EINVAL; | ||
| 735 | } | ||
| 736 | |||
| 737 | if (rdev->flags & RADEON_IS_IGP) { | ||
| 738 | rdev->asic->get_memory_clock = NULL; | ||
| 739 | rdev->asic->set_memory_clock = NULL; | ||
| 740 | } | ||
| 741 | |||
| 742 | /* set the number of crtcs */ | ||
| 743 | if (rdev->flags & RADEON_SINGLE_CRTC) | ||
| 744 | rdev->num_crtc = 1; | ||
| 745 | else { | ||
| 746 | if (ASIC_IS_DCE4(rdev)) | ||
| 747 | rdev->num_crtc = 6; | ||
| 748 | else | ||
| 749 | rdev->num_crtc = 2; | ||
| 750 | } | ||
| 751 | |||
| 752 | return 0; | ||
| 753 | } | ||
| 754 | |||
| 755 | /* | ||
| 756 | * Wrapper around modesetting bits. Move to radeon_clocks.c? | ||
| 757 | */ | ||
| 758 | int radeon_clocks_init(struct radeon_device *rdev) | ||
| 759 | { | ||
| 760 | int r; | ||
| 761 | |||
| 762 | r = radeon_static_clocks_init(rdev->ddev); | ||
| 763 | if (r) { | ||
| 764 | return r; | ||
| 765 | } | ||
| 766 | DRM_INFO("Clocks initialized !\n"); | ||
| 767 | return 0; | ||
| 768 | } | ||
| 769 | |||
| 770 | void radeon_clocks_fini(struct radeon_device *rdev) | ||
| 771 | { | ||
| 772 | } | ||
diff --git a/drivers/gpu/drm/radeon/radeon_asic.h b/drivers/gpu/drm/radeon/radeon_asic.h index d3a157b2bcb7..a0b8280663d1 100644 --- a/drivers/gpu/drm/radeon/radeon_asic.h +++ b/drivers/gpu/drm/radeon/radeon_asic.h | |||
| @@ -45,10 +45,18 @@ void radeon_atom_set_clock_gating(struct radeon_device *rdev, int enable); | |||
| 45 | /* | 45 | /* |
| 46 | * r100,rv100,rs100,rv200,rs200 | 46 | * r100,rv100,rs100,rv200,rs200 |
| 47 | */ | 47 | */ |
| 48 | extern int r100_init(struct radeon_device *rdev); | 48 | struct r100_mc_save { |
| 49 | extern void r100_fini(struct radeon_device *rdev); | 49 | u32 GENMO_WT; |
| 50 | extern int r100_suspend(struct radeon_device *rdev); | 50 | u32 CRTC_EXT_CNTL; |
| 51 | extern int r100_resume(struct radeon_device *rdev); | 51 | u32 CRTC_GEN_CNTL; |
| 52 | u32 CRTC2_GEN_CNTL; | ||
| 53 | u32 CUR_OFFSET; | ||
| 54 | u32 CUR2_OFFSET; | ||
| 55 | }; | ||
| 56 | int r100_init(struct radeon_device *rdev); | ||
| 57 | void r100_fini(struct radeon_device *rdev); | ||
| 58 | int r100_suspend(struct radeon_device *rdev); | ||
| 59 | int r100_resume(struct radeon_device *rdev); | ||
| 52 | uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg); | 60 | uint32_t r100_mm_rreg(struct radeon_device *rdev, uint32_t reg); |
| 53 | void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 61 | void r100_mm_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
| 54 | void r100_vga_set_state(struct radeon_device *rdev, bool state); | 62 | void r100_vga_set_state(struct radeon_device *rdev, bool state); |
| @@ -73,7 +81,7 @@ int r100_copy_blit(struct radeon_device *rdev, | |||
| 73 | int r100_set_surface_reg(struct radeon_device *rdev, int reg, | 81 | int r100_set_surface_reg(struct radeon_device *rdev, int reg, |
| 74 | uint32_t tiling_flags, uint32_t pitch, | 82 | uint32_t tiling_flags, uint32_t pitch, |
| 75 | uint32_t offset, uint32_t obj_size); | 83 | uint32_t offset, uint32_t obj_size); |
| 76 | int r100_clear_surface_reg(struct radeon_device *rdev, int reg); | 84 | void r100_clear_surface_reg(struct radeon_device *rdev, int reg); |
| 77 | void r100_bandwidth_update(struct radeon_device *rdev); | 85 | void r100_bandwidth_update(struct radeon_device *rdev); |
| 78 | void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); | 86 | void r100_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); |
| 79 | int r100_ring_test(struct radeon_device *rdev); | 87 | int r100_ring_test(struct radeon_device *rdev); |
| @@ -82,44 +90,42 @@ void r100_hpd_fini(struct radeon_device *rdev); | |||
| 82 | bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); | 90 | bool r100_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); |
| 83 | void r100_hpd_set_polarity(struct radeon_device *rdev, | 91 | void r100_hpd_set_polarity(struct radeon_device *rdev, |
| 84 | enum radeon_hpd_id hpd); | 92 | enum radeon_hpd_id hpd); |
| 85 | 93 | int r100_debugfs_rbbm_init(struct radeon_device *rdev); | |
| 86 | static struct radeon_asic r100_asic = { | 94 | int r100_debugfs_cp_init(struct radeon_device *rdev); |
| 87 | .init = &r100_init, | 95 | void r100_cp_disable(struct radeon_device *rdev); |
| 88 | .fini = &r100_fini, | 96 | int r100_cp_init(struct radeon_device *rdev, unsigned ring_size); |
| 89 | .suspend = &r100_suspend, | 97 | void r100_cp_fini(struct radeon_device *rdev); |
| 90 | .resume = &r100_resume, | 98 | int r100_pci_gart_init(struct radeon_device *rdev); |
| 91 | .vga_set_state = &r100_vga_set_state, | 99 | void r100_pci_gart_fini(struct radeon_device *rdev); |
| 92 | .gpu_reset = &r100_gpu_reset, | 100 | int r100_pci_gart_enable(struct radeon_device *rdev); |
| 93 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | 101 | void r100_pci_gart_disable(struct radeon_device *rdev); |
| 94 | .gart_set_page = &r100_pci_gart_set_page, | 102 | int r100_debugfs_mc_info_init(struct radeon_device *rdev); |
| 95 | .cp_commit = &r100_cp_commit, | 103 | int r100_gui_wait_for_idle(struct radeon_device *rdev); |
| 96 | .ring_start = &r100_ring_start, | 104 | void r100_ib_fini(struct radeon_device *rdev); |
| 97 | .ring_test = &r100_ring_test, | 105 | int r100_ib_init(struct radeon_device *rdev); |
| 98 | .ring_ib_execute = &r100_ring_ib_execute, | 106 | void r100_irq_disable(struct radeon_device *rdev); |
| 99 | .irq_set = &r100_irq_set, | 107 | void r100_mc_stop(struct radeon_device *rdev, struct r100_mc_save *save); |
| 100 | .irq_process = &r100_irq_process, | 108 | void r100_mc_resume(struct radeon_device *rdev, struct r100_mc_save *save); |
| 101 | .get_vblank_counter = &r100_get_vblank_counter, | 109 | void r100_vram_init_sizes(struct radeon_device *rdev); |
| 102 | .fence_ring_emit = &r100_fence_ring_emit, | 110 | void r100_wb_disable(struct radeon_device *rdev); |
| 103 | .cs_parse = &r100_cs_parse, | 111 | void r100_wb_fini(struct radeon_device *rdev); |
| 104 | .copy_blit = &r100_copy_blit, | 112 | int r100_wb_init(struct radeon_device *rdev); |
| 105 | .copy_dma = NULL, | 113 | void r100_hdp_reset(struct radeon_device *rdev); |
| 106 | .copy = &r100_copy_blit, | 114 | int r100_rb2d_reset(struct radeon_device *rdev); |
| 107 | .get_engine_clock = &radeon_legacy_get_engine_clock, | 115 | int r100_cp_reset(struct radeon_device *rdev); |
| 108 | .set_engine_clock = &radeon_legacy_set_engine_clock, | 116 | void r100_vga_render_disable(struct radeon_device *rdev); |
| 109 | .get_memory_clock = &radeon_legacy_get_memory_clock, | 117 | int r100_cs_track_check_pkt3_indx_buffer(struct radeon_cs_parser *p, |
| 110 | .set_memory_clock = NULL, | 118 | struct radeon_cs_packet *pkt, |
| 111 | .get_pcie_lanes = NULL, | 119 | struct radeon_bo *robj); |
| 112 | .set_pcie_lanes = NULL, | 120 | int r100_cs_parse_packet0(struct radeon_cs_parser *p, |
| 113 | .set_clock_gating = &radeon_legacy_set_clock_gating, | 121 | struct radeon_cs_packet *pkt, |
| 114 | .set_surface_reg = r100_set_surface_reg, | 122 | const unsigned *auth, unsigned n, |
| 115 | .clear_surface_reg = r100_clear_surface_reg, | 123 | radeon_packet0_check_t check); |
| 116 | .bandwidth_update = &r100_bandwidth_update, | 124 | int r100_cs_packet_parse(struct radeon_cs_parser *p, |
| 117 | .hpd_init = &r100_hpd_init, | 125 | struct radeon_cs_packet *pkt, |
| 118 | .hpd_fini = &r100_hpd_fini, | 126 | unsigned idx); |
| 119 | .hpd_sense = &r100_hpd_sense, | 127 | void r100_enable_bm(struct radeon_device *rdev); |
| 120 | .hpd_set_polarity = &r100_hpd_set_polarity, | 128 | void r100_set_common_regs(struct radeon_device *rdev); |
| 121 | .ioctl_wait_idle = NULL, | ||
| 122 | }; | ||
| 123 | 129 | ||
| 124 | /* | 130 | /* |
| 125 | * r200,rv250,rs300,rv280 | 131 | * r200,rv250,rs300,rv280 |
| @@ -129,43 +135,6 @@ extern int r200_copy_dma(struct radeon_device *rdev, | |||
| 129 | uint64_t dst_offset, | 135 | uint64_t dst_offset, |
| 130 | unsigned num_pages, | 136 | unsigned num_pages, |
| 131 | struct radeon_fence *fence); | 137 | struct radeon_fence *fence); |
| 132 | static struct radeon_asic r200_asic = { | ||
| 133 | .init = &r100_init, | ||
| 134 | .fini = &r100_fini, | ||
| 135 | .suspend = &r100_suspend, | ||
| 136 | .resume = &r100_resume, | ||
| 137 | .vga_set_state = &r100_vga_set_state, | ||
| 138 | .gpu_reset = &r100_gpu_reset, | ||
| 139 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | ||
| 140 | .gart_set_page = &r100_pci_gart_set_page, | ||
| 141 | .cp_commit = &r100_cp_commit, | ||
| 142 | .ring_start = &r100_ring_start, | ||
| 143 | .ring_test = &r100_ring_test, | ||
| 144 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 145 | .irq_set = &r100_irq_set, | ||
| 146 | .irq_process = &r100_irq_process, | ||
| 147 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 148 | .fence_ring_emit = &r100_fence_ring_emit, | ||
| 149 | .cs_parse = &r100_cs_parse, | ||
| 150 | .copy_blit = &r100_copy_blit, | ||
| 151 | .copy_dma = &r200_copy_dma, | ||
| 152 | .copy = &r100_copy_blit, | ||
| 153 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 154 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 155 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 156 | .set_memory_clock = NULL, | ||
| 157 | .set_pcie_lanes = NULL, | ||
| 158 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 159 | .set_surface_reg = r100_set_surface_reg, | ||
| 160 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 161 | .bandwidth_update = &r100_bandwidth_update, | ||
| 162 | .hpd_init = &r100_hpd_init, | ||
| 163 | .hpd_fini = &r100_hpd_fini, | ||
| 164 | .hpd_sense = &r100_hpd_sense, | ||
| 165 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 166 | .ioctl_wait_idle = NULL, | ||
| 167 | }; | ||
| 168 | |||
| 169 | 138 | ||
| 170 | /* | 139 | /* |
| 171 | * r300,r350,rv350,rv380 | 140 | * r300,r350,rv350,rv380 |
| @@ -186,82 +155,6 @@ extern void rv370_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v | |||
| 186 | extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes); | 155 | extern void rv370_set_pcie_lanes(struct radeon_device *rdev, int lanes); |
| 187 | extern int rv370_get_pcie_lanes(struct radeon_device *rdev); | 156 | extern int rv370_get_pcie_lanes(struct radeon_device *rdev); |
| 188 | 157 | ||
| 189 | static struct radeon_asic r300_asic = { | ||
| 190 | .init = &r300_init, | ||
| 191 | .fini = &r300_fini, | ||
| 192 | .suspend = &r300_suspend, | ||
| 193 | .resume = &r300_resume, | ||
| 194 | .vga_set_state = &r100_vga_set_state, | ||
| 195 | .gpu_reset = &r300_gpu_reset, | ||
| 196 | .gart_tlb_flush = &r100_pci_gart_tlb_flush, | ||
| 197 | .gart_set_page = &r100_pci_gart_set_page, | ||
| 198 | .cp_commit = &r100_cp_commit, | ||
| 199 | .ring_start = &r300_ring_start, | ||
| 200 | .ring_test = &r100_ring_test, | ||
| 201 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 202 | .irq_set = &r100_irq_set, | ||
| 203 | .irq_process = &r100_irq_process, | ||
| 204 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 205 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 206 | .cs_parse = &r300_cs_parse, | ||
| 207 | .copy_blit = &r100_copy_blit, | ||
| 208 | .copy_dma = &r200_copy_dma, | ||
| 209 | .copy = &r100_copy_blit, | ||
| 210 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 211 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 212 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 213 | .set_memory_clock = NULL, | ||
| 214 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 215 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 216 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 217 | .set_surface_reg = r100_set_surface_reg, | ||
| 218 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 219 | .bandwidth_update = &r100_bandwidth_update, | ||
| 220 | .hpd_init = &r100_hpd_init, | ||
| 221 | .hpd_fini = &r100_hpd_fini, | ||
| 222 | .hpd_sense = &r100_hpd_sense, | ||
| 223 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 224 | .ioctl_wait_idle = NULL, | ||
| 225 | }; | ||
| 226 | |||
| 227 | |||
| 228 | static struct radeon_asic r300_asic_pcie = { | ||
| 229 | .init = &r300_init, | ||
| 230 | .fini = &r300_fini, | ||
| 231 | .suspend = &r300_suspend, | ||
| 232 | .resume = &r300_resume, | ||
| 233 | .vga_set_state = &r100_vga_set_state, | ||
| 234 | .gpu_reset = &r300_gpu_reset, | ||
| 235 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 236 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 237 | .cp_commit = &r100_cp_commit, | ||
| 238 | .ring_start = &r300_ring_start, | ||
| 239 | .ring_test = &r100_ring_test, | ||
| 240 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 241 | .irq_set = &r100_irq_set, | ||
| 242 | .irq_process = &r100_irq_process, | ||
| 243 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 244 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 245 | .cs_parse = &r300_cs_parse, | ||
| 246 | .copy_blit = &r100_copy_blit, | ||
| 247 | .copy_dma = &r200_copy_dma, | ||
| 248 | .copy = &r100_copy_blit, | ||
| 249 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 250 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 251 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 252 | .set_memory_clock = NULL, | ||
| 253 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 254 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 255 | .set_surface_reg = r100_set_surface_reg, | ||
| 256 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 257 | .bandwidth_update = &r100_bandwidth_update, | ||
| 258 | .hpd_init = &r100_hpd_init, | ||
| 259 | .hpd_fini = &r100_hpd_fini, | ||
| 260 | .hpd_sense = &r100_hpd_sense, | ||
| 261 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 262 | .ioctl_wait_idle = NULL, | ||
| 263 | }; | ||
| 264 | |||
| 265 | /* | 158 | /* |
| 266 | * r420,r423,rv410 | 159 | * r420,r423,rv410 |
| 267 | */ | 160 | */ |
| @@ -269,44 +162,6 @@ extern int r420_init(struct radeon_device *rdev); | |||
| 269 | extern void r420_fini(struct radeon_device *rdev); | 162 | extern void r420_fini(struct radeon_device *rdev); |
| 270 | extern int r420_suspend(struct radeon_device *rdev); | 163 | extern int r420_suspend(struct radeon_device *rdev); |
| 271 | extern int r420_resume(struct radeon_device *rdev); | 164 | extern int r420_resume(struct radeon_device *rdev); |
| 272 | static struct radeon_asic r420_asic = { | ||
| 273 | .init = &r420_init, | ||
| 274 | .fini = &r420_fini, | ||
| 275 | .suspend = &r420_suspend, | ||
| 276 | .resume = &r420_resume, | ||
| 277 | .vga_set_state = &r100_vga_set_state, | ||
| 278 | .gpu_reset = &r300_gpu_reset, | ||
| 279 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 280 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 281 | .cp_commit = &r100_cp_commit, | ||
| 282 | .ring_start = &r300_ring_start, | ||
| 283 | .ring_test = &r100_ring_test, | ||
| 284 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 285 | .irq_set = &r100_irq_set, | ||
| 286 | .irq_process = &r100_irq_process, | ||
| 287 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 288 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 289 | .cs_parse = &r300_cs_parse, | ||
| 290 | .copy_blit = &r100_copy_blit, | ||
| 291 | .copy_dma = &r200_copy_dma, | ||
| 292 | .copy = &r100_copy_blit, | ||
| 293 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 294 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 295 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 296 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 297 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 298 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 299 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 300 | .set_surface_reg = r100_set_surface_reg, | ||
| 301 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 302 | .bandwidth_update = &r100_bandwidth_update, | ||
| 303 | .hpd_init = &r100_hpd_init, | ||
| 304 | .hpd_fini = &r100_hpd_fini, | ||
| 305 | .hpd_sense = &r100_hpd_sense, | ||
| 306 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 307 | .ioctl_wait_idle = NULL, | ||
| 308 | }; | ||
| 309 | |||
| 310 | 165 | ||
| 311 | /* | 166 | /* |
| 312 | * rs400,rs480 | 167 | * rs400,rs480 |
| @@ -319,44 +174,6 @@ void rs400_gart_tlb_flush(struct radeon_device *rdev); | |||
| 319 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); | 174 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr); |
| 320 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg); | 175 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg); |
| 321 | void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 176 | void rs400_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
| 322 | static struct radeon_asic rs400_asic = { | ||
| 323 | .init = &rs400_init, | ||
| 324 | .fini = &rs400_fini, | ||
| 325 | .suspend = &rs400_suspend, | ||
| 326 | .resume = &rs400_resume, | ||
| 327 | .vga_set_state = &r100_vga_set_state, | ||
| 328 | .gpu_reset = &r300_gpu_reset, | ||
| 329 | .gart_tlb_flush = &rs400_gart_tlb_flush, | ||
| 330 | .gart_set_page = &rs400_gart_set_page, | ||
| 331 | .cp_commit = &r100_cp_commit, | ||
| 332 | .ring_start = &r300_ring_start, | ||
| 333 | .ring_test = &r100_ring_test, | ||
| 334 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 335 | .irq_set = &r100_irq_set, | ||
| 336 | .irq_process = &r100_irq_process, | ||
| 337 | .get_vblank_counter = &r100_get_vblank_counter, | ||
| 338 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 339 | .cs_parse = &r300_cs_parse, | ||
| 340 | .copy_blit = &r100_copy_blit, | ||
| 341 | .copy_dma = &r200_copy_dma, | ||
| 342 | .copy = &r100_copy_blit, | ||
| 343 | .get_engine_clock = &radeon_legacy_get_engine_clock, | ||
| 344 | .set_engine_clock = &radeon_legacy_set_engine_clock, | ||
| 345 | .get_memory_clock = &radeon_legacy_get_memory_clock, | ||
| 346 | .set_memory_clock = NULL, | ||
| 347 | .get_pcie_lanes = NULL, | ||
| 348 | .set_pcie_lanes = NULL, | ||
| 349 | .set_clock_gating = &radeon_legacy_set_clock_gating, | ||
| 350 | .set_surface_reg = r100_set_surface_reg, | ||
| 351 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 352 | .bandwidth_update = &r100_bandwidth_update, | ||
| 353 | .hpd_init = &r100_hpd_init, | ||
| 354 | .hpd_fini = &r100_hpd_fini, | ||
| 355 | .hpd_sense = &r100_hpd_sense, | ||
| 356 | .hpd_set_polarity = &r100_hpd_set_polarity, | ||
| 357 | .ioctl_wait_idle = NULL, | ||
| 358 | }; | ||
| 359 | |||
| 360 | 177 | ||
| 361 | /* | 178 | /* |
| 362 | * rs600. | 179 | * rs600. |
| @@ -379,45 +196,6 @@ bool rs600_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); | |||
| 379 | void rs600_hpd_set_polarity(struct radeon_device *rdev, | 196 | void rs600_hpd_set_polarity(struct radeon_device *rdev, |
| 380 | enum radeon_hpd_id hpd); | 197 | enum radeon_hpd_id hpd); |
| 381 | 198 | ||
| 382 | static struct radeon_asic rs600_asic = { | ||
| 383 | .init = &rs600_init, | ||
| 384 | .fini = &rs600_fini, | ||
| 385 | .suspend = &rs600_suspend, | ||
| 386 | .resume = &rs600_resume, | ||
| 387 | .vga_set_state = &r100_vga_set_state, | ||
| 388 | .gpu_reset = &r300_gpu_reset, | ||
| 389 | .gart_tlb_flush = &rs600_gart_tlb_flush, | ||
| 390 | .gart_set_page = &rs600_gart_set_page, | ||
| 391 | .cp_commit = &r100_cp_commit, | ||
| 392 | .ring_start = &r300_ring_start, | ||
| 393 | .ring_test = &r100_ring_test, | ||
| 394 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 395 | .irq_set = &rs600_irq_set, | ||
| 396 | .irq_process = &rs600_irq_process, | ||
| 397 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 398 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 399 | .cs_parse = &r300_cs_parse, | ||
| 400 | .copy_blit = &r100_copy_blit, | ||
| 401 | .copy_dma = &r200_copy_dma, | ||
| 402 | .copy = &r100_copy_blit, | ||
| 403 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 404 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 405 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 406 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 407 | .get_pcie_lanes = NULL, | ||
| 408 | .set_pcie_lanes = NULL, | ||
| 409 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 410 | .set_surface_reg = r100_set_surface_reg, | ||
| 411 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 412 | .bandwidth_update = &rs600_bandwidth_update, | ||
| 413 | .hpd_init = &rs600_hpd_init, | ||
| 414 | .hpd_fini = &rs600_hpd_fini, | ||
| 415 | .hpd_sense = &rs600_hpd_sense, | ||
| 416 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 417 | .ioctl_wait_idle = NULL, | ||
| 418 | }; | ||
| 419 | |||
| 420 | |||
| 421 | /* | 199 | /* |
| 422 | * rs690,rs740 | 200 | * rs690,rs740 |
| 423 | */ | 201 | */ |
| @@ -428,44 +206,6 @@ int rs690_suspend(struct radeon_device *rdev); | |||
| 428 | uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg); | 206 | uint32_t rs690_mc_rreg(struct radeon_device *rdev, uint32_t reg); |
| 429 | void rs690_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | 207 | void rs690_mc_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); |
| 430 | void rs690_bandwidth_update(struct radeon_device *rdev); | 208 | void rs690_bandwidth_update(struct radeon_device *rdev); |
| 431 | static struct radeon_asic rs690_asic = { | ||
| 432 | .init = &rs690_init, | ||
| 433 | .fini = &rs690_fini, | ||
| 434 | .suspend = &rs690_suspend, | ||
| 435 | .resume = &rs690_resume, | ||
| 436 | .vga_set_state = &r100_vga_set_state, | ||
| 437 | .gpu_reset = &r300_gpu_reset, | ||
| 438 | .gart_tlb_flush = &rs400_gart_tlb_flush, | ||
| 439 | .gart_set_page = &rs400_gart_set_page, | ||
| 440 | .cp_commit = &r100_cp_commit, | ||
| 441 | .ring_start = &r300_ring_start, | ||
| 442 | .ring_test = &r100_ring_test, | ||
| 443 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 444 | .irq_set = &rs600_irq_set, | ||
| 445 | .irq_process = &rs600_irq_process, | ||
| 446 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 447 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 448 | .cs_parse = &r300_cs_parse, | ||
| 449 | .copy_blit = &r100_copy_blit, | ||
| 450 | .copy_dma = &r200_copy_dma, | ||
| 451 | .copy = &r200_copy_dma, | ||
| 452 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 453 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 454 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 455 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 456 | .get_pcie_lanes = NULL, | ||
| 457 | .set_pcie_lanes = NULL, | ||
| 458 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 459 | .set_surface_reg = r100_set_surface_reg, | ||
| 460 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 461 | .bandwidth_update = &rs690_bandwidth_update, | ||
| 462 | .hpd_init = &rs600_hpd_init, | ||
| 463 | .hpd_fini = &rs600_hpd_fini, | ||
| 464 | .hpd_sense = &rs600_hpd_sense, | ||
| 465 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 466 | .ioctl_wait_idle = NULL, | ||
| 467 | }; | ||
| 468 | |||
| 469 | 209 | ||
| 470 | /* | 210 | /* |
| 471 | * rv515 | 211 | * rv515 |
| @@ -481,87 +221,12 @@ void rv515_pcie_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v); | |||
| 481 | void rv515_bandwidth_update(struct radeon_device *rdev); | 221 | void rv515_bandwidth_update(struct radeon_device *rdev); |
| 482 | int rv515_resume(struct radeon_device *rdev); | 222 | int rv515_resume(struct radeon_device *rdev); |
| 483 | int rv515_suspend(struct radeon_device *rdev); | 223 | int rv515_suspend(struct radeon_device *rdev); |
| 484 | static struct radeon_asic rv515_asic = { | ||
| 485 | .init = &rv515_init, | ||
| 486 | .fini = &rv515_fini, | ||
| 487 | .suspend = &rv515_suspend, | ||
| 488 | .resume = &rv515_resume, | ||
| 489 | .vga_set_state = &r100_vga_set_state, | ||
| 490 | .gpu_reset = &rv515_gpu_reset, | ||
| 491 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 492 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 493 | .cp_commit = &r100_cp_commit, | ||
| 494 | .ring_start = &rv515_ring_start, | ||
| 495 | .ring_test = &r100_ring_test, | ||
| 496 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 497 | .irq_set = &rs600_irq_set, | ||
| 498 | .irq_process = &rs600_irq_process, | ||
| 499 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 500 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 501 | .cs_parse = &r300_cs_parse, | ||
| 502 | .copy_blit = &r100_copy_blit, | ||
| 503 | .copy_dma = &r200_copy_dma, | ||
| 504 | .copy = &r100_copy_blit, | ||
| 505 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 506 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 507 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 508 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 509 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 510 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 511 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 512 | .set_surface_reg = r100_set_surface_reg, | ||
| 513 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 514 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 515 | .hpd_init = &rs600_hpd_init, | ||
| 516 | .hpd_fini = &rs600_hpd_fini, | ||
| 517 | .hpd_sense = &rs600_hpd_sense, | ||
| 518 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 519 | .ioctl_wait_idle = NULL, | ||
| 520 | }; | ||
| 521 | |||
| 522 | 224 | ||
| 523 | /* | 225 | /* |
| 524 | * r520,rv530,rv560,rv570,r580 | 226 | * r520,rv530,rv560,rv570,r580 |
| 525 | */ | 227 | */ |
| 526 | int r520_init(struct radeon_device *rdev); | 228 | int r520_init(struct radeon_device *rdev); |
| 527 | int r520_resume(struct radeon_device *rdev); | 229 | int r520_resume(struct radeon_device *rdev); |
| 528 | static struct radeon_asic r520_asic = { | ||
| 529 | .init = &r520_init, | ||
| 530 | .fini = &rv515_fini, | ||
| 531 | .suspend = &rv515_suspend, | ||
| 532 | .resume = &r520_resume, | ||
| 533 | .vga_set_state = &r100_vga_set_state, | ||
| 534 | .gpu_reset = &rv515_gpu_reset, | ||
| 535 | .gart_tlb_flush = &rv370_pcie_gart_tlb_flush, | ||
| 536 | .gart_set_page = &rv370_pcie_gart_set_page, | ||
| 537 | .cp_commit = &r100_cp_commit, | ||
| 538 | .ring_start = &rv515_ring_start, | ||
| 539 | .ring_test = &r100_ring_test, | ||
| 540 | .ring_ib_execute = &r100_ring_ib_execute, | ||
| 541 | .irq_set = &rs600_irq_set, | ||
| 542 | .irq_process = &rs600_irq_process, | ||
| 543 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 544 | .fence_ring_emit = &r300_fence_ring_emit, | ||
| 545 | .cs_parse = &r300_cs_parse, | ||
| 546 | .copy_blit = &r100_copy_blit, | ||
| 547 | .copy_dma = &r200_copy_dma, | ||
| 548 | .copy = &r100_copy_blit, | ||
| 549 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 550 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 551 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 552 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 553 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 554 | .set_pcie_lanes = &rv370_set_pcie_lanes, | ||
| 555 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 556 | .set_surface_reg = r100_set_surface_reg, | ||
| 557 | .clear_surface_reg = r100_clear_surface_reg, | ||
| 558 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 559 | .hpd_init = &rs600_hpd_init, | ||
| 560 | .hpd_fini = &rs600_hpd_fini, | ||
| 561 | .hpd_sense = &rs600_hpd_sense, | ||
| 562 | .hpd_set_polarity = &rs600_hpd_set_polarity, | ||
| 563 | .ioctl_wait_idle = NULL, | ||
| 564 | }; | ||
| 565 | 230 | ||
| 566 | /* | 231 | /* |
| 567 | * r600,rv610,rv630,rv620,rv635,rv670,rs780,rs880 | 232 | * r600,rv610,rv630,rv620,rv635,rv670,rs780,rs880 |
| @@ -591,7 +256,7 @@ int r600_gpu_reset(struct radeon_device *rdev); | |||
| 591 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, | 256 | int r600_set_surface_reg(struct radeon_device *rdev, int reg, |
| 592 | uint32_t tiling_flags, uint32_t pitch, | 257 | uint32_t tiling_flags, uint32_t pitch, |
| 593 | uint32_t offset, uint32_t obj_size); | 258 | uint32_t offset, uint32_t obj_size); |
| 594 | int r600_clear_surface_reg(struct radeon_device *rdev, int reg); | 259 | void r600_clear_surface_reg(struct radeon_device *rdev, int reg); |
| 595 | void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); | 260 | void r600_ring_ib_execute(struct radeon_device *rdev, struct radeon_ib *ib); |
| 596 | int r600_ring_test(struct radeon_device *rdev); | 261 | int r600_ring_test(struct radeon_device *rdev); |
| 597 | int r600_copy_blit(struct radeon_device *rdev, | 262 | int r600_copy_blit(struct radeon_device *rdev, |
| @@ -604,43 +269,6 @@ void r600_hpd_set_polarity(struct radeon_device *rdev, | |||
| 604 | enum radeon_hpd_id hpd); | 269 | enum radeon_hpd_id hpd); |
| 605 | extern void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo); | 270 | extern void r600_ioctl_wait_idle(struct radeon_device *rdev, struct radeon_bo *bo); |
| 606 | 271 | ||
| 607 | static struct radeon_asic r600_asic = { | ||
| 608 | .init = &r600_init, | ||
| 609 | .fini = &r600_fini, | ||
| 610 | .suspend = &r600_suspend, | ||
| 611 | .resume = &r600_resume, | ||
| 612 | .cp_commit = &r600_cp_commit, | ||
| 613 | .vga_set_state = &r600_vga_set_state, | ||
| 614 | .gpu_reset = &r600_gpu_reset, | ||
| 615 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 616 | .gart_set_page = &rs600_gart_set_page, | ||
| 617 | .ring_test = &r600_ring_test, | ||
| 618 | .ring_ib_execute = &r600_ring_ib_execute, | ||
| 619 | .irq_set = &r600_irq_set, | ||
| 620 | .irq_process = &r600_irq_process, | ||
| 621 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 622 | .fence_ring_emit = &r600_fence_ring_emit, | ||
| 623 | .cs_parse = &r600_cs_parse, | ||
| 624 | .copy_blit = &r600_copy_blit, | ||
| 625 | .copy_dma = &r600_copy_blit, | ||
| 626 | .copy = &r600_copy_blit, | ||
| 627 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 628 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 629 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 630 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 631 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 632 | .set_pcie_lanes = NULL, | ||
| 633 | .set_clock_gating = NULL, | ||
| 634 | .set_surface_reg = r600_set_surface_reg, | ||
| 635 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 636 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 637 | .hpd_init = &r600_hpd_init, | ||
| 638 | .hpd_fini = &r600_hpd_fini, | ||
| 639 | .hpd_sense = &r600_hpd_sense, | ||
| 640 | .hpd_set_polarity = &r600_hpd_set_polarity, | ||
| 641 | .ioctl_wait_idle = r600_ioctl_wait_idle, | ||
| 642 | }; | ||
| 643 | |||
| 644 | /* | 272 | /* |
| 645 | * rv770,rv730,rv710,rv740 | 273 | * rv770,rv730,rv710,rv740 |
| 646 | */ | 274 | */ |
| @@ -650,43 +278,6 @@ int rv770_suspend(struct radeon_device *rdev); | |||
| 650 | int rv770_resume(struct radeon_device *rdev); | 278 | int rv770_resume(struct radeon_device *rdev); |
| 651 | int rv770_gpu_reset(struct radeon_device *rdev); | 279 | int rv770_gpu_reset(struct radeon_device *rdev); |
| 652 | 280 | ||
| 653 | static struct radeon_asic rv770_asic = { | ||
| 654 | .init = &rv770_init, | ||
| 655 | .fini = &rv770_fini, | ||
| 656 | .suspend = &rv770_suspend, | ||
| 657 | .resume = &rv770_resume, | ||
| 658 | .cp_commit = &r600_cp_commit, | ||
| 659 | .gpu_reset = &rv770_gpu_reset, | ||
| 660 | .vga_set_state = &r600_vga_set_state, | ||
| 661 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 662 | .gart_set_page = &rs600_gart_set_page, | ||
| 663 | .ring_test = &r600_ring_test, | ||
| 664 | .ring_ib_execute = &r600_ring_ib_execute, | ||
| 665 | .irq_set = &r600_irq_set, | ||
| 666 | .irq_process = &r600_irq_process, | ||
| 667 | .get_vblank_counter = &rs600_get_vblank_counter, | ||
| 668 | .fence_ring_emit = &r600_fence_ring_emit, | ||
| 669 | .cs_parse = &r600_cs_parse, | ||
| 670 | .copy_blit = &r600_copy_blit, | ||
| 671 | .copy_dma = &r600_copy_blit, | ||
| 672 | .copy = &r600_copy_blit, | ||
| 673 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 674 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 675 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 676 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 677 | .get_pcie_lanes = &rv370_get_pcie_lanes, | ||
| 678 | .set_pcie_lanes = NULL, | ||
| 679 | .set_clock_gating = &radeon_atom_set_clock_gating, | ||
| 680 | .set_surface_reg = r600_set_surface_reg, | ||
| 681 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 682 | .bandwidth_update = &rv515_bandwidth_update, | ||
| 683 | .hpd_init = &r600_hpd_init, | ||
| 684 | .hpd_fini = &r600_hpd_fini, | ||
| 685 | .hpd_sense = &r600_hpd_sense, | ||
| 686 | .hpd_set_polarity = &r600_hpd_set_polarity, | ||
| 687 | .ioctl_wait_idle = r600_ioctl_wait_idle, | ||
| 688 | }; | ||
| 689 | |||
| 690 | /* | 281 | /* |
| 691 | * evergreen | 282 | * evergreen |
| 692 | */ | 283 | */ |
| @@ -701,40 +292,4 @@ void evergreen_hpd_fini(struct radeon_device *rdev); | |||
| 701 | bool evergreen_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); | 292 | bool evergreen_hpd_sense(struct radeon_device *rdev, enum radeon_hpd_id hpd); |
| 702 | void evergreen_hpd_set_polarity(struct radeon_device *rdev, | 293 | void evergreen_hpd_set_polarity(struct radeon_device *rdev, |
| 703 | enum radeon_hpd_id hpd); | 294 | enum radeon_hpd_id hpd); |
| 704 | |||
| 705 | static struct radeon_asic evergreen_asic = { | ||
| 706 | .init = &evergreen_init, | ||
| 707 | .fini = &evergreen_fini, | ||
| 708 | .suspend = &evergreen_suspend, | ||
| 709 | .resume = &evergreen_resume, | ||
| 710 | .cp_commit = NULL, | ||
| 711 | .gpu_reset = &evergreen_gpu_reset, | ||
| 712 | .vga_set_state = &r600_vga_set_state, | ||
| 713 | .gart_tlb_flush = &r600_pcie_gart_tlb_flush, | ||
| 714 | .gart_set_page = &rs600_gart_set_page, | ||
| 715 | .ring_test = NULL, | ||
| 716 | .ring_ib_execute = NULL, | ||
| 717 | .irq_set = NULL, | ||
| 718 | .irq_process = NULL, | ||
| 719 | .get_vblank_counter = NULL, | ||
| 720 | .fence_ring_emit = NULL, | ||
| 721 | .cs_parse = NULL, | ||
| 722 | .copy_blit = NULL, | ||
| 723 | .copy_dma = NULL, | ||
| 724 | .copy = NULL, | ||
| 725 | .get_engine_clock = &radeon_atom_get_engine_clock, | ||
| 726 | .set_engine_clock = &radeon_atom_set_engine_clock, | ||
| 727 | .get_memory_clock = &radeon_atom_get_memory_clock, | ||
| 728 | .set_memory_clock = &radeon_atom_set_memory_clock, | ||
| 729 | .set_pcie_lanes = NULL, | ||
| 730 | .set_clock_gating = NULL, | ||
| 731 | .set_surface_reg = r600_set_surface_reg, | ||
| 732 | .clear_surface_reg = r600_clear_surface_reg, | ||
| 733 | .bandwidth_update = &evergreen_bandwidth_update, | ||
| 734 | .hpd_init = &evergreen_hpd_init, | ||
| 735 | .hpd_fini = &evergreen_hpd_fini, | ||
| 736 | .hpd_sense = &evergreen_hpd_sense, | ||
| 737 | .hpd_set_polarity = &evergreen_hpd_set_polarity, | ||
| 738 | }; | ||
| 739 | |||
| 740 | #endif | 295 | #endif |
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 93783b15c81d..1fff95505cf5 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
| @@ -75,46 +75,45 @@ static inline struct radeon_i2c_bus_rec radeon_lookup_i2c_gpio(struct radeon_dev | |||
| 75 | memset(&i2c, 0, sizeof(struct radeon_i2c_bus_rec)); | 75 | memset(&i2c, 0, sizeof(struct radeon_i2c_bus_rec)); |
| 76 | i2c.valid = false; | 76 | i2c.valid = false; |
| 77 | 77 | ||
| 78 | atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset); | 78 | if (atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) { |
| 79 | 79 | i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset); | |
| 80 | i2c_info = (struct _ATOM_GPIO_I2C_INFO *)(ctx->bios + data_offset); | 80 | |
| 81 | 81 | for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) { | |
| 82 | 82 | gpio = &i2c_info->asGPIO_Info[i]; | |
| 83 | for (i = 0; i < ATOM_MAX_SUPPORTED_DEVICE; i++) { | 83 | |
| 84 | gpio = &i2c_info->asGPIO_Info[i]; | 84 | if (gpio->sucI2cId.ucAccess == id) { |
| 85 | 85 | i2c.mask_clk_reg = le16_to_cpu(gpio->usClkMaskRegisterIndex) * 4; | |
| 86 | if (gpio->sucI2cId.ucAccess == id) { | 86 | i2c.mask_data_reg = le16_to_cpu(gpio->usDataMaskRegisterIndex) * 4; |
| 87 | i2c.mask_clk_reg = le16_to_cpu(gpio->usClkMaskRegisterIndex) * 4; | 87 | i2c.en_clk_reg = le16_to_cpu(gpio->usClkEnRegisterIndex) * 4; |
| 88 | i2c.mask_data_reg = le16_to_cpu(gpio->usDataMaskRegisterIndex) * 4; | 88 | i2c.en_data_reg = le16_to_cpu(gpio->usDataEnRegisterIndex) * 4; |
| 89 | i2c.en_clk_reg = le16_to_cpu(gpio->usClkEnRegisterIndex) * 4; | 89 | i2c.y_clk_reg = le16_to_cpu(gpio->usClkY_RegisterIndex) * 4; |
| 90 | i2c.en_data_reg = le16_to_cpu(gpio->usDataEnRegisterIndex) * 4; | 90 | i2c.y_data_reg = le16_to_cpu(gpio->usDataY_RegisterIndex) * 4; |
| 91 | i2c.y_clk_reg = le16_to_cpu(gpio->usClkY_RegisterIndex) * 4; | 91 | i2c.a_clk_reg = le16_to_cpu(gpio->usClkA_RegisterIndex) * 4; |
| 92 | i2c.y_data_reg = le16_to_cpu(gpio->usDataY_RegisterIndex) * 4; | 92 | i2c.a_data_reg = le16_to_cpu(gpio->usDataA_RegisterIndex) * 4; |
| 93 | i2c.a_clk_reg = le16_to_cpu(gpio->usClkA_RegisterIndex) * 4; | 93 | i2c.mask_clk_mask = (1 << gpio->ucClkMaskShift); |
| 94 | i2c.a_data_reg = le16_to_cpu(gpio->usDataA_RegisterIndex) * 4; | 94 | i2c.mask_data_mask = (1 << gpio->ucDataMaskShift); |
| 95 | i2c.mask_clk_mask = (1 << gpio->ucClkMaskShift); | 95 | i2c.en_clk_mask = (1 << gpio->ucClkEnShift); |
| 96 | i2c.mask_data_mask = (1 << gpio->ucDataMaskShift); | 96 | i2c.en_data_mask = (1 << gpio->ucDataEnShift); |
| 97 | i2c.en_clk_mask = (1 << gpio->ucClkEnShift); | 97 | i2c.y_clk_mask = (1 << gpio->ucClkY_Shift); |
| 98 | i2c.en_data_mask = (1 << gpio->ucDataEnShift); | 98 | i2c.y_data_mask = (1 << gpio->ucDataY_Shift); |
| 99 | i2c.y_clk_mask = (1 << gpio->ucClkY_Shift); | 99 | i2c.a_clk_mask = (1 << gpio->ucClkA_Shift); |
| 100 | i2c.y_data_mask = (1 << gpio->ucDataY_Shift); | 100 | i2c.a_data_mask = (1 << gpio->ucDataA_Shift); |
| 101 | i2c.a_clk_mask = (1 << gpio->ucClkA_Shift); | 101 | |
| 102 | i2c.a_data_mask = (1 << gpio->ucDataA_Shift); | 102 | if (gpio->sucI2cId.sbfAccess.bfHW_Capable) |
| 103 | 103 | i2c.hw_capable = true; | |
| 104 | if (gpio->sucI2cId.sbfAccess.bfHW_Capable) | 104 | else |
| 105 | i2c.hw_capable = true; | 105 | i2c.hw_capable = false; |
| 106 | else | 106 | |
| 107 | i2c.hw_capable = false; | 107 | if (gpio->sucI2cId.ucAccess == 0xa0) |
| 108 | 108 | i2c.mm_i2c = true; | |
| 109 | if (gpio->sucI2cId.ucAccess == 0xa0) | 109 | else |
| 110 | i2c.mm_i2c = true; | 110 | i2c.mm_i2c = false; |
| 111 | else | 111 | |
| 112 | i2c.mm_i2c = false; | 112 | i2c.i2c_id = gpio->sucI2cId.ucAccess; |
| 113 | 113 | ||
| 114 | i2c.i2c_id = gpio->sucI2cId.ucAccess; | 114 | i2c.valid = true; |
| 115 | 115 | break; | |
| 116 | i2c.valid = true; | 116 | } |
| 117 | break; | ||
| 118 | } | 117 | } |
| 119 | } | 118 | } |
| 120 | 119 | ||
| @@ -135,20 +134,21 @@ static inline struct radeon_gpio_rec radeon_lookup_gpio(struct radeon_device *rd | |||
| 135 | memset(&gpio, 0, sizeof(struct radeon_gpio_rec)); | 134 | memset(&gpio, 0, sizeof(struct radeon_gpio_rec)); |
| 136 | gpio.valid = false; | 135 | gpio.valid = false; |
| 137 | 136 | ||
| 138 | atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset); | 137 | if (atom_parse_data_header(ctx, index, &size, NULL, NULL, &data_offset)) { |
| 138 | gpio_info = (struct _ATOM_GPIO_PIN_LUT *)(ctx->bios + data_offset); | ||
| 139 | 139 | ||
| 140 | gpio_info = (struct _ATOM_GPIO_PIN_LUT *)(ctx->bios + data_offset); | 140 | num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) / |
| 141 | sizeof(ATOM_GPIO_PIN_ASSIGNMENT); | ||
| 141 | 142 | ||
| 142 | num_indices = (size - sizeof(ATOM_COMMON_TABLE_HEADER)) / sizeof(ATOM_GPIO_PIN_ASSIGNMENT); | 143 | for (i = 0; i < num_indices; i++) { |
| 143 | 144 | pin = &gpio_info->asGPIO_Pin[i]; | |
| 144 | for (i = 0; i < num_indices; i++) { | 145 | if (id == pin->ucGPIO_ID) { |
| 145 | pin = &gpio_info->asGPIO_Pin[i]; | 146 | gpio.id = pin->ucGPIO_ID; |
| 146 | if (id == pin->ucGPIO_ID) { | 147 | gpio.reg = pin->usGpioPin_AIndex * 4; |
| 147 | gpio.id = pin->ucGPIO_ID; | 148 | gpio.mask = (1 << pin->ucGpioPinBitShift); |
| 148 | gpio.reg = pin->usGpioPin_AIndex * 4; | 149 | gpio.valid = true; |
| 149 | gpio.mask = (1 << pin->ucGpioPinBitShift); | 150 | break; |
| 150 | gpio.valid = true; | 151 | } |
| 151 | break; | ||
| 152 | } | 152 | } |
| 153 | } | 153 | } |
| 154 | 154 | ||
| @@ -264,6 +264,8 @@ static bool radeon_atom_apply_quirks(struct drm_device *dev, | |||
| 264 | if ((supported_device == ATOM_DEVICE_CRT1_SUPPORT) || | 264 | if ((supported_device == ATOM_DEVICE_CRT1_SUPPORT) || |
| 265 | (supported_device == ATOM_DEVICE_DFP2_SUPPORT)) | 265 | (supported_device == ATOM_DEVICE_DFP2_SUPPORT)) |
| 266 | return false; | 266 | return false; |
| 267 | if (supported_device == ATOM_DEVICE_CRT2_SUPPORT) | ||
| 268 | *line_mux = 0x90; | ||
| 267 | } | 269 | } |
| 268 | 270 | ||
| 269 | /* ASUS HD 3600 XT board lists the DVI port as HDMI */ | 271 | /* ASUS HD 3600 XT board lists the DVI port as HDMI */ |
| @@ -395,9 +397,7 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) | |||
| 395 | struct radeon_gpio_rec gpio; | 397 | struct radeon_gpio_rec gpio; |
| 396 | struct radeon_hpd hpd; | 398 | struct radeon_hpd hpd; |
| 397 | 399 | ||
| 398 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); | 400 | if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) |
| 399 | |||
| 400 | if (data_offset == 0) | ||
| 401 | return false; | 401 | return false; |
| 402 | 402 | ||
| 403 | if (crev < 2) | 403 | if (crev < 2) |
| @@ -449,37 +449,43 @@ bool radeon_get_atom_connector_info_from_object_table(struct drm_device *dev) | |||
| 449 | GetIndexIntoMasterTable(DATA, | 449 | GetIndexIntoMasterTable(DATA, |
| 450 | IntegratedSystemInfo); | 450 | IntegratedSystemInfo); |
| 451 | 451 | ||
| 452 | atom_parse_data_header(ctx, index, &size, &frev, | 452 | if (atom_parse_data_header(ctx, index, &size, &frev, |
| 453 | &crev, &igp_offset); | 453 | &crev, &igp_offset)) { |
| 454 | 454 | ||
| 455 | if (crev >= 2) { | 455 | if (crev >= 2) { |
| 456 | igp_obj = | 456 | igp_obj = |
| 457 | (ATOM_INTEGRATED_SYSTEM_INFO_V2 | 457 | (ATOM_INTEGRATED_SYSTEM_INFO_V2 |
| 458 | *) (ctx->bios + igp_offset); | 458 | *) (ctx->bios + igp_offset); |
| 459 | 459 | ||
| 460 | if (igp_obj) { | 460 | if (igp_obj) { |
| 461 | uint32_t slot_config, ct; | 461 | uint32_t slot_config, ct; |
| 462 | 462 | ||
| 463 | if (con_obj_num == 1) | 463 | if (con_obj_num == 1) |
| 464 | slot_config = | 464 | slot_config = |
| 465 | igp_obj-> | 465 | igp_obj-> |
| 466 | ulDDISlot1Config; | 466 | ulDDISlot1Config; |
| 467 | else | 467 | else |
| 468 | slot_config = | 468 | slot_config = |
| 469 | igp_obj-> | 469 | igp_obj-> |
| 470 | ulDDISlot2Config; | 470 | ulDDISlot2Config; |
| 471 | 471 | ||
| 472 | ct = (slot_config >> 16) & 0xff; | 472 | ct = (slot_config >> 16) & 0xff; |
| 473 | connector_type = | 473 | connector_type = |
| 474 | object_connector_convert | 474 | object_connector_convert |
| 475 | [ct]; | 475 | [ct]; |
| 476 | connector_object_id = ct; | 476 | connector_object_id = ct; |
| 477 | igp_lane_info = | 477 | igp_lane_info = |
| 478 | slot_config & 0xffff; | 478 | slot_config & 0xffff; |
| 479 | } else | ||
| 480 | continue; | ||
| 479 | } else | 481 | } else |
| 480 | continue; | 482 | continue; |
| 481 | } else | 483 | } else { |
| 482 | continue; | 484 | igp_lane_info = 0; |
| 485 | connector_type = | ||
| 486 | object_connector_convert[con_obj_id]; | ||
| 487 | connector_object_id = con_obj_id; | ||
| 488 | } | ||
| 483 | } else { | 489 | } else { |
| 484 | igp_lane_info = 0; | 490 | igp_lane_info = 0; |
| 485 | connector_type = | 491 | connector_type = |
| @@ -627,20 +633,23 @@ static uint16_t atombios_get_connector_object_id(struct drm_device *dev, | |||
| 627 | uint8_t frev, crev; | 633 | uint8_t frev, crev; |
| 628 | ATOM_XTMDS_INFO *xtmds; | 634 | ATOM_XTMDS_INFO *xtmds; |
| 629 | 635 | ||
| 630 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); | 636 | if (atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) { |
| 631 | xtmds = (ATOM_XTMDS_INFO *)(ctx->bios + data_offset); | 637 | xtmds = (ATOM_XTMDS_INFO *)(ctx->bios + data_offset); |
| 632 | 638 | ||
| 633 | if (xtmds->ucSupportedLink & ATOM_XTMDS_SUPPORTED_DUALLINK) { | 639 | if (xtmds->ucSupportedLink & ATOM_XTMDS_SUPPORTED_DUALLINK) { |
| 634 | if (connector_type == DRM_MODE_CONNECTOR_DVII) | 640 | if (connector_type == DRM_MODE_CONNECTOR_DVII) |
| 635 | return CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I; | 641 | return CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_I; |
| 636 | else | 642 | else |
| 637 | return CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D; | 643 | return CONNECTOR_OBJECT_ID_DUAL_LINK_DVI_D; |
| 638 | } else { | 644 | } else { |
| 639 | if (connector_type == DRM_MODE_CONNECTOR_DVII) | 645 | if (connector_type == DRM_MODE_CONNECTOR_DVII) |
| 640 | return CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I; | 646 | return CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_I; |
| 641 | else | 647 | else |
| 642 | return CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D; | 648 | return CONNECTOR_OBJECT_ID_SINGLE_LINK_DVI_D; |
| 643 | } | 649 | } |
| 650 | } else | ||
| 651 | return supported_devices_connector_object_id_convert | ||
| 652 | [connector_type]; | ||
| 644 | } else { | 653 | } else { |
| 645 | return supported_devices_connector_object_id_convert | 654 | return supported_devices_connector_object_id_convert |
| 646 | [connector_type]; | 655 | [connector_type]; |
| @@ -672,7 +681,8 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct | |||
| 672 | int i, j, max_device; | 681 | int i, j, max_device; |
| 673 | struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; | 682 | struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; |
| 674 | 683 | ||
| 675 | atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); | 684 | if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) |
| 685 | return false; | ||
| 676 | 686 | ||
| 677 | supported_devices = | 687 | supported_devices = |
| 678 | (union atom_supported_devices *)(ctx->bios + data_offset); | 688 | (union atom_supported_devices *)(ctx->bios + data_offset); |
| @@ -865,14 +875,11 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) | |||
| 865 | struct radeon_pll *mpll = &rdev->clock.mpll; | 875 | struct radeon_pll *mpll = &rdev->clock.mpll; |
| 866 | uint16_t data_offset; | 876 | uint16_t data_offset; |
| 867 | 877 | ||
| 868 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, | 878 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 869 | &crev, &data_offset); | 879 | &frev, &crev, &data_offset)) { |
| 870 | 880 | firmware_info = | |
| 871 | firmware_info = | 881 | (union firmware_info *)(mode_info->atom_context->bios + |
| 872 | (union firmware_info *)(mode_info->atom_context->bios + | 882 | data_offset); |
| 873 | data_offset); | ||
| 874 | |||
| 875 | if (firmware_info) { | ||
| 876 | /* pixel clocks */ | 883 | /* pixel clocks */ |
| 877 | p1pll->reference_freq = | 884 | p1pll->reference_freq = |
| 878 | le16_to_cpu(firmware_info->info.usReferenceClock); | 885 | le16_to_cpu(firmware_info->info.usReferenceClock); |
| @@ -887,6 +894,20 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) | |||
| 887 | p1pll->pll_out_max = | 894 | p1pll->pll_out_max = |
| 888 | le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output); | 895 | le32_to_cpu(firmware_info->info.ulMaxPixelClockPLL_Output); |
| 889 | 896 | ||
| 897 | if (crev >= 4) { | ||
| 898 | p1pll->lcd_pll_out_min = | ||
| 899 | le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100; | ||
| 900 | if (p1pll->lcd_pll_out_min == 0) | ||
| 901 | p1pll->lcd_pll_out_min = p1pll->pll_out_min; | ||
| 902 | p1pll->lcd_pll_out_max = | ||
| 903 | le16_to_cpu(firmware_info->info_14.usLcdMaxPixelClockPLL_Output) * 100; | ||
| 904 | if (p1pll->lcd_pll_out_max == 0) | ||
| 905 | p1pll->lcd_pll_out_max = p1pll->pll_out_max; | ||
| 906 | } else { | ||
| 907 | p1pll->lcd_pll_out_min = p1pll->pll_out_min; | ||
| 908 | p1pll->lcd_pll_out_max = p1pll->pll_out_max; | ||
| 909 | } | ||
| 910 | |||
| 890 | if (p1pll->pll_out_min == 0) { | 911 | if (p1pll->pll_out_min == 0) { |
| 891 | if (ASIC_IS_AVIVO(rdev)) | 912 | if (ASIC_IS_AVIVO(rdev)) |
| 892 | p1pll->pll_out_min = 64800; | 913 | p1pll->pll_out_min = 64800; |
| @@ -992,13 +1013,10 @@ bool radeon_atombios_sideport_present(struct radeon_device *rdev) | |||
| 992 | u8 frev, crev; | 1013 | u8 frev, crev; |
| 993 | u16 data_offset; | 1014 | u16 data_offset; |
| 994 | 1015 | ||
| 995 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, | 1016 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 996 | &crev, &data_offset); | 1017 | &frev, &crev, &data_offset)) { |
| 997 | 1018 | igp_info = (union igp_info *)(mode_info->atom_context->bios + | |
| 998 | igp_info = (union igp_info *)(mode_info->atom_context->bios + | ||
| 999 | data_offset); | 1019 | data_offset); |
| 1000 | |||
| 1001 | if (igp_info) { | ||
| 1002 | switch (crev) { | 1020 | switch (crev) { |
| 1003 | case 1: | 1021 | case 1: |
| 1004 | if (igp_info->info.ucMemoryType & 0xf0) | 1022 | if (igp_info->info.ucMemoryType & 0xf0) |
| @@ -1029,14 +1047,12 @@ bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder, | |||
| 1029 | uint16_t maxfreq; | 1047 | uint16_t maxfreq; |
| 1030 | int i; | 1048 | int i; |
| 1031 | 1049 | ||
| 1032 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, | 1050 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1033 | &crev, &data_offset); | 1051 | &frev, &crev, &data_offset)) { |
| 1034 | 1052 | tmds_info = | |
| 1035 | tmds_info = | 1053 | (struct _ATOM_TMDS_INFO *)(mode_info->atom_context->bios + |
| 1036 | (struct _ATOM_TMDS_INFO *)(mode_info->atom_context->bios + | 1054 | data_offset); |
| 1037 | data_offset); | ||
| 1038 | 1055 | ||
| 1039 | if (tmds_info) { | ||
| 1040 | maxfreq = le16_to_cpu(tmds_info->usMaxFrequency); | 1056 | maxfreq = le16_to_cpu(tmds_info->usMaxFrequency); |
| 1041 | for (i = 0; i < 4; i++) { | 1057 | for (i = 0; i < 4; i++) { |
| 1042 | tmds->tmds_pll[i].freq = | 1058 | tmds->tmds_pll[i].freq = |
| @@ -1085,13 +1101,11 @@ static struct radeon_atom_ss *radeon_atombios_get_ss_info(struct | |||
| 1085 | if (id > ATOM_MAX_SS_ENTRY) | 1101 | if (id > ATOM_MAX_SS_ENTRY) |
| 1086 | return NULL; | 1102 | return NULL; |
| 1087 | 1103 | ||
| 1088 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, | 1104 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1089 | &crev, &data_offset); | 1105 | &frev, &crev, &data_offset)) { |
| 1106 | ss_info = | ||
| 1107 | (struct _ATOM_SPREAD_SPECTRUM_INFO *)(mode_info->atom_context->bios + data_offset); | ||
| 1090 | 1108 | ||
| 1091 | ss_info = | ||
| 1092 | (struct _ATOM_SPREAD_SPECTRUM_INFO *)(mode_info->atom_context->bios + data_offset); | ||
| 1093 | |||
| 1094 | if (ss_info) { | ||
| 1095 | ss = | 1109 | ss = |
| 1096 | kzalloc(sizeof(struct radeon_atom_ss), GFP_KERNEL); | 1110 | kzalloc(sizeof(struct radeon_atom_ss), GFP_KERNEL); |
| 1097 | 1111 | ||
| @@ -1114,30 +1128,6 @@ static struct radeon_atom_ss *radeon_atombios_get_ss_info(struct | |||
| 1114 | return ss; | 1128 | return ss; |
| 1115 | } | 1129 | } |
| 1116 | 1130 | ||
| 1117 | static void radeon_atom_apply_lvds_quirks(struct drm_device *dev, | ||
| 1118 | struct radeon_encoder_atom_dig *lvds) | ||
| 1119 | { | ||
| 1120 | |||
| 1121 | /* Toshiba A300-1BU laptop panel doesn't like new pll divider algo */ | ||
| 1122 | if ((dev->pdev->device == 0x95c4) && | ||
| 1123 | (dev->pdev->subsystem_vendor == 0x1179) && | ||
| 1124 | (dev->pdev->subsystem_device == 0xff50)) { | ||
| 1125 | if ((lvds->native_mode.hdisplay == 1280) && | ||
| 1126 | (lvds->native_mode.vdisplay == 800)) | ||
| 1127 | lvds->pll_algo = PLL_ALGO_LEGACY; | ||
| 1128 | } | ||
| 1129 | |||
| 1130 | /* Dell Studio 15 laptop panel doesn't like new pll divider algo */ | ||
| 1131 | if ((dev->pdev->device == 0x95c4) && | ||
| 1132 | (dev->pdev->subsystem_vendor == 0x1028) && | ||
| 1133 | (dev->pdev->subsystem_device == 0x029f)) { | ||
| 1134 | if ((lvds->native_mode.hdisplay == 1280) && | ||
| 1135 | (lvds->native_mode.vdisplay == 800)) | ||
| 1136 | lvds->pll_algo = PLL_ALGO_LEGACY; | ||
| 1137 | } | ||
| 1138 | |||
| 1139 | } | ||
| 1140 | |||
| 1141 | union lvds_info { | 1131 | union lvds_info { |
| 1142 | struct _ATOM_LVDS_INFO info; | 1132 | struct _ATOM_LVDS_INFO info; |
| 1143 | struct _ATOM_LVDS_INFO_V12 info_12; | 1133 | struct _ATOM_LVDS_INFO_V12 info_12; |
| @@ -1156,13 +1146,10 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct | |||
| 1156 | uint8_t frev, crev; | 1146 | uint8_t frev, crev; |
| 1157 | struct radeon_encoder_atom_dig *lvds = NULL; | 1147 | struct radeon_encoder_atom_dig *lvds = NULL; |
| 1158 | 1148 | ||
| 1159 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, | 1149 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1160 | &crev, &data_offset); | 1150 | &frev, &crev, &data_offset)) { |
| 1161 | 1151 | lvds_info = | |
| 1162 | lvds_info = | 1152 | (union lvds_info *)(mode_info->atom_context->bios + data_offset); |
| 1163 | (union lvds_info *)(mode_info->atom_context->bios + data_offset); | ||
| 1164 | |||
| 1165 | if (lvds_info) { | ||
| 1166 | lvds = | 1153 | lvds = |
| 1167 | kzalloc(sizeof(struct radeon_encoder_atom_dig), GFP_KERNEL); | 1154 | kzalloc(sizeof(struct radeon_encoder_atom_dig), GFP_KERNEL); |
| 1168 | 1155 | ||
| @@ -1220,9 +1207,6 @@ struct radeon_encoder_atom_dig *radeon_atombios_get_lvds_info(struct | |||
| 1220 | lvds->pll_algo = PLL_ALGO_LEGACY; | 1207 | lvds->pll_algo = PLL_ALGO_LEGACY; |
| 1221 | } | 1208 | } |
| 1222 | 1209 | ||
| 1223 | /* LVDS quirks */ | ||
| 1224 | radeon_atom_apply_lvds_quirks(dev, lvds); | ||
| 1225 | |||
| 1226 | encoder->native_mode = lvds->native_mode; | 1210 | encoder->native_mode = lvds->native_mode; |
| 1227 | } | 1211 | } |
| 1228 | return lvds; | 1212 | return lvds; |
| @@ -1241,11 +1225,11 @@ radeon_atombios_get_primary_dac_info(struct radeon_encoder *encoder) | |||
| 1241 | uint8_t bg, dac; | 1225 | uint8_t bg, dac; |
| 1242 | struct radeon_encoder_primary_dac *p_dac = NULL; | 1226 | struct radeon_encoder_primary_dac *p_dac = NULL; |
| 1243 | 1227 | ||
| 1244 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset); | 1228 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1245 | 1229 | &frev, &crev, &data_offset)) { | |
| 1246 | dac_info = (struct _COMPASSIONATE_DATA *)(mode_info->atom_context->bios + data_offset); | 1230 | dac_info = (struct _COMPASSIONATE_DATA *) |
| 1231 | (mode_info->atom_context->bios + data_offset); | ||
| 1247 | 1232 | ||
| 1248 | if (dac_info) { | ||
| 1249 | p_dac = kzalloc(sizeof(struct radeon_encoder_primary_dac), GFP_KERNEL); | 1233 | p_dac = kzalloc(sizeof(struct radeon_encoder_primary_dac), GFP_KERNEL); |
| 1250 | 1234 | ||
| 1251 | if (!p_dac) | 1235 | if (!p_dac) |
| @@ -1270,7 +1254,9 @@ bool radeon_atom_get_tv_timings(struct radeon_device *rdev, int index, | |||
| 1270 | u8 frev, crev; | 1254 | u8 frev, crev; |
| 1271 | u16 data_offset, misc; | 1255 | u16 data_offset, misc; |
| 1272 | 1256 | ||
| 1273 | atom_parse_data_header(mode_info->atom_context, data_index, NULL, &frev, &crev, &data_offset); | 1257 | if (!atom_parse_data_header(mode_info->atom_context, data_index, NULL, |
| 1258 | &frev, &crev, &data_offset)) | ||
| 1259 | return false; | ||
| 1274 | 1260 | ||
| 1275 | switch (crev) { | 1261 | switch (crev) { |
| 1276 | case 1: | 1262 | case 1: |
| @@ -1362,47 +1348,50 @@ radeon_atombios_get_tv_info(struct radeon_device *rdev) | |||
| 1362 | struct _ATOM_ANALOG_TV_INFO *tv_info; | 1348 | struct _ATOM_ANALOG_TV_INFO *tv_info; |
| 1363 | enum radeon_tv_std tv_std = TV_STD_NTSC; | 1349 | enum radeon_tv_std tv_std = TV_STD_NTSC; |
| 1364 | 1350 | ||
| 1365 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset); | 1351 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1352 | &frev, &crev, &data_offset)) { | ||
| 1366 | 1353 | ||
| 1367 | tv_info = (struct _ATOM_ANALOG_TV_INFO *)(mode_info->atom_context->bios + data_offset); | 1354 | tv_info = (struct _ATOM_ANALOG_TV_INFO *) |
| 1355 | (mode_info->atom_context->bios + data_offset); | ||
| 1368 | 1356 | ||
| 1369 | switch (tv_info->ucTV_BootUpDefaultStandard) { | 1357 | switch (tv_info->ucTV_BootUpDefaultStandard) { |
| 1370 | case ATOM_TV_NTSC: | 1358 | case ATOM_TV_NTSC: |
| 1371 | tv_std = TV_STD_NTSC; | 1359 | tv_std = TV_STD_NTSC; |
| 1372 | DRM_INFO("Default TV standard: NTSC\n"); | 1360 | DRM_INFO("Default TV standard: NTSC\n"); |
| 1373 | break; | 1361 | break; |
| 1374 | case ATOM_TV_NTSCJ: | 1362 | case ATOM_TV_NTSCJ: |
| 1375 | tv_std = TV_STD_NTSC_J; | 1363 | tv_std = TV_STD_NTSC_J; |
| 1376 | DRM_INFO("Default TV standard: NTSC-J\n"); | 1364 | DRM_INFO("Default TV standard: NTSC-J\n"); |
| 1377 | break; | 1365 | break; |
| 1378 | case ATOM_TV_PAL: | 1366 | case ATOM_TV_PAL: |
| 1379 | tv_std = TV_STD_PAL; | 1367 | tv_std = TV_STD_PAL; |
| 1380 | DRM_INFO("Default TV standard: PAL\n"); | 1368 | DRM_INFO("Default TV standard: PAL\n"); |
| 1381 | break; | 1369 | break; |
| 1382 | case ATOM_TV_PALM: | 1370 | case ATOM_TV_PALM: |
| 1383 | tv_std = TV_STD_PAL_M; | 1371 | tv_std = TV_STD_PAL_M; |
| 1384 | DRM_INFO("Default TV standard: PAL-M\n"); | 1372 | DRM_INFO("Default TV standard: PAL-M\n"); |
| 1385 | break; | 1373 | break; |
| 1386 | case ATOM_TV_PALN: | 1374 | case ATOM_TV_PALN: |
| 1387 | tv_std = TV_STD_PAL_N; | 1375 | tv_std = TV_STD_PAL_N; |
| 1388 | DRM_INFO("Default TV standard: PAL-N\n"); | 1376 | DRM_INFO("Default TV standard: PAL-N\n"); |
| 1389 | break; | 1377 | break; |
| 1390 | case ATOM_TV_PALCN: | 1378 | case ATOM_TV_PALCN: |
| 1391 | tv_std = TV_STD_PAL_CN; | 1379 | tv_std = TV_STD_PAL_CN; |
| 1392 | DRM_INFO("Default TV standard: PAL-CN\n"); | 1380 | DRM_INFO("Default TV standard: PAL-CN\n"); |
| 1393 | break; | 1381 | break; |
| 1394 | case ATOM_TV_PAL60: | 1382 | case ATOM_TV_PAL60: |
| 1395 | tv_std = TV_STD_PAL_60; | 1383 | tv_std = TV_STD_PAL_60; |
| 1396 | DRM_INFO("Default TV standard: PAL-60\n"); | 1384 | DRM_INFO("Default TV standard: PAL-60\n"); |
| 1397 | break; | 1385 | break; |
| 1398 | case ATOM_TV_SECAM: | 1386 | case ATOM_TV_SECAM: |
| 1399 | tv_std = TV_STD_SECAM; | 1387 | tv_std = TV_STD_SECAM; |
| 1400 | DRM_INFO("Default TV standard: SECAM\n"); | 1388 | DRM_INFO("Default TV standard: SECAM\n"); |
| 1401 | break; | 1389 | break; |
| 1402 | default: | 1390 | default: |
| 1403 | tv_std = TV_STD_NTSC; | 1391 | tv_std = TV_STD_NTSC; |
| 1404 | DRM_INFO("Unknown TV standard; defaulting to NTSC\n"); | 1392 | DRM_INFO("Unknown TV standard; defaulting to NTSC\n"); |
| 1405 | break; | 1393 | break; |
| 1394 | } | ||
| 1406 | } | 1395 | } |
| 1407 | return tv_std; | 1396 | return tv_std; |
| 1408 | } | 1397 | } |
| @@ -1420,11 +1409,12 @@ radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder) | |||
| 1420 | uint8_t bg, dac; | 1409 | uint8_t bg, dac; |
| 1421 | struct radeon_encoder_tv_dac *tv_dac = NULL; | 1410 | struct radeon_encoder_tv_dac *tv_dac = NULL; |
| 1422 | 1411 | ||
| 1423 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset); | 1412 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1413 | &frev, &crev, &data_offset)) { | ||
| 1424 | 1414 | ||
| 1425 | dac_info = (struct _COMPASSIONATE_DATA *)(mode_info->atom_context->bios + data_offset); | 1415 | dac_info = (struct _COMPASSIONATE_DATA *) |
| 1416 | (mode_info->atom_context->bios + data_offset); | ||
| 1426 | 1417 | ||
| 1427 | if (dac_info) { | ||
| 1428 | tv_dac = kzalloc(sizeof(struct radeon_encoder_tv_dac), GFP_KERNEL); | 1418 | tv_dac = kzalloc(sizeof(struct radeon_encoder_tv_dac), GFP_KERNEL); |
| 1429 | 1419 | ||
| 1430 | if (!tv_dac) | 1420 | if (!tv_dac) |
| @@ -1447,6 +1437,30 @@ radeon_atombios_get_tv_dac_info(struct radeon_encoder *encoder) | |||
| 1447 | return tv_dac; | 1437 | return tv_dac; |
| 1448 | } | 1438 | } |
| 1449 | 1439 | ||
| 1440 | static const char *thermal_controller_names[] = { | ||
| 1441 | "NONE", | ||
| 1442 | "LM63", | ||
| 1443 | "ADM1032", | ||
| 1444 | "ADM1030", | ||
| 1445 | "MUA6649", | ||
| 1446 | "LM64", | ||
| 1447 | "F75375", | ||
| 1448 | "ASC7512", | ||
| 1449 | }; | ||
| 1450 | |||
| 1451 | static const char *pp_lib_thermal_controller_names[] = { | ||
| 1452 | "NONE", | ||
| 1453 | "LM63", | ||
| 1454 | "ADM1032", | ||
| 1455 | "ADM1030", | ||
| 1456 | "MUA6649", | ||
| 1457 | "LM64", | ||
| 1458 | "F75375", | ||
| 1459 | "RV6xx", | ||
| 1460 | "RV770", | ||
| 1461 | "ADT7473", | ||
| 1462 | }; | ||
| 1463 | |||
| 1450 | union power_info { | 1464 | union power_info { |
| 1451 | struct _ATOM_POWERPLAY_INFO info; | 1465 | struct _ATOM_POWERPLAY_INFO info; |
| 1452 | struct _ATOM_POWERPLAY_INFO_V2 info_2; | 1466 | struct _ATOM_POWERPLAY_INFO_V2 info_2; |
| @@ -1466,15 +1480,22 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
| 1466 | struct _ATOM_PPLIB_STATE *power_state; | 1480 | struct _ATOM_PPLIB_STATE *power_state; |
| 1467 | int num_modes = 0, i, j; | 1481 | int num_modes = 0, i, j; |
| 1468 | int state_index = 0, mode_index = 0; | 1482 | int state_index = 0, mode_index = 0; |
| 1469 | 1483 | struct radeon_i2c_bus_rec i2c_bus; | |
| 1470 | atom_parse_data_header(mode_info->atom_context, index, NULL, &frev, &crev, &data_offset); | ||
| 1471 | |||
| 1472 | power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); | ||
| 1473 | 1484 | ||
| 1474 | rdev->pm.default_power_state = NULL; | 1485 | rdev->pm.default_power_state = NULL; |
| 1475 | 1486 | ||
| 1476 | if (power_info) { | 1487 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
| 1488 | &frev, &crev, &data_offset)) { | ||
| 1489 | power_info = (union power_info *)(mode_info->atom_context->bios + data_offset); | ||
| 1477 | if (frev < 4) { | 1490 | if (frev < 4) { |
| 1491 | /* add the i2c bus for thermal/fan chip */ | ||
| 1492 | if (power_info->info.ucOverdriveThermalController > 0) { | ||
| 1493 | DRM_INFO("Possible %s thermal controller at 0x%02x\n", | ||
| 1494 | thermal_controller_names[power_info->info.ucOverdriveThermalController], | ||
| 1495 | power_info->info.ucOverdriveControllerAddress >> 1); | ||
| 1496 | i2c_bus = radeon_lookup_i2c_gpio(rdev, power_info->info.ucOverdriveI2cLine); | ||
| 1497 | rdev->pm.i2c_bus = radeon_i2c_create(rdev->ddev, &i2c_bus, "Thermal"); | ||
| 1498 | } | ||
| 1478 | num_modes = power_info->info.ucNumOfPowerModeEntries; | 1499 | num_modes = power_info->info.ucNumOfPowerModeEntries; |
| 1479 | if (num_modes > ATOM_MAX_NUMBEROF_POWER_BLOCK) | 1500 | if (num_modes > ATOM_MAX_NUMBEROF_POWER_BLOCK) |
| 1480 | num_modes = ATOM_MAX_NUMBEROF_POWER_BLOCK; | 1501 | num_modes = ATOM_MAX_NUMBEROF_POWER_BLOCK; |
| @@ -1684,6 +1705,24 @@ void radeon_atombios_get_power_modes(struct radeon_device *rdev) | |||
| 1684 | } | 1705 | } |
| 1685 | } | 1706 | } |
| 1686 | } else if (frev == 4) { | 1707 | } else if (frev == 4) { |
| 1708 | /* add the i2c bus for thermal/fan chip */ | ||
| 1709 | /* no support for internal controller yet */ | ||
| 1710 | if (power_info->info_4.sThermalController.ucType > 0) { | ||
| 1711 | if ((power_info->info_4.sThermalController.ucType == ATOM_PP_THERMALCONTROLLER_RV6xx) || | ||
| 1712 | (power_info->info_4.sThermalController.ucType == ATOM_PP_THERMALCONTROLLER_RV770)) { | ||
| 1713 | DRM_INFO("Internal thermal controller %s fan control\n", | ||
| 1714 | (power_info->info_4.sThermalController.ucFanParameters & | ||
| 1715 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); | ||
| 1716 | } else { | ||
| 1717 | DRM_INFO("Possible %s thermal controller at 0x%02x %s fan control\n", | ||
| 1718 | pp_lib_thermal_controller_names[power_info->info_4.sThermalController.ucType], | ||
| 1719 | power_info->info_4.sThermalController.ucI2cAddress >> 1, | ||
| 1720 | (power_info->info_4.sThermalController.ucFanParameters & | ||
| 1721 | ATOM_PP_FANPARAMETERS_NOFAN) ? "without" : "with"); | ||
| 1722 | i2c_bus = radeon_lookup_i2c_gpio(rdev, power_info->info_4.sThermalController.ucI2cLine); | ||
| 1723 | rdev->pm.i2c_bus = radeon_i2c_create(rdev->ddev, &i2c_bus, "Thermal"); | ||
| 1724 | } | ||
| 1725 | } | ||
| 1687 | for (i = 0; i < power_info->info_4.ucNumStates; i++) { | 1726 | for (i = 0; i < power_info->info_4.ucNumStates; i++) { |
| 1688 | mode_index = 0; | 1727 | mode_index = 0; |
| 1689 | power_state = (struct _ATOM_PPLIB_STATE *) | 1728 | power_state = (struct _ATOM_PPLIB_STATE *) |
diff --git a/drivers/gpu/drm/radeon/radeon_atpx_handler.c b/drivers/gpu/drm/radeon/radeon_atpx_handler.c index 3f557c4151e0..ed5dfe58f29c 100644 --- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c +++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * ATPX support for both Intel/ATI | 7 | * ATPX support for both Intel/ATI |
| 8 | */ | 8 | */ |
| 9 | #include <linux/vga_switcheroo.h> | 9 | #include <linux/vga_switcheroo.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <acpi/acpi.h> | 11 | #include <acpi/acpi.h> |
| 11 | #include <acpi/acpi_bus.h> | 12 | #include <acpi/acpi_bus.h> |
| 12 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index 557240460526..8ad71f701316 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "atom.h" | 31 | #include "atom.h" |
| 32 | 32 | ||
| 33 | #include <linux/vga_switcheroo.h> | 33 | #include <linux/vga_switcheroo.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | /* | 35 | /* |
| 35 | * BIOS. | 36 | * BIOS. |
| 36 | */ | 37 | */ |
diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index e9ea38ece375..2becdeda68a3 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c | |||
| @@ -531,10 +531,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rde | |||
| 531 | case CHIP_RS300: | 531 | case CHIP_RS300: |
| 532 | switch (ddc_line) { | 532 | switch (ddc_line) { |
| 533 | case RADEON_GPIO_DVI_DDC: | 533 | case RADEON_GPIO_DVI_DDC: |
| 534 | /* in theory this should be hw capable, | 534 | i2c.hw_capable = true; |
| 535 | * but it doesn't seem to work | ||
| 536 | */ | ||
| 537 | i2c.hw_capable = false; | ||
| 538 | break; | 535 | break; |
| 539 | default: | 536 | default: |
| 540 | i2c.hw_capable = false; | 537 | i2c.hw_capable = false; |
| @@ -633,6 +630,8 @@ bool radeon_combios_get_clock_info(struct drm_device *dev) | |||
| 633 | p1pll->reference_div = RBIOS16(pll_info + 0x10); | 630 | p1pll->reference_div = RBIOS16(pll_info + 0x10); |
| 634 | p1pll->pll_out_min = RBIOS32(pll_info + 0x12); | 631 | p1pll->pll_out_min = RBIOS32(pll_info + 0x12); |
| 635 | p1pll->pll_out_max = RBIOS32(pll_info + 0x16); | 632 | p1pll->pll_out_max = RBIOS32(pll_info + 0x16); |
| 633 | p1pll->lcd_pll_out_min = p1pll->pll_out_min; | ||
| 634 | p1pll->lcd_pll_out_max = p1pll->pll_out_max; | ||
| 636 | 635 | ||
| 637 | if (rev > 9) { | 636 | if (rev > 9) { |
| 638 | p1pll->pll_in_min = RBIOS32(pll_info + 0x36); | 637 | p1pll->pll_in_min = RBIOS32(pll_info + 0x36); |
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index ee0083f982d8..60d59816b94f 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c | |||
| @@ -940,7 +940,7 @@ static void radeon_dp_connector_destroy(struct drm_connector *connector) | |||
| 940 | if (radeon_connector->edid) | 940 | if (radeon_connector->edid) |
| 941 | kfree(radeon_connector->edid); | 941 | kfree(radeon_connector->edid); |
| 942 | if (radeon_dig_connector->dp_i2c_bus) | 942 | if (radeon_dig_connector->dp_i2c_bus) |
| 943 | radeon_i2c_destroy_dp(radeon_dig_connector->dp_i2c_bus); | 943 | radeon_i2c_destroy(radeon_dig_connector->dp_i2c_bus); |
| 944 | kfree(radeon_connector->con_priv); | 944 | kfree(radeon_connector->con_priv); |
| 945 | drm_sysfs_connector_remove(connector); | 945 | drm_sysfs_connector_remove(connector); |
| 946 | drm_connector_cleanup(connector); | 946 | drm_connector_cleanup(connector); |
diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index 70ba02ed7723..f9b0fe002c0a 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c | |||
| @@ -193,9 +193,11 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error) | |||
| 193 | radeon_bo_list_fence(&parser->validated, parser->ib->fence); | 193 | radeon_bo_list_fence(&parser->validated, parser->ib->fence); |
| 194 | } | 194 | } |
| 195 | radeon_bo_list_unreserve(&parser->validated); | 195 | radeon_bo_list_unreserve(&parser->validated); |
| 196 | for (i = 0; i < parser->nrelocs; i++) { | 196 | if (parser->relocs != NULL) { |
| 197 | if (parser->relocs[i].gobj) | 197 | for (i = 0; i < parser->nrelocs; i++) { |
| 198 | drm_gem_object_unreference_unlocked(parser->relocs[i].gobj); | 198 | if (parser->relocs[i].gobj) |
| 199 | drm_gem_object_unreference_unlocked(parser->relocs[i].gobj); | ||
| 200 | } | ||
| 199 | } | 201 | } |
| 200 | kfree(parser->track); | 202 | kfree(parser->track); |
| 201 | kfree(parser->relocs); | 203 | kfree(parser->relocs); |
| @@ -243,7 +245,8 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) | |||
| 243 | } | 245 | } |
| 244 | r = radeon_cs_parser_relocs(&parser); | 246 | r = radeon_cs_parser_relocs(&parser); |
| 245 | if (r) { | 247 | if (r) { |
| 246 | DRM_ERROR("Failed to parse relocation !\n"); | 248 | if (r != -ERESTARTSYS) |
| 249 | DRM_ERROR("Failed to parse relocation %d!\n", r); | ||
| 247 | radeon_cs_parser_fini(&parser, r); | 250 | radeon_cs_parser_fini(&parser, r); |
| 248 | mutex_unlock(&rdev->cs_mutex); | 251 | mutex_unlock(&rdev->cs_mutex); |
| 249 | return r; | 252 | return r; |
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index e28e4ed5f720..bddf17f97da8 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/console.h> | 28 | #include <linux/console.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <drm/drmP.h> | 30 | #include <drm/drmP.h> |
| 30 | #include <drm/drm_crtc_helper.h> | 31 | #include <drm/drm_crtc_helper.h> |
| 31 | #include <drm/radeon_drm.h> | 32 | #include <drm/radeon_drm.h> |
| @@ -33,7 +34,6 @@ | |||
| 33 | #include <linux/vga_switcheroo.h> | 34 | #include <linux/vga_switcheroo.h> |
| 34 | #include "radeon_reg.h" | 35 | #include "radeon_reg.h" |
| 35 | #include "radeon.h" | 36 | #include "radeon.h" |
| 36 | #include "radeon_asic.h" | ||
| 37 | #include "atom.h" | 37 | #include "atom.h" |
| 38 | 38 | ||
| 39 | /* | 39 | /* |
| @@ -242,6 +242,36 @@ bool radeon_card_posted(struct radeon_device *rdev) | |||
| 242 | 242 | ||
| 243 | } | 243 | } |
| 244 | 244 | ||
| 245 | void radeon_update_bandwidth_info(struct radeon_device *rdev) | ||
| 246 | { | ||
| 247 | fixed20_12 a; | ||
| 248 | u32 sclk, mclk; | ||
| 249 | |||
| 250 | if (rdev->flags & RADEON_IS_IGP) { | ||
| 251 | sclk = radeon_get_engine_clock(rdev); | ||
| 252 | mclk = rdev->clock.default_mclk; | ||
| 253 | |||
| 254 | a.full = rfixed_const(100); | ||
| 255 | rdev->pm.sclk.full = rfixed_const(sclk); | ||
| 256 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 257 | rdev->pm.mclk.full = rfixed_const(mclk); | ||
| 258 | rdev->pm.mclk.full = rfixed_div(rdev->pm.mclk, a); | ||
| 259 | |||
| 260 | a.full = rfixed_const(16); | ||
| 261 | /* core_bandwidth = sclk(Mhz) * 16 */ | ||
| 262 | rdev->pm.core_bandwidth.full = rfixed_div(rdev->pm.sclk, a); | ||
| 263 | } else { | ||
| 264 | sclk = radeon_get_engine_clock(rdev); | ||
| 265 | mclk = radeon_get_memory_clock(rdev); | ||
| 266 | |||
| 267 | a.full = rfixed_const(100); | ||
| 268 | rdev->pm.sclk.full = rfixed_const(sclk); | ||
| 269 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 270 | rdev->pm.mclk.full = rfixed_const(mclk); | ||
| 271 | rdev->pm.mclk.full = rfixed_div(rdev->pm.mclk, a); | ||
| 272 | } | ||
| 273 | } | ||
| 274 | |||
| 245 | bool radeon_boot_test_post_card(struct radeon_device *rdev) | 275 | bool radeon_boot_test_post_card(struct radeon_device *rdev) |
| 246 | { | 276 | { |
| 247 | if (radeon_card_posted(rdev)) | 277 | if (radeon_card_posted(rdev)) |
| @@ -288,181 +318,6 @@ void radeon_dummy_page_fini(struct radeon_device *rdev) | |||
| 288 | } | 318 | } |
| 289 | 319 | ||
| 290 | 320 | ||
| 291 | /* | ||
| 292 | * Registers accessors functions. | ||
| 293 | */ | ||
| 294 | uint32_t radeon_invalid_rreg(struct radeon_device *rdev, uint32_t reg) | ||
| 295 | { | ||
| 296 | DRM_ERROR("Invalid callback to read register 0x%04X\n", reg); | ||
| 297 | BUG_ON(1); | ||
| 298 | return 0; | ||
| 299 | } | ||
| 300 | |||
| 301 | void radeon_invalid_wreg(struct radeon_device *rdev, uint32_t reg, uint32_t v) | ||
| 302 | { | ||
| 303 | DRM_ERROR("Invalid callback to write register 0x%04X with 0x%08X\n", | ||
| 304 | reg, v); | ||
| 305 | BUG_ON(1); | ||
| 306 | } | ||
| 307 | |||
| 308 | void radeon_register_accessor_init(struct radeon_device *rdev) | ||
| 309 | { | ||
| 310 | rdev->mc_rreg = &radeon_invalid_rreg; | ||
| 311 | rdev->mc_wreg = &radeon_invalid_wreg; | ||
| 312 | rdev->pll_rreg = &radeon_invalid_rreg; | ||
| 313 | rdev->pll_wreg = &radeon_invalid_wreg; | ||
| 314 | rdev->pciep_rreg = &radeon_invalid_rreg; | ||
| 315 | rdev->pciep_wreg = &radeon_invalid_wreg; | ||
| 316 | |||
| 317 | /* Don't change order as we are overridding accessor. */ | ||
| 318 | if (rdev->family < CHIP_RV515) { | ||
| 319 | rdev->pcie_reg_mask = 0xff; | ||
| 320 | } else { | ||
| 321 | rdev->pcie_reg_mask = 0x7ff; | ||
| 322 | } | ||
| 323 | /* FIXME: not sure here */ | ||
| 324 | if (rdev->family <= CHIP_R580) { | ||
| 325 | rdev->pll_rreg = &r100_pll_rreg; | ||
| 326 | rdev->pll_wreg = &r100_pll_wreg; | ||
| 327 | } | ||
| 328 | if (rdev->family >= CHIP_R420) { | ||
| 329 | rdev->mc_rreg = &r420_mc_rreg; | ||
| 330 | rdev->mc_wreg = &r420_mc_wreg; | ||
| 331 | } | ||
| 332 | if (rdev->family >= CHIP_RV515) { | ||
| 333 | rdev->mc_rreg = &rv515_mc_rreg; | ||
| 334 | rdev->mc_wreg = &rv515_mc_wreg; | ||
| 335 | } | ||
| 336 | if (rdev->family == CHIP_RS400 || rdev->family == CHIP_RS480) { | ||
| 337 | rdev->mc_rreg = &rs400_mc_rreg; | ||
| 338 | rdev->mc_wreg = &rs400_mc_wreg; | ||
| 339 | } | ||
| 340 | if (rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) { | ||
| 341 | rdev->mc_rreg = &rs690_mc_rreg; | ||
| 342 | rdev->mc_wreg = &rs690_mc_wreg; | ||
| 343 | } | ||
| 344 | if (rdev->family == CHIP_RS600) { | ||
| 345 | rdev->mc_rreg = &rs600_mc_rreg; | ||
| 346 | rdev->mc_wreg = &rs600_mc_wreg; | ||
| 347 | } | ||
| 348 | if ((rdev->family >= CHIP_R600) && (rdev->family <= CHIP_RV740)) { | ||
| 349 | rdev->pciep_rreg = &r600_pciep_rreg; | ||
| 350 | rdev->pciep_wreg = &r600_pciep_wreg; | ||
| 351 | } | ||
| 352 | } | ||
| 353 | |||
| 354 | |||
| 355 | /* | ||
| 356 | * ASIC | ||
| 357 | */ | ||
| 358 | int radeon_asic_init(struct radeon_device *rdev) | ||
| 359 | { | ||
| 360 | radeon_register_accessor_init(rdev); | ||
| 361 | switch (rdev->family) { | ||
| 362 | case CHIP_R100: | ||
| 363 | case CHIP_RV100: | ||
| 364 | case CHIP_RS100: | ||
| 365 | case CHIP_RV200: | ||
| 366 | case CHIP_RS200: | ||
| 367 | rdev->asic = &r100_asic; | ||
| 368 | break; | ||
| 369 | case CHIP_R200: | ||
| 370 | case CHIP_RV250: | ||
| 371 | case CHIP_RS300: | ||
| 372 | case CHIP_RV280: | ||
| 373 | rdev->asic = &r200_asic; | ||
| 374 | break; | ||
| 375 | case CHIP_R300: | ||
| 376 | case CHIP_R350: | ||
| 377 | case CHIP_RV350: | ||
| 378 | case CHIP_RV380: | ||
| 379 | if (rdev->flags & RADEON_IS_PCIE) | ||
| 380 | rdev->asic = &r300_asic_pcie; | ||
| 381 | else | ||
| 382 | rdev->asic = &r300_asic; | ||
| 383 | break; | ||
| 384 | case CHIP_R420: | ||
| 385 | case CHIP_R423: | ||
| 386 | case CHIP_RV410: | ||
| 387 | rdev->asic = &r420_asic; | ||
| 388 | break; | ||
| 389 | case CHIP_RS400: | ||
| 390 | case CHIP_RS480: | ||
| 391 | rdev->asic = &rs400_asic; | ||
| 392 | break; | ||
| 393 | case CHIP_RS600: | ||
| 394 | rdev->asic = &rs600_asic; | ||
| 395 | break; | ||
| 396 | case CHIP_RS690: | ||
| 397 | case CHIP_RS740: | ||
| 398 | rdev->asic = &rs690_asic; | ||
| 399 | break; | ||
| 400 | case CHIP_RV515: | ||
| 401 | rdev->asic = &rv515_asic; | ||
| 402 | break; | ||
| 403 | case CHIP_R520: | ||
| 404 | case CHIP_RV530: | ||
| 405 | case CHIP_RV560: | ||
| 406 | case CHIP_RV570: | ||
| 407 | case CHIP_R580: | ||
| 408 | rdev->asic = &r520_asic; | ||
| 409 | break; | ||
| 410 | case CHIP_R600: | ||
| 411 | case CHIP_RV610: | ||
| 412 | case CHIP_RV630: | ||
| 413 | case CHIP_RV620: | ||
| 414 | case CHIP_RV635: | ||
| 415 | case CHIP_RV670: | ||
| 416 | case CHIP_RS780: | ||
| 417 | case CHIP_RS880: | ||
| 418 | rdev->asic = &r600_asic; | ||
| 419 | break; | ||
| 420 | case CHIP_RV770: | ||
| 421 | case CHIP_RV730: | ||
| 422 | case CHIP_RV710: | ||
| 423 | case CHIP_RV740: | ||
| 424 | rdev->asic = &rv770_asic; | ||
| 425 | break; | ||
| 426 | case CHIP_CEDAR: | ||
| 427 | case CHIP_REDWOOD: | ||
| 428 | case CHIP_JUNIPER: | ||
| 429 | case CHIP_CYPRESS: | ||
| 430 | case CHIP_HEMLOCK: | ||
| 431 | rdev->asic = &evergreen_asic; | ||
| 432 | break; | ||
| 433 | default: | ||
| 434 | /* FIXME: not supported yet */ | ||
| 435 | return -EINVAL; | ||
| 436 | } | ||
| 437 | |||
| 438 | if (rdev->flags & RADEON_IS_IGP) { | ||
| 439 | rdev->asic->get_memory_clock = NULL; | ||
| 440 | rdev->asic->set_memory_clock = NULL; | ||
| 441 | } | ||
| 442 | |||
| 443 | return 0; | ||
| 444 | } | ||
| 445 | |||
| 446 | |||
| 447 | /* | ||
| 448 | * Wrapper around modesetting bits. | ||
| 449 | */ | ||
| 450 | int radeon_clocks_init(struct radeon_device *rdev) | ||
| 451 | { | ||
| 452 | int r; | ||
| 453 | |||
| 454 | r = radeon_static_clocks_init(rdev->ddev); | ||
| 455 | if (r) { | ||
| 456 | return r; | ||
| 457 | } | ||
| 458 | DRM_INFO("Clocks initialized !\n"); | ||
| 459 | return 0; | ||
| 460 | } | ||
| 461 | |||
| 462 | void radeon_clocks_fini(struct radeon_device *rdev) | ||
| 463 | { | ||
| 464 | } | ||
| 465 | |||
| 466 | /* ATOM accessor methods */ | 321 | /* ATOM accessor methods */ |
| 467 | static uint32_t cail_pll_read(struct card_info *info, uint32_t reg) | 322 | static uint32_t cail_pll_read(struct card_info *info, uint32_t reg) |
| 468 | { | 323 | { |
| @@ -567,29 +422,6 @@ static unsigned int radeon_vga_set_decode(void *cookie, bool state) | |||
| 567 | return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; | 422 | return VGA_RSRC_NORMAL_IO | VGA_RSRC_NORMAL_MEM; |
| 568 | } | 423 | } |
| 569 | 424 | ||
| 570 | void radeon_agp_disable(struct radeon_device *rdev) | ||
| 571 | { | ||
| 572 | rdev->flags &= ~RADEON_IS_AGP; | ||
| 573 | if (rdev->family >= CHIP_R600) { | ||
| 574 | DRM_INFO("Forcing AGP to PCIE mode\n"); | ||
| 575 | rdev->flags |= RADEON_IS_PCIE; | ||
| 576 | } else if (rdev->family >= CHIP_RV515 || | ||
| 577 | rdev->family == CHIP_RV380 || | ||
| 578 | rdev->family == CHIP_RV410 || | ||
| 579 | rdev->family == CHIP_R423) { | ||
| 580 | DRM_INFO("Forcing AGP to PCIE mode\n"); | ||
| 581 | rdev->flags |= RADEON_IS_PCIE; | ||
| 582 | rdev->asic->gart_tlb_flush = &rv370_pcie_gart_tlb_flush; | ||
| 583 | rdev->asic->gart_set_page = &rv370_pcie_gart_set_page; | ||
| 584 | } else { | ||
| 585 | DRM_INFO("Forcing AGP to PCI mode\n"); | ||
| 586 | rdev->flags |= RADEON_IS_PCI; | ||
| 587 | rdev->asic->gart_tlb_flush = &r100_pci_gart_tlb_flush; | ||
| 588 | rdev->asic->gart_set_page = &r100_pci_gart_set_page; | ||
| 589 | } | ||
| 590 | rdev->mc.gtt_size = radeon_gart_size * 1024 * 1024; | ||
| 591 | } | ||
| 592 | |||
| 593 | void radeon_check_arguments(struct radeon_device *rdev) | 425 | void radeon_check_arguments(struct radeon_device *rdev) |
| 594 | { | 426 | { |
| 595 | /* vramlimit must be a power of two */ | 427 | /* vramlimit must be a power of two */ |
| @@ -731,6 +563,14 @@ int radeon_device_init(struct radeon_device *rdev, | |||
| 731 | return r; | 563 | return r; |
| 732 | radeon_check_arguments(rdev); | 564 | radeon_check_arguments(rdev); |
| 733 | 565 | ||
| 566 | /* all of the newer IGP chips have an internal gart | ||
| 567 | * However some rs4xx report as AGP, so remove that here. | ||
| 568 | */ | ||
| 569 | if ((rdev->family >= CHIP_RS400) && | ||
| 570 | (rdev->flags & RADEON_IS_IGP)) { | ||
| 571 | rdev->flags &= ~RADEON_IS_AGP; | ||
| 572 | } | ||
| 573 | |||
| 734 | if (rdev->flags & RADEON_IS_AGP && radeon_agpmode == -1) { | 574 | if (rdev->flags & RADEON_IS_AGP && radeon_agpmode == -1) { |
| 735 | radeon_agp_disable(rdev); | 575 | radeon_agp_disable(rdev); |
| 736 | } | 576 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c index ba8d806dcf39..b8d672828246 100644 --- a/drivers/gpu/drm/radeon/radeon_display.c +++ b/drivers/gpu/drm/radeon/radeon_display.c | |||
| @@ -368,10 +368,9 @@ static bool radeon_setup_enc_conn(struct drm_device *dev) | |||
| 368 | 368 | ||
| 369 | if (rdev->bios) { | 369 | if (rdev->bios) { |
| 370 | if (rdev->is_atom_bios) { | 370 | if (rdev->is_atom_bios) { |
| 371 | if (rdev->family >= CHIP_R600) | 371 | ret = radeon_get_atom_connector_info_from_supported_devices_table(dev); |
| 372 | if (ret == false) | ||
| 372 | ret = radeon_get_atom_connector_info_from_object_table(dev); | 373 | ret = radeon_get_atom_connector_info_from_object_table(dev); |
| 373 | else | ||
| 374 | ret = radeon_get_atom_connector_info_from_supported_devices_table(dev); | ||
| 375 | } else { | 374 | } else { |
| 376 | ret = radeon_get_legacy_connector_info_from_bios(dev); | 375 | ret = radeon_get_legacy_connector_info_from_bios(dev); |
| 377 | if (ret == false) | 376 | if (ret == false) |
| @@ -469,10 +468,19 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll, | |||
| 469 | uint32_t best_error = 0xffffffff; | 468 | uint32_t best_error = 0xffffffff; |
| 470 | uint32_t best_vco_diff = 1; | 469 | uint32_t best_vco_diff = 1; |
| 471 | uint32_t post_div; | 470 | uint32_t post_div; |
| 471 | u32 pll_out_min, pll_out_max; | ||
| 472 | 472 | ||
| 473 | DRM_DEBUG("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); | 473 | DRM_DEBUG("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div); |
| 474 | freq = freq * 1000; | 474 | freq = freq * 1000; |
| 475 | 475 | ||
| 476 | if (pll->flags & RADEON_PLL_IS_LCD) { | ||
| 477 | pll_out_min = pll->lcd_pll_out_min; | ||
| 478 | pll_out_max = pll->lcd_pll_out_max; | ||
| 479 | } else { | ||
| 480 | pll_out_min = pll->pll_out_min; | ||
| 481 | pll_out_max = pll->pll_out_max; | ||
| 482 | } | ||
| 483 | |||
| 476 | if (pll->flags & RADEON_PLL_USE_REF_DIV) | 484 | if (pll->flags & RADEON_PLL_USE_REF_DIV) |
| 477 | min_ref_div = max_ref_div = pll->reference_div; | 485 | min_ref_div = max_ref_div = pll->reference_div; |
| 478 | else { | 486 | else { |
| @@ -536,10 +544,10 @@ static void radeon_compute_pll_legacy(struct radeon_pll *pll, | |||
| 536 | tmp = (uint64_t)pll->reference_freq * feedback_div; | 544 | tmp = (uint64_t)pll->reference_freq * feedback_div; |
| 537 | vco = radeon_div(tmp, ref_div); | 545 | vco = radeon_div(tmp, ref_div); |
| 538 | 546 | ||
| 539 | if (vco < pll->pll_out_min) { | 547 | if (vco < pll_out_min) { |
| 540 | min_feed_div = feedback_div + 1; | 548 | min_feed_div = feedback_div + 1; |
| 541 | continue; | 549 | continue; |
| 542 | } else if (vco > pll->pll_out_max) { | 550 | } else if (vco > pll_out_max) { |
| 543 | max_feed_div = feedback_div; | 551 | max_feed_div = feedback_div; |
| 544 | continue; | 552 | continue; |
| 545 | } | 553 | } |
| @@ -675,6 +683,15 @@ calc_fb_ref_div(struct radeon_pll *pll, | |||
| 675 | { | 683 | { |
| 676 | fixed20_12 ffreq, max_error, error, pll_out, a; | 684 | fixed20_12 ffreq, max_error, error, pll_out, a; |
| 677 | u32 vco; | 685 | u32 vco; |
| 686 | u32 pll_out_min, pll_out_max; | ||
| 687 | |||
| 688 | if (pll->flags & RADEON_PLL_IS_LCD) { | ||
| 689 | pll_out_min = pll->lcd_pll_out_min; | ||
| 690 | pll_out_max = pll->lcd_pll_out_max; | ||
| 691 | } else { | ||
| 692 | pll_out_min = pll->pll_out_min; | ||
| 693 | pll_out_max = pll->pll_out_max; | ||
| 694 | } | ||
| 678 | 695 | ||
| 679 | ffreq.full = rfixed_const(freq); | 696 | ffreq.full = rfixed_const(freq); |
| 680 | /* max_error = ffreq * 0.0025; */ | 697 | /* max_error = ffreq * 0.0025; */ |
| @@ -686,7 +703,7 @@ calc_fb_ref_div(struct radeon_pll *pll, | |||
| 686 | vco = pll->reference_freq * (((*fb_div) * 10) + (*fb_div_frac)); | 703 | vco = pll->reference_freq * (((*fb_div) * 10) + (*fb_div_frac)); |
| 687 | vco = vco / ((*ref_div) * 10); | 704 | vco = vco / ((*ref_div) * 10); |
| 688 | 705 | ||
| 689 | if ((vco < pll->pll_out_min) || (vco > pll->pll_out_max)) | 706 | if ((vco < pll_out_min) || (vco > pll_out_max)) |
| 690 | continue; | 707 | continue; |
| 691 | 708 | ||
| 692 | /* pll_out = vco / post_div; */ | 709 | /* pll_out = vco / post_div; */ |
| @@ -714,6 +731,15 @@ static void radeon_compute_pll_new(struct radeon_pll *pll, | |||
| 714 | { | 731 | { |
| 715 | u32 fb_div = 0, fb_div_frac = 0, post_div = 0, ref_div = 0; | 732 | u32 fb_div = 0, fb_div_frac = 0, post_div = 0, ref_div = 0; |
| 716 | u32 best_freq = 0, vco_frequency; | 733 | u32 best_freq = 0, vco_frequency; |
| 734 | u32 pll_out_min, pll_out_max; | ||
| 735 | |||
| 736 | if (pll->flags & RADEON_PLL_IS_LCD) { | ||
| 737 | pll_out_min = pll->lcd_pll_out_min; | ||
| 738 | pll_out_max = pll->lcd_pll_out_max; | ||
| 739 | } else { | ||
| 740 | pll_out_min = pll->pll_out_min; | ||
| 741 | pll_out_max = pll->pll_out_max; | ||
| 742 | } | ||
| 717 | 743 | ||
| 718 | /* freq = freq / 10; */ | 744 | /* freq = freq / 10; */ |
| 719 | do_div(freq, 10); | 745 | do_div(freq, 10); |
| @@ -724,7 +750,7 @@ static void radeon_compute_pll_new(struct radeon_pll *pll, | |||
| 724 | goto done; | 750 | goto done; |
| 725 | 751 | ||
| 726 | vco_frequency = freq * post_div; | 752 | vco_frequency = freq * post_div; |
| 727 | if ((vco_frequency < pll->pll_out_min) || (vco_frequency > pll->pll_out_max)) | 753 | if ((vco_frequency < pll_out_min) || (vco_frequency > pll_out_max)) |
| 728 | goto done; | 754 | goto done; |
| 729 | 755 | ||
| 730 | if (pll->flags & RADEON_PLL_USE_REF_DIV) { | 756 | if (pll->flags & RADEON_PLL_USE_REF_DIV) { |
| @@ -749,7 +775,7 @@ static void radeon_compute_pll_new(struct radeon_pll *pll, | |||
| 749 | continue; | 775 | continue; |
| 750 | 776 | ||
| 751 | vco_frequency = freq * post_div; | 777 | vco_frequency = freq * post_div; |
| 752 | if ((vco_frequency < pll->pll_out_min) || (vco_frequency > pll->pll_out_max)) | 778 | if ((vco_frequency < pll_out_min) || (vco_frequency > pll_out_max)) |
| 753 | continue; | 779 | continue; |
| 754 | if (pll->flags & RADEON_PLL_USE_REF_DIV) { | 780 | if (pll->flags & RADEON_PLL_USE_REF_DIV) { |
| 755 | ref_div = pll->reference_div; | 781 | ref_div = pll->reference_div; |
| @@ -945,6 +971,23 @@ static int radeon_modeset_create_props(struct radeon_device *rdev) | |||
| 945 | return 0; | 971 | return 0; |
| 946 | } | 972 | } |
| 947 | 973 | ||
| 974 | void radeon_update_display_priority(struct radeon_device *rdev) | ||
| 975 | { | ||
| 976 | /* adjustment options for the display watermarks */ | ||
| 977 | if ((radeon_disp_priority == 0) || (radeon_disp_priority > 2)) { | ||
| 978 | /* set display priority to high for r3xx, rv515 chips | ||
| 979 | * this avoids flickering due to underflow to the | ||
| 980 | * display controllers during heavy acceleration. | ||
| 981 | */ | ||
| 982 | if (ASIC_IS_R300(rdev) || (rdev->family == CHIP_RV515)) | ||
| 983 | rdev->disp_priority = 2; | ||
| 984 | else | ||
| 985 | rdev->disp_priority = 0; | ||
| 986 | } else | ||
| 987 | rdev->disp_priority = radeon_disp_priority; | ||
| 988 | |||
| 989 | } | ||
| 990 | |||
| 948 | int radeon_modeset_init(struct radeon_device *rdev) | 991 | int radeon_modeset_init(struct radeon_device *rdev) |
| 949 | { | 992 | { |
| 950 | int i; | 993 | int i; |
| @@ -976,15 +1019,6 @@ int radeon_modeset_init(struct radeon_device *rdev) | |||
| 976 | radeon_combios_check_hardcoded_edid(rdev); | 1019 | radeon_combios_check_hardcoded_edid(rdev); |
| 977 | } | 1020 | } |
| 978 | 1021 | ||
| 979 | if (rdev->flags & RADEON_SINGLE_CRTC) | ||
| 980 | rdev->num_crtc = 1; | ||
| 981 | else { | ||
| 982 | if (ASIC_IS_DCE4(rdev)) | ||
| 983 | rdev->num_crtc = 6; | ||
| 984 | else | ||
| 985 | rdev->num_crtc = 2; | ||
| 986 | } | ||
| 987 | |||
| 988 | /* allocate crtcs */ | 1022 | /* allocate crtcs */ |
| 989 | for (i = 0; i < rdev->num_crtc; i++) { | 1023 | for (i = 0; i < rdev->num_crtc; i++) { |
| 990 | radeon_crtc_init(rdev->ddev, i); | 1024 | radeon_crtc_init(rdev->ddev, i); |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 6eec0ece6a6c..055a51732dcb 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
| @@ -42,9 +42,10 @@ | |||
| 42 | * KMS wrapper. | 42 | * KMS wrapper. |
| 43 | * - 2.0.0 - initial interface | 43 | * - 2.0.0 - initial interface |
| 44 | * - 2.1.0 - add square tiling interface | 44 | * - 2.1.0 - add square tiling interface |
| 45 | * - 2.2.0 - add r6xx/r7xx const buffer support | ||
| 45 | */ | 46 | */ |
| 46 | #define KMS_DRIVER_MAJOR 2 | 47 | #define KMS_DRIVER_MAJOR 2 |
| 47 | #define KMS_DRIVER_MINOR 1 | 48 | #define KMS_DRIVER_MINOR 2 |
| 48 | #define KMS_DRIVER_PATCHLEVEL 0 | 49 | #define KMS_DRIVER_PATCHLEVEL 0 |
| 49 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); | 50 | int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags); |
| 50 | int radeon_driver_unload_kms(struct drm_device *dev); | 51 | int radeon_driver_unload_kms(struct drm_device *dev); |
| @@ -91,6 +92,8 @@ int radeon_tv = 1; | |||
| 91 | int radeon_new_pll = -1; | 92 | int radeon_new_pll = -1; |
| 92 | int radeon_dynpm = -1; | 93 | int radeon_dynpm = -1; |
| 93 | int radeon_audio = 1; | 94 | int radeon_audio = 1; |
| 95 | int radeon_disp_priority = 0; | ||
| 96 | int radeon_hw_i2c = 0; | ||
| 94 | 97 | ||
| 95 | MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); | 98 | MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); |
| 96 | module_param_named(no_wb, radeon_no_wb, int, 0444); | 99 | module_param_named(no_wb, radeon_no_wb, int, 0444); |
| @@ -134,6 +137,12 @@ module_param_named(dynpm, radeon_dynpm, int, 0444); | |||
| 134 | MODULE_PARM_DESC(audio, "Audio enable (0 = disable)"); | 137 | MODULE_PARM_DESC(audio, "Audio enable (0 = disable)"); |
| 135 | module_param_named(audio, radeon_audio, int, 0444); | 138 | module_param_named(audio, radeon_audio, int, 0444); |
| 136 | 139 | ||
| 140 | MODULE_PARM_DESC(disp_priority, "Display Priority (0 = auto, 1 = normal, 2 = high)"); | ||
| 141 | module_param_named(disp_priority, radeon_disp_priority, int, 0444); | ||
| 142 | |||
| 143 | MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)"); | ||
| 144 | module_param_named(hw_i2c, radeon_hw_i2c, int, 0444); | ||
| 145 | |||
| 137 | static int radeon_suspend(struct drm_device *dev, pm_message_t state) | 146 | static int radeon_suspend(struct drm_device *dev, pm_message_t state) |
| 138 | { | 147 | { |
| 139 | drm_radeon_private_t *dev_priv = dev->dev_private; | 148 | drm_radeon_private_t *dev_priv = dev->dev_private; |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.h b/drivers/gpu/drm/radeon/radeon_drv.h index ec55f2b23c22..448eba89d1e6 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.h +++ b/drivers/gpu/drm/radeon/radeon_drv.h | |||
| @@ -107,9 +107,10 @@ | |||
| 107 | * 1.30- Add support for occlusion queries | 107 | * 1.30- Add support for occlusion queries |
| 108 | * 1.31- Add support for num Z pipes from GET_PARAM | 108 | * 1.31- Add support for num Z pipes from GET_PARAM |
| 109 | * 1.32- fixes for rv740 setup | 109 | * 1.32- fixes for rv740 setup |
| 110 | * 1.33- Add r6xx/r7xx const buffer support | ||
| 110 | */ | 111 | */ |
| 111 | #define DRIVER_MAJOR 1 | 112 | #define DRIVER_MAJOR 1 |
| 112 | #define DRIVER_MINOR 32 | 113 | #define DRIVER_MINOR 33 |
| 113 | #define DRIVER_PATCHLEVEL 0 | 114 | #define DRIVER_PATCHLEVEL 0 |
| 114 | 115 | ||
| 115 | enum radeon_cp_microcode_version { | 116 | enum radeon_cp_microcode_version { |
diff --git a/drivers/gpu/drm/radeon/radeon_encoders.c b/drivers/gpu/drm/radeon/radeon_encoders.c index bc926ea0a530..52d6f96f274b 100644 --- a/drivers/gpu/drm/radeon/radeon_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_encoders.c | |||
| @@ -302,7 +302,7 @@ static bool radeon_atom_mode_fixup(struct drm_encoder *encoder, | |||
| 302 | } | 302 | } |
| 303 | 303 | ||
| 304 | if (ASIC_IS_DCE3(rdev) && | 304 | if (ASIC_IS_DCE3(rdev) && |
| 305 | (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT))) { | 305 | (radeon_encoder->active_device & (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT))) { |
| 306 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); | 306 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); |
| 307 | radeon_dp_set_link_config(connector, mode); | 307 | radeon_dp_set_link_config(connector, mode); |
| 308 | } | 308 | } |
| @@ -519,7 +519,8 @@ atombios_digital_setup(struct drm_encoder *encoder, int action) | |||
| 519 | break; | 519 | break; |
| 520 | } | 520 | } |
| 521 | 521 | ||
| 522 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 522 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
| 523 | return; | ||
| 523 | 524 | ||
| 524 | switch (frev) { | 525 | switch (frev) { |
| 525 | case 1: | 526 | case 1: |
| @@ -593,7 +594,6 @@ atombios_digital_setup(struct drm_encoder *encoder, int action) | |||
| 593 | } | 594 | } |
| 594 | 595 | ||
| 595 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | 596 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); |
| 596 | r600_hdmi_enable(encoder, hdmi_detected); | ||
| 597 | } | 597 | } |
| 598 | 598 | ||
| 599 | int | 599 | int |
| @@ -708,7 +708,7 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) | |||
| 708 | struct radeon_connector_atom_dig *dig_connector = | 708 | struct radeon_connector_atom_dig *dig_connector = |
| 709 | radeon_get_atom_connector_priv_from_encoder(encoder); | 709 | radeon_get_atom_connector_priv_from_encoder(encoder); |
| 710 | union dig_encoder_control args; | 710 | union dig_encoder_control args; |
| 711 | int index = 0, num = 0; | 711 | int index = 0; |
| 712 | uint8_t frev, crev; | 712 | uint8_t frev, crev; |
| 713 | 713 | ||
| 714 | if (!dig || !dig_connector) | 714 | if (!dig || !dig_connector) |
| @@ -724,9 +724,9 @@ atombios_dig_encoder_setup(struct drm_encoder *encoder, int action) | |||
| 724 | else | 724 | else |
| 725 | index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); | 725 | index = GetIndexIntoMasterTable(COMMAND, DIG1EncoderControl); |
| 726 | } | 726 | } |
| 727 | num = dig->dig_encoder + 1; | ||
| 728 | 727 | ||
| 729 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 728 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
| 729 | return; | ||
| 730 | 730 | ||
| 731 | args.v1.ucAction = action; | 731 | args.v1.ucAction = action; |
| 732 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); | 732 | args.v1.usPixelClock = cpu_to_le16(radeon_encoder->pixel_clock / 10); |
| @@ -785,7 +785,7 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 785 | struct drm_connector *connector; | 785 | struct drm_connector *connector; |
| 786 | struct radeon_connector *radeon_connector; | 786 | struct radeon_connector *radeon_connector; |
| 787 | union dig_transmitter_control args; | 787 | union dig_transmitter_control args; |
| 788 | int index = 0, num = 0; | 788 | int index = 0; |
| 789 | uint8_t frev, crev; | 789 | uint8_t frev, crev; |
| 790 | bool is_dp = false; | 790 | bool is_dp = false; |
| 791 | int pll_id = 0; | 791 | int pll_id = 0; |
| @@ -814,7 +814,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 814 | } | 814 | } |
| 815 | } | 815 | } |
| 816 | 816 | ||
| 817 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 817 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
| 818 | return; | ||
| 818 | 819 | ||
| 819 | args.v1.ucAction = action; | 820 | args.v1.ucAction = action; |
| 820 | if (action == ATOM_TRANSMITTER_ACTION_INIT) { | 821 | if (action == ATOM_TRANSMITTER_ACTION_INIT) { |
| @@ -860,15 +861,12 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 860 | switch (radeon_encoder->encoder_id) { | 861 | switch (radeon_encoder->encoder_id) { |
| 861 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 862 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
| 862 | args.v3.acConfig.ucTransmitterSel = 0; | 863 | args.v3.acConfig.ucTransmitterSel = 0; |
| 863 | num = 0; | ||
| 864 | break; | 864 | break; |
| 865 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | 865 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
| 866 | args.v3.acConfig.ucTransmitterSel = 1; | 866 | args.v3.acConfig.ucTransmitterSel = 1; |
| 867 | num = 1; | ||
| 868 | break; | 867 | break; |
| 869 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | 868 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
| 870 | args.v3.acConfig.ucTransmitterSel = 2; | 869 | args.v3.acConfig.ucTransmitterSel = 2; |
| 871 | num = 2; | ||
| 872 | break; | 870 | break; |
| 873 | } | 871 | } |
| 874 | 872 | ||
| @@ -879,23 +877,19 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 879 | args.v3.acConfig.fCoherentMode = 1; | 877 | args.v3.acConfig.fCoherentMode = 1; |
| 880 | } | 878 | } |
| 881 | } else if (ASIC_IS_DCE32(rdev)) { | 879 | } else if (ASIC_IS_DCE32(rdev)) { |
| 882 | if (dig->dig_encoder == 1) | 880 | args.v2.acConfig.ucEncoderSel = dig->dig_encoder; |
| 883 | args.v2.acConfig.ucEncoderSel = 1; | ||
| 884 | if (dig_connector->linkb) | 881 | if (dig_connector->linkb) |
| 885 | args.v2.acConfig.ucLinkSel = 1; | 882 | args.v2.acConfig.ucLinkSel = 1; |
| 886 | 883 | ||
| 887 | switch (radeon_encoder->encoder_id) { | 884 | switch (radeon_encoder->encoder_id) { |
| 888 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 885 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: |
| 889 | args.v2.acConfig.ucTransmitterSel = 0; | 886 | args.v2.acConfig.ucTransmitterSel = 0; |
| 890 | num = 0; | ||
| 891 | break; | 887 | break; |
| 892 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: | 888 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY1: |
| 893 | args.v2.acConfig.ucTransmitterSel = 1; | 889 | args.v2.acConfig.ucTransmitterSel = 1; |
| 894 | num = 1; | ||
| 895 | break; | 890 | break; |
| 896 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: | 891 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY2: |
| 897 | args.v2.acConfig.ucTransmitterSel = 2; | 892 | args.v2.acConfig.ucTransmitterSel = 2; |
| 898 | num = 2; | ||
| 899 | break; | 893 | break; |
| 900 | } | 894 | } |
| 901 | 895 | ||
| @@ -913,31 +907,25 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 913 | else | 907 | else |
| 914 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; | 908 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_DIG1_ENCODER; |
| 915 | 909 | ||
| 916 | switch (radeon_encoder->encoder_id) { | 910 | if ((rdev->flags & RADEON_IS_IGP) && |
| 917 | case ENCODER_OBJECT_ID_INTERNAL_UNIPHY: | 911 | (radeon_encoder->encoder_id == ENCODER_OBJECT_ID_INTERNAL_UNIPHY)) { |
| 918 | if (rdev->flags & RADEON_IS_IGP) { | 912 | if (is_dp || (radeon_encoder->pixel_clock <= 165000)) { |
| 919 | if (radeon_encoder->pixel_clock > 165000) { | 913 | if (dig_connector->igp_lane_info & 0x1) |
| 920 | if (dig_connector->igp_lane_info & 0x3) | 914 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3; |
| 921 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7; | 915 | else if (dig_connector->igp_lane_info & 0x2) |
| 922 | else if (dig_connector->igp_lane_info & 0xc) | 916 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_4_7; |
| 923 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15; | 917 | else if (dig_connector->igp_lane_info & 0x4) |
| 924 | } else { | 918 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_11; |
| 925 | if (dig_connector->igp_lane_info & 0x1) | 919 | else if (dig_connector->igp_lane_info & 0x8) |
| 926 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_3; | 920 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15; |
| 927 | else if (dig_connector->igp_lane_info & 0x2) | 921 | } else { |
| 928 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_4_7; | 922 | if (dig_connector->igp_lane_info & 0x3) |
| 929 | else if (dig_connector->igp_lane_info & 0x4) | 923 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_0_7; |
| 930 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_11; | 924 | else if (dig_connector->igp_lane_info & 0xc) |
| 931 | else if (dig_connector->igp_lane_info & 0x8) | 925 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_8_15; |
| 932 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LANE_12_15; | ||
| 933 | } | ||
| 934 | } | 926 | } |
| 935 | break; | ||
| 936 | } | 927 | } |
| 937 | 928 | ||
| 938 | if (radeon_encoder->pixel_clock > 165000) | ||
| 939 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_8LANE_LINK; | ||
| 940 | |||
| 941 | if (dig_connector->linkb) | 929 | if (dig_connector->linkb) |
| 942 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKB; | 930 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_LINKB; |
| 943 | else | 931 | else |
| @@ -948,6 +936,8 @@ atombios_dig_transmitter_setup(struct drm_encoder *encoder, int action, uint8_t | |||
| 948 | else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) { | 936 | else if (radeon_encoder->devices & (ATOM_DEVICE_DFP_SUPPORT)) { |
| 949 | if (dig->coherent_mode) | 937 | if (dig->coherent_mode) |
| 950 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT; | 938 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_COHERENT; |
| 939 | if (radeon_encoder->pixel_clock > 165000) | ||
| 940 | args.v1.ucConfig |= ATOM_TRANSMITTER_CONFIG_8LANE_LINK; | ||
| 951 | } | 941 | } |
| 952 | } | 942 | } |
| 953 | 943 | ||
| @@ -1054,16 +1044,25 @@ radeon_atom_encoder_dpms(struct drm_encoder *encoder, int mode) | |||
| 1054 | if (is_dig) { | 1044 | if (is_dig) { |
| 1055 | switch (mode) { | 1045 | switch (mode) { |
| 1056 | case DRM_MODE_DPMS_ON: | 1046 | case DRM_MODE_DPMS_ON: |
| 1057 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); | 1047 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { |
| 1058 | { | ||
| 1059 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); | 1048 | struct drm_connector *connector = radeon_get_connector_for_encoder(encoder); |
| 1049 | |||
| 1060 | dp_link_train(encoder, connector); | 1050 | dp_link_train(encoder, connector); |
| 1051 | if (ASIC_IS_DCE4(rdev)) | ||
| 1052 | atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_ON); | ||
| 1061 | } | 1053 | } |
| 1054 | if (!ASIC_IS_DCE4(rdev)) | ||
| 1055 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_ENABLE_OUTPUT, 0, 0); | ||
| 1062 | break; | 1056 | break; |
| 1063 | case DRM_MODE_DPMS_STANDBY: | 1057 | case DRM_MODE_DPMS_STANDBY: |
| 1064 | case DRM_MODE_DPMS_SUSPEND: | 1058 | case DRM_MODE_DPMS_SUSPEND: |
| 1065 | case DRM_MODE_DPMS_OFF: | 1059 | case DRM_MODE_DPMS_OFF: |
| 1066 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0); | 1060 | if (!ASIC_IS_DCE4(rdev)) |
| 1061 | atombios_dig_transmitter_setup(encoder, ATOM_TRANSMITTER_ACTION_DISABLE_OUTPUT, 0, 0); | ||
| 1062 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_DP) { | ||
| 1063 | if (ASIC_IS_DCE4(rdev)) | ||
| 1064 | atombios_dig_encoder_setup(encoder, ATOM_ENCODER_CMD_DP_VIDEO_OFF); | ||
| 1065 | } | ||
| 1067 | break; | 1066 | break; |
| 1068 | } | 1067 | } |
| 1069 | } else { | 1068 | } else { |
| @@ -1104,7 +1103,8 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) | |||
| 1104 | 1103 | ||
| 1105 | memset(&args, 0, sizeof(args)); | 1104 | memset(&args, 0, sizeof(args)); |
| 1106 | 1105 | ||
| 1107 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 1106 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
| 1107 | return; | ||
| 1108 | 1108 | ||
| 1109 | switch (frev) { | 1109 | switch (frev) { |
| 1110 | case 1: | 1110 | case 1: |
| @@ -1216,6 +1216,9 @@ atombios_set_encoder_crtc_source(struct drm_encoder *encoder) | |||
| 1216 | } | 1216 | } |
| 1217 | 1217 | ||
| 1218 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); | 1218 | atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args); |
| 1219 | |||
| 1220 | /* update scratch regs with new routing */ | ||
| 1221 | radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id); | ||
| 1219 | } | 1222 | } |
| 1220 | 1223 | ||
| 1221 | static void | 1224 | static void |
| @@ -1326,19 +1329,9 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | |||
| 1326 | struct drm_device *dev = encoder->dev; | 1329 | struct drm_device *dev = encoder->dev; |
| 1327 | struct radeon_device *rdev = dev->dev_private; | 1330 | struct radeon_device *rdev = dev->dev_private; |
| 1328 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | 1331 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); |
| 1329 | struct radeon_crtc *radeon_crtc = to_radeon_crtc(encoder->crtc); | ||
| 1330 | 1332 | ||
| 1331 | if (radeon_encoder->active_device & | ||
| 1332 | (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) { | ||
| 1333 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | ||
| 1334 | if (dig) | ||
| 1335 | dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder); | ||
| 1336 | } | ||
| 1337 | radeon_encoder->pixel_clock = adjusted_mode->clock; | 1333 | radeon_encoder->pixel_clock = adjusted_mode->clock; |
| 1338 | 1334 | ||
| 1339 | radeon_atombios_encoder_crtc_scratch_regs(encoder, radeon_crtc->crtc_id); | ||
| 1340 | atombios_set_encoder_crtc_source(encoder); | ||
| 1341 | |||
| 1342 | if (ASIC_IS_AVIVO(rdev)) { | 1335 | if (ASIC_IS_AVIVO(rdev)) { |
| 1343 | if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) | 1336 | if (radeon_encoder->active_device & (ATOM_DEVICE_CV_SUPPORT | ATOM_DEVICE_TV_SUPPORT)) |
| 1344 | atombios_yuv_setup(encoder, true); | 1337 | atombios_yuv_setup(encoder, true); |
| @@ -1396,9 +1389,10 @@ radeon_atom_encoder_mode_set(struct drm_encoder *encoder, | |||
| 1396 | } | 1389 | } |
| 1397 | atombios_apply_encoder_quirks(encoder, adjusted_mode); | 1390 | atombios_apply_encoder_quirks(encoder, adjusted_mode); |
| 1398 | 1391 | ||
| 1399 | /* XXX */ | 1392 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) { |
| 1400 | if (!ASIC_IS_DCE4(rdev)) | 1393 | r600_hdmi_enable(encoder); |
| 1401 | r600_hdmi_setmode(encoder, adjusted_mode); | 1394 | r600_hdmi_setmode(encoder, adjusted_mode); |
| 1395 | } | ||
| 1402 | } | 1396 | } |
| 1403 | 1397 | ||
| 1404 | static bool | 1398 | static bool |
| @@ -1418,7 +1412,8 @@ atombios_dac_load_detect(struct drm_encoder *encoder, struct drm_connector *conn | |||
| 1418 | 1412 | ||
| 1419 | memset(&args, 0, sizeof(args)); | 1413 | memset(&args, 0, sizeof(args)); |
| 1420 | 1414 | ||
| 1421 | atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev); | 1415 | if (!atom_parse_cmd_header(rdev->mode_info.atom_context, index, &frev, &crev)) |
| 1416 | return false; | ||
| 1422 | 1417 | ||
| 1423 | args.sDacload.ucMisc = 0; | 1418 | args.sDacload.ucMisc = 0; |
| 1424 | 1419 | ||
| @@ -1492,8 +1487,20 @@ radeon_atom_dac_detect(struct drm_encoder *encoder, struct drm_connector *connec | |||
| 1492 | 1487 | ||
| 1493 | static void radeon_atom_encoder_prepare(struct drm_encoder *encoder) | 1488 | static void radeon_atom_encoder_prepare(struct drm_encoder *encoder) |
| 1494 | { | 1489 | { |
| 1490 | struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); | ||
| 1491 | |||
| 1492 | if (radeon_encoder->active_device & | ||
| 1493 | (ATOM_DEVICE_DFP_SUPPORT | ATOM_DEVICE_LCD_SUPPORT)) { | ||
| 1494 | struct radeon_encoder_atom_dig *dig = radeon_encoder->enc_priv; | ||
| 1495 | if (dig) | ||
| 1496 | dig->dig_encoder = radeon_atom_pick_dig_encoder(encoder); | ||
| 1497 | } | ||
| 1498 | |||
| 1495 | radeon_atom_output_lock(encoder, true); | 1499 | radeon_atom_output_lock(encoder, true); |
| 1496 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); | 1500 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); |
| 1501 | |||
| 1502 | /* this is needed for the pll/ss setup to work correctly in some cases */ | ||
| 1503 | atombios_set_encoder_crtc_source(encoder); | ||
| 1497 | } | 1504 | } |
| 1498 | 1505 | ||
| 1499 | static void radeon_atom_encoder_commit(struct drm_encoder *encoder) | 1506 | static void radeon_atom_encoder_commit(struct drm_encoder *encoder) |
| @@ -1509,6 +1516,8 @@ static void radeon_atom_encoder_disable(struct drm_encoder *encoder) | |||
| 1509 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); | 1516 | radeon_atom_encoder_dpms(encoder, DRM_MODE_DPMS_OFF); |
| 1510 | 1517 | ||
| 1511 | if (radeon_encoder_is_digital(encoder)) { | 1518 | if (radeon_encoder_is_digital(encoder)) { |
| 1519 | if (atombios_get_encoder_mode(encoder) == ATOM_ENCODER_MODE_HDMI) | ||
| 1520 | r600_hdmi_disable(encoder); | ||
| 1512 | dig = radeon_encoder->enc_priv; | 1521 | dig = radeon_encoder->enc_priv; |
| 1513 | dig->dig_encoder = -1; | 1522 | dig->dig_encoder = -1; |
| 1514 | } | 1523 | } |
| @@ -1659,6 +1668,4 @@ radeon_add_atom_encoder(struct drm_device *dev, uint32_t encoder_id, uint32_t su | |||
| 1659 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); | 1668 | drm_encoder_helper_add(encoder, &radeon_atom_dig_helper_funcs); |
| 1660 | break; | 1669 | break; |
| 1661 | } | 1670 | } |
| 1662 | |||
| 1663 | r600_hdmi_init(encoder); | ||
| 1664 | } | 1671 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_fb.c b/drivers/gpu/drm/radeon/radeon_fb.c index 8fccbf29235e..9ac57a09784b 100644 --- a/drivers/gpu/drm/radeon/radeon_fb.c +++ b/drivers/gpu/drm/radeon/radeon_fb.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/fb.h> | 32 | #include <linux/fb.h> |
| 32 | 33 | ||
| 33 | #include "drmP.h" | 34 | #include "drmP.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 8495d4e32e18..d90f95b405c5 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/wait.h> | 33 | #include <linux/wait.h> |
| 34 | #include <linux/list.h> | 34 | #include <linux/list.h> |
| 35 | #include <linux/kref.h> | 35 | #include <linux/kref.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include "drmP.h" | 37 | #include "drmP.h" |
| 37 | #include "drm.h" | 38 | #include "drm.h" |
| 38 | #include "radeon_reg.h" | 39 | #include "radeon_reg.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_i2c.c b/drivers/gpu/drm/radeon/radeon_i2c.c index 4ae50c19589f..5def6f5dff38 100644 --- a/drivers/gpu/drm/radeon/radeon_i2c.c +++ b/drivers/gpu/drm/radeon/radeon_i2c.c | |||
| @@ -59,6 +59,7 @@ bool radeon_ddc_probe(struct radeon_connector *radeon_connector) | |||
| 59 | return false; | 59 | return false; |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | /* bit banging i2c */ | ||
| 62 | 63 | ||
| 63 | static void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state) | 64 | static void radeon_i2c_do_lock(struct radeon_i2c_chan *i2c, int lock_state) |
| 64 | { | 65 | { |
| @@ -181,13 +182,30 @@ static void set_data(void *i2c_priv, int data) | |||
| 181 | WREG32(rec->en_data_reg, val); | 182 | WREG32(rec->en_data_reg, val); |
| 182 | } | 183 | } |
| 183 | 184 | ||
| 185 | static int pre_xfer(struct i2c_adapter *i2c_adap) | ||
| 186 | { | ||
| 187 | struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap); | ||
| 188 | |||
| 189 | radeon_i2c_do_lock(i2c, 1); | ||
| 190 | |||
| 191 | return 0; | ||
| 192 | } | ||
| 193 | |||
| 194 | static void post_xfer(struct i2c_adapter *i2c_adap) | ||
| 195 | { | ||
| 196 | struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap); | ||
| 197 | |||
| 198 | radeon_i2c_do_lock(i2c, 0); | ||
| 199 | } | ||
| 200 | |||
| 201 | /* hw i2c */ | ||
| 202 | |||
| 184 | static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) | 203 | static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) |
| 185 | { | 204 | { |
| 186 | struct radeon_pll *spll = &rdev->clock.spll; | ||
| 187 | u32 sclk = radeon_get_engine_clock(rdev); | 205 | u32 sclk = radeon_get_engine_clock(rdev); |
| 188 | u32 prescale = 0; | 206 | u32 prescale = 0; |
| 189 | u32 n, m; | 207 | u32 nm; |
| 190 | u8 loop; | 208 | u8 n, m, loop; |
| 191 | int i2c_clock; | 209 | int i2c_clock; |
| 192 | 210 | ||
| 193 | switch (rdev->family) { | 211 | switch (rdev->family) { |
| @@ -203,13 +221,15 @@ static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) | |||
| 203 | case CHIP_R300: | 221 | case CHIP_R300: |
| 204 | case CHIP_R350: | 222 | case CHIP_R350: |
| 205 | case CHIP_RV350: | 223 | case CHIP_RV350: |
| 206 | n = (spll->reference_freq) / (4 * 6); | 224 | i2c_clock = 60; |
| 225 | nm = (sclk * 10) / (i2c_clock * 4); | ||
| 207 | for (loop = 1; loop < 255; loop++) { | 226 | for (loop = 1; loop < 255; loop++) { |
| 208 | if ((loop * (loop - 1)) > n) | 227 | if ((nm / loop) < loop) |
| 209 | break; | 228 | break; |
| 210 | } | 229 | } |
| 211 | m = loop - 1; | 230 | n = loop - 1; |
| 212 | prescale = m | (loop << 8); | 231 | m = loop - 2; |
| 232 | prescale = m | (n << 8); | ||
| 213 | break; | 233 | break; |
| 214 | case CHIP_RV380: | 234 | case CHIP_RV380: |
| 215 | case CHIP_RS400: | 235 | case CHIP_RS400: |
| @@ -217,7 +237,6 @@ static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) | |||
| 217 | case CHIP_R420: | 237 | case CHIP_R420: |
| 218 | case CHIP_R423: | 238 | case CHIP_R423: |
| 219 | case CHIP_RV410: | 239 | case CHIP_RV410: |
| 220 | sclk = radeon_get_engine_clock(rdev); | ||
| 221 | prescale = (((sclk * 10)/(4 * 128 * 100) + 1) << 8) + 128; | 240 | prescale = (((sclk * 10)/(4 * 128 * 100) + 1) << 8) + 128; |
| 222 | break; | 241 | break; |
| 223 | case CHIP_RS600: | 242 | case CHIP_RS600: |
| @@ -232,7 +251,6 @@ static u32 radeon_get_i2c_prescale(struct radeon_device *rdev) | |||
| 232 | case CHIP_RV570: | 251 | case CHIP_RV570: |
| 233 | case CHIP_R580: | 252 | case CHIP_R580: |
| 234 | i2c_clock = 50; | 253 | i2c_clock = 50; |
| 235 | sclk = radeon_get_engine_clock(rdev); | ||
| 236 | if (rdev->family == CHIP_R520) | 254 | if (rdev->family == CHIP_R520) |
| 237 | prescale = (127 << 8) + ((sclk * 10) / (4 * 127 * i2c_clock)); | 255 | prescale = (127 << 8) + ((sclk * 10) / (4 * 127 * i2c_clock)); |
| 238 | else | 256 | else |
| @@ -291,6 +309,7 @@ static int r100_hw_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 291 | prescale = radeon_get_i2c_prescale(rdev); | 309 | prescale = radeon_get_i2c_prescale(rdev); |
| 292 | 310 | ||
| 293 | reg = ((prescale << RADEON_I2C_PRESCALE_SHIFT) | | 311 | reg = ((prescale << RADEON_I2C_PRESCALE_SHIFT) | |
| 312 | RADEON_I2C_DRIVE_EN | | ||
| 294 | RADEON_I2C_START | | 313 | RADEON_I2C_START | |
| 295 | RADEON_I2C_STOP | | 314 | RADEON_I2C_STOP | |
| 296 | RADEON_I2C_GO); | 315 | RADEON_I2C_GO); |
| @@ -757,26 +776,13 @@ done: | |||
| 757 | return ret; | 776 | return ret; |
| 758 | } | 777 | } |
| 759 | 778 | ||
| 760 | static int radeon_sw_i2c_xfer(struct i2c_adapter *i2c_adap, | 779 | static int radeon_hw_i2c_xfer(struct i2c_adapter *i2c_adap, |
| 761 | struct i2c_msg *msgs, int num) | 780 | struct i2c_msg *msgs, int num) |
| 762 | { | 781 | { |
| 763 | struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap); | 782 | struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap); |
| 764 | int ret; | ||
| 765 | |||
| 766 | radeon_i2c_do_lock(i2c, 1); | ||
| 767 | ret = i2c_transfer(&i2c->algo.radeon.bit_adapter, msgs, num); | ||
| 768 | radeon_i2c_do_lock(i2c, 0); | ||
| 769 | |||
| 770 | return ret; | ||
| 771 | } | ||
| 772 | |||
| 773 | static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | ||
| 774 | struct i2c_msg *msgs, int num) | ||
| 775 | { | ||
| 776 | struct radeon_i2c_chan *i2c = i2c_get_adapdata(i2c_adap); | ||
| 777 | struct radeon_device *rdev = i2c->dev->dev_private; | 783 | struct radeon_device *rdev = i2c->dev->dev_private; |
| 778 | struct radeon_i2c_bus_rec *rec = &i2c->rec; | 784 | struct radeon_i2c_bus_rec *rec = &i2c->rec; |
| 779 | int ret; | 785 | int ret = 0; |
| 780 | 786 | ||
| 781 | switch (rdev->family) { | 787 | switch (rdev->family) { |
| 782 | case CHIP_R100: | 788 | case CHIP_R100: |
| @@ -797,16 +803,12 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 797 | case CHIP_RV410: | 803 | case CHIP_RV410: |
| 798 | case CHIP_RS400: | 804 | case CHIP_RS400: |
| 799 | case CHIP_RS480: | 805 | case CHIP_RS480: |
| 800 | if (rec->hw_capable) | 806 | ret = r100_hw_i2c_xfer(i2c_adap, msgs, num); |
| 801 | ret = r100_hw_i2c_xfer(i2c_adap, msgs, num); | ||
| 802 | else | ||
| 803 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 804 | break; | 807 | break; |
| 805 | case CHIP_RS600: | 808 | case CHIP_RS600: |
| 806 | case CHIP_RS690: | 809 | case CHIP_RS690: |
| 807 | case CHIP_RS740: | 810 | case CHIP_RS740: |
| 808 | /* XXX fill in hw i2c implementation */ | 811 | /* XXX fill in hw i2c implementation */ |
| 809 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 810 | break; | 812 | break; |
| 811 | case CHIP_RV515: | 813 | case CHIP_RV515: |
| 812 | case CHIP_R520: | 814 | case CHIP_R520: |
| @@ -814,20 +816,16 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 814 | case CHIP_RV560: | 816 | case CHIP_RV560: |
| 815 | case CHIP_RV570: | 817 | case CHIP_RV570: |
| 816 | case CHIP_R580: | 818 | case CHIP_R580: |
| 817 | if (rec->hw_capable) { | 819 | if (rec->mm_i2c) |
| 818 | if (rec->mm_i2c) | 820 | ret = r100_hw_i2c_xfer(i2c_adap, msgs, num); |
| 819 | ret = r100_hw_i2c_xfer(i2c_adap, msgs, num); | 821 | else |
| 820 | else | 822 | ret = r500_hw_i2c_xfer(i2c_adap, msgs, num); |
| 821 | ret = r500_hw_i2c_xfer(i2c_adap, msgs, num); | ||
| 822 | } else | ||
| 823 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 824 | break; | 823 | break; |
| 825 | case CHIP_R600: | 824 | case CHIP_R600: |
| 826 | case CHIP_RV610: | 825 | case CHIP_RV610: |
| 827 | case CHIP_RV630: | 826 | case CHIP_RV630: |
| 828 | case CHIP_RV670: | 827 | case CHIP_RV670: |
| 829 | /* XXX fill in hw i2c implementation */ | 828 | /* XXX fill in hw i2c implementation */ |
| 830 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 831 | break; | 829 | break; |
| 832 | case CHIP_RV620: | 830 | case CHIP_RV620: |
| 833 | case CHIP_RV635: | 831 | case CHIP_RV635: |
| @@ -838,7 +836,6 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 838 | case CHIP_RV710: | 836 | case CHIP_RV710: |
| 839 | case CHIP_RV740: | 837 | case CHIP_RV740: |
| 840 | /* XXX fill in hw i2c implementation */ | 838 | /* XXX fill in hw i2c implementation */ |
| 841 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 842 | break; | 839 | break; |
| 843 | case CHIP_CEDAR: | 840 | case CHIP_CEDAR: |
| 844 | case CHIP_REDWOOD: | 841 | case CHIP_REDWOOD: |
| @@ -846,7 +843,6 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 846 | case CHIP_CYPRESS: | 843 | case CHIP_CYPRESS: |
| 847 | case CHIP_HEMLOCK: | 844 | case CHIP_HEMLOCK: |
| 848 | /* XXX fill in hw i2c implementation */ | 845 | /* XXX fill in hw i2c implementation */ |
| 849 | ret = radeon_sw_i2c_xfer(i2c_adap, msgs, num); | ||
| 850 | break; | 846 | break; |
| 851 | default: | 847 | default: |
| 852 | DRM_ERROR("i2c: unhandled radeon chip\n"); | 848 | DRM_ERROR("i2c: unhandled radeon chip\n"); |
| @@ -857,20 +853,21 @@ static int radeon_i2c_xfer(struct i2c_adapter *i2c_adap, | |||
| 857 | return ret; | 853 | return ret; |
| 858 | } | 854 | } |
| 859 | 855 | ||
| 860 | static u32 radeon_i2c_func(struct i2c_adapter *adap) | 856 | static u32 radeon_hw_i2c_func(struct i2c_adapter *adap) |
| 861 | { | 857 | { |
| 862 | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; | 858 | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL; |
| 863 | } | 859 | } |
| 864 | 860 | ||
| 865 | static const struct i2c_algorithm radeon_i2c_algo = { | 861 | static const struct i2c_algorithm radeon_i2c_algo = { |
| 866 | .master_xfer = radeon_i2c_xfer, | 862 | .master_xfer = radeon_hw_i2c_xfer, |
| 867 | .functionality = radeon_i2c_func, | 863 | .functionality = radeon_hw_i2c_func, |
| 868 | }; | 864 | }; |
| 869 | 865 | ||
| 870 | struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, | 866 | struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, |
| 871 | struct radeon_i2c_bus_rec *rec, | 867 | struct radeon_i2c_bus_rec *rec, |
| 872 | const char *name) | 868 | const char *name) |
| 873 | { | 869 | { |
| 870 | struct radeon_device *rdev = dev->dev_private; | ||
| 874 | struct radeon_i2c_chan *i2c; | 871 | struct radeon_i2c_chan *i2c; |
| 875 | int ret; | 872 | int ret; |
| 876 | 873 | ||
| @@ -878,37 +875,43 @@ struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, | |||
| 878 | if (i2c == NULL) | 875 | if (i2c == NULL) |
| 879 | return NULL; | 876 | return NULL; |
| 880 | 877 | ||
| 881 | /* set the internal bit adapter */ | ||
| 882 | i2c->algo.radeon.bit_adapter.owner = THIS_MODULE; | ||
| 883 | i2c_set_adapdata(&i2c->algo.radeon.bit_adapter, i2c); | ||
| 884 | sprintf(i2c->algo.radeon.bit_adapter.name, "Radeon internal i2c bit bus %s", name); | ||
| 885 | i2c->algo.radeon.bit_adapter.algo_data = &i2c->algo.radeon.bit_data; | ||
| 886 | i2c->algo.radeon.bit_data.setsda = set_data; | ||
| 887 | i2c->algo.radeon.bit_data.setscl = set_clock; | ||
| 888 | i2c->algo.radeon.bit_data.getsda = get_data; | ||
| 889 | i2c->algo.radeon.bit_data.getscl = get_clock; | ||
| 890 | i2c->algo.radeon.bit_data.udelay = 20; | ||
| 891 | /* vesa says 2.2 ms is enough, 1 jiffy doesn't seem to always | ||
| 892 | * make this, 2 jiffies is a lot more reliable */ | ||
| 893 | i2c->algo.radeon.bit_data.timeout = 2; | ||
| 894 | i2c->algo.radeon.bit_data.data = i2c; | ||
| 895 | ret = i2c_bit_add_bus(&i2c->algo.radeon.bit_adapter); | ||
| 896 | if (ret) { | ||
| 897 | DRM_ERROR("Failed to register internal bit i2c %s\n", name); | ||
| 898 | goto out_free; | ||
| 899 | } | ||
| 900 | /* set the radeon i2c adapter */ | ||
| 901 | i2c->dev = dev; | ||
| 902 | i2c->rec = *rec; | 878 | i2c->rec = *rec; |
| 903 | i2c->adapter.owner = THIS_MODULE; | 879 | i2c->adapter.owner = THIS_MODULE; |
| 880 | i2c->dev = dev; | ||
| 904 | i2c_set_adapdata(&i2c->adapter, i2c); | 881 | i2c_set_adapdata(&i2c->adapter, i2c); |
| 905 | sprintf(i2c->adapter.name, "Radeon i2c %s", name); | 882 | if (rec->mm_i2c || |
| 906 | i2c->adapter.algo_data = &i2c->algo.radeon; | 883 | (rec->hw_capable && |
| 907 | i2c->adapter.algo = &radeon_i2c_algo; | 884 | radeon_hw_i2c && |
| 908 | ret = i2c_add_adapter(&i2c->adapter); | 885 | ((rdev->family <= CHIP_RS480) || |
| 909 | if (ret) { | 886 | ((rdev->family >= CHIP_RV515) && (rdev->family <= CHIP_R580))))) { |
| 910 | DRM_ERROR("Failed to register i2c %s\n", name); | 887 | /* set the radeon hw i2c adapter */ |
| 911 | goto out_free; | 888 | sprintf(i2c->adapter.name, "Radeon i2c hw bus %s", name); |
| 889 | i2c->adapter.algo = &radeon_i2c_algo; | ||
| 890 | ret = i2c_add_adapter(&i2c->adapter); | ||
| 891 | if (ret) { | ||
| 892 | DRM_ERROR("Failed to register hw i2c %s\n", name); | ||
| 893 | goto out_free; | ||
| 894 | } | ||
| 895 | } else { | ||
| 896 | /* set the radeon bit adapter */ | ||
| 897 | sprintf(i2c->adapter.name, "Radeon i2c bit bus %s", name); | ||
| 898 | i2c->adapter.algo_data = &i2c->algo.bit; | ||
| 899 | i2c->algo.bit.pre_xfer = pre_xfer; | ||
| 900 | i2c->algo.bit.post_xfer = post_xfer; | ||
| 901 | i2c->algo.bit.setsda = set_data; | ||
| 902 | i2c->algo.bit.setscl = set_clock; | ||
| 903 | i2c->algo.bit.getsda = get_data; | ||
| 904 | i2c->algo.bit.getscl = get_clock; | ||
| 905 | i2c->algo.bit.udelay = 20; | ||
| 906 | /* vesa says 2.2 ms is enough, 1 jiffy doesn't seem to always | ||
| 907 | * make this, 2 jiffies is a lot more reliable */ | ||
| 908 | i2c->algo.bit.timeout = 2; | ||
| 909 | i2c->algo.bit.data = i2c; | ||
| 910 | ret = i2c_bit_add_bus(&i2c->adapter); | ||
| 911 | if (ret) { | ||
| 912 | DRM_ERROR("Failed to register bit i2c %s\n", name); | ||
| 913 | goto out_free; | ||
| 914 | } | ||
| 912 | } | 915 | } |
| 913 | 916 | ||
| 914 | return i2c; | 917 | return i2c; |
| @@ -953,16 +956,6 @@ void radeon_i2c_destroy(struct radeon_i2c_chan *i2c) | |||
| 953 | { | 956 | { |
| 954 | if (!i2c) | 957 | if (!i2c) |
| 955 | return; | 958 | return; |
| 956 | i2c_del_adapter(&i2c->algo.radeon.bit_adapter); | ||
| 957 | i2c_del_adapter(&i2c->adapter); | ||
| 958 | kfree(i2c); | ||
| 959 | } | ||
| 960 | |||
| 961 | void radeon_i2c_destroy_dp(struct radeon_i2c_chan *i2c) | ||
| 962 | { | ||
| 963 | if (!i2c) | ||
| 964 | return; | ||
| 965 | |||
| 966 | i2c_del_adapter(&i2c->adapter); | 959 | i2c_del_adapter(&i2c->adapter); |
| 967 | kfree(i2c); | 960 | kfree(i2c); |
| 968 | } | 961 | } |
diff --git a/drivers/gpu/drm/radeon/radeon_irq_kms.c b/drivers/gpu/drm/radeon/radeon_irq_kms.c index ea4c645ece11..a212041e8b0b 100644 --- a/drivers/gpu/drm/radeon/radeon_irq_kms.c +++ b/drivers/gpu/drm/radeon/radeon_irq_kms.c | |||
| @@ -67,9 +67,10 @@ void radeon_driver_irq_preinstall_kms(struct drm_device *dev) | |||
| 67 | 67 | ||
| 68 | /* Disable *all* interrupts */ | 68 | /* Disable *all* interrupts */ |
| 69 | rdev->irq.sw_int = false; | 69 | rdev->irq.sw_int = false; |
| 70 | for (i = 0; i < 2; i++) { | 70 | for (i = 0; i < rdev->num_crtc; i++) |
| 71 | rdev->irq.crtc_vblank_int[i] = false; | 71 | rdev->irq.crtc_vblank_int[i] = false; |
| 72 | } | 72 | for (i = 0; i < 6; i++) |
| 73 | rdev->irq.hpd[i] = false; | ||
| 73 | radeon_irq_set(rdev); | 74 | radeon_irq_set(rdev); |
| 74 | /* Clear bits */ | 75 | /* Clear bits */ |
| 75 | radeon_irq_process(rdev); | 76 | radeon_irq_process(rdev); |
| @@ -95,28 +96,29 @@ void radeon_driver_irq_uninstall_kms(struct drm_device *dev) | |||
| 95 | } | 96 | } |
| 96 | /* Disable *all* interrupts */ | 97 | /* Disable *all* interrupts */ |
| 97 | rdev->irq.sw_int = false; | 98 | rdev->irq.sw_int = false; |
| 98 | for (i = 0; i < 2; i++) { | 99 | for (i = 0; i < rdev->num_crtc; i++) |
| 99 | rdev->irq.crtc_vblank_int[i] = false; | 100 | rdev->irq.crtc_vblank_int[i] = false; |
| 101 | for (i = 0; i < 6; i++) | ||
| 100 | rdev->irq.hpd[i] = false; | 102 | rdev->irq.hpd[i] = false; |
| 101 | } | ||
| 102 | radeon_irq_set(rdev); | 103 | radeon_irq_set(rdev); |
| 103 | } | 104 | } |
| 104 | 105 | ||
| 105 | int radeon_irq_kms_init(struct radeon_device *rdev) | 106 | int radeon_irq_kms_init(struct radeon_device *rdev) |
| 106 | { | 107 | { |
| 107 | int r = 0; | 108 | int r = 0; |
| 108 | int num_crtc = 2; | ||
| 109 | 109 | ||
| 110 | if (rdev->flags & RADEON_SINGLE_CRTC) | ||
| 111 | num_crtc = 1; | ||
| 112 | spin_lock_init(&rdev->irq.sw_lock); | 110 | spin_lock_init(&rdev->irq.sw_lock); |
| 113 | r = drm_vblank_init(rdev->ddev, num_crtc); | 111 | r = drm_vblank_init(rdev->ddev, rdev->num_crtc); |
| 114 | if (r) { | 112 | if (r) { |
| 115 | return r; | 113 | return r; |
| 116 | } | 114 | } |
| 117 | /* enable msi */ | 115 | /* enable msi */ |
| 118 | rdev->msi_enabled = 0; | 116 | rdev->msi_enabled = 0; |
| 119 | if (rdev->family >= CHIP_RV380) { | 117 | /* MSIs don't seem to work reliably on all IGP |
| 118 | * chips. Disable MSI on them for now. | ||
| 119 | */ | ||
| 120 | if ((rdev->family >= CHIP_RV380) && | ||
| 121 | (!(rdev->flags & RADEON_IS_IGP))) { | ||
| 120 | int ret = pci_enable_msi(rdev->pdev); | 122 | int ret = pci_enable_msi(rdev->pdev); |
| 121 | if (!ret) { | 123 | if (!ret) { |
| 122 | rdev->msi_enabled = 1; | 124 | rdev->msi_enabled = 1; |
diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c index 20ec276e7596..d3657dcfdd26 100644 --- a/drivers/gpu/drm/radeon/radeon_kms.c +++ b/drivers/gpu/drm/radeon/radeon_kms.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "radeon_drm.h" | 31 | #include "radeon_drm.h" |
| 32 | 32 | ||
| 33 | #include <linux/vga_switcheroo.h> | 33 | #include <linux/vga_switcheroo.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | int radeon_driver_unload_kms(struct drm_device *dev) | 36 | int radeon_driver_unload_kms(struct drm_device *dev) |
| 36 | { | 37 | { |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c index df23d6a01d02..88865e38fe30 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_crtc.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_crtc.c | |||
| @@ -603,6 +603,10 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod | |||
| 603 | ? RADEON_CRTC2_INTERLACE_EN | 603 | ? RADEON_CRTC2_INTERLACE_EN |
| 604 | : 0)); | 604 | : 0)); |
| 605 | 605 | ||
| 606 | /* rs4xx chips seem to like to have the crtc enabled when the timing is set */ | ||
| 607 | if ((rdev->family == CHIP_RS400) || (rdev->family == CHIP_RS480)) | ||
| 608 | crtc2_gen_cntl |= RADEON_CRTC2_EN; | ||
| 609 | |||
| 606 | disp2_merge_cntl = RREG32(RADEON_DISP2_MERGE_CNTL); | 610 | disp2_merge_cntl = RREG32(RADEON_DISP2_MERGE_CNTL); |
| 607 | disp2_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN; | 611 | disp2_merge_cntl &= ~RADEON_DISP2_RGB_OFFSET_EN; |
| 608 | 612 | ||
| @@ -630,6 +634,10 @@ static bool radeon_set_crtc_timing(struct drm_crtc *crtc, struct drm_display_mod | |||
| 630 | ? RADEON_CRTC_INTERLACE_EN | 634 | ? RADEON_CRTC_INTERLACE_EN |
| 631 | : 0)); | 635 | : 0)); |
| 632 | 636 | ||
| 637 | /* rs4xx chips seem to like to have the crtc enabled when the timing is set */ | ||
| 638 | if ((rdev->family == CHIP_RS400) || (rdev->family == CHIP_RS480)) | ||
| 639 | crtc_gen_cntl |= RADEON_CRTC_EN; | ||
| 640 | |||
| 633 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); | 641 | crtc_ext_cntl = RREG32(RADEON_CRTC_EXT_CNTL); |
| 634 | crtc_ext_cntl |= (RADEON_XCRT_CNT_EN | | 642 | crtc_ext_cntl |= (RADEON_XCRT_CNT_EN | |
| 635 | RADEON_CRTC_VSYNC_DIS | | 643 | RADEON_CRTC_VSYNC_DIS | |
diff --git a/drivers/gpu/drm/radeon/radeon_legacy_tv.c b/drivers/gpu/drm/radeon/radeon_legacy_tv.c index 417684daef4c..f2ed27c8055b 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_tv.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_tv.c | |||
| @@ -57,6 +57,10 @@ | |||
| 57 | #define NTSC_TV_PLL_N_14 693 | 57 | #define NTSC_TV_PLL_N_14 693 |
| 58 | #define NTSC_TV_PLL_P_14 7 | 58 | #define NTSC_TV_PLL_P_14 7 |
| 59 | 59 | ||
| 60 | #define PAL_TV_PLL_M_14 19 | ||
| 61 | #define PAL_TV_PLL_N_14 353 | ||
| 62 | #define PAL_TV_PLL_P_14 5 | ||
| 63 | |||
| 60 | #define VERT_LEAD_IN_LINES 2 | 64 | #define VERT_LEAD_IN_LINES 2 |
| 61 | #define FRAC_BITS 0xe | 65 | #define FRAC_BITS 0xe |
| 62 | #define FRAC_MASK 0x3fff | 66 | #define FRAC_MASK 0x3fff |
| @@ -205,9 +209,24 @@ static const struct radeon_tv_mode_constants available_tv_modes[] = { | |||
| 205 | 630627, /* defRestart */ | 209 | 630627, /* defRestart */ |
| 206 | 347, /* crtcPLL_N */ | 210 | 347, /* crtcPLL_N */ |
| 207 | 14, /* crtcPLL_M */ | 211 | 14, /* crtcPLL_M */ |
| 208 | 8, /* crtcPLL_postDiv */ | 212 | 8, /* crtcPLL_postDiv */ |
| 209 | 1022, /* pixToTV */ | 213 | 1022, /* pixToTV */ |
| 210 | }, | 214 | }, |
| 215 | { /* PAL timing for 14 Mhz ref clk */ | ||
| 216 | 800, /* horResolution */ | ||
| 217 | 600, /* verResolution */ | ||
| 218 | TV_STD_PAL, /* standard */ | ||
| 219 | 1131, /* horTotal */ | ||
| 220 | 742, /* verTotal */ | ||
| 221 | 813, /* horStart */ | ||
| 222 | 840, /* horSyncStart */ | ||
| 223 | 633, /* verSyncStart */ | ||
| 224 | 708369, /* defRestart */ | ||
| 225 | 211, /* crtcPLL_N */ | ||
| 226 | 9, /* crtcPLL_M */ | ||
| 227 | 8, /* crtcPLL_postDiv */ | ||
| 228 | 759, /* pixToTV */ | ||
| 229 | }, | ||
| 211 | }; | 230 | }; |
| 212 | 231 | ||
| 213 | #define N_AVAILABLE_MODES ARRAY_SIZE(available_tv_modes) | 232 | #define N_AVAILABLE_MODES ARRAY_SIZE(available_tv_modes) |
| @@ -242,7 +261,7 @@ static const struct radeon_tv_mode_constants *radeon_legacy_tv_get_std_mode(stru | |||
| 242 | if (pll->reference_freq == 2700) | 261 | if (pll->reference_freq == 2700) |
| 243 | const_ptr = &available_tv_modes[1]; | 262 | const_ptr = &available_tv_modes[1]; |
| 244 | else | 263 | else |
| 245 | const_ptr = &available_tv_modes[1]; /* FIX ME */ | 264 | const_ptr = &available_tv_modes[3]; |
| 246 | } | 265 | } |
| 247 | return const_ptr; | 266 | return const_ptr; |
| 248 | } | 267 | } |
| @@ -685,9 +704,9 @@ void radeon_legacy_tv_mode_set(struct drm_encoder *encoder, | |||
| 685 | n = PAL_TV_PLL_N_27; | 704 | n = PAL_TV_PLL_N_27; |
| 686 | p = PAL_TV_PLL_P_27; | 705 | p = PAL_TV_PLL_P_27; |
| 687 | } else { | 706 | } else { |
| 688 | m = PAL_TV_PLL_M_27; | 707 | m = PAL_TV_PLL_M_14; |
| 689 | n = PAL_TV_PLL_N_27; | 708 | n = PAL_TV_PLL_N_14; |
| 690 | p = PAL_TV_PLL_P_27; | 709 | p = PAL_TV_PLL_P_14; |
| 691 | } | 710 | } |
| 692 | } | 711 | } |
| 693 | 712 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h index 1702b820aa4d..0b8e32776b10 100644 --- a/drivers/gpu/drm/radeon/radeon_mode.h +++ b/drivers/gpu/drm/radeon/radeon_mode.h | |||
| @@ -129,6 +129,7 @@ struct radeon_tmds_pll { | |||
| 129 | #define RADEON_PLL_USE_FRAC_FB_DIV (1 << 10) | 129 | #define RADEON_PLL_USE_FRAC_FB_DIV (1 << 10) |
| 130 | #define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 11) | 130 | #define RADEON_PLL_PREFER_CLOSEST_LOWER (1 << 11) |
| 131 | #define RADEON_PLL_USE_POST_DIV (1 << 12) | 131 | #define RADEON_PLL_USE_POST_DIV (1 << 12) |
| 132 | #define RADEON_PLL_IS_LCD (1 << 13) | ||
| 132 | 133 | ||
| 133 | /* pll algo */ | 134 | /* pll algo */ |
| 134 | enum radeon_pll_algo { | 135 | enum radeon_pll_algo { |
| @@ -149,6 +150,8 @@ struct radeon_pll { | |||
| 149 | uint32_t pll_in_max; | 150 | uint32_t pll_in_max; |
| 150 | uint32_t pll_out_min; | 151 | uint32_t pll_out_min; |
| 151 | uint32_t pll_out_max; | 152 | uint32_t pll_out_max; |
| 153 | uint32_t lcd_pll_out_min; | ||
| 154 | uint32_t lcd_pll_out_max; | ||
| 152 | uint32_t best_vco; | 155 | uint32_t best_vco; |
| 153 | 156 | ||
| 154 | /* divider limits */ | 157 | /* divider limits */ |
| @@ -170,17 +173,12 @@ struct radeon_pll { | |||
| 170 | enum radeon_pll_algo algo; | 173 | enum radeon_pll_algo algo; |
| 171 | }; | 174 | }; |
| 172 | 175 | ||
| 173 | struct i2c_algo_radeon_data { | ||
| 174 | struct i2c_adapter bit_adapter; | ||
| 175 | struct i2c_algo_bit_data bit_data; | ||
| 176 | }; | ||
| 177 | |||
| 178 | struct radeon_i2c_chan { | 176 | struct radeon_i2c_chan { |
| 179 | struct i2c_adapter adapter; | 177 | struct i2c_adapter adapter; |
| 180 | struct drm_device *dev; | 178 | struct drm_device *dev; |
| 181 | union { | 179 | union { |
| 180 | struct i2c_algo_bit_data bit; | ||
| 182 | struct i2c_algo_dp_aux_data dp; | 181 | struct i2c_algo_dp_aux_data dp; |
| 183 | struct i2c_algo_radeon_data radeon; | ||
| 184 | } algo; | 182 | } algo; |
| 185 | struct radeon_i2c_bus_rec rec; | 183 | struct radeon_i2c_bus_rec rec; |
| 186 | }; | 184 | }; |
| @@ -342,6 +340,7 @@ struct radeon_encoder { | |||
| 342 | struct drm_display_mode native_mode; | 340 | struct drm_display_mode native_mode; |
| 343 | void *enc_priv; | 341 | void *enc_priv; |
| 344 | int hdmi_offset; | 342 | int hdmi_offset; |
| 343 | int hdmi_config_offset; | ||
| 345 | int hdmi_audio_workaround; | 344 | int hdmi_audio_workaround; |
| 346 | int hdmi_buffer_status; | 345 | int hdmi_buffer_status; |
| 347 | }; | 346 | }; |
| @@ -431,7 +430,6 @@ extern struct radeon_i2c_chan *radeon_i2c_create(struct drm_device *dev, | |||
| 431 | struct radeon_i2c_bus_rec *rec, | 430 | struct radeon_i2c_bus_rec *rec, |
| 432 | const char *name); | 431 | const char *name); |
| 433 | extern void radeon_i2c_destroy(struct radeon_i2c_chan *i2c); | 432 | extern void radeon_i2c_destroy(struct radeon_i2c_chan *i2c); |
| 434 | extern void radeon_i2c_destroy_dp(struct radeon_i2c_chan *i2c); | ||
| 435 | extern void radeon_i2c_get_byte(struct radeon_i2c_chan *i2c_bus, | 433 | extern void radeon_i2c_get_byte(struct radeon_i2c_chan *i2c_bus, |
| 436 | u8 slave_addr, | 434 | u8 slave_addr, |
| 437 | u8 addr, | 435 | u8 addr, |
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index fc9d00ac6b15..122774742bd5 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * Dave Airlie | 30 | * Dave Airlie |
| 31 | */ | 31 | */ |
| 32 | #include <linux/list.h> | 32 | #include <linux/list.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <drm/drmP.h> | 34 | #include <drm/drmP.h> |
| 34 | #include "radeon_drm.h" | 35 | #include "radeon_drm.h" |
| 35 | #include "radeon.h" | 36 | #include "radeon.h" |
| @@ -185,8 +186,10 @@ int radeon_bo_pin(struct radeon_bo *bo, u32 domain, u64 *gpu_addr) | |||
| 185 | return 0; | 186 | return 0; |
| 186 | } | 187 | } |
| 187 | radeon_ttm_placement_from_domain(bo, domain); | 188 | radeon_ttm_placement_from_domain(bo, domain); |
| 188 | /* force to pin into visible video ram */ | 189 | if (domain == RADEON_GEM_DOMAIN_VRAM) { |
| 189 | bo->placement.lpfn = bo->rdev->mc.visible_vram_size >> PAGE_SHIFT; | 190 | /* force to pin into visible video ram */ |
| 191 | bo->placement.lpfn = bo->rdev->mc.visible_vram_size >> PAGE_SHIFT; | ||
| 192 | } | ||
| 190 | for (i = 0; i < bo->placement.num_placement; i++) | 193 | for (i = 0; i < bo->placement.num_placement; i++) |
| 191 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; | 194 | bo->placements[i] |= TTM_PL_FLAG_NO_EVICT; |
| 192 | r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false); | 195 | r = ttm_bo_validate(&bo->tbo, &bo->placement, false, false); |
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c index d4d1c39a0e99..a4b57493aa78 100644 --- a/drivers/gpu/drm/radeon/radeon_pm.c +++ b/drivers/gpu/drm/radeon/radeon_pm.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #define RADEON_RECLOCK_DELAY_MS 200 | 28 | #define RADEON_RECLOCK_DELAY_MS 200 |
| 29 | #define RADEON_WAIT_VBLANK_TIMEOUT 200 | 29 | #define RADEON_WAIT_VBLANK_TIMEOUT 200 |
| 30 | 30 | ||
| 31 | static bool radeon_pm_debug_check_in_vbl(struct radeon_device *rdev, bool finish); | ||
| 31 | static void radeon_pm_set_clocks_locked(struct radeon_device *rdev); | 32 | static void radeon_pm_set_clocks_locked(struct radeon_device *rdev); |
| 32 | static void radeon_pm_set_clocks(struct radeon_device *rdev); | 33 | static void radeon_pm_set_clocks(struct radeon_device *rdev); |
| 33 | static void radeon_pm_idle_work_handler(struct work_struct *work); | 34 | static void radeon_pm_idle_work_handler(struct work_struct *work); |
| @@ -179,6 +180,16 @@ static void radeon_get_power_state(struct radeon_device *rdev, | |||
| 179 | rdev->pm.requested_power_state->non_clock_info.pcie_lanes); | 180 | rdev->pm.requested_power_state->non_clock_info.pcie_lanes); |
| 180 | } | 181 | } |
| 181 | 182 | ||
| 183 | static inline void radeon_sync_with_vblank(struct radeon_device *rdev) | ||
| 184 | { | ||
| 185 | if (rdev->pm.active_crtcs) { | ||
| 186 | rdev->pm.vblank_sync = false; | ||
| 187 | wait_event_timeout( | ||
| 188 | rdev->irq.vblank_queue, rdev->pm.vblank_sync, | ||
| 189 | msecs_to_jiffies(RADEON_WAIT_VBLANK_TIMEOUT)); | ||
| 190 | } | ||
| 191 | } | ||
| 192 | |||
| 182 | static void radeon_set_power_state(struct radeon_device *rdev) | 193 | static void radeon_set_power_state(struct radeon_device *rdev) |
| 183 | { | 194 | { |
| 184 | /* if *_clock_mode are the same, *_power_state are as well */ | 195 | /* if *_clock_mode are the same, *_power_state are as well */ |
| @@ -189,11 +200,28 @@ static void radeon_set_power_state(struct radeon_device *rdev) | |||
| 189 | rdev->pm.requested_clock_mode->sclk, | 200 | rdev->pm.requested_clock_mode->sclk, |
| 190 | rdev->pm.requested_clock_mode->mclk, | 201 | rdev->pm.requested_clock_mode->mclk, |
| 191 | rdev->pm.requested_power_state->non_clock_info.pcie_lanes); | 202 | rdev->pm.requested_power_state->non_clock_info.pcie_lanes); |
| 203 | |||
| 192 | /* set pcie lanes */ | 204 | /* set pcie lanes */ |
| 205 | /* TODO */ | ||
| 206 | |||
| 193 | /* set voltage */ | 207 | /* set voltage */ |
| 208 | /* TODO */ | ||
| 209 | |||
| 194 | /* set engine clock */ | 210 | /* set engine clock */ |
| 211 | radeon_sync_with_vblank(rdev); | ||
| 212 | radeon_pm_debug_check_in_vbl(rdev, false); | ||
| 195 | radeon_set_engine_clock(rdev, rdev->pm.requested_clock_mode->sclk); | 213 | radeon_set_engine_clock(rdev, rdev->pm.requested_clock_mode->sclk); |
| 214 | radeon_pm_debug_check_in_vbl(rdev, true); | ||
| 215 | |||
| 216 | #if 0 | ||
| 196 | /* set memory clock */ | 217 | /* set memory clock */ |
| 218 | if (rdev->asic->set_memory_clock) { | ||
| 219 | radeon_sync_with_vblank(rdev); | ||
| 220 | radeon_pm_debug_check_in_vbl(rdev, false); | ||
| 221 | radeon_set_memory_clock(rdev, rdev->pm.requested_clock_mode->mclk); | ||
| 222 | radeon_pm_debug_check_in_vbl(rdev, true); | ||
| 223 | } | ||
| 224 | #endif | ||
| 197 | 225 | ||
| 198 | rdev->pm.current_power_state = rdev->pm.requested_power_state; | 226 | rdev->pm.current_power_state = rdev->pm.requested_power_state; |
| 199 | rdev->pm.current_clock_mode = rdev->pm.requested_clock_mode; | 227 | rdev->pm.current_clock_mode = rdev->pm.requested_clock_mode; |
| @@ -229,6 +257,12 @@ int radeon_pm_init(struct radeon_device *rdev) | |||
| 229 | return 0; | 257 | return 0; |
| 230 | } | 258 | } |
| 231 | 259 | ||
| 260 | void radeon_pm_fini(struct radeon_device *rdev) | ||
| 261 | { | ||
| 262 | if (rdev->pm.i2c_bus) | ||
| 263 | radeon_i2c_destroy(rdev->pm.i2c_bus); | ||
| 264 | } | ||
| 265 | |||
| 232 | void radeon_pm_compute_clocks(struct radeon_device *rdev) | 266 | void radeon_pm_compute_clocks(struct radeon_device *rdev) |
| 233 | { | 267 | { |
| 234 | struct drm_device *ddev = rdev->ddev; | 268 | struct drm_device *ddev = rdev->ddev; |
| @@ -245,7 +279,8 @@ void radeon_pm_compute_clocks(struct radeon_device *rdev) | |||
| 245 | list_for_each_entry(connector, | 279 | list_for_each_entry(connector, |
| 246 | &ddev->mode_config.connector_list, head) { | 280 | &ddev->mode_config.connector_list, head) { |
| 247 | if (connector->encoder && | 281 | if (connector->encoder && |
| 248 | connector->dpms != DRM_MODE_DPMS_OFF) { | 282 | connector->encoder->crtc && |
| 283 | connector->dpms != DRM_MODE_DPMS_OFF) { | ||
| 249 | radeon_crtc = to_radeon_crtc(connector->encoder->crtc); | 284 | radeon_crtc = to_radeon_crtc(connector->encoder->crtc); |
| 250 | rdev->pm.active_crtcs |= (1 << radeon_crtc->crtc_id); | 285 | rdev->pm.active_crtcs |= (1 << radeon_crtc->crtc_id); |
| 251 | ++count; | 286 | ++count; |
| @@ -333,10 +368,7 @@ static void radeon_pm_set_clocks_locked(struct radeon_device *rdev) | |||
| 333 | break; | 368 | break; |
| 334 | } | 369 | } |
| 335 | 370 | ||
| 336 | /* check if we are in vblank */ | ||
| 337 | radeon_pm_debug_check_in_vbl(rdev, false); | ||
| 338 | radeon_set_power_state(rdev); | 371 | radeon_set_power_state(rdev); |
| 339 | radeon_pm_debug_check_in_vbl(rdev, true); | ||
| 340 | rdev->pm.planned_action = PM_ACTION_NONE; | 372 | rdev->pm.planned_action = PM_ACTION_NONE; |
| 341 | } | 373 | } |
| 342 | 374 | ||
| @@ -353,10 +385,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) | |||
| 353 | rdev->pm.req_vblank |= (1 << 1); | 385 | rdev->pm.req_vblank |= (1 << 1); |
| 354 | drm_vblank_get(rdev->ddev, 1); | 386 | drm_vblank_get(rdev->ddev, 1); |
| 355 | } | 387 | } |
| 356 | if (rdev->pm.active_crtcs) | 388 | radeon_pm_set_clocks_locked(rdev); |
| 357 | wait_event_interruptible_timeout( | ||
| 358 | rdev->irq.vblank_queue, 0, | ||
| 359 | msecs_to_jiffies(RADEON_WAIT_VBLANK_TIMEOUT)); | ||
| 360 | if (rdev->pm.req_vblank & (1 << 0)) { | 389 | if (rdev->pm.req_vblank & (1 << 0)) { |
| 361 | rdev->pm.req_vblank &= ~(1 << 0); | 390 | rdev->pm.req_vblank &= ~(1 << 0); |
| 362 | drm_vblank_put(rdev->ddev, 0); | 391 | drm_vblank_put(rdev->ddev, 0); |
| @@ -366,7 +395,6 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev) | |||
| 366 | drm_vblank_put(rdev->ddev, 1); | 395 | drm_vblank_put(rdev->ddev, 1); |
| 367 | } | 396 | } |
| 368 | 397 | ||
| 369 | radeon_pm_set_clocks_locked(rdev); | ||
| 370 | mutex_unlock(&rdev->cp.mutex); | 398 | mutex_unlock(&rdev->cp.mutex); |
| 371 | } | 399 | } |
| 372 | 400 | ||
diff --git a/drivers/gpu/drm/radeon/radeon_reg.h b/drivers/gpu/drm/radeon/radeon_reg.h index 5c0dc082d330..eabbc9cf30a7 100644 --- a/drivers/gpu/drm/radeon/radeon_reg.h +++ b/drivers/gpu/drm/radeon/radeon_reg.h | |||
| @@ -346,6 +346,7 @@ | |||
| 346 | # define RADEON_TVPLL_PWRMGT_OFF (1 << 30) | 346 | # define RADEON_TVPLL_PWRMGT_OFF (1 << 30) |
| 347 | # define RADEON_TVCLK_TURNOFF (1 << 31) | 347 | # define RADEON_TVCLK_TURNOFF (1 << 31) |
| 348 | #define RADEON_PLL_PWRMGT_CNTL 0x0015 /* PLL */ | 348 | #define RADEON_PLL_PWRMGT_CNTL 0x0015 /* PLL */ |
| 349 | # define RADEON_PM_MODE_SEL (1 << 13) | ||
| 349 | # define RADEON_TCL_BYPASS_DISABLE (1 << 20) | 350 | # define RADEON_TCL_BYPASS_DISABLE (1 << 20) |
| 350 | #define RADEON_CLR_CMP_CLR_3D 0x1a24 | 351 | #define RADEON_CLR_CMP_CLR_3D 0x1a24 |
| 351 | #define RADEON_CLR_CMP_CLR_DST 0x15c8 | 352 | #define RADEON_CLR_CMP_CLR_DST 0x15c8 |
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index e50513a62735..f6e1e8d4d986 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "radeon_drm.h" | 31 | #include "radeon_drm.h" |
| 31 | #include "radeon_reg.h" | 32 | #include "radeon_reg.h" |
diff --git a/drivers/gpu/drm/radeon/radeon_ttm.c b/drivers/gpu/drm/radeon/radeon_ttm.c index 43c5ab34b634..d031b6863082 100644 --- a/drivers/gpu/drm/radeon/radeon_ttm.c +++ b/drivers/gpu/drm/radeon/radeon_ttm.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <drm/drmP.h> | 36 | #include <drm/drmP.h> |
| 37 | #include <drm/radeon_drm.h> | 37 | #include <drm/radeon_drm.h> |
| 38 | #include <linux/seq_file.h> | 38 | #include <linux/seq_file.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include "radeon_reg.h" | 40 | #include "radeon_reg.h" |
| 40 | #include "radeon.h" | 41 | #include "radeon.h" |
| 41 | 42 | ||
diff --git a/drivers/gpu/drm/radeon/reg_srcs/r600 b/drivers/gpu/drm/radeon/reg_srcs/r600 index 8f414a5f520f..af0da4ae3f55 100644 --- a/drivers/gpu/drm/radeon/reg_srcs/r600 +++ b/drivers/gpu/drm/radeon/reg_srcs/r600 | |||
| @@ -26,20 +26,16 @@ r600 0x9400 | |||
| 26 | 0x00028408 VGT_INDX_OFFSET | 26 | 0x00028408 VGT_INDX_OFFSET |
| 27 | 0x00028AA0 VGT_INSTANCE_STEP_RATE_0 | 27 | 0x00028AA0 VGT_INSTANCE_STEP_RATE_0 |
| 28 | 0x00028AA4 VGT_INSTANCE_STEP_RATE_1 | 28 | 0x00028AA4 VGT_INSTANCE_STEP_RATE_1 |
| 29 | 0x000088C0 VGT_LAST_COPY_STATE | ||
| 30 | 0x00028400 VGT_MAX_VTX_INDX | 29 | 0x00028400 VGT_MAX_VTX_INDX |
| 31 | 0x000088D8 VGT_MC_LAT_CNTL | ||
| 32 | 0x00028404 VGT_MIN_VTX_INDX | 30 | 0x00028404 VGT_MIN_VTX_INDX |
| 33 | 0x00028A94 VGT_MULTI_PRIM_IB_RESET_EN | 31 | 0x00028A94 VGT_MULTI_PRIM_IB_RESET_EN |
| 34 | 0x0002840C VGT_MULTI_PRIM_IB_RESET_INDX | 32 | 0x0002840C VGT_MULTI_PRIM_IB_RESET_INDX |
| 35 | 0x00008970 VGT_NUM_INDICES | 33 | 0x00008970 VGT_NUM_INDICES |
| 36 | 0x00008974 VGT_NUM_INSTANCES | 34 | 0x00008974 VGT_NUM_INSTANCES |
| 37 | 0x00028A10 VGT_OUTPUT_PATH_CNTL | 35 | 0x00028A10 VGT_OUTPUT_PATH_CNTL |
| 38 | 0x00028C5C VGT_OUT_DEALLOC_CNTL | ||
| 39 | 0x00028A84 VGT_PRIMITIVEID_EN | 36 | 0x00028A84 VGT_PRIMITIVEID_EN |
| 40 | 0x00008958 VGT_PRIMITIVE_TYPE | 37 | 0x00008958 VGT_PRIMITIVE_TYPE |
| 41 | 0x00028AB4 VGT_REUSE_OFF | 38 | 0x00028AB4 VGT_REUSE_OFF |
| 42 | 0x00028C58 VGT_VERTEX_REUSE_BLOCK_CNTL | ||
| 43 | 0x00028AB8 VGT_VTX_CNT_EN | 39 | 0x00028AB8 VGT_VTX_CNT_EN |
| 44 | 0x000088B0 VGT_VTX_VECT_EJECT_REG | 40 | 0x000088B0 VGT_VTX_VECT_EJECT_REG |
| 45 | 0x00028810 PA_CL_CLIP_CNTL | 41 | 0x00028810 PA_CL_CLIP_CNTL |
| @@ -280,7 +276,6 @@ r600 0x9400 | |||
| 280 | 0x00028E00 PA_SU_POLY_OFFSET_FRONT_SCALE | 276 | 0x00028E00 PA_SU_POLY_OFFSET_FRONT_SCALE |
| 281 | 0x00028814 PA_SU_SC_MODE_CNTL | 277 | 0x00028814 PA_SU_SC_MODE_CNTL |
| 282 | 0x00028C08 PA_SU_VTX_CNTL | 278 | 0x00028C08 PA_SU_VTX_CNTL |
| 283 | 0x00008C00 SQ_CONFIG | ||
| 284 | 0x00008C04 SQ_GPR_RESOURCE_MGMT_1 | 279 | 0x00008C04 SQ_GPR_RESOURCE_MGMT_1 |
| 285 | 0x00008C08 SQ_GPR_RESOURCE_MGMT_2 | 280 | 0x00008C08 SQ_GPR_RESOURCE_MGMT_2 |
| 286 | 0x00008C10 SQ_STACK_RESOURCE_MGMT_1 | 281 | 0x00008C10 SQ_STACK_RESOURCE_MGMT_1 |
| @@ -320,18 +315,6 @@ r600 0x9400 | |||
| 320 | 0x000283FC SQ_VTX_SEMANTIC_31 | 315 | 0x000283FC SQ_VTX_SEMANTIC_31 |
| 321 | 0x000288E0 SQ_VTX_SEMANTIC_CLEAR | 316 | 0x000288E0 SQ_VTX_SEMANTIC_CLEAR |
| 322 | 0x0003CFF4 SQ_VTX_START_INST_LOC | 317 | 0x0003CFF4 SQ_VTX_START_INST_LOC |
| 323 | 0x0003C000 SQ_TEX_SAMPLER_WORD0_0 | ||
| 324 | 0x0003C004 SQ_TEX_SAMPLER_WORD1_0 | ||
| 325 | 0x0003C008 SQ_TEX_SAMPLER_WORD2_0 | ||
| 326 | 0x00030000 SQ_ALU_CONSTANT0_0 | ||
| 327 | 0x00030004 SQ_ALU_CONSTANT1_0 | ||
| 328 | 0x00030008 SQ_ALU_CONSTANT2_0 | ||
| 329 | 0x0003000C SQ_ALU_CONSTANT3_0 | ||
| 330 | 0x0003E380 SQ_BOOL_CONST_0 | ||
| 331 | 0x0003E384 SQ_BOOL_CONST_1 | ||
| 332 | 0x0003E388 SQ_BOOL_CONST_2 | ||
| 333 | 0x0003E200 SQ_LOOP_CONST_0 | ||
| 334 | 0x0003E200 SQ_LOOP_CONST_DX10_0 | ||
| 335 | 0x000281C0 SQ_ALU_CONST_BUFFER_SIZE_GS_0 | 318 | 0x000281C0 SQ_ALU_CONST_BUFFER_SIZE_GS_0 |
| 336 | 0x000281C4 SQ_ALU_CONST_BUFFER_SIZE_GS_1 | 319 | 0x000281C4 SQ_ALU_CONST_BUFFER_SIZE_GS_1 |
| 337 | 0x000281C8 SQ_ALU_CONST_BUFFER_SIZE_GS_2 | 320 | 0x000281C8 SQ_ALU_CONST_BUFFER_SIZE_GS_2 |
| @@ -380,54 +363,6 @@ r600 0x9400 | |||
| 380 | 0x000281B4 SQ_ALU_CONST_BUFFER_SIZE_VS_13 | 363 | 0x000281B4 SQ_ALU_CONST_BUFFER_SIZE_VS_13 |
| 381 | 0x000281B8 SQ_ALU_CONST_BUFFER_SIZE_VS_14 | 364 | 0x000281B8 SQ_ALU_CONST_BUFFER_SIZE_VS_14 |
| 382 | 0x000281BC SQ_ALU_CONST_BUFFER_SIZE_VS_15 | 365 | 0x000281BC SQ_ALU_CONST_BUFFER_SIZE_VS_15 |
| 383 | 0x000289C0 SQ_ALU_CONST_CACHE_GS_0 | ||
| 384 | 0x000289C4 SQ_ALU_CONST_CACHE_GS_1 | ||
| 385 | 0x000289C8 SQ_ALU_CONST_CACHE_GS_2 | ||
| 386 | 0x000289CC SQ_ALU_CONST_CACHE_GS_3 | ||
| 387 | 0x000289D0 SQ_ALU_CONST_CACHE_GS_4 | ||
| 388 | 0x000289D4 SQ_ALU_CONST_CACHE_GS_5 | ||
| 389 | 0x000289D8 SQ_ALU_CONST_CACHE_GS_6 | ||
| 390 | 0x000289DC SQ_ALU_CONST_CACHE_GS_7 | ||
| 391 | 0x000289E0 SQ_ALU_CONST_CACHE_GS_8 | ||
| 392 | 0x000289E4 SQ_ALU_CONST_CACHE_GS_9 | ||
| 393 | 0x000289E8 SQ_ALU_CONST_CACHE_GS_10 | ||
| 394 | 0x000289EC SQ_ALU_CONST_CACHE_GS_11 | ||
| 395 | 0x000289F0 SQ_ALU_CONST_CACHE_GS_12 | ||
| 396 | 0x000289F4 SQ_ALU_CONST_CACHE_GS_13 | ||
| 397 | 0x000289F8 SQ_ALU_CONST_CACHE_GS_14 | ||
| 398 | 0x000289FC SQ_ALU_CONST_CACHE_GS_15 | ||
| 399 | 0x00028940 SQ_ALU_CONST_CACHE_PS_0 | ||
| 400 | 0x00028944 SQ_ALU_CONST_CACHE_PS_1 | ||
| 401 | 0x00028948 SQ_ALU_CONST_CACHE_PS_2 | ||
| 402 | 0x0002894C SQ_ALU_CONST_CACHE_PS_3 | ||
| 403 | 0x00028950 SQ_ALU_CONST_CACHE_PS_4 | ||
| 404 | 0x00028954 SQ_ALU_CONST_CACHE_PS_5 | ||
| 405 | 0x00028958 SQ_ALU_CONST_CACHE_PS_6 | ||
| 406 | 0x0002895C SQ_ALU_CONST_CACHE_PS_7 | ||
| 407 | 0x00028960 SQ_ALU_CONST_CACHE_PS_8 | ||
| 408 | 0x00028964 SQ_ALU_CONST_CACHE_PS_9 | ||
| 409 | 0x00028968 SQ_ALU_CONST_CACHE_PS_10 | ||
| 410 | 0x0002896C SQ_ALU_CONST_CACHE_PS_11 | ||
| 411 | 0x00028970 SQ_ALU_CONST_CACHE_PS_12 | ||
| 412 | 0x00028974 SQ_ALU_CONST_CACHE_PS_13 | ||
| 413 | 0x00028978 SQ_ALU_CONST_CACHE_PS_14 | ||
| 414 | 0x0002897C SQ_ALU_CONST_CACHE_PS_15 | ||
| 415 | 0x00028980 SQ_ALU_CONST_CACHE_VS_0 | ||
| 416 | 0x00028984 SQ_ALU_CONST_CACHE_VS_1 | ||
| 417 | 0x00028988 SQ_ALU_CONST_CACHE_VS_2 | ||
| 418 | 0x0002898C SQ_ALU_CONST_CACHE_VS_3 | ||
| 419 | 0x00028990 SQ_ALU_CONST_CACHE_VS_4 | ||
| 420 | 0x00028994 SQ_ALU_CONST_CACHE_VS_5 | ||
| 421 | 0x00028998 SQ_ALU_CONST_CACHE_VS_6 | ||
| 422 | 0x0002899C SQ_ALU_CONST_CACHE_VS_7 | ||
| 423 | 0x000289A0 SQ_ALU_CONST_CACHE_VS_8 | ||
| 424 | 0x000289A4 SQ_ALU_CONST_CACHE_VS_9 | ||
| 425 | 0x000289A8 SQ_ALU_CONST_CACHE_VS_10 | ||
| 426 | 0x000289AC SQ_ALU_CONST_CACHE_VS_11 | ||
| 427 | 0x000289B0 SQ_ALU_CONST_CACHE_VS_12 | ||
| 428 | 0x000289B4 SQ_ALU_CONST_CACHE_VS_13 | ||
| 429 | 0x000289B8 SQ_ALU_CONST_CACHE_VS_14 | ||
| 430 | 0x000289BC SQ_ALU_CONST_CACHE_VS_15 | ||
| 431 | 0x000288D8 SQ_PGM_CF_OFFSET_ES | 366 | 0x000288D8 SQ_PGM_CF_OFFSET_ES |
| 432 | 0x000288DC SQ_PGM_CF_OFFSET_FS | 367 | 0x000288DC SQ_PGM_CF_OFFSET_FS |
| 433 | 0x000288D4 SQ_PGM_CF_OFFSET_GS | 368 | 0x000288D4 SQ_PGM_CF_OFFSET_GS |
| @@ -494,12 +429,7 @@ r600 0x9400 | |||
| 494 | 0x00028438 SX_ALPHA_REF | 429 | 0x00028438 SX_ALPHA_REF |
| 495 | 0x00028410 SX_ALPHA_TEST_CONTROL | 430 | 0x00028410 SX_ALPHA_TEST_CONTROL |
| 496 | 0x00028350 SX_MISC | 431 | 0x00028350 SX_MISC |
| 497 | 0x0000A020 SMX_DC_CTL0 | ||
| 498 | 0x0000A024 SMX_DC_CTL1 | ||
| 499 | 0x0000A028 SMX_DC_CTL2 | ||
| 500 | 0x00009608 TC_CNTL | ||
| 501 | 0x00009604 TC_INVALIDATE | 432 | 0x00009604 TC_INVALIDATE |
| 502 | 0x00009490 TD_CNTL | ||
| 503 | 0x00009400 TD_FILTER4 | 433 | 0x00009400 TD_FILTER4 |
| 504 | 0x00009404 TD_FILTER4_1 | 434 | 0x00009404 TD_FILTER4_1 |
| 505 | 0x00009408 TD_FILTER4_2 | 435 | 0x00009408 TD_FILTER4_2 |
| @@ -824,14 +754,9 @@ r600 0x9400 | |||
| 824 | 0x00028428 CB_FOG_GREEN | 754 | 0x00028428 CB_FOG_GREEN |
| 825 | 0x00028424 CB_FOG_RED | 755 | 0x00028424 CB_FOG_RED |
| 826 | 0x00008040 WAIT_UNTIL | 756 | 0x00008040 WAIT_UNTIL |
| 827 | 0x00008950 CC_GC_SHADER_PIPE_CONFIG | ||
| 828 | 0x00008954 GC_USER_SHADER_PIPE_CONFIG | ||
| 829 | 0x00009714 VC_ENHANCE | 757 | 0x00009714 VC_ENHANCE |
| 830 | 0x00009830 DB_DEBUG | 758 | 0x00009830 DB_DEBUG |
| 831 | 0x00009838 DB_WATERMARKS | 759 | 0x00009838 DB_WATERMARKS |
| 832 | 0x00028D28 DB_SRESULTS_COMPARE_STATE0 | 760 | 0x00028D28 DB_SRESULTS_COMPARE_STATE0 |
| 833 | 0x00028D44 DB_ALPHA_TO_MASK | 761 | 0x00028D44 DB_ALPHA_TO_MASK |
| 834 | 0x00009504 TA_CNTL | ||
| 835 | 0x00009700 VC_CNTL | 762 | 0x00009700 VC_CNTL |
| 836 | 0x00009718 VC_CONFIG | ||
| 837 | 0x0000A02C SMX_DC_MC_INTF_CTL | ||
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index 626d51891ee9..1a41cb268b72 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c | |||
| @@ -26,8 +26,10 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <drm/drmP.h> | 30 | #include <drm/drmP.h> |
| 30 | #include "radeon.h" | 31 | #include "radeon.h" |
| 32 | #include "radeon_asic.h" | ||
| 31 | #include "rs400d.h" | 33 | #include "rs400d.h" |
| 32 | 34 | ||
| 33 | /* This files gather functions specifics to : rs400,rs480 */ | 35 | /* This files gather functions specifics to : rs400,rs480 */ |
| @@ -202,9 +204,9 @@ void rs400_gart_disable(struct radeon_device *rdev) | |||
| 202 | 204 | ||
| 203 | void rs400_gart_fini(struct radeon_device *rdev) | 205 | void rs400_gart_fini(struct radeon_device *rdev) |
| 204 | { | 206 | { |
| 207 | radeon_gart_fini(rdev); | ||
| 205 | rs400_gart_disable(rdev); | 208 | rs400_gart_disable(rdev); |
| 206 | radeon_gart_table_ram_free(rdev); | 209 | radeon_gart_table_ram_free(rdev); |
| 207 | radeon_gart_fini(rdev); | ||
| 208 | } | 210 | } |
| 209 | 211 | ||
| 210 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) | 212 | int rs400_gart_set_page(struct radeon_device *rdev, int i, uint64_t addr) |
| @@ -264,6 +266,7 @@ void rs400_mc_init(struct radeon_device *rdev) | |||
| 264 | base = (RREG32(RADEON_NB_TOM) & 0xffff) << 16; | 266 | base = (RREG32(RADEON_NB_TOM) & 0xffff) << 16; |
| 265 | radeon_vram_location(rdev, &rdev->mc, base); | 267 | radeon_vram_location(rdev, &rdev->mc, base); |
| 266 | radeon_gtt_location(rdev, &rdev->mc); | 268 | radeon_gtt_location(rdev, &rdev->mc); |
| 269 | radeon_update_bandwidth_info(rdev); | ||
| 267 | } | 270 | } |
| 268 | 271 | ||
| 269 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg) | 272 | uint32_t rs400_mc_rreg(struct radeon_device *rdev, uint32_t reg) |
| @@ -388,6 +391,8 @@ static int rs400_startup(struct radeon_device *rdev) | |||
| 388 | { | 391 | { |
| 389 | int r; | 392 | int r; |
| 390 | 393 | ||
| 394 | r100_set_common_regs(rdev); | ||
| 395 | |||
| 391 | rs400_mc_program(rdev); | 396 | rs400_mc_program(rdev); |
| 392 | /* Resume clock */ | 397 | /* Resume clock */ |
| 393 | r300_clock_startup(rdev); | 398 | r300_clock_startup(rdev); |
| @@ -453,6 +458,7 @@ int rs400_suspend(struct radeon_device *rdev) | |||
| 453 | 458 | ||
| 454 | void rs400_fini(struct radeon_device *rdev) | 459 | void rs400_fini(struct radeon_device *rdev) |
| 455 | { | 460 | { |
| 461 | radeon_pm_fini(rdev); | ||
| 456 | r100_cp_fini(rdev); | 462 | r100_cp_fini(rdev); |
| 457 | r100_wb_fini(rdev); | 463 | r100_wb_fini(rdev); |
| 458 | r100_ib_fini(rdev); | 464 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index 47f046b78c6b..abf824c2123d 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | */ | 37 | */ |
| 38 | #include "drmP.h" | 38 | #include "drmP.h" |
| 39 | #include "radeon.h" | 39 | #include "radeon.h" |
| 40 | #include "radeon_asic.h" | ||
| 40 | #include "atom.h" | 41 | #include "atom.h" |
| 41 | #include "rs600d.h" | 42 | #include "rs600d.h" |
| 42 | 43 | ||
| @@ -267,9 +268,9 @@ void rs600_gart_disable(struct radeon_device *rdev) | |||
| 267 | 268 | ||
| 268 | void rs600_gart_fini(struct radeon_device *rdev) | 269 | void rs600_gart_fini(struct radeon_device *rdev) |
| 269 | { | 270 | { |
| 271 | radeon_gart_fini(rdev); | ||
| 270 | rs600_gart_disable(rdev); | 272 | rs600_gart_disable(rdev); |
| 271 | radeon_gart_table_vram_free(rdev); | 273 | radeon_gart_table_vram_free(rdev); |
| 272 | radeon_gart_fini(rdev); | ||
| 273 | } | 274 | } |
| 274 | 275 | ||
| 275 | #define R600_PTE_VALID (1 << 0) | 276 | #define R600_PTE_VALID (1 << 0) |
| @@ -392,10 +393,12 @@ int rs600_irq_process(struct radeon_device *rdev) | |||
| 392 | /* Vertical blank interrupts */ | 393 | /* Vertical blank interrupts */ |
| 393 | if (G_007EDC_LB_D1_VBLANK_INTERRUPT(r500_disp_int)) { | 394 | if (G_007EDC_LB_D1_VBLANK_INTERRUPT(r500_disp_int)) { |
| 394 | drm_handle_vblank(rdev->ddev, 0); | 395 | drm_handle_vblank(rdev->ddev, 0); |
| 396 | rdev->pm.vblank_sync = true; | ||
| 395 | wake_up(&rdev->irq.vblank_queue); | 397 | wake_up(&rdev->irq.vblank_queue); |
| 396 | } | 398 | } |
| 397 | if (G_007EDC_LB_D2_VBLANK_INTERRUPT(r500_disp_int)) { | 399 | if (G_007EDC_LB_D2_VBLANK_INTERRUPT(r500_disp_int)) { |
| 398 | drm_handle_vblank(rdev->ddev, 1); | 400 | drm_handle_vblank(rdev->ddev, 1); |
| 401 | rdev->pm.vblank_sync = true; | ||
| 399 | wake_up(&rdev->irq.vblank_queue); | 402 | wake_up(&rdev->irq.vblank_queue); |
| 400 | } | 403 | } |
| 401 | if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT(r500_disp_int)) { | 404 | if (G_007EDC_DC_HOT_PLUG_DETECT1_INTERRUPT(r500_disp_int)) { |
| @@ -472,13 +475,38 @@ void rs600_mc_init(struct radeon_device *rdev) | |||
| 472 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); | 475 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); |
| 473 | base = RREG32_MC(R_000004_MC_FB_LOCATION); | 476 | base = RREG32_MC(R_000004_MC_FB_LOCATION); |
| 474 | base = G_000004_MC_FB_START(base) << 16; | 477 | base = G_000004_MC_FB_START(base) << 16; |
| 478 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); | ||
| 475 | radeon_vram_location(rdev, &rdev->mc, base); | 479 | radeon_vram_location(rdev, &rdev->mc, base); |
| 476 | radeon_gtt_location(rdev, &rdev->mc); | 480 | radeon_gtt_location(rdev, &rdev->mc); |
| 481 | radeon_update_bandwidth_info(rdev); | ||
| 477 | } | 482 | } |
| 478 | 483 | ||
| 479 | void rs600_bandwidth_update(struct radeon_device *rdev) | 484 | void rs600_bandwidth_update(struct radeon_device *rdev) |
| 480 | { | 485 | { |
| 481 | /* FIXME: implement, should this be like rs690 ? */ | 486 | struct drm_display_mode *mode0 = NULL; |
| 487 | struct drm_display_mode *mode1 = NULL; | ||
| 488 | u32 d1mode_priority_a_cnt, d2mode_priority_a_cnt; | ||
| 489 | /* FIXME: implement full support */ | ||
| 490 | |||
| 491 | radeon_update_display_priority(rdev); | ||
| 492 | |||
| 493 | if (rdev->mode_info.crtcs[0]->base.enabled) | ||
| 494 | mode0 = &rdev->mode_info.crtcs[0]->base.mode; | ||
| 495 | if (rdev->mode_info.crtcs[1]->base.enabled) | ||
| 496 | mode1 = &rdev->mode_info.crtcs[1]->base.mode; | ||
| 497 | |||
| 498 | rs690_line_buffer_adjust(rdev, mode0, mode1); | ||
| 499 | |||
| 500 | if (rdev->disp_priority == 2) { | ||
| 501 | d1mode_priority_a_cnt = RREG32(R_006548_D1MODE_PRIORITY_A_CNT); | ||
| 502 | d2mode_priority_a_cnt = RREG32(R_006D48_D2MODE_PRIORITY_A_CNT); | ||
| 503 | d1mode_priority_a_cnt |= S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1); | ||
| 504 | d2mode_priority_a_cnt |= S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1); | ||
| 505 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt); | ||
| 506 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt); | ||
| 507 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt); | ||
| 508 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt); | ||
| 509 | } | ||
| 482 | } | 510 | } |
| 483 | 511 | ||
| 484 | uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg) | 512 | uint32_t rs600_mc_rreg(struct radeon_device *rdev, uint32_t reg) |
| @@ -598,6 +626,7 @@ int rs600_suspend(struct radeon_device *rdev) | |||
| 598 | 626 | ||
| 599 | void rs600_fini(struct radeon_device *rdev) | 627 | void rs600_fini(struct radeon_device *rdev) |
| 600 | { | 628 | { |
| 629 | radeon_pm_fini(rdev); | ||
| 601 | r100_cp_fini(rdev); | 630 | r100_cp_fini(rdev); |
| 602 | r100_wb_fini(rdev); | 631 | r100_wb_fini(rdev); |
| 603 | r100_ib_fini(rdev); | 632 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/rs600d.h b/drivers/gpu/drm/radeon/rs600d.h index c1c8f5885cbb..e52d2695510b 100644 --- a/drivers/gpu/drm/radeon/rs600d.h +++ b/drivers/gpu/drm/radeon/rs600d.h | |||
| @@ -535,4 +535,57 @@ | |||
| 535 | #define G_00016C_INVALIDATE_L1_TLB(x) (((x) >> 20) & 0x1) | 535 | #define G_00016C_INVALIDATE_L1_TLB(x) (((x) >> 20) & 0x1) |
| 536 | #define C_00016C_INVALIDATE_L1_TLB 0xFFEFFFFF | 536 | #define C_00016C_INVALIDATE_L1_TLB 0xFFEFFFFF |
| 537 | 537 | ||
| 538 | #define R_006548_D1MODE_PRIORITY_A_CNT 0x006548 | ||
| 539 | #define S_006548_D1MODE_PRIORITY_MARK_A(x) (((x) & 0x7FFF) << 0) | ||
| 540 | #define G_006548_D1MODE_PRIORITY_MARK_A(x) (((x) >> 0) & 0x7FFF) | ||
| 541 | #define C_006548_D1MODE_PRIORITY_MARK_A 0xFFFF8000 | ||
| 542 | #define S_006548_D1MODE_PRIORITY_A_OFF(x) (((x) & 0x1) << 16) | ||
| 543 | #define G_006548_D1MODE_PRIORITY_A_OFF(x) (((x) >> 16) & 0x1) | ||
| 544 | #define C_006548_D1MODE_PRIORITY_A_OFF 0xFFFEFFFF | ||
| 545 | #define S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(x) (((x) & 0x1) << 20) | ||
| 546 | #define G_006548_D1MODE_PRIORITY_A_ALWAYS_ON(x) (((x) >> 20) & 0x1) | ||
| 547 | #define C_006548_D1MODE_PRIORITY_A_ALWAYS_ON 0xFFEFFFFF | ||
| 548 | #define S_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) & 0x1) << 24) | ||
| 549 | #define G_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) >> 24) & 0x1) | ||
| 550 | #define C_006548_D1MODE_PRIORITY_A_FORCE_MASK 0xFEFFFFFF | ||
| 551 | #define R_00654C_D1MODE_PRIORITY_B_CNT 0x00654C | ||
| 552 | #define S_00654C_D1MODE_PRIORITY_MARK_B(x) (((x) & 0x7FFF) << 0) | ||
| 553 | #define G_00654C_D1MODE_PRIORITY_MARK_B(x) (((x) >> 0) & 0x7FFF) | ||
| 554 | #define C_00654C_D1MODE_PRIORITY_MARK_B 0xFFFF8000 | ||
| 555 | #define S_00654C_D1MODE_PRIORITY_B_OFF(x) (((x) & 0x1) << 16) | ||
| 556 | #define G_00654C_D1MODE_PRIORITY_B_OFF(x) (((x) >> 16) & 0x1) | ||
| 557 | #define C_00654C_D1MODE_PRIORITY_B_OFF 0xFFFEFFFF | ||
| 558 | #define S_00654C_D1MODE_PRIORITY_B_ALWAYS_ON(x) (((x) & 0x1) << 20) | ||
| 559 | #define G_00654C_D1MODE_PRIORITY_B_ALWAYS_ON(x) (((x) >> 20) & 0x1) | ||
| 560 | #define C_00654C_D1MODE_PRIORITY_B_ALWAYS_ON 0xFFEFFFFF | ||
| 561 | #define S_00654C_D1MODE_PRIORITY_B_FORCE_MASK(x) (((x) & 0x1) << 24) | ||
| 562 | #define G_00654C_D1MODE_PRIORITY_B_FORCE_MASK(x) (((x) >> 24) & 0x1) | ||
| 563 | #define C_00654C_D1MODE_PRIORITY_B_FORCE_MASK 0xFEFFFFFF | ||
| 564 | #define R_006D48_D2MODE_PRIORITY_A_CNT 0x006D48 | ||
| 565 | #define S_006D48_D2MODE_PRIORITY_MARK_A(x) (((x) & 0x7FFF) << 0) | ||
| 566 | #define G_006D48_D2MODE_PRIORITY_MARK_A(x) (((x) >> 0) & 0x7FFF) | ||
| 567 | #define C_006D48_D2MODE_PRIORITY_MARK_A 0xFFFF8000 | ||
| 568 | #define S_006D48_D2MODE_PRIORITY_A_OFF(x) (((x) & 0x1) << 16) | ||
| 569 | #define G_006D48_D2MODE_PRIORITY_A_OFF(x) (((x) >> 16) & 0x1) | ||
| 570 | #define C_006D48_D2MODE_PRIORITY_A_OFF 0xFFFEFFFF | ||
| 571 | #define S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(x) (((x) & 0x1) << 20) | ||
| 572 | #define G_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(x) (((x) >> 20) & 0x1) | ||
| 573 | #define C_006D48_D2MODE_PRIORITY_A_ALWAYS_ON 0xFFEFFFFF | ||
| 574 | #define S_006D48_D2MODE_PRIORITY_A_FORCE_MASK(x) (((x) & 0x1) << 24) | ||
| 575 | #define G_006D48_D2MODE_PRIORITY_A_FORCE_MASK(x) (((x) >> 24) & 0x1) | ||
| 576 | #define C_006D48_D2MODE_PRIORITY_A_FORCE_MASK 0xFEFFFFFF | ||
| 577 | #define R_006D4C_D2MODE_PRIORITY_B_CNT 0x006D4C | ||
| 578 | #define S_006D4C_D2MODE_PRIORITY_MARK_B(x) (((x) & 0x7FFF) << 0) | ||
| 579 | #define G_006D4C_D2MODE_PRIORITY_MARK_B(x) (((x) >> 0) & 0x7FFF) | ||
| 580 | #define C_006D4C_D2MODE_PRIORITY_MARK_B 0xFFFF8000 | ||
| 581 | #define S_006D4C_D2MODE_PRIORITY_B_OFF(x) (((x) & 0x1) << 16) | ||
| 582 | #define G_006D4C_D2MODE_PRIORITY_B_OFF(x) (((x) >> 16) & 0x1) | ||
| 583 | #define C_006D4C_D2MODE_PRIORITY_B_OFF 0xFFFEFFFF | ||
| 584 | #define S_006D4C_D2MODE_PRIORITY_B_ALWAYS_ON(x) (((x) & 0x1) << 20) | ||
| 585 | #define G_006D4C_D2MODE_PRIORITY_B_ALWAYS_ON(x) (((x) >> 20) & 0x1) | ||
| 586 | #define C_006D4C_D2MODE_PRIORITY_B_ALWAYS_ON 0xFFEFFFFF | ||
| 587 | #define S_006D4C_D2MODE_PRIORITY_B_FORCE_MASK(x) (((x) & 0x1) << 24) | ||
| 588 | #define G_006D4C_D2MODE_PRIORITY_B_FORCE_MASK(x) (((x) >> 24) & 0x1) | ||
| 589 | #define C_006D4C_D2MODE_PRIORITY_B_FORCE_MASK 0xFEFFFFFF | ||
| 590 | |||
| 538 | #endif | 591 | #endif |
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 83b9174f76f2..bbf3da790fd5 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #include "drmP.h" | 28 | #include "drmP.h" |
| 29 | #include "radeon.h" | 29 | #include "radeon.h" |
| 30 | #include "radeon_asic.h" | ||
| 30 | #include "atom.h" | 31 | #include "atom.h" |
| 31 | #include "rs690d.h" | 32 | #include "rs690d.h" |
| 32 | 33 | ||
| @@ -57,42 +58,57 @@ static void rs690_gpu_init(struct radeon_device *rdev) | |||
| 57 | } | 58 | } |
| 58 | } | 59 | } |
| 59 | 60 | ||
| 61 | union igp_info { | ||
| 62 | struct _ATOM_INTEGRATED_SYSTEM_INFO info; | ||
| 63 | struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 info_v2; | ||
| 64 | }; | ||
| 65 | |||
| 60 | void rs690_pm_info(struct radeon_device *rdev) | 66 | void rs690_pm_info(struct radeon_device *rdev) |
| 61 | { | 67 | { |
| 62 | int index = GetIndexIntoMasterTable(DATA, IntegratedSystemInfo); | 68 | int index = GetIndexIntoMasterTable(DATA, IntegratedSystemInfo); |
| 63 | struct _ATOM_INTEGRATED_SYSTEM_INFO *info; | 69 | union igp_info *info; |
| 64 | struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 *info_v2; | ||
| 65 | void *ptr; | ||
| 66 | uint16_t data_offset; | 70 | uint16_t data_offset; |
| 67 | uint8_t frev, crev; | 71 | uint8_t frev, crev; |
| 68 | fixed20_12 tmp; | 72 | fixed20_12 tmp; |
| 69 | 73 | ||
| 70 | atom_parse_data_header(rdev->mode_info.atom_context, index, NULL, | 74 | if (atom_parse_data_header(rdev->mode_info.atom_context, index, NULL, |
| 71 | &frev, &crev, &data_offset); | 75 | &frev, &crev, &data_offset)) { |
| 72 | ptr = rdev->mode_info.atom_context->bios + data_offset; | 76 | info = (union igp_info *)(rdev->mode_info.atom_context->bios + data_offset); |
| 73 | info = (struct _ATOM_INTEGRATED_SYSTEM_INFO *)ptr; | 77 | |
| 74 | info_v2 = (struct _ATOM_INTEGRATED_SYSTEM_INFO_V2 *)ptr; | 78 | /* Get various system informations from bios */ |
| 75 | /* Get various system informations from bios */ | 79 | switch (crev) { |
| 76 | switch (crev) { | 80 | case 1: |
| 77 | case 1: | 81 | tmp.full = rfixed_const(100); |
| 78 | tmp.full = rfixed_const(100); | 82 | rdev->pm.igp_sideport_mclk.full = rfixed_const(info->info.ulBootUpMemoryClock); |
| 79 | rdev->pm.igp_sideport_mclk.full = rfixed_const(info->ulBootUpMemoryClock); | 83 | rdev->pm.igp_sideport_mclk.full = rfixed_div(rdev->pm.igp_sideport_mclk, tmp); |
| 80 | rdev->pm.igp_sideport_mclk.full = rfixed_div(rdev->pm.igp_sideport_mclk, tmp); | 84 | rdev->pm.igp_system_mclk.full = rfixed_const(le16_to_cpu(info->info.usK8MemoryClock)); |
| 81 | rdev->pm.igp_system_mclk.full = rfixed_const(le16_to_cpu(info->usK8MemoryClock)); | 85 | rdev->pm.igp_ht_link_clk.full = rfixed_const(le16_to_cpu(info->info.usFSBClock)); |
| 82 | rdev->pm.igp_ht_link_clk.full = rfixed_const(le16_to_cpu(info->usFSBClock)); | 86 | rdev->pm.igp_ht_link_width.full = rfixed_const(info->info.ucHTLinkWidth); |
| 83 | rdev->pm.igp_ht_link_width.full = rfixed_const(info->ucHTLinkWidth); | 87 | break; |
| 84 | break; | 88 | case 2: |
| 85 | case 2: | 89 | tmp.full = rfixed_const(100); |
| 86 | tmp.full = rfixed_const(100); | 90 | rdev->pm.igp_sideport_mclk.full = rfixed_const(info->info_v2.ulBootUpSidePortClock); |
| 87 | rdev->pm.igp_sideport_mclk.full = rfixed_const(info_v2->ulBootUpSidePortClock); | 91 | rdev->pm.igp_sideport_mclk.full = rfixed_div(rdev->pm.igp_sideport_mclk, tmp); |
| 88 | rdev->pm.igp_sideport_mclk.full = rfixed_div(rdev->pm.igp_sideport_mclk, tmp); | 92 | rdev->pm.igp_system_mclk.full = rfixed_const(info->info_v2.ulBootUpUMAClock); |
| 89 | rdev->pm.igp_system_mclk.full = rfixed_const(info_v2->ulBootUpUMAClock); | 93 | rdev->pm.igp_system_mclk.full = rfixed_div(rdev->pm.igp_system_mclk, tmp); |
| 90 | rdev->pm.igp_system_mclk.full = rfixed_div(rdev->pm.igp_system_mclk, tmp); | 94 | rdev->pm.igp_ht_link_clk.full = rfixed_const(info->info_v2.ulHTLinkFreq); |
| 91 | rdev->pm.igp_ht_link_clk.full = rfixed_const(info_v2->ulHTLinkFreq); | 95 | rdev->pm.igp_ht_link_clk.full = rfixed_div(rdev->pm.igp_ht_link_clk, tmp); |
| 92 | rdev->pm.igp_ht_link_clk.full = rfixed_div(rdev->pm.igp_ht_link_clk, tmp); | 96 | rdev->pm.igp_ht_link_width.full = rfixed_const(le16_to_cpu(info->info_v2.usMinHTLinkWidth)); |
| 93 | rdev->pm.igp_ht_link_width.full = rfixed_const(le16_to_cpu(info_v2->usMinHTLinkWidth)); | 97 | break; |
| 94 | break; | 98 | default: |
| 95 | default: | 99 | tmp.full = rfixed_const(100); |
| 100 | /* We assume the slower possible clock ie worst case */ | ||
| 101 | /* DDR 333Mhz */ | ||
| 102 | rdev->pm.igp_sideport_mclk.full = rfixed_const(333); | ||
| 103 | /* FIXME: system clock ? */ | ||
| 104 | rdev->pm.igp_system_mclk.full = rfixed_const(100); | ||
| 105 | rdev->pm.igp_system_mclk.full = rfixed_div(rdev->pm.igp_system_mclk, tmp); | ||
| 106 | rdev->pm.igp_ht_link_clk.full = rfixed_const(200); | ||
| 107 | rdev->pm.igp_ht_link_width.full = rfixed_const(8); | ||
| 108 | DRM_ERROR("No integrated system info for your GPU, using safe default\n"); | ||
| 109 | break; | ||
| 110 | } | ||
| 111 | } else { | ||
| 96 | tmp.full = rfixed_const(100); | 112 | tmp.full = rfixed_const(100); |
| 97 | /* We assume the slower possible clock ie worst case */ | 113 | /* We assume the slower possible clock ie worst case */ |
| 98 | /* DDR 333Mhz */ | 114 | /* DDR 333Mhz */ |
| @@ -103,7 +119,6 @@ void rs690_pm_info(struct radeon_device *rdev) | |||
| 103 | rdev->pm.igp_ht_link_clk.full = rfixed_const(200); | 119 | rdev->pm.igp_ht_link_clk.full = rfixed_const(200); |
| 104 | rdev->pm.igp_ht_link_width.full = rfixed_const(8); | 120 | rdev->pm.igp_ht_link_width.full = rfixed_const(8); |
| 105 | DRM_ERROR("No integrated system info for your GPU, using safe default\n"); | 121 | DRM_ERROR("No integrated system info for your GPU, using safe default\n"); |
| 106 | break; | ||
| 107 | } | 122 | } |
| 108 | /* Compute various bandwidth */ | 123 | /* Compute various bandwidth */ |
| 109 | /* k8_bandwidth = (memory_clk / 2) * 2 * 8 * 0.5 = memory_clk * 4 */ | 124 | /* k8_bandwidth = (memory_clk / 2) * 2 * 8 * 0.5 = memory_clk * 4 */ |
| @@ -131,7 +146,6 @@ void rs690_pm_info(struct radeon_device *rdev) | |||
| 131 | 146 | ||
| 132 | void rs690_mc_init(struct radeon_device *rdev) | 147 | void rs690_mc_init(struct radeon_device *rdev) |
| 133 | { | 148 | { |
| 134 | fixed20_12 a; | ||
| 135 | u64 base; | 149 | u64 base; |
| 136 | 150 | ||
| 137 | rs400_gart_adjust_size(rdev); | 151 | rs400_gart_adjust_size(rdev); |
| @@ -145,18 +159,10 @@ void rs690_mc_init(struct radeon_device *rdev) | |||
| 145 | base = RREG32_MC(R_000100_MCCFG_FB_LOCATION); | 159 | base = RREG32_MC(R_000100_MCCFG_FB_LOCATION); |
| 146 | base = G_000100_MC_FB_START(base) << 16; | 160 | base = G_000100_MC_FB_START(base) << 16; |
| 147 | rs690_pm_info(rdev); | 161 | rs690_pm_info(rdev); |
| 148 | /* FIXME: we should enforce default clock in case GPU is not in | ||
| 149 | * default setup | ||
| 150 | */ | ||
| 151 | a.full = rfixed_const(100); | ||
| 152 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 153 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 154 | a.full = rfixed_const(16); | ||
| 155 | /* core_bandwidth = sclk(Mhz) * 16 */ | ||
| 156 | rdev->pm.core_bandwidth.full = rfixed_div(rdev->pm.sclk, a); | ||
| 157 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); | 162 | rdev->mc.igp_sideport_enabled = radeon_atombios_sideport_present(rdev); |
| 158 | radeon_vram_location(rdev, &rdev->mc, base); | 163 | radeon_vram_location(rdev, &rdev->mc, base); |
| 159 | radeon_gtt_location(rdev, &rdev->mc); | 164 | radeon_gtt_location(rdev, &rdev->mc); |
| 165 | radeon_update_bandwidth_info(rdev); | ||
| 160 | } | 166 | } |
| 161 | 167 | ||
| 162 | void rs690_line_buffer_adjust(struct radeon_device *rdev, | 168 | void rs690_line_buffer_adjust(struct radeon_device *rdev, |
| @@ -394,10 +400,12 @@ void rs690_bandwidth_update(struct radeon_device *rdev) | |||
| 394 | struct drm_display_mode *mode1 = NULL; | 400 | struct drm_display_mode *mode1 = NULL; |
| 395 | struct rs690_watermark wm0; | 401 | struct rs690_watermark wm0; |
| 396 | struct rs690_watermark wm1; | 402 | struct rs690_watermark wm1; |
| 397 | u32 tmp; | 403 | u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt; |
| 398 | fixed20_12 priority_mark02, priority_mark12, fill_rate; | 404 | fixed20_12 priority_mark02, priority_mark12, fill_rate; |
| 399 | fixed20_12 a, b; | 405 | fixed20_12 a, b; |
| 400 | 406 | ||
| 407 | radeon_update_display_priority(rdev); | ||
| 408 | |||
| 401 | if (rdev->mode_info.crtcs[0]->base.enabled) | 409 | if (rdev->mode_info.crtcs[0]->base.enabled) |
| 402 | mode0 = &rdev->mode_info.crtcs[0]->base.mode; | 410 | mode0 = &rdev->mode_info.crtcs[0]->base.mode; |
| 403 | if (rdev->mode_info.crtcs[1]->base.enabled) | 411 | if (rdev->mode_info.crtcs[1]->base.enabled) |
| @@ -407,7 +415,8 @@ void rs690_bandwidth_update(struct radeon_device *rdev) | |||
| 407 | * modes if the user specifies HIGH for displaypriority | 415 | * modes if the user specifies HIGH for displaypriority |
| 408 | * option. | 416 | * option. |
| 409 | */ | 417 | */ |
| 410 | if (rdev->disp_priority == 2) { | 418 | if ((rdev->disp_priority == 2) && |
| 419 | ((rdev->family == CHIP_RS690) || (rdev->family == CHIP_RS740))) { | ||
| 411 | tmp = RREG32_MC(R_000104_MC_INIT_MISC_LAT_TIMER); | 420 | tmp = RREG32_MC(R_000104_MC_INIT_MISC_LAT_TIMER); |
| 412 | tmp &= C_000104_MC_DISP0R_INIT_LAT; | 421 | tmp &= C_000104_MC_DISP0R_INIT_LAT; |
| 413 | tmp &= C_000104_MC_DISP1R_INIT_LAT; | 422 | tmp &= C_000104_MC_DISP1R_INIT_LAT; |
| @@ -482,10 +491,16 @@ void rs690_bandwidth_update(struct radeon_device *rdev) | |||
| 482 | priority_mark12.full = 0; | 491 | priority_mark12.full = 0; |
| 483 | if (wm1.priority_mark_max.full > priority_mark12.full) | 492 | if (wm1.priority_mark_max.full > priority_mark12.full) |
| 484 | priority_mark12.full = wm1.priority_mark_max.full; | 493 | priority_mark12.full = wm1.priority_mark_max.full; |
| 485 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark02)); | 494 | d1mode_priority_a_cnt = rfixed_trunc(priority_mark02); |
| 486 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark02)); | 495 | d2mode_priority_a_cnt = rfixed_trunc(priority_mark12); |
| 487 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark12)); | 496 | if (rdev->disp_priority == 2) { |
| 488 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark12)); | 497 | d1mode_priority_a_cnt |= S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1); |
| 498 | d2mode_priority_a_cnt |= S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1); | ||
| 499 | } | ||
| 500 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt); | ||
| 501 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt); | ||
| 502 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt); | ||
| 503 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt); | ||
| 489 | } else if (mode0) { | 504 | } else if (mode0) { |
| 490 | if (rfixed_trunc(wm0.dbpp) > 64) | 505 | if (rfixed_trunc(wm0.dbpp) > 64) |
| 491 | a.full = rfixed_mul(wm0.dbpp, wm0.num_line_pair); | 506 | a.full = rfixed_mul(wm0.dbpp, wm0.num_line_pair); |
| @@ -512,8 +527,11 @@ void rs690_bandwidth_update(struct radeon_device *rdev) | |||
| 512 | priority_mark02.full = 0; | 527 | priority_mark02.full = 0; |
| 513 | if (wm0.priority_mark_max.full > priority_mark02.full) | 528 | if (wm0.priority_mark_max.full > priority_mark02.full) |
| 514 | priority_mark02.full = wm0.priority_mark_max.full; | 529 | priority_mark02.full = wm0.priority_mark_max.full; |
| 515 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark02)); | 530 | d1mode_priority_a_cnt = rfixed_trunc(priority_mark02); |
| 516 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark02)); | 531 | if (rdev->disp_priority == 2) |
| 532 | d1mode_priority_a_cnt |= S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(1); | ||
| 533 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt); | ||
| 534 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt); | ||
| 517 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, | 535 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, |
| 518 | S_006D48_D2MODE_PRIORITY_A_OFF(1)); | 536 | S_006D48_D2MODE_PRIORITY_A_OFF(1)); |
| 519 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, | 537 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, |
| @@ -544,12 +562,15 @@ void rs690_bandwidth_update(struct radeon_device *rdev) | |||
| 544 | priority_mark12.full = 0; | 562 | priority_mark12.full = 0; |
| 545 | if (wm1.priority_mark_max.full > priority_mark12.full) | 563 | if (wm1.priority_mark_max.full > priority_mark12.full) |
| 546 | priority_mark12.full = wm1.priority_mark_max.full; | 564 | priority_mark12.full = wm1.priority_mark_max.full; |
| 565 | d2mode_priority_a_cnt = rfixed_trunc(priority_mark12); | ||
| 566 | if (rdev->disp_priority == 2) | ||
| 567 | d2mode_priority_a_cnt |= S_006D48_D2MODE_PRIORITY_A_ALWAYS_ON(1); | ||
| 547 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, | 568 | WREG32(R_006548_D1MODE_PRIORITY_A_CNT, |
| 548 | S_006548_D1MODE_PRIORITY_A_OFF(1)); | 569 | S_006548_D1MODE_PRIORITY_A_OFF(1)); |
| 549 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, | 570 | WREG32(R_00654C_D1MODE_PRIORITY_B_CNT, |
| 550 | S_00654C_D1MODE_PRIORITY_B_OFF(1)); | 571 | S_00654C_D1MODE_PRIORITY_B_OFF(1)); |
| 551 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark12)); | 572 | WREG32(R_006D48_D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt); |
| 552 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark12)); | 573 | WREG32(R_006D4C_D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt); |
| 553 | } | 574 | } |
| 554 | } | 575 | } |
| 555 | 576 | ||
| @@ -657,6 +678,7 @@ int rs690_suspend(struct radeon_device *rdev) | |||
| 657 | 678 | ||
| 658 | void rs690_fini(struct radeon_device *rdev) | 679 | void rs690_fini(struct radeon_device *rdev) |
| 659 | { | 680 | { |
| 681 | radeon_pm_fini(rdev); | ||
| 660 | r100_cp_fini(rdev); | 682 | r100_cp_fini(rdev); |
| 661 | r100_wb_fini(rdev); | 683 | r100_wb_fini(rdev); |
| 662 | r100_ib_fini(rdev); | 684 | r100_ib_fini(rdev); |
diff --git a/drivers/gpu/drm/radeon/rs690d.h b/drivers/gpu/drm/radeon/rs690d.h index 62d31e7a897f..36e6398a98ae 100644 --- a/drivers/gpu/drm/radeon/rs690d.h +++ b/drivers/gpu/drm/radeon/rs690d.h | |||
| @@ -182,6 +182,9 @@ | |||
| 182 | #define S_006548_D1MODE_PRIORITY_A_OFF(x) (((x) & 0x1) << 16) | 182 | #define S_006548_D1MODE_PRIORITY_A_OFF(x) (((x) & 0x1) << 16) |
| 183 | #define G_006548_D1MODE_PRIORITY_A_OFF(x) (((x) >> 16) & 0x1) | 183 | #define G_006548_D1MODE_PRIORITY_A_OFF(x) (((x) >> 16) & 0x1) |
| 184 | #define C_006548_D1MODE_PRIORITY_A_OFF 0xFFFEFFFF | 184 | #define C_006548_D1MODE_PRIORITY_A_OFF 0xFFFEFFFF |
| 185 | #define S_006548_D1MODE_PRIORITY_A_ALWAYS_ON(x) (((x) & 0x1) << 20) | ||
| 186 | #define G_006548_D1MODE_PRIORITY_A_ALWAYS_ON(x) (((x) >> 20) & 0x1) | ||
| 187 | #define C_006548_D1MODE_PRIORITY_A_ALWAYS_ON 0xFFEFFFFF | ||
| 185 | #define S_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) & 0x1) << 24) | 188 | #define S_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) & 0x1) << 24) |
| 186 | #define G_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) >> 24) & 0x1) | 189 | #define G_006548_D1MODE_PRIORITY_A_FORCE_MASK(x) (((x) >> 24) & 0x1) |
| 187 | #define C_006548_D1MODE_PRIORITY_A_FORCE_MASK 0xFEFFFFFF | 190 | #define C_006548_D1MODE_PRIORITY_A_FORCE_MASK 0xFEFFFFFF |
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index bea747da123f..9035121f4b58 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c | |||
| @@ -26,9 +26,11 @@ | |||
| 26 | * Jerome Glisse | 26 | * Jerome Glisse |
| 27 | */ | 27 | */ |
| 28 | #include <linux/seq_file.h> | 28 | #include <linux/seq_file.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "drmP.h" | 30 | #include "drmP.h" |
| 30 | #include "rv515d.h" | 31 | #include "rv515d.h" |
| 31 | #include "radeon.h" | 32 | #include "radeon.h" |
| 33 | #include "radeon_asic.h" | ||
| 32 | #include "atom.h" | 34 | #include "atom.h" |
| 33 | #include "rv515_reg_safe.h" | 35 | #include "rv515_reg_safe.h" |
| 34 | 36 | ||
| @@ -279,19 +281,13 @@ static void rv515_vram_get_type(struct radeon_device *rdev) | |||
| 279 | 281 | ||
| 280 | void rv515_mc_init(struct radeon_device *rdev) | 282 | void rv515_mc_init(struct radeon_device *rdev) |
| 281 | { | 283 | { |
| 282 | fixed20_12 a; | ||
| 283 | 284 | ||
| 284 | rv515_vram_get_type(rdev); | 285 | rv515_vram_get_type(rdev); |
| 285 | r100_vram_init_sizes(rdev); | 286 | r100_vram_init_sizes(rdev); |
| 286 | radeon_vram_location(rdev, &rdev->mc, 0); | 287 | radeon_vram_location(rdev, &rdev->mc, 0); |
| 287 | if (!(rdev->flags & RADEON_IS_AGP)) | 288 | if (!(rdev->flags & RADEON_IS_AGP)) |
| 288 | radeon_gtt_location(rdev, &rdev->mc); | 289 | radeon_gtt_location(rdev, &rdev->mc); |
| 289 | /* FIXME: we should enforce default clock in case GPU is not in | 290 | radeon_update_bandwidth_info(rdev); |
| 290 | * default setup | ||
| 291 | */ | ||
| 292 | a.full = rfixed_const(100); | ||
| 293 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 294 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 295 | } | 291 | } |
| 296 | 292 | ||
| 297 | uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg) | 293 | uint32_t rv515_mc_rreg(struct radeon_device *rdev, uint32_t reg) |
| @@ -539,6 +535,7 @@ void rv515_set_safe_registers(struct radeon_device *rdev) | |||
| 539 | 535 | ||
| 540 | void rv515_fini(struct radeon_device *rdev) | 536 | void rv515_fini(struct radeon_device *rdev) |
| 541 | { | 537 | { |
| 538 | radeon_pm_fini(rdev); | ||
| 542 | r100_cp_fini(rdev); | 539 | r100_cp_fini(rdev); |
| 543 | r100_wb_fini(rdev); | 540 | r100_wb_fini(rdev); |
| 544 | r100_ib_fini(rdev); | 541 | r100_ib_fini(rdev); |
| @@ -1020,7 +1017,7 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) | |||
| 1020 | struct drm_display_mode *mode1 = NULL; | 1017 | struct drm_display_mode *mode1 = NULL; |
| 1021 | struct rv515_watermark wm0; | 1018 | struct rv515_watermark wm0; |
| 1022 | struct rv515_watermark wm1; | 1019 | struct rv515_watermark wm1; |
| 1023 | u32 tmp; | 1020 | u32 tmp, d1mode_priority_a_cnt, d2mode_priority_a_cnt; |
| 1024 | fixed20_12 priority_mark02, priority_mark12, fill_rate; | 1021 | fixed20_12 priority_mark02, priority_mark12, fill_rate; |
| 1025 | fixed20_12 a, b; | 1022 | fixed20_12 a, b; |
| 1026 | 1023 | ||
| @@ -1088,10 +1085,16 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) | |||
| 1088 | priority_mark12.full = 0; | 1085 | priority_mark12.full = 0; |
| 1089 | if (wm1.priority_mark_max.full > priority_mark12.full) | 1086 | if (wm1.priority_mark_max.full > priority_mark12.full) |
| 1090 | priority_mark12.full = wm1.priority_mark_max.full; | 1087 | priority_mark12.full = wm1.priority_mark_max.full; |
| 1091 | WREG32(D1MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark02)); | 1088 | d1mode_priority_a_cnt = rfixed_trunc(priority_mark02); |
| 1092 | WREG32(D1MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark02)); | 1089 | d2mode_priority_a_cnt = rfixed_trunc(priority_mark12); |
| 1093 | WREG32(D2MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark12)); | 1090 | if (rdev->disp_priority == 2) { |
| 1094 | WREG32(D2MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark12)); | 1091 | d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON; |
| 1092 | d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON; | ||
| 1093 | } | ||
| 1094 | WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt); | ||
| 1095 | WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt); | ||
| 1096 | WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt); | ||
| 1097 | WREG32(D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt); | ||
| 1095 | } else if (mode0) { | 1098 | } else if (mode0) { |
| 1096 | if (rfixed_trunc(wm0.dbpp) > 64) | 1099 | if (rfixed_trunc(wm0.dbpp) > 64) |
| 1097 | a.full = rfixed_div(wm0.dbpp, wm0.num_line_pair); | 1100 | a.full = rfixed_div(wm0.dbpp, wm0.num_line_pair); |
| @@ -1118,8 +1121,11 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) | |||
| 1118 | priority_mark02.full = 0; | 1121 | priority_mark02.full = 0; |
| 1119 | if (wm0.priority_mark_max.full > priority_mark02.full) | 1122 | if (wm0.priority_mark_max.full > priority_mark02.full) |
| 1120 | priority_mark02.full = wm0.priority_mark_max.full; | 1123 | priority_mark02.full = wm0.priority_mark_max.full; |
| 1121 | WREG32(D1MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark02)); | 1124 | d1mode_priority_a_cnt = rfixed_trunc(priority_mark02); |
| 1122 | WREG32(D1MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark02)); | 1125 | if (rdev->disp_priority == 2) |
| 1126 | d1mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON; | ||
| 1127 | WREG32(D1MODE_PRIORITY_A_CNT, d1mode_priority_a_cnt); | ||
| 1128 | WREG32(D1MODE_PRIORITY_B_CNT, d1mode_priority_a_cnt); | ||
| 1123 | WREG32(D2MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF); | 1129 | WREG32(D2MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF); |
| 1124 | WREG32(D2MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF); | 1130 | WREG32(D2MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF); |
| 1125 | } else { | 1131 | } else { |
| @@ -1148,10 +1154,13 @@ void rv515_bandwidth_avivo_update(struct radeon_device *rdev) | |||
| 1148 | priority_mark12.full = 0; | 1154 | priority_mark12.full = 0; |
| 1149 | if (wm1.priority_mark_max.full > priority_mark12.full) | 1155 | if (wm1.priority_mark_max.full > priority_mark12.full) |
| 1150 | priority_mark12.full = wm1.priority_mark_max.full; | 1156 | priority_mark12.full = wm1.priority_mark_max.full; |
| 1157 | d2mode_priority_a_cnt = rfixed_trunc(priority_mark12); | ||
| 1158 | if (rdev->disp_priority == 2) | ||
| 1159 | d2mode_priority_a_cnt |= MODE_PRIORITY_ALWAYS_ON; | ||
| 1151 | WREG32(D1MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF); | 1160 | WREG32(D1MODE_PRIORITY_A_CNT, MODE_PRIORITY_OFF); |
| 1152 | WREG32(D1MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF); | 1161 | WREG32(D1MODE_PRIORITY_B_CNT, MODE_PRIORITY_OFF); |
| 1153 | WREG32(D2MODE_PRIORITY_A_CNT, rfixed_trunc(priority_mark12)); | 1162 | WREG32(D2MODE_PRIORITY_A_CNT, d2mode_priority_a_cnt); |
| 1154 | WREG32(D2MODE_PRIORITY_B_CNT, rfixed_trunc(priority_mark12)); | 1163 | WREG32(D2MODE_PRIORITY_B_CNT, d2mode_priority_a_cnt); |
| 1155 | } | 1164 | } |
| 1156 | } | 1165 | } |
| 1157 | 1166 | ||
| @@ -1161,6 +1170,8 @@ void rv515_bandwidth_update(struct radeon_device *rdev) | |||
| 1161 | struct drm_display_mode *mode0 = NULL; | 1170 | struct drm_display_mode *mode0 = NULL; |
| 1162 | struct drm_display_mode *mode1 = NULL; | 1171 | struct drm_display_mode *mode1 = NULL; |
| 1163 | 1172 | ||
| 1173 | radeon_update_display_priority(rdev); | ||
| 1174 | |||
| 1164 | if (rdev->mode_info.crtcs[0]->base.enabled) | 1175 | if (rdev->mode_info.crtcs[0]->base.enabled) |
| 1165 | mode0 = &rdev->mode_info.crtcs[0]->base.mode; | 1176 | mode0 = &rdev->mode_info.crtcs[0]->base.mode; |
| 1166 | if (rdev->mode_info.crtcs[1]->base.enabled) | 1177 | if (rdev->mode_info.crtcs[1]->base.enabled) |
| @@ -1170,7 +1181,8 @@ void rv515_bandwidth_update(struct radeon_device *rdev) | |||
| 1170 | * modes if the user specifies HIGH for displaypriority | 1181 | * modes if the user specifies HIGH for displaypriority |
| 1171 | * option. | 1182 | * option. |
| 1172 | */ | 1183 | */ |
| 1173 | if (rdev->disp_priority == 2) { | 1184 | if ((rdev->disp_priority == 2) && |
| 1185 | (rdev->family == CHIP_RV515)) { | ||
| 1174 | tmp = RREG32_MC(MC_MISC_LAT_TIMER); | 1186 | tmp = RREG32_MC(MC_MISC_LAT_TIMER); |
| 1175 | tmp &= ~MC_DISP1R_INIT_LAT_MASK; | 1187 | tmp &= ~MC_DISP1R_INIT_LAT_MASK; |
| 1176 | tmp &= ~MC_DISP0R_INIT_LAT_MASK; | 1188 | tmp &= ~MC_DISP0R_INIT_LAT_MASK; |
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 37887dee12af..97958a64df1a 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c | |||
| @@ -27,8 +27,10 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
| 29 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include "drmP.h" | 31 | #include "drmP.h" |
| 31 | #include "radeon.h" | 32 | #include "radeon.h" |
| 33 | #include "radeon_asic.h" | ||
| 32 | #include "radeon_drm.h" | 34 | #include "radeon_drm.h" |
| 33 | #include "rv770d.h" | 35 | #include "rv770d.h" |
| 34 | #include "atom.h" | 36 | #include "atom.h" |
| @@ -125,9 +127,9 @@ void rv770_pcie_gart_disable(struct radeon_device *rdev) | |||
| 125 | 127 | ||
| 126 | void rv770_pcie_gart_fini(struct radeon_device *rdev) | 128 | void rv770_pcie_gart_fini(struct radeon_device *rdev) |
| 127 | { | 129 | { |
| 130 | radeon_gart_fini(rdev); | ||
| 128 | rv770_pcie_gart_disable(rdev); | 131 | rv770_pcie_gart_disable(rdev); |
| 129 | radeon_gart_table_vram_free(rdev); | 132 | radeon_gart_table_vram_free(rdev); |
| 130 | radeon_gart_fini(rdev); | ||
| 131 | } | 133 | } |
| 132 | 134 | ||
| 133 | 135 | ||
| @@ -647,10 +649,13 @@ static void rv770_gpu_init(struct radeon_device *rdev) | |||
| 647 | 649 | ||
| 648 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 650 | WREG32(CC_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 649 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | 651 | WREG32(CC_GC_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); |
| 652 | WREG32(GC_USER_SHADER_PIPE_CONFIG, cc_gc_shader_pipe_config); | ||
| 650 | WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); | 653 | WREG32(CC_SYS_RB_BACKEND_DISABLE, cc_rb_backend_disable); |
| 651 | 654 | ||
| 652 | WREG32(CGTS_SYS_TCC_DISABLE, 0); | 655 | WREG32(CGTS_SYS_TCC_DISABLE, 0); |
| 653 | WREG32(CGTS_TCC_DISABLE, 0); | 656 | WREG32(CGTS_TCC_DISABLE, 0); |
| 657 | WREG32(CGTS_USER_SYS_TCC_DISABLE, 0); | ||
| 658 | WREG32(CGTS_USER_TCC_DISABLE, 0); | ||
| 654 | 659 | ||
| 655 | num_qd_pipes = | 660 | num_qd_pipes = |
| 656 | R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); | 661 | R7XX_MAX_PIPES - r600_count_pipe_bits((cc_gc_shader_pipe_config & INACTIVE_QD_PIPES_MASK) >> 8); |
| @@ -864,7 +869,6 @@ static void rv770_gpu_init(struct radeon_device *rdev) | |||
| 864 | 869 | ||
| 865 | int rv770_mc_init(struct radeon_device *rdev) | 870 | int rv770_mc_init(struct radeon_device *rdev) |
| 866 | { | 871 | { |
| 867 | fixed20_12 a; | ||
| 868 | u32 tmp; | 872 | u32 tmp; |
| 869 | int chansize, numchan; | 873 | int chansize, numchan; |
| 870 | 874 | ||
| @@ -908,12 +912,8 @@ int rv770_mc_init(struct radeon_device *rdev) | |||
| 908 | rdev->mc.real_vram_size = rdev->mc.aper_size; | 912 | rdev->mc.real_vram_size = rdev->mc.aper_size; |
| 909 | } | 913 | } |
| 910 | r600_vram_gtt_location(rdev, &rdev->mc); | 914 | r600_vram_gtt_location(rdev, &rdev->mc); |
| 911 | /* FIXME: we should enforce default clock in case GPU is not in | 915 | radeon_update_bandwidth_info(rdev); |
| 912 | * default setup | 916 | |
| 913 | */ | ||
| 914 | a.full = rfixed_const(100); | ||
| 915 | rdev->pm.sclk.full = rfixed_const(rdev->clock.default_sclk); | ||
| 916 | rdev->pm.sclk.full = rfixed_div(rdev->pm.sclk, a); | ||
| 917 | return 0; | 917 | return 0; |
| 918 | } | 918 | } |
| 919 | 919 | ||
| @@ -1013,6 +1013,13 @@ int rv770_resume(struct radeon_device *rdev) | |||
| 1013 | DRM_ERROR("radeon: failled testing IB (%d).\n", r); | 1013 | DRM_ERROR("radeon: failled testing IB (%d).\n", r); |
| 1014 | return r; | 1014 | return r; |
| 1015 | } | 1015 | } |
| 1016 | |||
| 1017 | r = r600_audio_init(rdev); | ||
| 1018 | if (r) { | ||
| 1019 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 1020 | return r; | ||
| 1021 | } | ||
| 1022 | |||
| 1016 | return r; | 1023 | return r; |
| 1017 | 1024 | ||
| 1018 | } | 1025 | } |
| @@ -1021,6 +1028,7 @@ int rv770_suspend(struct radeon_device *rdev) | |||
| 1021 | { | 1028 | { |
| 1022 | int r; | 1029 | int r; |
| 1023 | 1030 | ||
| 1031 | r600_audio_fini(rdev); | ||
| 1024 | /* FIXME: we should wait for ring to be empty */ | 1032 | /* FIXME: we should wait for ring to be empty */ |
| 1025 | r700_cp_stop(rdev); | 1033 | r700_cp_stop(rdev); |
| 1026 | rdev->cp.ready = false; | 1034 | rdev->cp.ready = false; |
| @@ -1144,11 +1152,19 @@ int rv770_init(struct radeon_device *rdev) | |||
| 1144 | } | 1152 | } |
| 1145 | } | 1153 | } |
| 1146 | } | 1154 | } |
| 1155 | |||
| 1156 | r = r600_audio_init(rdev); | ||
| 1157 | if (r) { | ||
| 1158 | dev_err(rdev->dev, "radeon: audio init failed\n"); | ||
| 1159 | return r; | ||
| 1160 | } | ||
| 1161 | |||
| 1147 | return 0; | 1162 | return 0; |
| 1148 | } | 1163 | } |
| 1149 | 1164 | ||
| 1150 | void rv770_fini(struct radeon_device *rdev) | 1165 | void rv770_fini(struct radeon_device *rdev) |
| 1151 | { | 1166 | { |
| 1167 | radeon_pm_fini(rdev); | ||
| 1152 | r600_blit_fini(rdev); | 1168 | r600_blit_fini(rdev); |
| 1153 | r600_cp_fini(rdev); | 1169 | r600_cp_fini(rdev); |
| 1154 | r600_wb_fini(rdev); | 1170 | r600_wb_fini(rdev); |
diff --git a/drivers/gpu/drm/ttm/ttm_agp_backend.c b/drivers/gpu/drm/ttm/ttm_agp_backend.c index 4648ed2f0143..4bf69c404491 100644 --- a/drivers/gpu/drm/ttm/ttm_agp_backend.c +++ b/drivers/gpu/drm/ttm/ttm_agp_backend.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include "ttm/ttm_placement.h" | 35 | #include "ttm/ttm_placement.h" |
| 36 | #include <linux/agp_backend.h> | 36 | #include <linux/agp_backend.h> |
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <linux/io.h> | 39 | #include <linux/io.h> |
| 39 | #include <asm/agp.h> | 40 | #include <asm/agp.h> |
| 40 | 41 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c index 89c38c49066f..dd47b2a9a791 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c | |||
| @@ -1425,8 +1425,8 @@ int ttm_bo_global_init(struct ttm_global_reference *ref) | |||
| 1425 | 1425 | ||
| 1426 | atomic_set(&glob->bo_count, 0); | 1426 | atomic_set(&glob->bo_count, 0); |
| 1427 | 1427 | ||
| 1428 | kobject_init(&glob->kobj, &ttm_bo_glob_kobj_type); | 1428 | ret = kobject_init_and_add( |
| 1429 | ret = kobject_add(&glob->kobj, ttm_get_kobj(), "buffer_objects"); | 1429 | &glob->kobj, &ttm_bo_glob_kobj_type, ttm_get_kobj(), "buffer_objects"); |
| 1430 | if (unlikely(ret != 0)) | 1430 | if (unlikely(ret != 0)) |
| 1431 | kobject_put(&glob->kobj); | 1431 | kobject_put(&glob->kobj); |
| 1432 | return ret; | 1432 | return ret; |
diff --git a/drivers/gpu/drm/ttm/ttm_bo_util.c b/drivers/gpu/drm/ttm/ttm_bo_util.c index 5ca37a58a98c..d764e82e799b 100644 --- a/drivers/gpu/drm/ttm/ttm_bo_util.c +++ b/drivers/gpu/drm/ttm/ttm_bo_util.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | #include <linux/highmem.h> | 34 | #include <linux/highmem.h> |
| 35 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 37 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 38 | 39 | ||
diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c index eb143e04d402..801b702566e6 100644 --- a/drivers/gpu/drm/ttm/ttm_memory.c +++ b/drivers/gpu/drm/ttm/ttm_memory.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/wait.h> | 32 | #include <linux/wait.h> |
| 33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #define TTM_MEMORY_ALLOC_RETRIES 4 | 37 | #define TTM_MEMORY_ALLOC_RETRIES 4 |
| 37 | 38 | ||
| @@ -260,8 +261,8 @@ static int ttm_mem_init_kernel_zone(struct ttm_mem_global *glob, | |||
| 260 | zone->used_mem = 0; | 261 | zone->used_mem = 0; |
| 261 | zone->glob = glob; | 262 | zone->glob = glob; |
| 262 | glob->zone_kernel = zone; | 263 | glob->zone_kernel = zone; |
| 263 | kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type); | 264 | ret = kobject_init_and_add( |
| 264 | ret = kobject_add(&zone->kobj, &glob->kobj, zone->name); | 265 | &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name); |
| 265 | if (unlikely(ret != 0)) { | 266 | if (unlikely(ret != 0)) { |
| 266 | kobject_put(&zone->kobj); | 267 | kobject_put(&zone->kobj); |
| 267 | return ret; | 268 | return ret; |
| @@ -296,8 +297,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob, | |||
| 296 | zone->used_mem = 0; | 297 | zone->used_mem = 0; |
| 297 | zone->glob = glob; | 298 | zone->glob = glob; |
| 298 | glob->zone_highmem = zone; | 299 | glob->zone_highmem = zone; |
| 299 | kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type); | 300 | ret = kobject_init_and_add( |
| 300 | ret = kobject_add(&zone->kobj, &glob->kobj, zone->name); | 301 | &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name); |
| 301 | if (unlikely(ret != 0)) { | 302 | if (unlikely(ret != 0)) { |
| 302 | kobject_put(&zone->kobj); | 303 | kobject_put(&zone->kobj); |
| 303 | return ret; | 304 | return ret; |
| @@ -343,8 +344,8 @@ static int ttm_mem_init_dma32_zone(struct ttm_mem_global *glob, | |||
| 343 | zone->used_mem = 0; | 344 | zone->used_mem = 0; |
| 344 | zone->glob = glob; | 345 | zone->glob = glob; |
| 345 | glob->zone_dma32 = zone; | 346 | glob->zone_dma32 = zone; |
| 346 | kobject_init(&zone->kobj, &ttm_mem_zone_kobj_type); | 347 | ret = kobject_init_and_add( |
| 347 | ret = kobject_add(&zone->kobj, &glob->kobj, zone->name); | 348 | &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name); |
| 348 | if (unlikely(ret != 0)) { | 349 | if (unlikely(ret != 0)) { |
| 349 | kobject_put(&zone->kobj); | 350 | kobject_put(&zone->kobj); |
| 350 | return ret; | 351 | return ret; |
| @@ -365,10 +366,8 @@ int ttm_mem_global_init(struct ttm_mem_global *glob) | |||
| 365 | glob->swap_queue = create_singlethread_workqueue("ttm_swap"); | 366 | glob->swap_queue = create_singlethread_workqueue("ttm_swap"); |
| 366 | INIT_WORK(&glob->work, ttm_shrink_work); | 367 | INIT_WORK(&glob->work, ttm_shrink_work); |
| 367 | init_waitqueue_head(&glob->queue); | 368 | init_waitqueue_head(&glob->queue); |
| 368 | kobject_init(&glob->kobj, &ttm_mem_glob_kobj_type); | 369 | ret = kobject_init_and_add( |
| 369 | ret = kobject_add(&glob->kobj, | 370 | &glob->kobj, &ttm_mem_glob_kobj_type, ttm_get_kobj(), "memory_accounting"); |
| 370 | ttm_get_kobj(), | ||
| 371 | "memory_accounting"); | ||
| 372 | if (unlikely(ret != 0)) { | 371 | if (unlikely(ret != 0)) { |
| 373 | kobject_put(&glob->kobj); | 372 | kobject_put(&glob->kobj); |
| 374 | return ret; | 373 | return ret; |
diff --git a/drivers/gpu/drm/ttm/ttm_tt.c b/drivers/gpu/drm/ttm/ttm_tt.c index a759170763bb..d5fd5b8faeb3 100644 --- a/drivers/gpu/drm/ttm/ttm_tt.c +++ b/drivers/gpu/drm/ttm/ttm_tt.c | |||
| @@ -28,13 +28,14 @@ | |||
| 28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 28 | * Authors: Thomas Hellstrom <thellstrom-at-vmware-dot-com> |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/vmalloc.h> | ||
| 32 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 33 | #include <linux/highmem.h> | 32 | #include <linux/highmem.h> |
| 34 | #include <linux/pagemap.h> | 33 | #include <linux/pagemap.h> |
| 35 | #include <linux/file.h> | 34 | #include <linux/file.h> |
| 36 | #include <linux/swap.h> | 35 | #include <linux/swap.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include "drm_cache.h" | 37 | #include "drm_cache.h" |
| 38 | #include "drm_mem_util.h" | ||
| 38 | #include "ttm/ttm_module.h" | 39 | #include "ttm/ttm_module.h" |
| 39 | #include "ttm/ttm_bo_driver.h" | 40 | #include "ttm/ttm_bo_driver.h" |
| 40 | #include "ttm/ttm_placement.h" | 41 | #include "ttm/ttm_placement.h" |
| @@ -43,32 +44,15 @@ static int ttm_tt_swapin(struct ttm_tt *ttm); | |||
| 43 | 44 | ||
| 44 | /** | 45 | /** |
| 45 | * Allocates storage for pointers to the pages that back the ttm. | 46 | * Allocates storage for pointers to the pages that back the ttm. |
| 46 | * | ||
| 47 | * Uses kmalloc if possible. Otherwise falls back to vmalloc. | ||
| 48 | */ | 47 | */ |
| 49 | static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm) | 48 | static void ttm_tt_alloc_page_directory(struct ttm_tt *ttm) |
| 50 | { | 49 | { |
| 51 | unsigned long size = ttm->num_pages * sizeof(*ttm->pages); | 50 | ttm->pages = drm_calloc_large(ttm->num_pages, sizeof(*ttm->pages)); |
| 52 | ttm->pages = NULL; | ||
| 53 | |||
| 54 | if (size <= PAGE_SIZE) | ||
| 55 | ttm->pages = kzalloc(size, GFP_KERNEL); | ||
| 56 | |||
| 57 | if (!ttm->pages) { | ||
| 58 | ttm->pages = vmalloc_user(size); | ||
| 59 | if (ttm->pages) | ||
| 60 | ttm->page_flags |= TTM_PAGE_FLAG_VMALLOC; | ||
| 61 | } | ||
| 62 | } | 51 | } |
| 63 | 52 | ||
| 64 | static void ttm_tt_free_page_directory(struct ttm_tt *ttm) | 53 | static void ttm_tt_free_page_directory(struct ttm_tt *ttm) |
| 65 | { | 54 | { |
| 66 | if (ttm->page_flags & TTM_PAGE_FLAG_VMALLOC) { | 55 | drm_free_large(ttm->pages); |
| 67 | vfree(ttm->pages); | ||
| 68 | ttm->page_flags &= ~TTM_PAGE_FLAG_VMALLOC; | ||
| 69 | } else { | ||
| 70 | kfree(ttm->pages); | ||
| 71 | } | ||
| 72 | ttm->pages = NULL; | 56 | ttm->pages = NULL; |
| 73 | } | 57 | } |
| 74 | 58 | ||
diff --git a/drivers/gpu/drm/via/via_dmablit.c b/drivers/gpu/drm/via/via_dmablit.c index 327380888b4a..4c54f043068e 100644 --- a/drivers/gpu/drm/via/via_dmablit.c +++ b/drivers/gpu/drm/via/via_dmablit.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include "via_dmablit.h" | 40 | #include "via_dmablit.h" |
| 41 | 41 | ||
| 42 | #include <linux/pagemap.h> | 42 | #include <linux/pagemap.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) | 45 | #define VIA_PGDN(x) (((unsigned long)(x)) & PAGE_MASK) |
| 45 | #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) | 46 | #define VIA_PGOFF(x) (((unsigned long)(x)) & ~PAGE_MASK) |
diff --git a/drivers/gpu/drm/vmwgfx/Kconfig b/drivers/gpu/drm/vmwgfx/Kconfig index f20b8bcbef39..30ad13344f7b 100644 --- a/drivers/gpu/drm/vmwgfx/Kconfig +++ b/drivers/gpu/drm/vmwgfx/Kconfig | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | config DRM_VMWGFX | 1 | config DRM_VMWGFX |
| 2 | tristate "DRM driver for VMware Virtual GPU" | 2 | tristate "DRM driver for VMware Virtual GPU" |
| 3 | depends on DRM && PCI | 3 | depends on DRM && PCI && FB |
| 4 | select FB_DEFERRED_IO | 4 | select FB_DEFERRED_IO |
| 5 | select FB_CFB_FILLRECT | 5 | select FB_CFB_FILLRECT |
| 6 | select FB_CFB_COPYAREA | 6 | select FB_CFB_COPYAREA |
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c index 8827814d0735..441e38c95a85 100644 --- a/drivers/gpu/vga/vgaarb.c +++ b/drivers/gpu/vga/vgaarb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
| 22 | #include <linux/miscdevice.h> | 22 | #include <linux/miscdevice.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
| 25 | 26 | ||
diff --git a/drivers/hid/hid-3m-pct.c b/drivers/hid/hid-3m-pct.c index 2370aefc86b2..c31e0be8ccea 100644 --- a/drivers/hid/hid-3m-pct.c +++ b/drivers/hid/hid-3m-pct.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/hid.h> | 16 | #include <linux/hid.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/usb.h> | 19 | #include <linux/usb.h> |
| 19 | 20 | ||
| 20 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); | 21 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); |
diff --git a/drivers/hid/hid-a4tech.c b/drivers/hid/hid-a4tech.c index df474c699fb8..3a2b223c1da4 100644 --- a/drivers/hid/hid-a4tech.c +++ b/drivers/hid/hid-a4tech.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/hid.h> | 21 | #include <linux/hid.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
| 25 | 26 | ||
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c index 78286b184ace..bba05d0a8980 100644 --- a/drivers/hid/hid-apple.c +++ b/drivers/hid/hid-apple.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <linux/hid.h> | 20 | #include <linux/hid.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 23 | 24 | ||
| 24 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 0c4e75573186..56f314fbd4f9 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/debugfs.h> | 29 | #include <linux/debugfs.h> |
| 30 | #include <linux/seq_file.h> | 30 | #include <linux/seq_file.h> |
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
| 33 | #include <linux/poll.h> | 34 | #include <linux/poll.h> |
| 34 | 35 | ||
diff --git a/drivers/hid/hid-drff.c b/drivers/hid/hid-drff.c index a239d20ad7a5..968b04f9b796 100644 --- a/drivers/hid/hid-drff.c +++ b/drivers/hid/hid-drff.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/input.h> | 30 | #include <linux/input.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 32 | #include <linux/hid.h> | 33 | #include <linux/hid.h> |
| 33 | 34 | ||
diff --git a/drivers/hid/hid-gaff.c b/drivers/hid/hid-gaff.c index 8a11ccddaf2e..88dfcf49a5d7 100644 --- a/drivers/hid/hid-gaff.c +++ b/drivers/hid/hid-gaff.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | */ | 28 | */ |
| 29 | 29 | ||
| 30 | #include <linux/input.h> | 30 | #include <linux/input.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
| 32 | #include <linux/hid.h> | 33 | #include <linux/hid.h> |
| 33 | #include "hid-ids.h" | 34 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-gyration.c b/drivers/hid/hid-gyration.c index cab13e8c7d29..62416e6baeca 100644 --- a/drivers/hid/hid-gyration.c +++ b/drivers/hid/hid-gyration.c | |||
| @@ -53,10 +53,13 @@ static int gyration_input_mapping(struct hid_device *hdev, struct hid_input *hi, | |||
| 53 | static int gyration_event(struct hid_device *hdev, struct hid_field *field, | 53 | static int gyration_event(struct hid_device *hdev, struct hid_field *field, |
| 54 | struct hid_usage *usage, __s32 value) | 54 | struct hid_usage *usage, __s32 value) |
| 55 | { | 55 | { |
| 56 | struct input_dev *input = field->hidinput->input; | 56 | |
| 57 | if (!(hdev->claimed & HID_CLAIMED_INPUT) || !field->hidinput) | ||
| 58 | return 0; | ||
| 57 | 59 | ||
| 58 | if ((usage->hid & HID_USAGE_PAGE) == HID_UP_GENDESK && | 60 | if ((usage->hid & HID_USAGE_PAGE) == HID_UP_GENDESK && |
| 59 | (usage->hid & 0xff) == 0x82) { | 61 | (usage->hid & 0xff) == 0x82) { |
| 62 | struct input_dev *input = field->hidinput->input; | ||
| 60 | input_event(input, usage->type, usage->code, 1); | 63 | input_event(input, usage->type, usage->code, 1); |
| 61 | input_sync(input); | 64 | input_sync(input); |
| 62 | input_event(input, usage->type, usage->code, 0); | 65 | input_event(input, usage->type, usage->code, 0); |
diff --git a/drivers/hid/hid-lg2ff.c b/drivers/hid/hid-lg2ff.c index 4e6dc6e26523..d888f1e6794f 100644 --- a/drivers/hid/hid-lg2ff.c +++ b/drivers/hid/hid-lg2ff.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/usb.h> | 26 | #include <linux/usb.h> |
| 26 | #include <linux/hid.h> | 27 | #include <linux/hid.h> |
| 27 | 28 | ||
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index c174b64c3810..0d471fc2ab82 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/hid.h> | 15 | #include <linux/hid.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/usb.h> | 18 | #include <linux/usb.h> |
| 18 | 19 | ||
| 19 | #include "hid-ids.h" | 20 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-mosart.c b/drivers/hid/hid-mosart.c index c8718168fe42..e91437c18906 100644 --- a/drivers/hid/hid-mosart.c +++ b/drivers/hid/hid-mosart.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/hid.h> | 17 | #include <linux/hid.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/usb.h> | 20 | #include <linux/usb.h> |
| 20 | #include "usbhid/usbhid.h" | 21 | #include "usbhid/usbhid.h" |
| 21 | 22 | ||
diff --git a/drivers/hid/hid-ntrig.c b/drivers/hid/hid-ntrig.c index edcc0c4247bb..9b24fc510712 100644 --- a/drivers/hid/hid-ntrig.c +++ b/drivers/hid/hid-ntrig.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/hid.h> | 17 | #include <linux/hid.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include "hid-ids.h" | 21 | #include "hid-ids.h" |
| 21 | 22 | ||
diff --git a/drivers/hid/hid-pl.c b/drivers/hid/hid-pl.c index c6d7dbc935b1..9f41e2bd8483 100644 --- a/drivers/hid/hid-pl.c +++ b/drivers/hid/hid-pl.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #define debug(format, arg...) pr_debug("hid-plff: " format "\n" , ## arg) | 39 | #define debug(format, arg...) pr_debug("hid-plff: " format "\n" , ## arg) |
| 40 | 40 | ||
| 41 | #include <linux/input.h> | 41 | #include <linux/input.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/usb.h> | 43 | #include <linux/usb.h> |
| 43 | #include <linux/hid.h> | 44 | #include <linux/hid.h> |
| 44 | 45 | ||
diff --git a/drivers/hid/hid-quanta.c b/drivers/hid/hid-quanta.c index 01dd51c4986c..54d3db50605b 100644 --- a/drivers/hid/hid-quanta.c +++ b/drivers/hid/hid-quanta.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/hid.h> | 16 | #include <linux/hid.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); | 20 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); |
| 20 | MODULE_DESCRIPTION("Quanta dual-touch panel"); | 21 | MODULE_DESCRIPTION("Quanta dual-touch panel"); |
diff --git a/drivers/hid/hid-sjoy.c b/drivers/hid/hid-sjoy.c index 203c438b016f..e10a7687ebf2 100644 --- a/drivers/hid/hid-sjoy.c +++ b/drivers/hid/hid-sjoy.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | /* #define DEBUG */ | 27 | /* #define DEBUG */ |
| 28 | 28 | ||
| 29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/usb.h> | 31 | #include <linux/usb.h> |
| 31 | #include <linux/hid.h> | 32 | #include <linux/hid.h> |
| 32 | #include "hid-ids.h" | 33 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c index 9bf00d77d92b..7502a4b2fa86 100644 --- a/drivers/hid/hid-sony.c +++ b/drivers/hid/hid-sony.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <linux/hid.h> | 20 | #include <linux/hid.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 23 | 24 | ||
| 24 | #include "hid-ids.h" | 25 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-stantum.c b/drivers/hid/hid-stantum.c index 2e592a06654e..90df886c5e04 100644 --- a/drivers/hid/hid-stantum.c +++ b/drivers/hid/hid-stantum.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/hid.h> | 16 | #include <linux/hid.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); | 20 | MODULE_AUTHOR("Stephane Chatty <chatty@enac.fr>"); |
| 20 | MODULE_DESCRIPTION("Stantum HID multitouch panels"); | 21 | MODULE_DESCRIPTION("Stantum HID multitouch panels"); |
diff --git a/drivers/hid/hid-tmff.c b/drivers/hid/hid-tmff.c index c32f32c84ac8..15434c814793 100644 --- a/drivers/hid/hid-tmff.c +++ b/drivers/hid/hid-tmff.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/hid.h> | 30 | #include <linux/hid.h> |
| 31 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 33 | 34 | ||
| 34 | #include "hid-ids.h" | 35 | #include "hid-ids.h" |
diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c index 8d3b46f5d149..f7700cf49721 100644 --- a/drivers/hid/hid-wacom.c +++ b/drivers/hid/hid-wacom.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/hid.h> | 22 | #include <linux/hid.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "hid-ids.h" | 26 | #include "hid-ids.h" |
| 26 | 27 | ||
diff --git a/drivers/hid/hid-zpff.c b/drivers/hid/hid-zpff.c index a79f0d78c6be..b7acceabba80 100644 --- a/drivers/hid/hid-zpff.c +++ b/drivers/hid/hid-zpff.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/hid.h> | 24 | #include <linux/hid.h> |
| 25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | 28 | ||
| 28 | #include "hid-ids.h" | 29 | #include "hid-ids.h" |
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index d04476700b7b..6eadf1a9b3cc 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/poll.h> | 28 | #include <linux/poll.h> |
| 29 | #include <linux/device.h> | 29 | #include <linux/device.h> |
| 30 | #include <linux/major.h> | 30 | #include <linux/major.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/hid.h> | 32 | #include <linux/hid.h> |
| 32 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
| 33 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
diff --git a/drivers/hid/usbhid/hid-pidff.c b/drivers/hid/usbhid/hid-pidff.c index e565dbe91d97..ef381d79cfa8 100644 --- a/drivers/hid/usbhid/hid-pidff.c +++ b/drivers/hid/usbhid/hid-pidff.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #define debug(format, arg...) pr_debug("hid-pidff: " format "\n" , ## arg) | 25 | #define debug(format, arg...) pr_debug("hid-pidff: " format "\n" , ## arg) |
| 26 | 26 | ||
| 27 | #include <linux/input.h> | 27 | #include <linux/input.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 29 | 30 | ||
| 30 | #include <linux/hid.h> | 31 | #include <linux/hid.h> |
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c index 928943c7ce9a..1152f9b5fd44 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/hid.h> | 18 | #include <linux/hid.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include "../hid-ids.h" | 21 | #include "../hid-ids.h" |
| 21 | 22 | ||
| @@ -60,6 +61,7 @@ static const struct hid_blacklist { | |||
| 60 | { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, | 61 | { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, |
| 61 | { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, | 62 | { USB_VENDOR_ID_ELO, USB_DEVICE_ID_ELO_TS2700, HID_QUIRK_NOGET }, |
| 62 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, | 63 | { USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET }, |
| 64 | { USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_PIXART_IMAGING_INC_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NOGET }, | ||
| 63 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, | 65 | { USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET }, |
| 64 | { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, | 66 | { USB_VENDOR_ID_TURBOX, USB_DEVICE_ID_TURBOX_KEYBOARD, HID_QUIRK_NOGET }, |
| 65 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT }, | 67 | { USB_VENDOR_ID_UCLOGIC, USB_DEVICE_ID_UCLOGIC_TABLET_PF1209, HID_QUIRK_MULTI_INPUT }, |
diff --git a/drivers/hwmon/ad7414.c b/drivers/hwmon/ad7414.c index bfda8c80ef24..1e4c21fc1a89 100644 --- a/drivers/hwmon/ad7414.c +++ b/drivers/hwmon/ad7414.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 29 | #include <linux/sysfs.h> | 29 | #include <linux/sysfs.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | 32 | ||
| 32 | /* AD7414 registers */ | 33 | /* AD7414 registers */ |
diff --git a/drivers/hwmon/ad7418.c b/drivers/hwmon/ad7418.c index f97b5b356875..ffc781fec185 100644 --- a/drivers/hwmon/ad7418.c +++ b/drivers/hwmon/ad7418.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "lm75.h" | 25 | #include "lm75.h" |
| 25 | 26 | ||
diff --git a/drivers/hwmon/adcxx.c b/drivers/hwmon/adcxx.c index 74d9c5195e44..fbdc7655303b 100644 --- a/drivers/hwmon/adcxx.c +++ b/drivers/hwmon/adcxx.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/device.h> | 41 | #include <linux/device.h> |
| 41 | #include <linux/err.h> | 42 | #include <linux/err.h> |
| 42 | #include <linux/sysfs.h> | 43 | #include <linux/sysfs.h> |
diff --git a/drivers/hwmon/adt7411.c b/drivers/hwmon/adt7411.c index 3471884e42d2..4086c7257f91 100644 --- a/drivers/hwmon/adt7411.c +++ b/drivers/hwmon/adt7411.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
| 22 | #include <linux/hwmon.h> | 22 | #include <linux/hwmon.h> |
| 23 | #include <linux/hwmon-sysfs.h> | 23 | #include <linux/hwmon-sysfs.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #define ADT7411_REG_INT_TEMP_VDD_LSB 0x03 | 26 | #define ADT7411_REG_INT_TEMP_VDD_LSB 0x03 |
| 26 | #define ADT7411_REG_EXT_TEMP_AIN14_LSB 0x04 | 27 | #define ADT7411_REG_EXT_TEMP_AIN14_LSB 0x04 |
diff --git a/drivers/hwmon/adt7462.c b/drivers/hwmon/adt7462.c index b8156b4893bb..2af0c7b6b4e4 100644 --- a/drivers/hwmon/adt7462.c +++ b/drivers/hwmon/adt7462.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/mutex.h> | 28 | #include <linux/mutex.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/log2.h> | 30 | #include <linux/log2.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | /* Addresses to scan */ | 33 | /* Addresses to scan */ |
| 33 | static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END }; | 34 | static const unsigned short normal_i2c[] = { 0x58, 0x5C, I2C_CLIENT_END }; |
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c index 3445ce1cba81..9e775717abb7 100644 --- a/drivers/hwmon/adt7470.c +++ b/drivers/hwmon/adt7470.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/log2.h> | 30 | #include <linux/log2.h> |
| 31 | #include <linux/kthread.h> | 31 | #include <linux/kthread.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | /* Addresses to scan */ | 34 | /* Addresses to scan */ |
| 34 | static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; | 35 | static const unsigned short normal_i2c[] = { 0x2C, 0x2E, 0x2F, I2C_CLIENT_END }; |
diff --git a/drivers/hwmon/asus_atk0110.c b/drivers/hwmon/asus_atk0110.c index 028284f544e3..75f3fa55663d 100644 --- a/drivers/hwmon/asus_atk0110.c +++ b/drivers/hwmon/asus_atk0110.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/hwmon.h> | 10 | #include <linux/hwmon.h> |
| 11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | 14 | ||
| 14 | #include <acpi/acpi.h> | 15 | #include <acpi/acpi.h> |
| 15 | #include <acpi/acpixf.h> | 16 | #include <acpi/acpixf.h> |
diff --git a/drivers/hwmon/atxp1.c b/drivers/hwmon/atxp1.c index 94cadc19f0c5..33cc143b2069 100644 --- a/drivers/hwmon/atxp1.c +++ b/drivers/hwmon/atxp1.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/sysfs.h> | 30 | #include <linux/sysfs.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | MODULE_LICENSE("GPL"); | 33 | MODULE_LICENSE("GPL"); |
| 33 | MODULE_DESCRIPTION("System voltages control via Attansic ATXP1"); | 34 | MODULE_DESCRIPTION("System voltages control via Attansic ATXP1"); |
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 277398f9c938..bad2cf3ef4a4 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/err.h> | 35 | #include <linux/err.h> |
| 36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
| 37 | #include <linux/f75375s.h> | 37 | #include <linux/f75375s.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | /* Addresses to scan */ | 40 | /* Addresses to scan */ |
| 40 | static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END }; | 41 | static const unsigned short normal_i2c[] = { 0x2d, 0x2e, I2C_CLIENT_END }; |
diff --git a/drivers/hwmon/i5k_amb.c b/drivers/hwmon/i5k_amb.c index 27d7f72a5f11..e880e2c3871d 100644 --- a/drivers/hwmon/i5k_amb.c +++ b/drivers/hwmon/i5k_amb.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/log2.h> | 30 | #include <linux/log2.h> |
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #define DRVNAME "i5k_amb" | 35 | #define DRVNAME "i5k_amb" |
| 35 | 36 | ||
diff --git a/drivers/hwmon/ibmaem.c b/drivers/hwmon/ibmaem.c index 405d3fb5d76f..eaee546af19a 100644 --- a/drivers/hwmon/ibmaem.c +++ b/drivers/hwmon/ibmaem.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/idr.h> | 31 | #include <linux/idr.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 33 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 34 | #include <linux/math64.h> | 35 | #include <linux/math64.h> |
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index a36363312f2f..06d4eafcf76b 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/hwmon-sysfs.h> | 25 | #include <linux/hwmon-sysfs.h> |
| 26 | #include <linux/jiffies.h> | 26 | #include <linux/jiffies.h> |
| 27 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #define REFRESH_INTERVAL (2 * HZ) | 30 | #define REFRESH_INTERVAL (2 * HZ) |
| 30 | #define DRVNAME "ibmpex" | 31 | #define DRVNAME "ibmpex" |
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index ab8a5d3c7690..fd108cfc05c7 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
| 35 | #include <linux/mod_devicetable.h> | 35 | #include <linux/mod_devicetable.h> |
| 36 | #include <linux/spi/spi.h> | 36 | #include <linux/spi/spi.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | 39 | ||
| 39 | #define DRVNAME "lm70" | 40 | #define DRVNAME "lm70" |
diff --git a/drivers/hwmon/lm73.c b/drivers/hwmon/lm73.c index c5f39ba103c0..4d1b76bc8148 100644 --- a/drivers/hwmon/lm73.c +++ b/drivers/hwmon/lm73.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 21 | #include <linux/hwmon.h> | 20 | #include <linux/hwmon.h> |
| 22 | #include <linux/hwmon-sysfs.h> | 21 | #include <linux/hwmon-sysfs.h> |
diff --git a/drivers/hwmon/max1111.c b/drivers/hwmon/max1111.c index 9ac497271adf..12a54aa29776 100644 --- a/drivers/hwmon/max1111.c +++ b/drivers/hwmon/max1111.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/hwmon.h> | 20 | #include <linux/hwmon.h> |
| 21 | #include <linux/hwmon-sysfs.h> | 21 | #include <linux/hwmon-sysfs.h> |
| 22 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #define MAX1111_TX_BUF_SIZE 1 | 25 | #define MAX1111_TX_BUF_SIZE 1 |
| 25 | #define MAX1111_RX_BUF_SIZE 2 | 26 | #define MAX1111_RX_BUF_SIZE 2 |
diff --git a/drivers/hwmon/mc13783-adc.c b/drivers/hwmon/mc13783-adc.c index 883fa8197da4..ce3c7bc81814 100644 --- a/drivers/hwmon/mc13783-adc.c +++ b/drivers/hwmon/mc13783-adc.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/hwmon.h> | 26 | #include <linux/hwmon.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 28 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 29 | 30 | ||
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index 864a371f6eb9..6b2d8ae64fe1 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
| 37 | #include <linux/sht15.h> | 37 | #include <linux/sht15.h> |
| 38 | #include <linux/regulator/consumer.h> | 38 | #include <linux/regulator/consumer.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <asm/atomic.h> | 40 | #include <asm/atomic.h> |
| 40 | 41 | ||
| 41 | #define SHT15_MEASURE_TEMP 3 | 42 | #define SHT15_MEASURE_TEMP 3 |
diff --git a/drivers/hwmon/wm831x-hwmon.c b/drivers/hwmon/wm831x-hwmon.c index c16e9e74c356..97b1f834a471 100644 --- a/drivers/hwmon/wm831x-hwmon.c +++ b/drivers/hwmon/wm831x-hwmon.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 25 | #include <linux/hwmon.h> | 25 | #include <linux/hwmon.h> |
| 26 | #include <linux/hwmon-sysfs.h> | 26 | #include <linux/hwmon-sysfs.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <linux/mfd/wm831x/core.h> | 29 | #include <linux/mfd/wm831x/core.h> |
| 29 | #include <linux/mfd/wm831x/auxadc.h> | 30 | #include <linux/mfd/wm831x/auxadc.h> |
diff --git a/drivers/i2c/algos/i2c-algo-bit.c b/drivers/i2c/algos/i2c-algo-bit.c index e8d568c3fb09..a39e6cff86e7 100644 --- a/drivers/i2c/algos/i2c-algo-bit.c +++ b/drivers/i2c/algos/i2c-algo-bit.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 30 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
diff --git a/drivers/i2c/algos/i2c-algo-pcf.c b/drivers/i2c/algos/i2c-algo-pcf.c index 6b6bd06202b2..5eebf562ff31 100644 --- a/drivers/i2c/algos/i2c-algo-pcf.c +++ b/drivers/i2c/algos/i2c-algo-pcf.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 35 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
diff --git a/drivers/i2c/busses/i2c-amd8111.c b/drivers/i2c/busses/i2c-amd8111.c index d0dc970d7370..2fbef27b6cd6 100644 --- a/drivers/i2c/busses/i2c-amd8111.c +++ b/drivers/i2c/busses/i2c-amd8111.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/acpi.h> | 19 | #include <linux/acpi.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <asm/io.h> | 21 | #include <asm/io.h> |
| 21 | 22 | ||
| 22 | MODULE_LICENSE("GPL"); | 23 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index fe3fb567317d..f1e14dd590c9 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 16 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 17 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
diff --git a/drivers/i2c/busses/i2c-davinci.c b/drivers/i2c/busses/i2c-davinci.c index c89687a10835..4523364e6722 100644 --- a/drivers/i2c/busses/i2c-davinci.c +++ b/drivers/i2c/busses/i2c-davinci.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
| 40 | 41 | ||
diff --git a/drivers/i2c/busses/i2c-designware.c b/drivers/i2c/busses/i2c-designware.c index 3e72b69aa7f8..b664ed8bbdb3 100644 --- a/drivers/i2c/busses/i2c-designware.c +++ b/drivers/i2c/busses/i2c-designware.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/io.h> | 38 | #include <linux/io.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | /* | 41 | /* |
| 41 | * Registers offset | 42 | * Registers offset |
diff --git a/drivers/i2c/busses/i2c-elektor.c b/drivers/i2c/busses/i2c-elektor.c index 448b4bf35eb7..612255614a66 100644 --- a/drivers/i2c/busses/i2c-elektor.c +++ b/drivers/i2c/busses/i2c-elektor.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 35 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
diff --git a/drivers/i2c/busses/i2c-gpio.c b/drivers/i2c/busses/i2c-gpio.c index 32104eac8d3d..c21077d248af 100644 --- a/drivers/i2c/busses/i2c-gpio.c +++ b/drivers/i2c/busses/i2c-gpio.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/i2c-gpio.h> | 12 | #include <linux/i2c-gpio.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 16 | 17 | ||
| 17 | #include <asm/gpio.h> | 18 | #include <asm/gpio.h> |
diff --git a/drivers/i2c/busses/i2c-highlander.c b/drivers/i2c/busses/i2c-highlander.c index 87ecace415da..ce87a902c94d 100644 --- a/drivers/i2c/busses/i2c-highlander.c +++ b/drivers/i2c/busses/i2c-highlander.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/completion.h> | 19 | #include <linux/completion.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define SMCR 0x00 | 24 | #define SMCR 0x00 |
| 24 | #define SMCR_START (1 << 0) | 25 | #define SMCR_START (1 << 0) |
diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c index 32375bddae7d..f7e27b702375 100644 --- a/drivers/i2c/busses/i2c-imx.c +++ b/drivers/i2c/busses/i2c-imx.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/sched.h> | 47 | #include <linux/sched.h> |
| 48 | #include <linux/platform_device.h> | 48 | #include <linux/platform_device.h> |
| 49 | #include <linux/clk.h> | 49 | #include <linux/clk.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include <mach/irqs.h> | 52 | #include <mach/irqs.h> |
| 52 | #include <mach/hardware.h> | 53 | #include <mach/hardware.h> |
diff --git a/drivers/i2c/busses/i2c-ixp2000.c b/drivers/i2c/busses/i2c-ixp2000.c index c016f7a2c5fc..5d8aed5ec21b 100644 --- a/drivers/i2c/busses/i2c-ixp2000.c +++ b/drivers/i2c/busses/i2c-ixp2000.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
| 34 | #include <linux/i2c-algo-bit.h> | 34 | #include <linux/i2c-algo-bit.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <mach/hardware.h> /* Pick up IXP2000-specific bits */ | 37 | #include <mach/hardware.h> /* Pick up IXP2000-specific bits */ |
| 37 | #include <mach/gpio.h> | 38 | #include <mach/gpio.h> |
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c index 78a15af32942..f1321f763789 100644 --- a/drivers/i2c/busses/i2c-mpc.c +++ b/drivers/i2c/busses/i2c-mpc.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/of_platform.h> | 20 | #include <linux/of_platform.h> |
| 21 | #include <linux/of_i2c.h> | 21 | #include <linux/of_i2c.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 24 | #include <linux/fsl_devices.h> | 25 | #include <linux/fsl_devices.h> |
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index ed387ffa4730..3623a4499084 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * or implied. | 10 | * or implied. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 14 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
| 15 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c index 4a700587ef18..4a48dd4ef787 100644 --- a/drivers/i2c/busses/i2c-nforce2.c +++ b/drivers/i2c/busses/i2c-nforce2.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | #include <linux/delay.h> | 56 | #include <linux/delay.h> |
| 57 | #include <linux/dmi.h> | 57 | #include <linux/dmi.h> |
| 58 | #include <linux/acpi.h> | 58 | #include <linux/acpi.h> |
| 59 | #include <linux/slab.h> | ||
| 59 | #include <asm/io.h> | 60 | #include <asm/io.h> |
| 60 | 61 | ||
| 61 | MODULE_LICENSE("GPL"); | 62 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index a15f731fa451..a4f8d33fa389 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 20 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
| 21 | #include <linux/err.h> | 22 | #include <linux/err.h> |
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 0dabe643ec51..b4ed4ca802ed 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/wait.h> | 19 | #include <linux/wait.h> |
| 20 | #include <linux/i2c-ocores.h> | 20 | #include <linux/i2c-ocores.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 22 | 23 | ||
| 23 | struct ocores_i2c { | 24 | struct ocores_i2c { |
diff --git a/drivers/i2c/busses/i2c-octeon.c b/drivers/i2c/busses/i2c-octeon.c index 60375504fa49..a2481f40ea1c 100644 --- a/drivers/i2c/busses/i2c-octeon.c +++ b/drivers/i2c/busses/i2c-octeon.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | 19 | ||
| 19 | #include <linux/io.h> | 20 | #include <linux/io.h> |
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index c7c237537f81..6bd0f19cd451 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/clk.h> | 38 | #include <linux/clk.h> |
| 39 | #include <linux/io.h> | 39 | #include <linux/io.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | /* I2C controller revisions */ | 42 | /* I2C controller revisions */ |
| 42 | #define OMAP_I2C_REV_2 0x20 | 43 | #define OMAP_I2C_REV_2 0x20 |
diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c index 220fca7f23a6..846583ed4763 100644 --- a/drivers/i2c/busses/i2c-parport.c +++ b/drivers/i2c/busses/i2c-parport.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
| 33 | #include <linux/i2c-algo-bit.h> | 33 | #include <linux/i2c-algo-bit.h> |
| 34 | #include <linux/i2c-smbus.h> | 34 | #include <linux/i2c-smbus.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include "i2c-parport.h" | 36 | #include "i2c-parport.h" |
| 36 | 37 | ||
| 37 | /* ----- Device list ------------------------------------------------------ */ | 38 | /* ----- Device list ------------------------------------------------------ */ |
diff --git a/drivers/i2c/busses/i2c-pasemi.c b/drivers/i2c/busses/i2c-pasemi.c index 0d20ff46a518..d3d4a4b43a1d 100644 --- a/drivers/i2c/busses/i2c-pasemi.c +++ b/drivers/i2c/busses/i2c-pasemi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <asm/io.h> | 28 | #include <asm/io.h> |
| 28 | 29 | ||
| 29 | static struct pci_driver pasemi_smb_driver; | 30 | static struct pci_driver pasemi_smb_driver; |
diff --git a/drivers/i2c/busses/i2c-pnx.c b/drivers/i2c/busses/i2c-pnx.c index 9532dee6b580..247103372a06 100644 --- a/drivers/i2c/busses/i2c-pnx.c +++ b/drivers/i2c/busses/i2c-pnx.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/err.h> | 23 | #include <linux/err.h> |
| 24 | #include <linux/clk.h> | 24 | #include <linux/clk.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
| 27 | #include <mach/i2c.h> | 28 | #include <mach/i2c.h> |
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c index 90ffbf6f9d4f..14d249f5ed3f 100644 --- a/drivers/i2c/busses/i2c-pxa.c +++ b/drivers/i2c/busses/i2c-pxa.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
| 35 | #include <linux/clk.h> | 35 | #include <linux/clk.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/irq.h> | 38 | #include <asm/irq.h> |
| 38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index 1d8c98613fa0..d27072b2249f 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/clk.h> | 35 | #include <linux/clk.h> |
| 36 | #include <linux/cpufreq.h> | 36 | #include <linux/cpufreq.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
| 39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
diff --git a/drivers/i2c/busses/i2c-sh_mobile.c b/drivers/i2c/busses/i2c-sh_mobile.c index ccc46418ef7f..ffb405d7c6f2 100644 --- a/drivers/i2c/busses/i2c-sh_mobile.c +++ b/drivers/i2c/busses/i2c-sh_mobile.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/pm_runtime.h> | 31 | #include <linux/pm_runtime.h> |
| 32 | #include <linux/clk.h> | 32 | #include <linux/clk.h> |
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | /* Transmit operation: */ | 36 | /* Transmit operation: */ |
| 36 | /* */ | 37 | /* */ |
diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c index 6407f47bda82..78b06107342c 100644 --- a/drivers/i2c/busses/i2c-simtec.c +++ b/drivers/i2c/busses/i2c-simtec.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 28 | #include <linux/i2c-algo-bit.h> | 29 | #include <linux/i2c-algo-bit.h> |
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c index d2728a28a8db..1f5b38be73bc 100644 --- a/drivers/i2c/busses/i2c-stu300.c +++ b/drivers/i2c/busses/i2c-stu300.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | /* the name of this kernel module */ | 21 | /* the name of this kernel module */ |
| 21 | #define NAME "stu300" | 22 | #define NAME "stu300" |
diff --git a/drivers/i2c/busses/i2c-tiny-usb.c b/drivers/i2c/busses/i2c-tiny-usb.c index b5b1bbf37d3c..d03b04002f0d 100644 --- a/drivers/i2c/busses/i2c-tiny-usb.c +++ b/drivers/i2c/busses/i2c-tiny-usb.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 17 | 18 | ||
| 18 | /* include interfaces to usb layer */ | 19 | /* include interfaces to usb layer */ |
diff --git a/drivers/i2c/busses/i2c-versatile.c b/drivers/i2c/busses/i2c-versatile.c index 70de82163463..5c473833d948 100644 --- a/drivers/i2c/busses/i2c-versatile.c +++ b/drivers/i2c/busses/i2c-versatile.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/i2c-algo-bit.h> | 14 | #include <linux/i2c-algo-bit.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | 20 | ||
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index f0ef8da6c554..a9c419e075a5 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/wait.h> | 39 | #include <linux/wait.h> |
| 40 | #include <linux/i2c-xiic.h> | 40 | #include <linux/i2c-xiic.h> |
| 41 | #include <linux/io.h> | 41 | #include <linux/io.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #define DRIVER_NAME "xiic-i2c" | 44 | #define DRIVER_NAME "xiic-i2c" |
| 44 | 45 | ||
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index cf994bd01d9c..684395b6f3e2 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/io.h> | 35 | #include <asm/io.h> |
| 35 | 36 | ||
| 36 | #include <linux/scx200.h> | 37 | #include <linux/scx200.h> |
diff --git a/drivers/i2c/i2c-boardinfo.c b/drivers/i2c/i2c-boardinfo.c index a26a34a06641..7e6a63b57165 100644 --- a/drivers/i2c/i2c-boardinfo.c +++ b/drivers/i2c/i2c-boardinfo.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/rwsem.h> | 22 | #include <linux/rwsem.h> |
| 22 | 23 | ||
| 23 | #include "i2c-core.h" | 24 | #include "i2c-core.h" |
diff --git a/drivers/i2c/i2c-smbus.c b/drivers/i2c/i2c-smbus.c index 7a8201ed2181..a24e0bfe9201 100644 --- a/drivers/i2c/i2c-smbus.c +++ b/drivers/i2c/i2c-smbus.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/workqueue.h> | 26 | #include <linux/workqueue.h> |
| 27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 28 | #include <linux/i2c-smbus.h> | 28 | #include <linux/i2c-smbus.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | struct i2c_smbus_alert { | 31 | struct i2c_smbus_alert { |
| 31 | unsigned int alert_edge_triggered:1; | 32 | unsigned int alert_edge_triggered:1; |
diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c index b885c1d548f5..45163693f737 100644 --- a/drivers/ide/hpt366.c +++ b/drivers/ide/hpt366.c | |||
| @@ -128,6 +128,7 @@ | |||
| 128 | #include <linux/pci.h> | 128 | #include <linux/pci.h> |
| 129 | #include <linux/init.h> | 129 | #include <linux/init.h> |
| 130 | #include <linux/ide.h> | 130 | #include <linux/ide.h> |
| 131 | #include <linux/slab.h> | ||
| 131 | 132 | ||
| 132 | #include <asm/uaccess.h> | 133 | #include <asm/uaccess.h> |
| 133 | #include <asm/io.h> | 134 | #include <asm/io.h> |
diff --git a/drivers/ide/ide-acpi.c b/drivers/ide/ide-acpi.c index 5cb01e5c323c..c26c11905ffe 100644 --- a/drivers/ide/ide-acpi.c +++ b/drivers/ide/ide-acpi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <acpi/acpi.h> | 16 | #include <acpi/acpi.h> |
| 16 | #include <linux/ide.h> | 17 | #include <linux/ide.h> |
| 17 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index eb2181a6a11c..a4046e94158d 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
| 8 | #include <linux/ide.h> | 8 | #include <linux/ide.h> |
| 9 | #include <linux/scatterlist.h> | 9 | #include <linux/scatterlist.h> |
| 10 | #include <linux/gfp.h> | ||
| 10 | 11 | ||
| 11 | #include <scsi/scsi.h> | 12 | #include <scsi/scsi.h> |
| 12 | 13 | ||
diff --git a/drivers/ide/ide-cd_ioctl.c b/drivers/ide/ide-cd_ioctl.c index df3df0041eb6..02712bf045c1 100644 --- a/drivers/ide/ide-cd_ioctl.c +++ b/drivers/ide/ide-cd_ioctl.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/cdrom.h> | 10 | #include <linux/cdrom.h> |
| 11 | #include <linux/gfp.h> | ||
| 11 | #include <linux/ide.h> | 12 | #include <linux/ide.h> |
| 12 | #include <scsi/scsi.h> | 13 | #include <scsi/scsi.h> |
| 13 | 14 | ||
diff --git a/drivers/ide/ide-devsets.c b/drivers/ide/ide-devsets.c index c6935c78757c..9e98122f646e 100644 --- a/drivers/ide/ide-devsets.c +++ b/drivers/ide/ide-devsets.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
| 3 | #include <linux/gfp.h> | ||
| 3 | #include <linux/ide.h> | 4 | #include <linux/ide.h> |
| 4 | 5 | ||
| 5 | DEFINE_MUTEX(ide_setting_mtx); | 6 | DEFINE_MUTEX(ide_setting_mtx); |
diff --git a/drivers/ide/ide-disk_proc.c b/drivers/ide/ide-disk_proc.c index 60b0590ccc9c..f9bbd904eae7 100644 --- a/drivers/ide/ide-disk_proc.c +++ b/drivers/ide/ide-disk_proc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/ide.h> | 2 | #include <linux/ide.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/seq_file.h> | 4 | #include <linux/seq_file.h> |
| 4 | 5 | ||
| 5 | #include "ide-disk.h" | 6 | #include "ide-disk.h" |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index ee58c88dee5a..2c17e3fb43e3 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 33 | #include <linux/ide.h> | 34 | #include <linux/ide.h> |
| 34 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
diff --git a/drivers/ide/ide-floppy.c b/drivers/ide/ide-floppy.c index efd907623469..4713bdca20b6 100644 --- a/drivers/ide/ide-floppy.c +++ b/drivers/ide/ide-floppy.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/major.h> | 25 | #include <linux/major.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/genhd.h> | 27 | #include <linux/genhd.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/cdrom.h> | 28 | #include <linux/cdrom.h> |
| 30 | #include <linux/ide.h> | 29 | #include <linux/ide.h> |
| 31 | #include <linux/hdreg.h> | 30 | #include <linux/hdreg.h> |
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 753241429c26..c32d83996ae1 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/ide.h> | 8 | #include <linux/ide.h> |
| 9 | #include <linux/hdreg.h> | 9 | #include <linux/hdreg.h> |
| 10 | #include <linux/dmi.h> | 10 | #include <linux/dmi.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | 12 | ||
| 12 | #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT) | 13 | #if !defined(CONFIG_DEBUG_BLOCK_EXT_DEVT) |
| 13 | #define IDE_DISK_MINORS (1 << PARTN_BITS) | 14 | #define IDE_DISK_MINORS (1 << PARTN_BITS) |
diff --git a/drivers/ide/ide-ioctls.c b/drivers/ide/ide-ioctls.c index 6e7ae2b6cfc6..9965ecd5078c 100644 --- a/drivers/ide/ide-ioctls.c +++ b/drivers/ide/ide-ioctls.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/hdreg.h> | 5 | #include <linux/hdreg.h> |
| 6 | #include <linux/ide.h> | 6 | #include <linux/ide.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | 8 | ||
| 8 | static const struct ide_ioctl_devset ide_ioctl_settings[] = { | 9 | static const struct ide_ioctl_devset ide_ioctl_settings[] = { |
| 9 | { HDIO_GET_32BIT, HDIO_SET_32BIT, &ide_devset_io_32bit }, | 10 | { HDIO_GET_32BIT, HDIO_SET_32BIT, &ide_devset_io_32bit }, |
diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index a914023d6d03..88a380c5a470 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/gfp.h> | ||
| 2 | #include <linux/ide.h> | 3 | #include <linux/ide.h> |
| 3 | #include <linux/jiffies.h> | 4 | #include <linux/jiffies.h> |
| 4 | #include <linux/blkdev.h> | 5 | #include <linux/blkdev.h> |
diff --git a/drivers/ide/ide-pm.c b/drivers/ide/ide-pm.c index ad7be2669dcb..1c08311b0a0e 100644 --- a/drivers/ide/ide-pm.c +++ b/drivers/ide/ide-pm.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/gfp.h> | ||
| 2 | #include <linux/ide.h> | 3 | #include <linux/ide.h> |
| 3 | 4 | ||
| 4 | int generic_ide_suspend(struct device *dev, pm_message_t mesg) | 5 | int generic_ide_suspend(struct device *dev, pm_message_t mesg) |
diff --git a/drivers/ide/ide-proc.c b/drivers/ide/ide-proc.c index 017c09540c2f..a3133d7b2a0c 100644 --- a/drivers/ide/ide-proc.c +++ b/drivers/ide/ide-proc.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/ide.h> | 26 | #include <linux/ide.h> |
| 27 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 30 | 31 | ||
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 16d056939f9f..3cb9c4e056ff 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #include <linux/major.h> | 52 | #include <linux/major.h> |
| 53 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
| 54 | #include <linux/genhd.h> | 54 | #include <linux/genhd.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 57 | #include <linux/pci.h> | 56 | #include <linux/pci.h> |
| 58 | #include <linux/ide.h> | 57 | #include <linux/ide.h> |
diff --git a/drivers/ide/it821x.c b/drivers/ide/it821x.c index b2709c733485..2e3169f2acda 100644 --- a/drivers/ide/it821x.c +++ b/drivers/ide/it821x.c | |||
| @@ -61,6 +61,7 @@ | |||
| 61 | 61 | ||
| 62 | #include <linux/types.h> | 62 | #include <linux/types.h> |
| 63 | #include <linux/module.h> | 63 | #include <linux/module.h> |
| 64 | #include <linux/slab.h> | ||
| 64 | #include <linux/pci.h> | 65 | #include <linux/pci.h> |
| 65 | #include <linux/ide.h> | 66 | #include <linux/ide.h> |
| 66 | #include <linux/init.h> | 67 | #include <linux/init.h> |
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c index 850ee452e9bb..159955d16c47 100644 --- a/drivers/ide/pmac.c +++ b/drivers/ide/pmac.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/adb.h> | 33 | #include <linux/adb.h> |
| 34 | #include <linux/pmu.h> | 34 | #include <linux/pmu.h> |
| 35 | #include <linux/scatterlist.h> | 35 | #include <linux/scatterlist.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/prom.h> | 38 | #include <asm/prom.h> |
| 38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c index 00f54248f41f..48d976aad7ab 100644 --- a/drivers/ide/rapide.c +++ b/drivers/ide/rapide.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/module.h> | 5 | #include <linux/module.h> |
| 6 | #include <linux/slab.h> | ||
| 7 | #include <linux/blkdev.h> | 6 | #include <linux/blkdev.h> |
| 8 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 9 | #include <linux/ide.h> | 8 | #include <linux/ide.h> |
diff --git a/drivers/ide/sc1200.c b/drivers/ide/sc1200.c index 134f1fd13866..356b9b504ffd 100644 --- a/drivers/ide/sc1200.c +++ b/drivers/ide/sc1200.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include <linux/ide.h> | 20 | #include <linux/ide.h> |
diff --git a/drivers/ide/via82cxxx.c b/drivers/ide/via82cxxx.c index 48fd4efc90ad..101f40022386 100644 --- a/drivers/ide/via82cxxx.c +++ b/drivers/ide/via82cxxx.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/ide.h> | 32 | #include <linux/ide.h> |
diff --git a/drivers/idle/i7300_idle.c b/drivers/idle/i7300_idle.c index dd253002cd50..15341fc1c68b 100644 --- a/drivers/idle/i7300_idle.c +++ b/drivers/idle/i7300_idle.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/gfp.h> | ||
| 21 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 22 | #include <linux/notifier.h> | 23 | #include <linux/notifier.h> |
| 23 | #include <linux/cpumask.h> | 24 | #include <linux/cpumask.h> |
diff --git a/drivers/ieee1394/dma.c b/drivers/ieee1394/dma.c index 8e7e3344c4b3..d178699b194a 100644 --- a/drivers/ieee1394/dma.c +++ b/drivers/ieee1394/dma.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/vmalloc.h> | 13 | #include <linux/vmalloc.h> |
| 15 | #include <linux/scatterlist.h> | 14 | #include <linux/scatterlist.h> |
| 16 | 15 | ||
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index c88696a6cf8a..4565cb5d3d1a 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -56,7 +56,6 @@ | |||
| 56 | #include <linux/delay.h> | 56 | #include <linux/delay.h> |
| 57 | #include <linux/device.h> | 57 | #include <linux/device.h> |
| 58 | #include <linux/dma-mapping.h> | 58 | #include <linux/dma-mapping.h> |
| 59 | #include <linux/gfp.h> | ||
| 60 | #include <linux/init.h> | 59 | #include <linux/init.h> |
| 61 | #include <linux/kernel.h> | 60 | #include <linux/kernel.h> |
| 62 | #include <linux/list.h> | 61 | #include <linux/list.h> |
diff --git a/drivers/infiniband/core/addr.c b/drivers/infiniband/core/addr.c index abbb06996f9e..0b926e45afe2 100644 --- a/drivers/infiniband/core/addr.c +++ b/drivers/infiniband/core/addr.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/mutex.h> | 36 | #include <linux/mutex.h> |
| 37 | #include <linux/inetdevice.h> | 37 | #include <linux/inetdevice.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <linux/workqueue.h> | 39 | #include <linux/workqueue.h> |
| 39 | #include <net/arp.h> | 40 | #include <net/arp.h> |
| 40 | #include <net/neighbour.h> | 41 | #include <net/neighbour.h> |
diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c index 764787ebe8d8..fc73d6ac11b6 100644 --- a/drivers/infiniband/core/cm.c +++ b/drivers/infiniband/core/cm.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/random.h> | 42 | #include <linux/random.h> |
| 43 | #include <linux/rbtree.h> | 43 | #include <linux/rbtree.h> |
| 44 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <linux/sysfs.h> | 46 | #include <linux/sysfs.h> |
| 46 | #include <linux/workqueue.h> | 47 | #include <linux/workqueue.h> |
| 47 | #include <linux/kdev_t.h> | 48 | #include <linux/kdev_t.h> |
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 875e34e0b235..7794249430ca 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/random.h> | 40 | #include <linux/random.h> |
| 41 | #include <linux/idr.h> | 41 | #include <linux/idr.h> |
| 42 | #include <linux/inetdevice.h> | 42 | #include <linux/inetdevice.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include <net/tcp.h> | 45 | #include <net/tcp.h> |
| 45 | #include <net/ipv6.h> | 46 | #include <net/ipv6.h> |
diff --git a/drivers/infiniband/core/iwcm.c b/drivers/infiniband/core/iwcm.c index 0f89909abce9..bfead5bc25f6 100644 --- a/drivers/infiniband/core/iwcm.c +++ b/drivers/infiniband/core/iwcm.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
| 45 | #include <linux/workqueue.h> | 45 | #include <linux/workqueue.h> |
| 46 | #include <linux/completion.h> | 46 | #include <linux/completion.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | #include <rdma/iw_cm.h> | 49 | #include <rdma/iw_cm.h> |
| 49 | #include <rdma/ib_addr.h> | 50 | #include <rdma/ib_addr.h> |
diff --git a/drivers/infiniband/core/mad.c b/drivers/infiniband/core/mad.c index e351b1548535..1df1194aeba4 100644 --- a/drivers/infiniband/core/mad.c +++ b/drivers/infiniband/core/mad.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | * | 34 | * |
| 35 | */ | 35 | */ |
| 36 | #include <linux/dma-mapping.h> | 36 | #include <linux/dma-mapping.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <rdma/ib_cache.h> | 38 | #include <rdma/ib_cache.h> |
| 38 | 39 | ||
| 39 | #include "mad_priv.h" | 40 | #include "mad_priv.h" |
diff --git a/drivers/infiniband/core/mad_rmpp.c b/drivers/infiniband/core/mad_rmpp.c index 4e0f2829e0e5..f37878c9c06e 100644 --- a/drivers/infiniband/core/mad_rmpp.c +++ b/drivers/infiniband/core/mad_rmpp.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include "mad_priv.h" | 36 | #include "mad_priv.h" |
| 35 | #include "mad_rmpp.h" | 37 | #include "mad_rmpp.h" |
| 36 | 38 | ||
diff --git a/drivers/infiniband/core/multicast.c b/drivers/infiniband/core/multicast.c index 8d82ba171353..a519801dcfb7 100644 --- a/drivers/infiniband/core/multicast.c +++ b/drivers/infiniband/core/multicast.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/err.h> | 35 | #include <linux/err.h> |
| 36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/bitops.h> | 38 | #include <linux/bitops.h> |
| 38 | #include <linux/random.h> | 39 | #include <linux/random.h> |
| 39 | 40 | ||
diff --git a/drivers/infiniband/core/ucm.c b/drivers/infiniband/core/ucm.c index 017d6e24448f..512b1c43460c 100644 --- a/drivers/infiniband/core/ucm.c +++ b/drivers/infiniband/core/ucm.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/cdev.h> | 44 | #include <linux/cdev.h> |
| 45 | #include <linux/idr.h> | 45 | #include <linux/idr.h> |
| 46 | #include <linux/mutex.h> | 46 | #include <linux/mutex.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | #include <asm/uaccess.h> | 49 | #include <asm/uaccess.h> |
| 49 | 50 | ||
diff --git a/drivers/infiniband/core/ucma.c b/drivers/infiniband/core/ucma.c index b2e16c332d5b..46185084121e 100644 --- a/drivers/infiniband/core/ucma.c +++ b/drivers/infiniband/core/ucma.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/in.h> | 39 | #include <linux/in.h> |
| 40 | #include <linux/in6.h> | 40 | #include <linux/in6.h> |
| 41 | #include <linux/miscdevice.h> | 41 | #include <linux/miscdevice.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <rdma/rdma_user_cm.h> | 44 | #include <rdma/rdma_user_cm.h> |
| 44 | #include <rdma/ib_marshall.h> | 45 | #include <rdma/ib_marshall.h> |
diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c index 4f906f0614f0..415e186eee32 100644 --- a/drivers/infiniband/core/umem.c +++ b/drivers/infiniband/core/umem.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/hugetlb.h> | 38 | #include <linux/hugetlb.h> |
| 39 | #include <linux/dma-attrs.h> | 39 | #include <linux/dma-attrs.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include "uverbs.h" | 42 | #include "uverbs.h" |
| 42 | 43 | ||
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c index 04b585e86cb2..e7db054fb1c8 100644 --- a/drivers/infiniband/core/user_mad.c +++ b/drivers/infiniband/core/user_mad.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/compat.h> | 46 | #include <linux/compat.h> |
| 47 | #include <linux/sched.h> | 47 | #include <linux/sched.h> |
| 48 | #include <linux/semaphore.h> | 48 | #include <linux/semaphore.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | 50 | ||
| 50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 51 | 52 | ||
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index f71cf138d674..6fcfbeb24a23 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/file.h> | 36 | #include <linux/file.h> |
| 37 | #include <linux/fs.h> | 37 | #include <linux/fs.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/uaccess.h> | 40 | #include <asm/uaccess.h> |
| 40 | 41 | ||
diff --git a/drivers/infiniband/core/uverbs_main.c b/drivers/infiniband/core/uverbs_main.c index d805cf365c8d..fb3526254426 100644 --- a/drivers/infiniband/core/uverbs_main.c +++ b/drivers/infiniband/core/uverbs_main.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/file.h> | 44 | #include <linux/file.h> |
| 45 | #include <linux/cdev.h> | 45 | #include <linux/cdev.h> |
| 46 | #include <linux/anon_inodes.h> | 46 | #include <linux/anon_inodes.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | #include <asm/uaccess.h> | 49 | #include <asm/uaccess.h> |
| 49 | 50 | ||
diff --git a/drivers/infiniband/hw/amso1100/c2.c b/drivers/infiniband/hw/amso1100/c2.c index c61fd2b4a556..dc85d777578e 100644 --- a/drivers/infiniband/hw/amso1100/c2.c +++ b/drivers/infiniband/hw/amso1100/c2.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/tcp.h> | 46 | #include <linux/tcp.h> |
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/dma-mapping.h> | 48 | #include <linux/dma-mapping.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | 50 | ||
| 50 | #include <asm/io.h> | 51 | #include <asm/io.h> |
| 51 | #include <asm/irq.h> | 52 | #include <asm/irq.h> |
diff --git a/drivers/infiniband/hw/amso1100/c2_alloc.c b/drivers/infiniband/hw/amso1100/c2_alloc.c index e9110163aeff..d4f5f5d42e90 100644 --- a/drivers/infiniband/hw/amso1100/c2_alloc.c +++ b/drivers/infiniband/hw/amso1100/c2_alloc.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/bitmap.h> | 35 | #include <linux/bitmap.h> |
| 37 | 36 | ||
| 38 | #include "c2.h" | 37 | #include "c2.h" |
diff --git a/drivers/infiniband/hw/amso1100/c2_cm.c b/drivers/infiniband/hw/amso1100/c2_cm.c index 75b93e9b8810..95f58ab1e0b8 100644 --- a/drivers/infiniband/hw/amso1100/c2_cm.c +++ b/drivers/infiniband/hw/amso1100/c2_cm.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | * | 32 | * |
| 33 | */ | 33 | */ |
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include "c2.h" | 36 | #include "c2.h" |
| 35 | #include "c2_wr.h" | 37 | #include "c2_wr.h" |
| 36 | #include "c2_vq.h" | 38 | #include "c2_vq.h" |
diff --git a/drivers/infiniband/hw/amso1100/c2_cq.c b/drivers/infiniband/hw/amso1100/c2_cq.c index f5c45b194f53..f7b0fc23f413 100644 --- a/drivers/infiniband/hw/amso1100/c2_cq.c +++ b/drivers/infiniband/hw/amso1100/c2_cq.c | |||
| @@ -35,6 +35,8 @@ | |||
| 35 | * SOFTWARE. | 35 | * SOFTWARE. |
| 36 | * | 36 | * |
| 37 | */ | 37 | */ |
| 38 | #include <linux/gfp.h> | ||
| 39 | |||
| 38 | #include "c2.h" | 40 | #include "c2.h" |
| 39 | #include "c2_vq.h" | 41 | #include "c2_vq.h" |
| 40 | #include "c2_status.h" | 42 | #include "c2_status.h" |
diff --git a/drivers/infiniband/hw/amso1100/c2_mm.c b/drivers/infiniband/hw/amso1100/c2_mm.c index b506fe22b4d4..119c4f3d9791 100644 --- a/drivers/infiniband/hw/amso1100/c2_mm.c +++ b/drivers/infiniband/hw/amso1100/c2_mm.c | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 30 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | #include <linux/slab.h> | ||
| 34 | |||
| 33 | #include "c2.h" | 35 | #include "c2.h" |
| 34 | #include "c2_vq.h" | 36 | #include "c2_vq.h" |
| 35 | 37 | ||
diff --git a/drivers/infiniband/hw/amso1100/c2_pd.c b/drivers/infiniband/hw/amso1100/c2_pd.c index 00c709926c8d..161f2a285351 100644 --- a/drivers/infiniband/hw/amso1100/c2_pd.c +++ b/drivers/infiniband/hw/amso1100/c2_pd.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 38 | 39 | ||
| 39 | #include "c2.h" | 40 | #include "c2.h" |
diff --git a/drivers/infiniband/hw/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c index ad723bd8bf49..c47f618d12e8 100644 --- a/drivers/infiniband/hw/amso1100/c2_provider.c +++ b/drivers/infiniband/hw/amso1100/c2_provider.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/dma-mapping.h> | 50 | #include <linux/dma-mapping.h> |
| 51 | #include <linux/if_arp.h> | 51 | #include <linux/if_arp.h> |
| 52 | #include <linux/vmalloc.h> | 52 | #include <linux/vmalloc.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #include <asm/io.h> | 55 | #include <asm/io.h> |
| 55 | #include <asm/irq.h> | 56 | #include <asm/irq.h> |
diff --git a/drivers/infiniband/hw/amso1100/c2_qp.c b/drivers/infiniband/hw/amso1100/c2_qp.c index ad518868df77..d8f4bb8bf42e 100644 --- a/drivers/infiniband/hw/amso1100/c2_qp.c +++ b/drivers/infiniband/hw/amso1100/c2_qp.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 39 | #include <linux/gfp.h> | ||
| 39 | 40 | ||
| 40 | #include "c2.h" | 41 | #include "c2.h" |
| 41 | #include "c2_vq.h" | 42 | #include "c2_vq.h" |
diff --git a/drivers/infiniband/hw/amso1100/c2_rnic.c b/drivers/infiniband/hw/amso1100/c2_rnic.c index dd05c4835642..78c4bcc6ef60 100644 --- a/drivers/infiniband/hw/amso1100/c2_rnic.c +++ b/drivers/infiniband/hw/amso1100/c2_rnic.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/mm.h> | 51 | #include <linux/mm.h> |
| 52 | #include <linux/inet.h> | 52 | #include <linux/inet.h> |
| 53 | #include <linux/vmalloc.h> | 53 | #include <linux/vmalloc.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include <linux/route.h> | 56 | #include <linux/route.h> |
| 56 | 57 | ||
diff --git a/drivers/infiniband/hw/cxgb3/cxio_dbg.c b/drivers/infiniband/hw/cxgb3/cxio_dbg.c index a8d24d53f307..8bca6b4ec9af 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_dbg.c +++ b/drivers/infiniband/hw/cxgb3/cxio_dbg.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | #ifdef DEBUG | 32 | #ifdef DEBUG |
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include "common.h" | 35 | #include "common.h" |
| 35 | #include "cxgb3_ioctl.h" | 36 | #include "cxgb3_ioctl.h" |
| 36 | #include "cxio_hal.h" | 37 | #include "cxio_hal.h" |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c index a28e862f2d68..35f286f1ad1e 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_hal.c +++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
| 38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 39 | #include <linux/dma-mapping.h> | 39 | #include <linux/dma-mapping.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <net/net_namespace.h> | 41 | #include <net/net_namespace.h> |
| 41 | 42 | ||
| 42 | #include "cxio_resource.h" | 43 | #include "cxio_resource.h" |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c index d94388b81a40..4fef03296276 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_cm.c +++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/list.h> | 33 | #include <linux/list.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 35 | #include <linux/skbuff.h> | 36 | #include <linux/skbuff.h> |
| 36 | #include <linux/timer.h> | 37 | #include <linux/timer.h> |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_ev.c b/drivers/infiniband/hw/cxgb3/iwch_ev.c index 743c5d8b8806..6afc89e7572c 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_ev.c +++ b/drivers/infiniband/hw/cxgb3/iwch_ev.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 30 | * SOFTWARE. | 30 | * SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/slab.h> | 32 | #include <linux/gfp.h> |
| 33 | #include <linux/mman.h> | 33 | #include <linux/mman.h> |
| 34 | #include <net/sock.h> | 34 | #include <net/sock.h> |
| 35 | #include "iwch_provider.h" | 35 | #include "iwch_provider.h" |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_mem.c b/drivers/infiniband/hw/cxgb3/iwch_mem.c index e1ec65ebb016..5c36ee2809ac 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_mem.c +++ b/drivers/infiniband/hw/cxgb3/iwch_mem.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | 29 | * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 30 | * SOFTWARE. | 30 | * SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <asm/byteorder.h> | 33 | #include <asm/byteorder.h> |
| 33 | 34 | ||
| 34 | #include <rdma/iw_cm.h> | 35 | #include <rdma/iw_cm.h> |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c index 47b35c6608d2..19b1c4a62a23 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_provider.c +++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/ethtool.h> | 42 | #include <linux/ethtool.h> |
| 43 | #include <linux/rtnetlink.h> | 43 | #include <linux/rtnetlink.h> |
| 44 | #include <linux/inetdevice.h> | 44 | #include <linux/inetdevice.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | 46 | ||
| 46 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 47 | #include <asm/irq.h> | 48 | #include <asm/irq.h> |
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c index b4d893de3650..ae47bfd22bd5 100644 --- a/drivers/infiniband/hw/cxgb3/iwch_qp.c +++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * SOFTWARE. | 30 | * SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | #include "iwch_provider.h" | 34 | #include "iwch_provider.h" |
| 34 | #include "iwch.h" | 35 | #include "iwch.h" |
| 35 | #include "iwch_cm.h" | 36 | #include "iwch_cm.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_av.c b/drivers/infiniband/hw/ehca/ehca_av.c index 56735ea2fc57..465926319f3d 100644 --- a/drivers/infiniband/hw/ehca/ehca_av.c +++ b/drivers/infiniband/hw/ehca/ehca_av.c | |||
| @@ -41,6 +41,8 @@ | |||
| 41 | * POSSIBILITY OF SUCH DAMAGE. | 41 | * POSSIBILITY OF SUCH DAMAGE. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/slab.h> | ||
| 45 | |||
| 44 | #include "ehca_tools.h" | 46 | #include "ehca_tools.h" |
| 45 | #include "ehca_iverbs.h" | 47 | #include "ehca_iverbs.h" |
| 46 | #include "hcp_if.h" | 48 | #include "hcp_if.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_cq.c b/drivers/infiniband/hw/ehca/ehca_cq.c index 97e4b231cdc4..d9b0ebcb67d7 100644 --- a/drivers/infiniband/hw/ehca/ehca_cq.c +++ b/drivers/infiniband/hw/ehca/ehca_cq.c | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | * POSSIBILITY OF SUCH DAMAGE. | 43 | * POSSIBILITY OF SUCH DAMAGE. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/slab.h> | ||
| 47 | |||
| 46 | #include "ehca_iverbs.h" | 48 | #include "ehca_iverbs.h" |
| 47 | #include "ehca_classes.h" | 49 | #include "ehca_classes.h" |
| 48 | #include "ehca_irq.h" | 50 | #include "ehca_irq.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_hca.c b/drivers/infiniband/hw/ehca/ehca_hca.c index 8b92f85d4dd0..73edc3668663 100644 --- a/drivers/infiniband/hw/ehca/ehca_hca.c +++ b/drivers/infiniband/hw/ehca/ehca_hca.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | * POSSIBILITY OF SUCH DAMAGE. | 39 | * POSSIBILITY OF SUCH DAMAGE. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/gfp.h> | ||
| 43 | |||
| 42 | #include "ehca_tools.h" | 44 | #include "ehca_tools.h" |
| 43 | #include "ehca_iverbs.h" | 45 | #include "ehca_iverbs.h" |
| 44 | #include "hcp_if.h" | 46 | #include "hcp_if.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c index b2b6fea2b141..07cae552cafb 100644 --- a/drivers/infiniband/hw/ehca/ehca_irq.c +++ b/drivers/infiniband/hw/ehca/ehca_irq.c | |||
| @@ -41,6 +41,8 @@ | |||
| 41 | * POSSIBILITY OF SUCH DAMAGE. | 41 | * POSSIBILITY OF SUCH DAMAGE. |
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/slab.h> | ||
| 45 | |||
| 44 | #include "ehca_classes.h" | 46 | #include "ehca_classes.h" |
| 45 | #include "ehca_irq.h" | 47 | #include "ehca_irq.h" |
| 46 | #include "ehca_iverbs.h" | 48 | #include "ehca_iverbs.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c index 7550a534005c..31a68b9c52d0 100644 --- a/drivers/infiniband/hw/ehca/ehca_mrmw.c +++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | * POSSIBILITY OF SUCH DAMAGE. | 40 | * POSSIBILITY OF SUCH DAMAGE. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/slab.h> | ||
| 43 | #include <rdma/ib_umem.h> | 44 | #include <rdma/ib_umem.h> |
| 44 | 45 | ||
| 45 | #include "ehca_iverbs.h" | 46 | #include "ehca_iverbs.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_pd.c b/drivers/infiniband/hw/ehca/ehca_pd.c index 2fe554855fa5..351577a6670a 100644 --- a/drivers/infiniband/hw/ehca/ehca_pd.c +++ b/drivers/infiniband/hw/ehca/ehca_pd.c | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | * POSSIBILITY OF SUCH DAMAGE. | 38 | * POSSIBILITY OF SUCH DAMAGE. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/slab.h> | ||
| 42 | |||
| 41 | #include "ehca_tools.h" | 43 | #include "ehca_tools.h" |
| 42 | #include "ehca_iverbs.h" | 44 | #include "ehca_iverbs.h" |
| 43 | 45 | ||
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c index b105f664d3ef..47d388ec1cde 100644 --- a/drivers/infiniband/hw/ehca/ehca_qp.c +++ b/drivers/infiniband/hw/ehca/ehca_qp.c | |||
| @@ -43,6 +43,8 @@ | |||
| 43 | * POSSIBILITY OF SUCH DAMAGE. | 43 | * POSSIBILITY OF SUCH DAMAGE. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/slab.h> | ||
| 47 | |||
| 46 | #include "ehca_classes.h" | 48 | #include "ehca_classes.h" |
| 47 | #include "ehca_tools.h" | 49 | #include "ehca_tools.h" |
| 48 | #include "ehca_qes.h" | 50 | #include "ehca_qes.h" |
diff --git a/drivers/infiniband/hw/ehca/ehca_uverbs.c b/drivers/infiniband/hw/ehca/ehca_uverbs.c index f1565cae8ec6..45ee89b65c23 100644 --- a/drivers/infiniband/hw/ehca/ehca_uverbs.c +++ b/drivers/infiniband/hw/ehca/ehca_uverbs.c | |||
| @@ -40,6 +40,8 @@ | |||
| 40 | * POSSIBILITY OF SUCH DAMAGE. | 40 | * POSSIBILITY OF SUCH DAMAGE. |
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/slab.h> | ||
| 44 | |||
| 43 | #include "ehca_classes.h" | 45 | #include "ehca_classes.h" |
| 44 | #include "ehca_iverbs.h" | 46 | #include "ehca_iverbs.h" |
| 45 | #include "ehca_mrmw.h" | 47 | #include "ehca_mrmw.h" |
diff --git a/drivers/infiniband/hw/ehca/ipz_pt_fn.c b/drivers/infiniband/hw/ehca/ipz_pt_fn.c index 1227c593627a..1596e3085344 100644 --- a/drivers/infiniband/hw/ehca/ipz_pt_fn.c +++ b/drivers/infiniband/hw/ehca/ipz_pt_fn.c | |||
| @@ -38,6 +38,8 @@ | |||
| 38 | * POSSIBILITY OF SUCH DAMAGE. | 38 | * POSSIBILITY OF SUCH DAMAGE. |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/slab.h> | ||
| 42 | |||
| 41 | #include "ehca_tools.h" | 43 | #include "ehca_tools.h" |
| 42 | #include "ipz_pt_fn.h" | 44 | #include "ipz_pt_fn.h" |
| 43 | #include "ehca_classes.h" | 45 | #include "ehca_classes.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c index d385e4168c97..0416c6c0e126 100644 --- a/drivers/infiniband/hw/ipath/ipath_cq.c +++ b/drivers/infiniband/hw/ipath/ipath_cq.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 36 | 37 | ||
| 37 | #include "ipath_verbs.h" | 38 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_dma.c b/drivers/infiniband/hw/ipath/ipath_dma.c index e90a0ea538a0..644c2c74e054 100644 --- a/drivers/infiniband/hw/ipath/ipath_dma.c +++ b/drivers/infiniband/hw/ipath/ipath_dma.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/scatterlist.h> | 33 | #include <linux/scatterlist.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <rdma/ib_verbs.h> | 35 | #include <rdma/ib_verbs.h> |
| 35 | 36 | ||
| 36 | #include "ipath_verbs.h" | 37 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c index d2787fe80304..6302626d17f0 100644 --- a/drivers/infiniband/hw/ipath/ipath_driver.c +++ b/drivers/infiniband/hw/ipath/ipath_driver.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/netdevice.h> | 40 | #include <linux/netdevice.h> |
| 41 | #include <linux/vmalloc.h> | 41 | #include <linux/vmalloc.h> |
| 42 | #include <linux/bitmap.h> | 42 | #include <linux/bitmap.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include "ipath_kernel.h" | 45 | #include "ipath_kernel.h" |
| 45 | #include "ipath_verbs.h" | 46 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_file_ops.c b/drivers/infiniband/hw/ipath/ipath_file_ops.c index 73933a41ce84..9c5c66d16a23 100644 --- a/drivers/infiniband/hw/ipath/ipath_file_ops.c +++ b/drivers/infiniband/hw/ipath/ipath_file_ops.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/cdev.h> | 36 | #include <linux/cdev.h> |
| 37 | #include <linux/swap.h> | 37 | #include <linux/swap.h> |
| 38 | #include <linux/vmalloc.h> | 38 | #include <linux/vmalloc.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <linux/highmem.h> | 40 | #include <linux/highmem.h> |
| 40 | #include <linux/io.h> | 41 | #include <linux/io.h> |
| 41 | #include <linux/jiffies.h> | 42 | #include <linux/jiffies.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_fs.c b/drivers/infiniband/hw/ipath/ipath_fs.c index 100da8542bba..2fca70836dae 100644 --- a/drivers/infiniband/hw/ipath/ipath_fs.c +++ b/drivers/infiniband/hw/ipath/ipath_fs.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/pagemap.h> | 37 | #include <linux/pagemap.h> |
| 38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 39 | #include <linux/namei.h> | 39 | #include <linux/namei.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include "ipath_kernel.h" | 42 | #include "ipath_kernel.h" |
| 42 | 43 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_init_chip.c b/drivers/infiniband/hw/ipath/ipath_init_chip.c index 077879c0bdb5..776938299e4c 100644 --- a/drivers/infiniband/hw/ipath/ipath_init_chip.c +++ b/drivers/infiniband/hw/ipath/ipath_init_chip.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 37 | 38 | ||
| 38 | #include "ipath_kernel.h" | 39 | #include "ipath_kernel.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_mmap.c b/drivers/infiniband/hw/ipath/ipath_mmap.c index b28865faf435..e73274229404 100644 --- a/drivers/infiniband/hw/ipath/ipath_mmap.c +++ b/drivers/infiniband/hw/ipath/ipath_mmap.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/vmalloc.h> | 34 | #include <linux/vmalloc.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 36 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 37 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_mr.c b/drivers/infiniband/hw/ipath/ipath_mr.c index 9d343b7c2f3b..e346d3890a0e 100644 --- a/drivers/infiniband/hw/ipath/ipath_mr.c +++ b/drivers/infiniband/hw/ipath/ipath_mr.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include <rdma/ib_umem.h> | 36 | #include <rdma/ib_umem.h> |
| 35 | #include <rdma/ib_pack.h> | 37 | #include <rdma/ib_pack.h> |
| 36 | #include <rdma/ib_smi.h> | 38 | #include <rdma/ib_smi.h> |
diff --git a/drivers/infiniband/hw/ipath/ipath_qp.c b/drivers/infiniband/hw/ipath/ipath_qp.c index cb2d3ef2ae12..0857a9c3cd3d 100644 --- a/drivers/infiniband/hw/ipath/ipath_qp.c +++ b/drivers/infiniband/hw/ipath/ipath_qp.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 37 | 38 | ||
| 38 | #include "ipath_verbs.h" | 39 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_sdma.c b/drivers/infiniband/hw/ipath/ipath_sdma.c index 4b0698590850..98ac18ec977e 100644 --- a/drivers/infiniband/hw/ipath/ipath_sdma.c +++ b/drivers/infiniband/hw/ipath/ipath_sdma.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | 35 | ||
| 35 | #include "ipath_kernel.h" | 36 | #include "ipath_kernel.h" |
| 36 | #include "ipath_verbs.h" | 37 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_srq.c b/drivers/infiniband/hw/ipath/ipath_srq.c index e3d80ca84c1a..386e2c717c53 100644 --- a/drivers/infiniband/hw/ipath/ipath_srq.c +++ b/drivers/infiniband/hw/ipath/ipath_srq.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 36 | 37 | ||
| 37 | #include "ipath_verbs.h" | 38 | #include "ipath_verbs.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_user_pages.c b/drivers/infiniband/hw/ipath/ipath_user_pages.c index eb7d59abd12d..5e86d73eba2a 100644 --- a/drivers/infiniband/hw/ipath/ipath_user_pages.c +++ b/drivers/infiniband/hw/ipath/ipath_user_pages.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/device.h> | 35 | #include <linux/device.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 37 | 38 | ||
| 38 | #include "ipath_kernel.h" | 39 | #include "ipath_kernel.h" |
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c index 9289ab4b0ae8..559f39be0dcc 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <rdma/ib_mad.h> | 34 | #include <rdma/ib_mad.h> |
| 35 | #include <rdma/ib_user_verbs.h> | 35 | #include <rdma/ib_user_verbs.h> |
| 36 | #include <linux/io.h> | 36 | #include <linux/io.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/utsname.h> | 38 | #include <linux/utsname.h> |
| 38 | #include <linux/rculist.h> | 39 | #include <linux/rculist.h> |
| 39 | 40 | ||
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c index 6923e1d986da..6216ea923853 100644 --- a/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c +++ b/drivers/infiniband/hw/ipath/ipath_verbs_mcast.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/rculist.h> | 34 | #include <linux/rculist.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include "ipath_verbs.h" | 38 | #include "ipath_verbs.h" |
| 38 | 39 | ||
diff --git a/drivers/infiniband/hw/mlx4/ah.c b/drivers/infiniband/hw/mlx4/ah.c index c75ac9463e20..11a236f8d884 100644 --- a/drivers/infiniband/hw/mlx4/ah.c +++ b/drivers/infiniband/hw/mlx4/ah.c | |||
| @@ -30,6 +30,8 @@ | |||
| 30 | * SOFTWARE. | 30 | * SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/slab.h> | ||
| 34 | |||
| 33 | #include "mlx4_ib.h" | 35 | #include "mlx4_ib.h" |
| 34 | 36 | ||
| 35 | struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) | 37 | struct ib_ah *mlx4_ib_create_ah(struct ib_pd *pd, struct ib_ah_attr *ah_attr) |
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c index de5263beab4a..cc2ddd29ac57 100644 --- a/drivers/infiniband/hw/mlx4/cq.c +++ b/drivers/infiniband/hw/mlx4/cq.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/mlx4/cq.h> | 34 | #include <linux/mlx4/cq.h> |
| 35 | #include <linux/mlx4/qp.h> | 35 | #include <linux/mlx4/qp.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include "mlx4_ib.h" | 38 | #include "mlx4_ib.h" |
| 38 | #include "user.h" | 39 | #include "user.h" |
diff --git a/drivers/infiniband/hw/mlx4/mad.c b/drivers/infiniband/hw/mlx4/mad.c index 19e68ab66168..f38d5b118927 100644 --- a/drivers/infiniband/hw/mlx4/mad.c +++ b/drivers/infiniband/hw/mlx4/mad.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <rdma/ib_smi.h> | 34 | #include <rdma/ib_smi.h> |
| 35 | 35 | ||
| 36 | #include <linux/mlx4/cmd.h> | 36 | #include <linux/mlx4/cmd.h> |
| 37 | #include <linux/gfp.h> | ||
| 37 | 38 | ||
| 38 | #include "mlx4_ib.h" | 39 | #include "mlx4_ib.h" |
| 39 | 40 | ||
diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c index e596537ff353..01f2a3f93355 100644 --- a/drivers/infiniband/hw/mlx4/main.c +++ b/drivers/infiniband/hw/mlx4/main.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 37 | 38 | ||
| 38 | #include <rdma/ib_smi.h> | 39 | #include <rdma/ib_smi.h> |
diff --git a/drivers/infiniband/hw/mlx4/mr.c b/drivers/infiniband/hw/mlx4/mr.c index 8f3666b20ea4..56147b28a23a 100644 --- a/drivers/infiniband/hw/mlx4/mr.c +++ b/drivers/infiniband/hw/mlx4/mr.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include "mlx4_ib.h" | 36 | #include "mlx4_ib.h" |
| 35 | 37 | ||
| 36 | static u32 convert_access(int acc) | 38 | static u32 convert_access(int acc) |
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c index ae75389937d6..5643f4a8ffef 100644 --- a/drivers/infiniband/hw/mlx4/qp.c +++ b/drivers/infiniband/hw/mlx4/qp.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/log2.h> | 34 | #include <linux/log2.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <rdma/ib_cache.h> | 37 | #include <rdma/ib_cache.h> |
| 37 | #include <rdma/ib_pack.h> | 38 | #include <rdma/ib_pack.h> |
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c index cf8085bcbd6d..818b7ecace5e 100644 --- a/drivers/infiniband/hw/mlx4/srq.c +++ b/drivers/infiniband/hw/mlx4/srq.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/mlx4/qp.h> | 34 | #include <linux/mlx4/qp.h> |
| 35 | #include <linux/mlx4/srq.h> | 35 | #include <linux/mlx4/srq.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include "mlx4_ib.h" | 38 | #include "mlx4_ib.h" |
| 38 | #include "user.h" | 39 | #include "user.h" |
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c index 8c2ed994d540..3603ae89b606 100644 --- a/drivers/infiniband/hw/mthca/mthca_cmd.c +++ b/drivers/infiniband/hw/mthca/mthca_cmd.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 37 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 40 | #include <rdma/ib_mad.h> | 41 | #include <rdma/ib_mad.h> |
| 41 | 42 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c index d9f4735c2b37..18ee3fa4b88c 100644 --- a/drivers/infiniband/hw/mthca/mthca_cq.c +++ b/drivers/infiniband/hw/mthca/mthca_cq.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | * SOFTWARE. | 34 | * SOFTWARE. |
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/gfp.h> | ||
| 37 | #include <linux/hardirq.h> | 38 | #include <linux/hardirq.h> |
| 38 | #include <linux/sched.h> | 39 | #include <linux/sched.h> |
| 39 | 40 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c index 8c31fa36e95e..9388164b6053 100644 --- a/drivers/infiniband/hw/mthca/mthca_eq.c +++ b/drivers/infiniband/hw/mthca/mthca_eq.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include "mthca_dev.h" | 39 | #include "mthca_dev.h" |
| 39 | #include "mthca_cmd.h" | 40 | #include "mthca_cmd.h" |
diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c index b01b28987874..5eee6665919a 100644 --- a/drivers/infiniband/hw/mthca/mthca_main.c +++ b/drivers/infiniband/hw/mthca/mthca_main.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/gfp.h> | ||
| 40 | 41 | ||
| 41 | #include "mthca_dev.h" | 42 | #include "mthca_dev.h" |
| 42 | #include "mthca_config_reg.h" | 43 | #include "mthca_config_reg.h" |
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c index d4c81053e439..515790a606e6 100644 --- a/drivers/infiniband/hw/mthca/mthca_mcg.c +++ b/drivers/infiniband/hw/mthca/mthca_mcg.c | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/slab.h> | 34 | #include <linux/gfp.h> |
| 35 | 35 | ||
| 36 | #include "mthca_dev.h" | 36 | #include "mthca_dev.h" |
| 37 | #include "mthca_cmd.h" | 37 | #include "mthca_cmd.h" |
diff --git a/drivers/infiniband/hw/mthca/mthca_memfree.c b/drivers/infiniband/hw/mthca/mthca_memfree.c index 1f7d1a29d2a8..8c2a83732b5d 100644 --- a/drivers/infiniband/hw/mthca/mthca_memfree.c +++ b/drivers/infiniband/hw/mthca/mthca_memfree.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
| 36 | #include <linux/scatterlist.h> | 36 | #include <linux/scatterlist.h> |
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/page.h> | 40 | #include <asm/page.h> |
| 40 | 41 | ||
diff --git a/drivers/infiniband/hw/mthca/mthca_provider.c b/drivers/infiniband/hw/mthca/mthca_provider.c index bcf7a4014820..f080a784bc79 100644 --- a/drivers/infiniband/hw/mthca/mthca_provider.c +++ b/drivers/infiniband/hw/mthca/mthca_provider.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <rdma/ib_user_verbs.h> | 39 | #include <rdma/ib_user_verbs.h> |
| 40 | 40 | ||
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
| 43 | 44 | ||
| 44 | #include "mthca_dev.h" | 45 | #include "mthca_dev.h" |
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c index 4272c52e38a4..de7b9d7166f3 100644 --- a/drivers/infiniband/hw/nes/nes.c +++ b/drivers/infiniband/hw/nes/nes.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/if_arp.h> | 45 | #include <linux/if_arp.h> |
| 46 | #include <linux/highmem.h> | 46 | #include <linux/highmem.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <asm/io.h> | 48 | #include <asm/io.h> |
| 48 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
| 49 | #include <asm/byteorder.h> | 50 | #include <asm/byteorder.h> |
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c index 2a49ee40b520..986d6f32dded 100644 --- a/drivers/infiniband/hw/nes/nes_cm.c +++ b/drivers/infiniband/hw/nes/nes_cm.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/list.h> | 53 | #include <linux/list.h> |
| 54 | #include <linux/threads.h> | 54 | #include <linux/threads.h> |
| 55 | #include <linux/highmem.h> | 55 | #include <linux/highmem.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | #include <net/arp.h> | 57 | #include <net/arp.h> |
| 57 | #include <net/neighbour.h> | 58 | #include <net/neighbour.h> |
| 58 | #include <net/route.h> | 59 | #include <net/route.h> |
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c index 925075557dc2..c36a3f514929 100644 --- a/drivers/infiniband/hw/nes/nes_hw.c +++ b/drivers/infiniband/hw/nes/nes_hw.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/tcp.h> | 39 | #include <linux/tcp.h> |
| 40 | #include <linux/if_vlan.h> | 40 | #include <linux/if_vlan.h> |
| 41 | #include <linux/inet_lro.h> | 41 | #include <linux/inet_lro.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include "nes.h" | 44 | #include "nes.h" |
| 44 | 45 | ||
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c index 91fdde382e82..b7c813f4be43 100644 --- a/drivers/infiniband/hw/nes/nes_nic.c +++ b/drivers/infiniband/hw/nes/nes_nic.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/if_arp.h> | 40 | #include <linux/if_arp.h> |
| 41 | #include <linux/if_vlan.h> | 41 | #include <linux/if_vlan.h> |
| 42 | #include <linux/ethtool.h> | 42 | #include <linux/ethtool.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <net/tcp.h> | 44 | #include <net/tcp.h> |
| 44 | 45 | ||
| 45 | #include <net/inet_common.h> | 46 | #include <net/inet_common.h> |
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index 729d525c5b70..186623d86959 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/ethtool.h> | 38 | #include <linux/ethtool.h> |
| 39 | #include <linux/mii.h> | 39 | #include <linux/mii.h> |
| 40 | #include <linux/if_vlan.h> | 40 | #include <linux/if_vlan.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/crc32.h> | 42 | #include <linux/crc32.h> |
| 42 | #include <linux/in.h> | 43 | #include <linux/in.h> |
| 43 | #include <linux/ip.h> | 44 | #include <linux/ip.h> |
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c index 69928296d74b..5a076e8f116a 100644 --- a/drivers/infiniband/hw/nes/nes_verbs.c +++ b/drivers/infiniband/hw/nes/nes_verbs.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <linux/random.h> | 36 | #include <linux/random.h> |
| 37 | #include <linux/highmem.h> | 37 | #include <linux/highmem.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <asm/byteorder.h> | 39 | #include <asm/byteorder.h> |
| 39 | 40 | ||
| 40 | #include <rdma/ib_verbs.h> | 41 | #include <rdma/ib_verbs.h> |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c index bc658373ad55..bb1004114dec 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <net/icmp.h> | 35 | #include <net/icmp.h> |
| 36 | #include <linux/icmpv6.h> | 36 | #include <linux/icmpv6.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <linux/vmalloc.h> | 39 | #include <linux/vmalloc.h> |
| 39 | 40 | ||
| 40 | #include "ipoib.h" | 41 | #include "ipoib.h" |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c index 961c585da216..86eae229dc49 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/err.h> | 33 | #include <linux/err.h> |
| 34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | struct file_operations; | 37 | struct file_operations; |
| 37 | 38 | ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c index 5df40b128f81..ec6b4fbe25e4 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <linux/ip.h> | 40 | #include <linux/ip.h> |
| 40 | #include <linux/tcp.h> | 41 | #include <linux/tcp.h> |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c index d41ea27be5e1..b166bb75753d 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/inetdevice.h> | 40 | #include <linux/inetdevice.h> |
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | #include <linux/completion.h> | 42 | #include <linux/completion.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include <net/dst.h> | 45 | #include <net/dst.h> |
| 45 | 46 | ||
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c index 68325119f740..049a997caff3 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include "ipoib.h" | 36 | #include "ipoib.h" |
| 35 | 37 | ||
| 36 | int ipoib_mcast_attach(struct net_device *dev, u16 mlid, union ib_gid *mgid, int set_qkey) | 38 | int ipoib_mcast_attach(struct net_device *dev, u16 mlid, union ib_gid *mgid, int set_qkey) |
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c index e3bf00d8cd25..d7e9740c7248 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | 34 | ||
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/seq_file.h> | 36 | #include <linux/seq_file.h> |
| 38 | 37 | ||
| 39 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
diff --git a/drivers/infiniband/ulp/iser/iscsi_iser.c b/drivers/infiniband/ulp/iser/iscsi_iser.c index e78af36d3a0e..93399dff0c6f 100644 --- a/drivers/infiniband/ulp/iser/iscsi_iser.c +++ b/drivers/infiniband/ulp/iser/iscsi_iser.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | #include <linux/net.h> | 56 | #include <linux/net.h> |
| 57 | #include <linux/scatterlist.h> | 57 | #include <linux/scatterlist.h> |
| 58 | #include <linux/delay.h> | 58 | #include <linux/delay.h> |
| 59 | #include <linux/slab.h> | ||
| 59 | 60 | ||
| 60 | #include <net/sock.h> | 61 | #include <net/sock.h> |
| 61 | 62 | ||
diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c index 308d17bb5146..b89d76b39a13 100644 --- a/drivers/infiniband/ulp/iser/iser_verbs.c +++ b/drivers/infiniband/ulp/iser/iser_verbs.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 36 | 37 | ||
| 37 | #include "iscsi_iser.h" | 38 | #include "iscsi_iser.h" |
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c index b2f07aa1604b..03078c08309a 100644 --- a/drivers/input/ff-core.c +++ b/drivers/input/ff-core.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * Check that the effect_id is a valid effect and whether the user | 35 | * Check that the effect_id is a valid effect and whether the user |
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c index f967008f332e..1d881c96ba8f 100644 --- a/drivers/input/ff-memless.c +++ b/drivers/input/ff-memless.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #define debug(format, arg...) pr_debug("ff-memless: " format "\n", ## arg) | 26 | #define debug(format, arg...) pr_debug("ff-memless: " format "\n", ## arg) |
| 27 | 27 | ||
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/input.h> | 29 | #include <linux/input.h> |
| 29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 30 | #include <linux/mutex.h> | 31 | #include <linux/mutex.h> |
diff --git a/drivers/input/gameport/lightning.c b/drivers/input/gameport/lightning.c index 06ad36ed3483..85d6ee09f11f 100644 --- a/drivers/input/gameport/lightning.c +++ b/drivers/input/gameport/lightning.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/gameport.h> | 36 | #include <linux/gameport.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | 37 | ||
| 39 | #define L4_PORT 0x201 | 38 | #define L4_PORT 0x201 |
| 40 | #define L4_SELECT_ANALOG 0xa4 | 39 | #define L4_SELECT_ANALOG 0xa4 |
diff --git a/drivers/input/input-polldev.c b/drivers/input/input-polldev.c index 291d9393d359..10c9b0a845f0 100644 --- a/drivers/input/input-polldev.c +++ b/drivers/input/input-polldev.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/jiffies.h> | 11 | #include <linux/jiffies.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 13 | #include <linux/input-polldev.h> | 14 | #include <linux/input-polldev.h> |
| 14 | 15 | ||
diff --git a/drivers/input/input.c b/drivers/input/input.c index e2aad0a51826..afd4e2b7658c 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/random.h> | 18 | #include <linux/random.h> |
| 18 | #include <linux/major.h> | 19 | #include <linux/major.h> |
| 19 | #include <linux/proc_fs.h> | 20 | #include <linux/proc_fs.h> |
diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c index 523959484753..8e7de5c7754f 100644 --- a/drivers/input/joystick/db9.c +++ b/drivers/input/joystick/db9.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/parport.h> | 36 | #include <linux/parport.h> |
| 37 | #include <linux/input.h> | 37 | #include <linux/input.h> |
| 38 | #include <linux/mutex.h> | 38 | #include <linux/mutex.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); | 41 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); |
| 41 | MODULE_DESCRIPTION("Atari, Amstrad, Commodore, Amiga, Sega, etc. joystick driver"); | 42 | MODULE_DESCRIPTION("Atari, Amstrad, Commodore, Amiga, Sega, etc. joystick driver"); |
diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c index 7a55714a1486..fbd62abb66f9 100644 --- a/drivers/input/joystick/gamecon.c +++ b/drivers/input/joystick/gamecon.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/parport.h> | 39 | #include <linux/parport.h> |
| 40 | #include <linux/input.h> | 40 | #include <linux/input.h> |
| 41 | #include <linux/mutex.h> | 41 | #include <linux/mutex.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); | 44 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); |
| 44 | MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver"); | 45 | MODULE_DESCRIPTION("NES, SNES, N64, MultiSystem, PSX gamepad driver"); |
diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c index b6f859869540..d53b9e900234 100644 --- a/drivers/input/joystick/turbografx.c +++ b/drivers/input/joystick/turbografx.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); | 40 | MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); |
| 40 | MODULE_DESCRIPTION("TurboGraFX parallel port interface driver"); | 41 | MODULE_DESCRIPTION("TurboGraFX parallel port interface driver"); |
diff --git a/drivers/input/keyboard/adp5520-keys.c b/drivers/input/keyboard/adp5520-keys.c index a7ba27fb4109..3db8006dac3a 100644 --- a/drivers/input/keyboard/adp5520-keys.c +++ b/drivers/input/keyboard/adp5520-keys.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
| 14 | #include <linux/mfd/adp5520.h> | 14 | #include <linux/mfd/adp5520.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | struct adp5520_keys { | 17 | struct adp5520_keys { |
| 17 | struct input_dev *input; | 18 | struct input_dev *input; |
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index b5142d2d5112..4771ab172b59 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/i2c/adp5588.h> | 24 | #include <linux/i2c/adp5588.h> |
| 24 | 25 | ||
diff --git a/drivers/input/keyboard/bf54x-keys.c b/drivers/input/keyboard/bf54x-keys.c index 593c052416b9..7d989603f875 100644 --- a/drivers/input/keyboard/bf54x-keys.c +++ b/drivers/input/keyboard/bf54x-keys.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/irq.h> | 36 | #include <linux/irq.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 38 | #include <linux/pm.h> | 39 | #include <linux/pm.h> |
| 39 | #include <linux/sysctl.h> | 40 | #include <linux/sysctl.h> |
diff --git a/drivers/input/keyboard/davinci_keyscan.c b/drivers/input/keyboard/davinci_keyscan.c index d410d7a52f1d..a91ee941b5c1 100644 --- a/drivers/input/keyboard/davinci_keyscan.c +++ b/drivers/input/keyboard/davinci_keyscan.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 35 | 36 | ||
diff --git a/drivers/input/keyboard/ep93xx_keypad.c b/drivers/input/keyboard/ep93xx_keypad.c index bd25a3af1664..c8242dd190d0 100644 --- a/drivers/input/keyboard/ep93xx_keypad.c +++ b/drivers/input/keyboard/ep93xx_keypad.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/input/matrix_keypad.h> | 27 | #include <linux/input/matrix_keypad.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 30 | #include <mach/ep93xx_keypad.h> | 31 | #include <mach/ep93xx_keypad.h> |
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 2b708aa85553..b8213fd13c3f 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/irq.h> | 16 | #include <linux/irq.h> |
| 17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 18 | #include <linux/pm.h> | 18 | #include <linux/pm.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/sysctl.h> | 20 | #include <linux/sysctl.h> |
| 20 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
| 21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 2ee5b798024d..d92c15c39e68 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/timer.h> | 25 | #include <linux/timer.h> |
| 25 | 26 | ||
| 26 | /* | 27 | /* |
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c index 781fc6102860..5fc976dbce0b 100644 --- a/drivers/input/keyboard/jornada680_kbd.c +++ b/drivers/input/keyboard/jornada680_kbd.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <asm/delay.h> | 29 | #include <asm/delay.h> |
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c index 4e016d823069..2cd3e1d56ea4 100644 --- a/drivers/input/keyboard/jornada720_kbd.c +++ b/drivers/input/keyboard/jornada720_kbd.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/jornada720.h> | 28 | #include <mach/jornada720.h> |
| 28 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
diff --git a/drivers/input/keyboard/lm8323.c b/drivers/input/keyboard/lm8323.c index 574eda2a4957..60ac4684f875 100644 --- a/drivers/input/keyboard/lm8323.c +++ b/drivers/input/keyboard/lm8323.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 32 | #include <linux/leds.h> | 32 | #include <linux/leds.h> |
| 33 | #include <linux/i2c/lm8323.h> | 33 | #include <linux/i2c/lm8323.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | /* Commands to send to the chip. */ | 36 | /* Commands to send to the chip. */ |
| 36 | #define LM8323_CMD_READ_ID 0x80 /* Read chip ID. */ | 37 | #define LM8323_CMD_READ_ID 0x80 /* Read chip ID. */ |
diff --git a/drivers/input/keyboard/matrix_keypad.c b/drivers/input/keyboard/matrix_keypad.c index d3c8b61a941d..ffc25cfcef7a 100644 --- a/drivers/input/keyboard/matrix_keypad.c +++ b/drivers/input/keyboard/matrix_keypad.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
| 24 | #include <linux/input/matrix_keypad.h> | 24 | #include <linux/input/matrix_keypad.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | struct matrix_keypad { | 27 | struct matrix_keypad { |
| 27 | const struct matrix_keypad_platform_data *pdata; | 28 | const struct matrix_keypad_platform_data *pdata; |
diff --git a/drivers/input/keyboard/max7359_keypad.c b/drivers/input/keyboard/max7359_keypad.c index 3b5b948eba39..7fc8185e5c1b 100644 --- a/drivers/input/keyboard/max7359_keypad.c +++ b/drivers/input/keyboard/max7359_keypad.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 19 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 20 | #include <linux/input/matrix_keypad.h> | 21 | #include <linux/input/matrix_keypad.h> |
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 1a494d505431..a72e61ddca91 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/mutex.h> | 35 | #include <linux/mutex.h> |
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <mach/gpio.h> | 38 | #include <mach/gpio.h> |
| 38 | #include <plat/keypad.h> | 39 | #include <plat/keypad.h> |
| 39 | #include <plat/menelaus.h> | 40 | #include <plat/menelaus.h> |
diff --git a/drivers/input/keyboard/opencores-kbd.c b/drivers/input/keyboard/opencores-kbd.c index 78cccddbf551..1f1a5563f60a 100644 --- a/drivers/input/keyboard/opencores-kbd.c +++ b/drivers/input/keyboard/opencores-kbd.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | struct opencores_kbd { | 19 | struct opencores_kbd { |
| 19 | struct input_dev *input; | 20 | struct input_dev *input; |
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c index 79cd3e9fdf2e..0e53b3bc39af 100644 --- a/drivers/input/keyboard/pxa27x_keypad.c +++ b/drivers/input/keyboard/pxa27x_keypad.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/input/matrix_keypad.h> | 28 | #include <linux/input/matrix_keypad.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/mach/arch.h> | 31 | #include <asm/mach/arch.h> |
| 31 | #include <asm/mach/map.h> | 32 | #include <asm/mach/map.h> |
diff --git a/drivers/input/keyboard/pxa930_rotary.c b/drivers/input/keyboard/pxa930_rotary.c index 95fbba470e65..b7123a44b6ec 100644 --- a/drivers/input/keyboard/pxa930_rotary.c +++ b/drivers/input/keyboard/pxa930_rotary.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <mach/pxa930_rotary.h> | 18 | #include <mach/pxa930_rotary.h> |
| 18 | 19 | ||
diff --git a/drivers/input/keyboard/sh_keysc.c b/drivers/input/keyboard/sh_keysc.c index 854e2035cd6e..d7dafd9425b6 100644 --- a/drivers/input/keyboard/sh_keysc.c +++ b/drivers/input/keyboard/sh_keysc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/bitmap.h> | 22 | #include <linux/bitmap.h> |
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | static const struct { | 27 | static const struct { |
| 27 | unsigned char kymd, keyout, keyin; | 28 | unsigned char kymd, keyout, keyin; |
diff --git a/drivers/input/keyboard/tosakbd.c b/drivers/input/keyboard/tosakbd.c index 42cb3faf7336..3910f269cfc8 100644 --- a/drivers/input/keyboard/tosakbd.c +++ b/drivers/input/keyboard/tosakbd.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <mach/gpio.h> | 23 | #include <mach/gpio.h> |
| 23 | #include <mach/tosa.h> | 24 | #include <mach/tosa.h> |
diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index 21d6184efa96..7aa59e07b689 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 33 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 34 | #include <linux/i2c/twl.h> | 34 | #include <linux/i2c/twl.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | 37 | ||
| 37 | /* | 38 | /* |
diff --git a/drivers/input/keyboard/w90p910_keypad.c b/drivers/input/keyboard/w90p910_keypad.c index 6032def03707..4ef764cc493c 100644 --- a/drivers/input/keyboard/w90p910_keypad.c +++ b/drivers/input/keyboard/w90p910_keypad.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <mach/w90p910_keypad.h> | 24 | #include <mach/w90p910_keypad.h> |
| 24 | 25 | ||
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c index 69a48e8701b9..40dabd8487b5 100644 --- a/drivers/input/misc/88pm860x_onkey.c +++ b/drivers/input/misc/88pm860x_onkey.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/mfd/88pm860x.h> | 27 | #include <linux/mfd/88pm860x.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #define PM8607_WAKEUP 0x0b | 30 | #define PM8607_WAKEUP 0x0b |
| 30 | 31 | ||
diff --git a/drivers/input/misc/ati_remote2.c b/drivers/input/misc/ati_remote2.c index 15be5430bc6d..2124b99378bb 100644 --- a/drivers/input/misc/ati_remote2.c +++ b/drivers/input/misc/ati_remote2.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/usb/input.h> | 12 | #include <linux/usb/input.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | 14 | ||
| 14 | #define DRIVER_DESC "ATI/Philips USB RF remote driver" | 15 | #define DRIVER_DESC "ATI/Philips USB RF remote driver" |
| 15 | #define DRIVER_VERSION "0.3" | 16 | #define DRIVER_VERSION "0.3" |
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c index 61d10177fa83..4f72bdd69410 100644 --- a/drivers/input/misc/bfin_rotary.c +++ b/drivers/input/misc/bfin_rotary.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <asm/portmux.h> | 18 | #include <asm/portmux.h> |
| 18 | #include <asm/bfin_rotary.h> | 19 | #include <asm/bfin_rotary.h> |
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c index ee73d7219c92..fd8407a29631 100644 --- a/drivers/input/misc/cobalt_btns.c +++ b/drivers/input/misc/cobalt_btns.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #define BUTTONS_POLL_INTERVAL 30 /* msec */ | 27 | #define BUTTONS_POLL_INTERVAL 30 /* msec */ |
| 27 | #define BUTTONS_COUNT_THRESHOLD 3 | 28 | #define BUTTONS_COUNT_THRESHOLD 3 |
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c index 766c06911f41..19af682c24fb 100644 --- a/drivers/input/misc/dm355evm_keys.c +++ b/drivers/input/misc/dm355evm_keys.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/input.h> | 14 | #include <linux/input.h> |
| 14 | #include <linux/input/sparse-keymap.h> | 15 | #include <linux/input/sparse-keymap.h> |
| 15 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
diff --git a/drivers/input/misc/pcap_keys.c b/drivers/input/misc/pcap_keys.c index 7ea969347ca9..99335c286250 100644 --- a/drivers/input/misc/pcap_keys.c +++ b/drivers/input/misc/pcap_keys.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/mfd/ezx-pcap.h> | 19 | #include <linux/mfd/ezx-pcap.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | struct pcap_keys { | 22 | struct pcap_keys { |
| 22 | struct pcap_chip *pcap; | 23 | struct pcap_chip *pcap; |
diff --git a/drivers/input/misc/pcf50633-input.c b/drivers/input/misc/pcf50633-input.c index 008de0c5834b..95562735728d 100644 --- a/drivers/input/misc/pcf50633-input.c +++ b/drivers/input/misc/pcf50633-input.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/input.h> | 22 | #include <linux/input.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <linux/mfd/pcf50633/core.h> | 25 | #include <linux/mfd/pcf50633/core.h> |
| 25 | 26 | ||
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c index 4ae07935985e..1f8e0108962e 100644 --- a/drivers/input/misc/rotary_encoder.c +++ b/drivers/input/misc/rotary_encoder.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
| 24 | #include <linux/rotary_encoder.h> | 24 | #include <linux/rotary_encoder.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #define DRV_NAME "rotary-encoder" | 27 | #define DRV_NAME "rotary-encoder" |
| 27 | 28 | ||
diff --git a/drivers/input/misc/sgi_btns.c b/drivers/input/misc/sgi_btns.c index be3a15f5b25d..1a80c0dab83b 100644 --- a/drivers/input/misc/sgi_btns.c +++ b/drivers/input/misc/sgi_btns.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/ioport.h> | 22 | #include <linux/ioport.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #ifdef CONFIG_SGI_IP22 | 27 | #ifdef CONFIG_SGI_IP22 |
| 27 | #include <asm/sgi/ioc.h> | 28 | #include <asm/sgi/ioc.h> |
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c index b064419b90a2..0d45422f8095 100644 --- a/drivers/input/misc/sparcspkr.c +++ b/drivers/input/misc/sparcspkr.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 10 | #include <linux/input.h> | 10 | #include <linux/input.h> |
| 11 | #include <linux/of_device.h> | 11 | #include <linux/of_device.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #include <asm/io.h> | 14 | #include <asm/io.h> |
| 14 | 15 | ||
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 2fb79e064da3..fee9eac8e04a 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/i2c/twl.h> | 30 | #include <linux/i2c/twl.h> |
| 31 | #include <linux/mfd/twl4030-codec.h> | 31 | #include <linux/mfd/twl4030-codec.h> |
| 32 | #include <linux/input.h> | 32 | #include <linux/input.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | /* MODULE ID2 */ | 35 | /* MODULE ID2 */ |
| 35 | #define LEDEN 0x00 | 36 | #define LEDEN 0x00 |
diff --git a/drivers/input/misc/winbond-cir.c b/drivers/input/misc/winbond-cir.c index 9c155a43abc2..64f1de7960c6 100644 --- a/drivers/input/misc/winbond-cir.c +++ b/drivers/input/misc/winbond-cir.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | #include <linux/io.h> | 56 | #include <linux/io.h> |
| 57 | #include <linux/bitrev.h> | 57 | #include <linux/bitrev.h> |
| 58 | #include <linux/bitops.h> | 58 | #include <linux/bitops.h> |
| 59 | #include <linux/slab.h> | ||
| 59 | 60 | ||
| 60 | #define DRVNAME "winbond-cir" | 61 | #define DRVNAME "winbond-cir" |
| 61 | 62 | ||
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index c0afb71a3a6d..04d5a4a3181f 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/preempt.h> | 30 | #include <linux/preempt.h> |
| 31 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 33 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 34 | #include <linux/leds.h> | 35 | #include <linux/leds.h> |
diff --git a/drivers/input/misc/wm831x-on.c b/drivers/input/misc/wm831x-on.c index 1e54bce72db5..c3d7ba5f5b47 100644 --- a/drivers/input/misc/wm831x-on.c +++ b/drivers/input/misc/wm831x-on.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 23 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 24 | #include <linux/input.h> | 25 | #include <linux/input.h> |
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 7490f1da4a53..99d58764ef03 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * the Free Software Foundation. | 15 | * the Free Software Foundation. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/input.h> | 19 | #include <linux/input.h> |
| 19 | #include <linux/serio.h> | 20 | #include <linux/serio.h> |
| 20 | #include <linux/libps2.h> | 21 | #include <linux/libps2.h> |
diff --git a/drivers/input/mouse/elantech.c b/drivers/input/mouse/elantech.c index b27684f267bf..a138b5da79f9 100644 --- a/drivers/input/mouse/elantech.c +++ b/drivers/input/mouse/elantech.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 15 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 16 | #include <linux/serio.h> | 17 | #include <linux/serio.h> |
diff --git a/drivers/input/mouse/hgpk.c b/drivers/input/mouse/hgpk.c index 9169d1591c1f..08d66d820d2b 100644 --- a/drivers/input/mouse/hgpk.c +++ b/drivers/input/mouse/hgpk.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #define DEBUG | 32 | #define DEBUG |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/input.h> | 34 | #include <linux/input.h> |
| 34 | #include <linux/serio.h> | 35 | #include <linux/serio.h> |
| 35 | #include <linux/libps2.h> | 36 | #include <linux/libps2.h> |
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c index 7c1d7d420ae3..c31ad11df6bb 100644 --- a/drivers/input/mouse/lifebook.c +++ b/drivers/input/mouse/lifebook.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/serio.h> | 16 | #include <linux/serio.h> |
| 17 | #include <linux/libps2.h> | 17 | #include <linux/libps2.h> |
| 18 | #include <linux/dmi.h> | 18 | #include <linux/dmi.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include "psmouse.h" | 21 | #include "psmouse.h" |
| 21 | #include "lifebook.h" | 22 | #include "lifebook.h" |
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c index 1e827ad0afbe..943cfec15665 100644 --- a/drivers/input/mouse/pxa930_trkball.c +++ b/drivers/input/mouse/pxa930_trkball.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <mach/pxa930_trkball.h> | 24 | #include <mach/pxa930_trkball.h> |
diff --git a/drivers/input/mouse/sentelic.c b/drivers/input/mouse/sentelic.c index 81a6b81cb2fe..1242775fee19 100644 --- a/drivers/input/mouse/sentelic.c +++ b/drivers/input/mouse/sentelic.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/libps2.h> | 26 | #include <linux/libps2.h> |
| 27 | #include <linux/serio.h> | 27 | #include <linux/serio.h> |
| 28 | #include <linux/jiffies.h> | 28 | #include <linux/jiffies.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "psmouse.h" | 31 | #include "psmouse.h" |
| 31 | #include "sentelic.h" | 32 | #include "sentelic.h" |
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c index d3f5243fa093..026df6010161 100644 --- a/drivers/input/mouse/synaptics.c +++ b/drivers/input/mouse/synaptics.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/serio.h> | 29 | #include <linux/serio.h> |
| 30 | #include <linux/libps2.h> | 30 | #include <linux/libps2.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include "psmouse.h" | 32 | #include "psmouse.h" |
| 32 | #include "synaptics.h" | 33 | #include "synaptics.h" |
| 33 | 34 | ||
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 9867dfe2a638..8291e7399ffa 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/input.h> | 17 | #include <linux/input.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #define DRIVER_NAME "synaptics_i2c" | 22 | #define DRIVER_NAME "synaptics_i2c" |
| 22 | /* maximum product id is 15 characters */ | 23 | /* maximum product id is 15 characters */ |
diff --git a/drivers/input/mouse/touchkit_ps2.c b/drivers/input/mouse/touchkit_ps2.c index 909431c31ab4..88121c59c3cc 100644 --- a/drivers/input/mouse/touchkit_ps2.c +++ b/drivers/input/mouse/touchkit_ps2.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | 29 | ||
| 31 | #include <linux/input.h> | 30 | #include <linux/input.h> |
| 32 | #include <linux/serio.h> | 31 | #include <linux/serio.h> |
diff --git a/drivers/input/mouse/trackpoint.c b/drivers/input/mouse/trackpoint.c index 63d4a67830f2..0643e49ca603 100644 --- a/drivers/input/mouse/trackpoint.c +++ b/drivers/input/mouse/trackpoint.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * Trademarks are the property of their respective owners. | 8 | * Trademarks are the property of their respective owners. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 12 | #include <linux/serio.h> | 13 | #include <linux/serio.h> |
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
diff --git a/drivers/input/serio/altera_ps2.c b/drivers/input/serio/altera_ps2.c index 320b7ca48bf8..7998560a1904 100644 --- a/drivers/input/serio/altera_ps2.c +++ b/drivers/input/serio/altera_ps2.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define DRV_NAME "altera_ps2" | 23 | #define DRV_NAME "altera_ps2" |
| 23 | 24 | ||
diff --git a/drivers/input/serio/at32psif.c b/drivers/input/serio/at32psif.c index b54452a8c771..6ee8f0ddad51 100644 --- a/drivers/input/serio/at32psif.c +++ b/drivers/input/serio/at32psif.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | /* PSIF register offsets */ | 23 | /* PSIF register offsets */ |
| 23 | #define PSIF_CR 0x00 | 24 | #define PSIF_CR 0x00 |
diff --git a/drivers/input/serio/ct82c710.c b/drivers/input/serio/ct82c710.c index d1380fc72cc6..4a3084695c00 100644 --- a/drivers/input/serio/ct82c710.c +++ b/drivers/input/serio/ct82c710.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
| 36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 40 | 41 | ||
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 06addfa7cc47..3c287dd879d3 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/serio.h> | 28 | #include <linux/serio.h> |
| 28 | #include <linux/input.h> | 29 | #include <linux/input.h> |
| 29 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index 6cd03ebaf5fb..c92f4edfee7b 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/module.h> | 58 | #include <linux/module.h> |
| 59 | #include <linux/init.h> | 59 | #include <linux/init.h> |
| 60 | #include <linux/interrupt.h> | 60 | #include <linux/interrupt.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <linux/timer.h> | 62 | #include <linux/timer.h> |
| 62 | #include <linux/list.h> | 63 | #include <linux/list.h> |
| 63 | 64 | ||
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 9302ba0e48f8..577688b5b951 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/rcupdate.h> | 21 | #include <linux/rcupdate.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/i8042.h> | 23 | #include <linux/i8042.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 26 | 27 | ||
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c index f3876acc3e83..980af94ba9c8 100644 --- a/drivers/input/serio/libps2.c +++ b/drivers/input/serio/libps2.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 19 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 20 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c index b089977e0ef9..26b45936f9fd 100644 --- a/drivers/input/serio/parkbd.c +++ b/drivers/input/serio/parkbd.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/parport.h> | 48 | #include <linux/parport.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 50 | #include <linux/serio.h> | 51 | #include <linux/serio.h> |
| 51 | 52 | ||
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c index 797314be7af2..43494742541c 100644 --- a/drivers/input/serio/pcips2.c +++ b/drivers/input/serio/pcips2.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
| 16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include <linux/serio.h> | 20 | #include <linux/serio.h> |
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/drivers/input/serio/q40kbd.c b/drivers/input/serio/q40kbd.c index e36a0901646c..5eb84b3b67fb 100644 --- a/drivers/input/serio/q40kbd.c +++ b/drivers/input/serio/q40kbd.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
| 37 | #include <linux/bitops.h> | 37 | #include <linux/bitops.h> |
| 38 | #include <linux/platform_device.h> | 38 | #include <linux/platform_device.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/io.h> | 41 | #include <asm/io.h> |
| 41 | #include <asm/uaccess.h> | 42 | #include <asm/uaccess.h> |
diff --git a/drivers/input/serio/rpckbd.c b/drivers/input/serio/rpckbd.c index ed045c99f84b..9da6fbcaaa7e 100644 --- a/drivers/input/serio/rpckbd.c +++ b/drivers/input/serio/rpckbd.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/err.h> | 34 | #include <linux/err.h> |
| 35 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
| 36 | #include <linux/io.h> | 36 | #include <linux/io.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
| 39 | #include <mach/hardware.h> | 40 | #include <mach/hardware.h> |
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c index 8298e1f68234..f84f8e32e3f1 100644 --- a/drivers/input/serio/xilinx_ps2.c +++ b/drivers/input/serio/xilinx_ps2.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/serio.h> | 19 | #include <linux/serio.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 23 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 24 | #include <linux/io.h> | 25 | #include <linux/io.h> |
diff --git a/drivers/input/sparse-keymap.c b/drivers/input/sparse-keymap.c index e6bde55e5203..82ae18d29685 100644 --- a/drivers/input/sparse-keymap.c +++ b/drivers/input/sparse-keymap.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 17 | #include <linux/input/sparse-keymap.h> | 17 | #include <linux/input/sparse-keymap.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); | 20 | MODULE_AUTHOR("Dmitry Torokhov <dtor@mail.ru>"); |
| 20 | MODULE_DESCRIPTION("Generic support for sparse keymaps"); | 21 | MODULE_DESCRIPTION("Generic support for sparse keymaps"); |
diff --git a/drivers/input/touchscreen/88pm860x-ts.c b/drivers/input/touchscreen/88pm860x-ts.c index 286bb490a9f2..b3aebc2166ba 100644 --- a/drivers/input/touchscreen/88pm860x-ts.c +++ b/drivers/input/touchscreen/88pm860x-ts.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/mfd/88pm860x.h> | 16 | #include <linux/mfd/88pm860x.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #define MEAS_LEN (8) | 19 | #define MEAS_LEN (8) |
| 19 | #define ACCURATE_BIT (12) | 20 | #define ACCURATE_BIT (12) |
diff --git a/drivers/input/touchscreen/atmel-wm97xx.c b/drivers/input/touchscreen/atmel-wm97xx.c index a12242f77e23..fa8e56bd9094 100644 --- a/drivers/input/touchscreen/atmel-wm97xx.c +++ b/drivers/input/touchscreen/atmel-wm97xx.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define AC97C_ICA 0x10 | 24 | #define AC97C_ICA 0x10 |
| 24 | #define AC97C_CBRHR 0x30 | 25 | #define AC97C_CBRHR 0x30 |
diff --git a/drivers/input/touchscreen/da9034-ts.c b/drivers/input/touchscreen/da9034-ts.c index 3ffd4c4b170c..2b72a5923c16 100644 --- a/drivers/input/touchscreen/da9034-ts.c +++ b/drivers/input/touchscreen/da9034-ts.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/input.h> | 19 | #include <linux/input.h> |
| 20 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
| 21 | #include <linux/mfd/da903x.h> | 21 | #include <linux/mfd/da903x.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define DA9034_MANUAL_CTRL 0x50 | 24 | #define DA9034_MANUAL_CTRL 0x50 |
| 24 | #define DA9034_LDO_ADC_EN (1 << 4) | 25 | #define DA9034_LDO_ADC_EN (1 << 4) |
diff --git a/drivers/input/touchscreen/eeti_ts.c b/drivers/input/touchscreen/eeti_ts.c index 9029bd3f34e5..204b8a1a601c 100644 --- a/drivers/input/touchscreen/eeti_ts.c +++ b/drivers/input/touchscreen/eeti_ts.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/timer.h> | 33 | #include <linux/timer.h> |
| 34 | #include <linux/gpio.h> | 34 | #include <linux/gpio.h> |
| 35 | #include <linux/input/eeti_ts.h> | 35 | #include <linux/input/eeti_ts.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | static int flip_x; | 38 | static int flip_x; |
| 38 | module_param(flip_x, bool, 0644); | 39 | module_param(flip_x, bool, 0644); |
diff --git a/drivers/input/touchscreen/jornada720_ts.c b/drivers/input/touchscreen/jornada720_ts.c index c8b7e8a45c4d..4b0a061811ff 100644 --- a/drivers/input/touchscreen/jornada720_ts.c +++ b/drivers/input/touchscreen/jornada720_ts.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <mach/hardware.h> | 23 | #include <mach/hardware.h> |
| 23 | #include <mach/jornada720.h> | 24 | #include <mach/jornada720.h> |
diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c index be54fd639aca..c5bc62d85bb6 100644 --- a/drivers/input/touchscreen/mc13783_ts.c +++ b/drivers/input/touchscreen/mc13783_ts.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 19 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | 22 | ||
| 22 | #define MC13783_TS_NAME "mc13783-ts" | 23 | #define MC13783_TS_NAME "mc13783-ts" |
diff --git a/drivers/input/touchscreen/mcs5000_ts.c b/drivers/input/touchscreen/mcs5000_ts.c index 4c28b89757f9..ce8ab0269f6f 100644 --- a/drivers/input/touchscreen/mcs5000_ts.c +++ b/drivers/input/touchscreen/mcs5000_ts.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 22 | #include <linux/irq.h> | 22 | #include <linux/irq.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | /* Registers */ | 25 | /* Registers */ |
| 25 | #define MCS5000_TS_STATUS 0x00 | 26 | #define MCS5000_TS_STATUS 0x00 |
diff --git a/drivers/input/touchscreen/migor_ts.c b/drivers/input/touchscreen/migor_ts.c index 141dd584330e..defe5dd3627c 100644 --- a/drivers/input/touchscreen/migor_ts.c +++ b/drivers/input/touchscreen/migor_ts.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 28 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c index b79097e3028a..ea6ef16e59b4 100644 --- a/drivers/input/touchscreen/pcap_ts.c +++ b/drivers/input/touchscreen/pcap_ts.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/pm.h> | 18 | #include <linux/pm.h> |
| 18 | #include <linux/timer.h> | 19 | #include <linux/timer.h> |
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index 3755a47d053c..98a7d1279486 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/drivers/input/touchscreen/s3c2410_ts.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/gpio.h> | 29 | #include <linux/gpio.h> |
| 31 | #include <linux/input.h> | 30 | #include <linux/input.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
diff --git a/drivers/input/touchscreen/ucb1400_ts.c b/drivers/input/touchscreen/ucb1400_ts.c index 89dcbe7b4b02..028a5363eea1 100644 --- a/drivers/input/touchscreen/ucb1400_ts.c +++ b/drivers/input/touchscreen/ucb1400_ts.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/suspend.h> | 28 | #include <linux/suspend.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
| 31 | #include <linux/freezer.h> | 30 | #include <linux/freezer.h> |
| 32 | #include <linux/ucb1400.h> | 31 | #include <linux/ucb1400.h> |
diff --git a/drivers/input/touchscreen/w90p910_ts.c b/drivers/input/touchscreen/w90p910_ts.c index 6ccbdbbf33fe..cc18265be1a8 100644 --- a/drivers/input/touchscreen/w90p910_ts.c +++ b/drivers/input/touchscreen/w90p910_ts.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
| 17 | #include <linux/input.h> | 17 | #include <linux/input.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | /* ADC controller bit defines */ | 21 | /* ADC controller bit defines */ |
| 21 | #define ADC_DELAY 0xf00 | 22 | #define ADC_DELAY 0xf00 |
diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index f944918466e5..5109bf3dd858 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/wm97xx.h> | 48 | #include <linux/wm97xx.h> |
| 49 | #include <linux/uaccess.h> | 49 | #include <linux/uaccess.h> |
| 50 | #include <linux/io.h> | 50 | #include <linux/io.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | 52 | ||
| 52 | #define TS_NAME "wm97xx" | 53 | #define TS_NAME "wm97xx" |
| 53 | #define WM_CORE_VERSION "1.00" | 54 | #define WM_CORE_VERSION "1.00" |
diff --git a/drivers/input/xen-kbdfront.c b/drivers/input/xen-kbdfront.c index d30436fee476..e14081675bb2 100644 --- a/drivers/input/xen-kbdfront.c +++ b/drivers/input/xen-kbdfront.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/input.h> | 23 | #include <linux/input.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/xen/hypervisor.h> | 26 | #include <asm/xen/hypervisor.h> |
| 26 | 27 | ||
diff --git a/drivers/isdn/act2000/module.c b/drivers/isdn/act2000/module.c index f774e12bb64d..05ed72c4cf59 100644 --- a/drivers/isdn/act2000/module.c +++ b/drivers/isdn/act2000/module.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "act2000_isa.h" | 16 | #include "act2000_isa.h" |
| 17 | #include "capi.h" | 17 | #include "capi.h" |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 20 | 21 | ||
| 21 | static unsigned short act2000_isa_ports[] = | 22 | static unsigned short act2000_isa_ports[] = |
diff --git a/drivers/isdn/capi/capifs.c b/drivers/isdn/capi/capifs.c index 8596bd1a4d26..2b83850997c3 100644 --- a/drivers/isdn/capi/capifs.c +++ b/drivers/isdn/capi/capifs.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/fs.h> | 12 | #include <linux/fs.h> |
| 13 | #include <linux/mount.h> | 13 | #include <linux/mount.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/namei.h> | 15 | #include <linux/namei.h> |
| 15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
diff --git a/drivers/isdn/capi/capilib.c b/drivers/isdn/capi/capilib.c index fcaa1241ee77..0b041df2108c 100644 --- a/drivers/isdn/capi/capilib.c +++ b/drivers/isdn/capi/capilib.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | 1 | ||
| 2 | #include <linux/slab.h> | ||
| 2 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 3 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 4 | #include <linux/isdn/capilli.h> | 5 | #include <linux/isdn/capilli.h> |
diff --git a/drivers/isdn/capi/capiutil.c b/drivers/isdn/capi/capiutil.c index 26626eead828..03c469e4451f 100644 --- a/drivers/isdn/capi/capiutil.c +++ b/drivers/isdn/capi/capiutil.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/isdn/capiutil.h> | 20 | #include <linux/isdn/capiutil.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | /* from CAPI2.0 DDK AVM Berlin GmbH */ | 23 | /* from CAPI2.0 DDK AVM Berlin GmbH */ |
| 23 | 24 | ||
diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index ce9b05b9e93a..bd00dceacaf0 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/moduleparam.h> | 28 | #include <linux/moduleparam.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 31 | #include <linux/isdn/capicmd.h> | 32 | #include <linux/isdn/capicmd.h> |
| 32 | #include <linux/isdn/capiutil.h> | 33 | #include <linux/isdn/capiutil.h> |
diff --git a/drivers/isdn/divert/divert_procfs.c b/drivers/isdn/divert/divert_procfs.c index 3697c409bec6..9f49d9065791 100644 --- a/drivers/isdn/divert/divert_procfs.c +++ b/drivers/isdn/divert/divert_procfs.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/poll.h> | 13 | #include <linux/poll.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #ifdef CONFIG_PROC_FS | 15 | #ifdef CONFIG_PROC_FS |
| 15 | #include <linux/proc_fs.h> | 16 | #include <linux/proc_fs.h> |
| 16 | #else | 17 | #else |
diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c index 77e9fdda0597..70cf6bac7a5a 100644 --- a/drivers/isdn/divert/isdn_divert.c +++ b/drivers/isdn/divert/isdn_divert.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/proc_fs.h> | 12 | #include <linux/proc_fs.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
| 14 | #include <linux/jiffies.h> | 15 | #include <linux/jiffies.h> |
| 15 | 16 | ||
diff --git a/drivers/isdn/gigaset/capi.c b/drivers/isdn/gigaset/capi.c index 0220c19351d9..eb7e27105a82 100644 --- a/drivers/isdn/gigaset/capi.c +++ b/drivers/isdn/gigaset/capi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include "gigaset.h" | 14 | #include "gigaset.h" |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/ctype.h> | 16 | #include <linux/ctype.h> |
| 16 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 17 | #include <linux/seq_file.h> | 18 | #include <linux/seq_file.h> |
diff --git a/drivers/isdn/gigaset/common.c b/drivers/isdn/gigaset/common.c index bdc01cb9f0ab..0b39b387c125 100644 --- a/drivers/isdn/gigaset/common.c +++ b/drivers/isdn/gigaset/common.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/ctype.h> | 17 | #include <linux/ctype.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | /* Version Information */ | 22 | /* Version Information */ |
| 22 | #define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers" | 23 | #define DRIVER_AUTHOR "Hansjoerg Lipp <hjlipp@web.de>, Tilman Schmidt <tilman@imap.cc>, Stefan Eilers" |
diff --git a/drivers/isdn/gigaset/gigaset.h b/drivers/isdn/gigaset/gigaset.h index cdd144ecdc5f..9ef5b0463fd5 100644 --- a/drivers/isdn/gigaset/gigaset.h +++ b/drivers/isdn/gigaset/gigaset.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/compiler.h> | 23 | #include <linux/compiler.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | #include <linux/skbuff.h> | 28 | #include <linux/skbuff.h> |
diff --git a/drivers/isdn/gigaset/i4l.c b/drivers/isdn/gigaset/i4l.c index c22e5ace8276..c99fb9790a13 100644 --- a/drivers/isdn/gigaset/i4l.c +++ b/drivers/isdn/gigaset/i4l.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include "gigaset.h" | 16 | #include "gigaset.h" |
| 17 | #include <linux/isdnif.h> | 17 | #include <linux/isdnif.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #define HW_HDR_LEN 2 /* Header size used to store ack info */ | 20 | #define HW_HDR_LEN 2 /* Header size used to store ack info */ |
| 20 | 21 | ||
diff --git a/drivers/isdn/gigaset/ser-gigaset.c b/drivers/isdn/gigaset/ser-gigaset.c index 168d585d64d8..8b0afd203a07 100644 --- a/drivers/isdn/gigaset/ser-gigaset.c +++ b/drivers/isdn/gigaset/ser-gigaset.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
| 19 | #include <linux/completion.h> | 19 | #include <linux/completion.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | /* Version Information */ | 22 | /* Version Information */ |
| 22 | #define DRIVER_AUTHOR "Tilman Schmidt" | 23 | #define DRIVER_AUTHOR "Tilman Schmidt" |
diff --git a/drivers/isdn/hardware/avm/b1.c b/drivers/isdn/hardware/avm/b1.c index c38fa0f4c729..2a57da590d79 100644 --- a/drivers/isdn/hardware/avm/b1.c +++ b/drivers/isdn/hardware/avm/b1.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/capi.h> | 22 | #include <linux/capi.h> |
| 23 | #include <linux/kernelcapi.h> | 23 | #include <linux/kernelcapi.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 25 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
diff --git a/drivers/isdn/hardware/avm/b1dma.c b/drivers/isdn/hardware/avm/b1dma.c index 124550d0dbf3..9c8d7aa053c5 100644 --- a/drivers/isdn/hardware/avm/b1dma.c +++ b/drivers/isdn/hardware/avm/b1dma.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| 21 | #include <linux/capi.h> | 21 | #include <linux/capi.h> |
| 22 | #include <linux/kernelcapi.h> | 22 | #include <linux/kernelcapi.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
diff --git a/drivers/isdn/hardware/avm/c4.c b/drivers/isdn/hardware/avm/c4.c index de6e6b311819..7715d3242ec8 100644 --- a/drivers/isdn/hardware/avm/c4.c +++ b/drivers/isdn/hardware/avm/c4.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/capi.h> | 22 | #include <linux/capi.h> |
| 23 | #include <linux/kernelcapi.h> | 23 | #include <linux/kernelcapi.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/gfp.h> | ||
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 27 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
diff --git a/drivers/isdn/hardware/avm/t1isa.c b/drivers/isdn/hardware/avm/t1isa.c index baeeb3c2a3ee..08216b14be13 100644 --- a/drivers/isdn/hardware/avm/t1isa.c +++ b/drivers/isdn/hardware/avm/t1isa.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/kernelcapi.h> | 21 | #include <linux/kernelcapi.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/gfp.h> | ||
| 24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 25 | #include <linux/isdn/capicmd.h> | 26 | #include <linux/isdn/capicmd.h> |
| 26 | #include <linux/isdn/capiutil.h> | 27 | #include <linux/isdn/capiutil.h> |
diff --git a/drivers/isdn/hardware/eicon/capimain.c b/drivers/isdn/hardware/eicon/capimain.c index 0f073cd73763..97a20964cfc7 100644 --- a/drivers/isdn/hardware/eicon/capimain.c +++ b/drivers/isdn/hardware/eicon/capimain.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <asm/uaccess.h> | 16 | #include <asm/uaccess.h> |
| 16 | #include <linux/seq_file.h> | 17 | #include <linux/seq_file.h> |
diff --git a/drivers/isdn/hardware/mISDN/avmfritz.c b/drivers/isdn/hardware/mISDN/avmfritz.c index 81ac541d40d9..d4215369bb59 100644 --- a/drivers/isdn/hardware/mISDN/avmfritz.c +++ b/drivers/isdn/hardware/mISDN/avmfritz.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/mISDNhw.h> | 26 | #include <linux/mISDNhw.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <asm/unaligned.h> | 28 | #include <asm/unaligned.h> |
| 28 | #include "ipac.h" | 29 | #include "ipac.h" |
| 29 | 30 | ||
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 8affba3e569d..75e71b5d9215 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
| @@ -153,6 +153,7 @@ | |||
| 153 | #define HFC_MULTI_VERSION "2.03" | 153 | #define HFC_MULTI_VERSION "2.03" |
| 154 | 154 | ||
| 155 | #include <linux/module.h> | 155 | #include <linux/module.h> |
| 156 | #include <linux/slab.h> | ||
| 156 | #include <linux/pci.h> | 157 | #include <linux/pci.h> |
| 157 | #include <linux/delay.h> | 158 | #include <linux/delay.h> |
| 158 | #include <linux/mISDNhw.h> | 159 | #include <linux/mISDNhw.h> |
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 70e6b0e01121..5940a2c12074 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/pci.h> | 48 | #include <linux/pci.h> |
| 49 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 50 | #include <linux/mISDNhw.h> | 50 | #include <linux/mISDNhw.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | 52 | ||
| 52 | #include "hfc_pci.h" | 53 | #include "hfc_pci.h" |
| 53 | 54 | ||
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index a64bb6c67ba7..b3b7e2879bac 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
| 35 | #include <linux/mISDNhw.h> | 35 | #include <linux/mISDNhw.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include "hfcsusb.h" | 37 | #include "hfcsusb.h" |
| 37 | 38 | ||
| 38 | static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; | 39 | static const char *hfcsusb_rev = "Revision: 0.3.3 (socket), 2008-11-05"; |
diff --git a/drivers/isdn/hardware/mISDN/mISDNinfineon.c b/drivers/isdn/hardware/mISDN/mISDNinfineon.c index 36c6c616a655..f5b3d2b26a08 100644 --- a/drivers/isdn/hardware/mISDN/mISDNinfineon.c +++ b/drivers/isdn/hardware/mISDN/mISDNinfineon.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 44 | #include <linux/mISDNhw.h> | 44 | #include <linux/mISDNhw.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include "ipac.h" | 46 | #include "ipac.h" |
| 46 | 47 | ||
| 47 | #define INFINEON_REV "1.0" | 48 | #define INFINEON_REV "1.0" |
diff --git a/drivers/isdn/hardware/mISDN/mISDNipac.c b/drivers/isdn/hardware/mISDN/mISDNipac.c index 613ba0435372..64ecc6f5ffaf 100644 --- a/drivers/isdn/hardware/mISDN/mISDNipac.c +++ b/drivers/isdn/hardware/mISDN/mISDNipac.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/mISDNhw.h> | 25 | #include <linux/mISDNhw.h> |
| 25 | #include "ipac.h" | 26 | #include "ipac.h" |
diff --git a/drivers/isdn/hardware/mISDN/mISDNisar.c b/drivers/isdn/hardware/mISDN/mISDNisar.c index f0bc6fa95809..38eb31439a73 100644 --- a/drivers/isdn/hardware/mISDN/mISDNisar.c +++ b/drivers/isdn/hardware/mISDN/mISDNisar.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | /* #define DEBUG */ | 26 | /* #define DEBUG */ |
| 27 | 27 | ||
| 28 | #include <linux/gfp.h> | ||
| 28 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 29 | #include <linux/vmalloc.h> | 30 | #include <linux/vmalloc.h> |
| 30 | #include <linux/mISDNhw.h> | 31 | #include <linux/mISDNhw.h> |
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c index 6c1b164937a9..0a3553df065f 100644 --- a/drivers/isdn/hardware/mISDN/netjet.c +++ b/drivers/isdn/hardware/mISDN/netjet.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/mISDNhw.h> | 26 | #include <linux/mISDNhw.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "ipac.h" | 28 | #include "ipac.h" |
| 28 | #include "iohelper.h" | 29 | #include "iohelper.h" |
| 29 | #include "netjet.h" | 30 | #include "netjet.h" |
diff --git a/drivers/isdn/hardware/mISDN/speedfax.c b/drivers/isdn/hardware/mISDN/speedfax.c index 7726afdbb40b..d097a4e40e2b 100644 --- a/drivers/isdn/hardware/mISDN/speedfax.c +++ b/drivers/isdn/hardware/mISDN/speedfax.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 27 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 28 | #include <linux/mISDNhw.h> | 29 | #include <linux/mISDNhw.h> |
diff --git a/drivers/isdn/hardware/mISDN/w6692.c b/drivers/isdn/hardware/mISDN/w6692.c index 2952a58c7a61..31f9d71fb22f 100644 --- a/drivers/isdn/hardware/mISDN/w6692.c +++ b/drivers/isdn/hardware/mISDN/w6692.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/mISDNhw.h> | 27 | #include <linux/mISDNhw.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "w6692.h" | 29 | #include "w6692.h" |
| 29 | 30 | ||
| 30 | #define W6692_REV "2.0" | 31 | #define W6692_REV "2.0" |
diff --git a/drivers/isdn/hisax/amd7930_fn.c b/drivers/isdn/hisax/amd7930_fn.c index d6fdf1f66754..5d7278397878 100644 --- a/drivers/isdn/hisax/amd7930_fn.c +++ b/drivers/isdn/hisax/amd7930_fn.c | |||
| @@ -59,6 +59,7 @@ | |||
| 59 | #include "amd7930_fn.h" | 59 | #include "amd7930_fn.h" |
| 60 | #include <linux/interrupt.h> | 60 | #include <linux/interrupt.h> |
| 61 | #include <linux/init.h> | 61 | #include <linux/init.h> |
| 62 | #include <linux/gfp.h> | ||
| 62 | 63 | ||
| 63 | static void Amd7930_new_ph(struct IsdnCardState *cs); | 64 | static void Amd7930_new_ph(struct IsdnCardState *cs); |
| 64 | 65 | ||
diff --git a/drivers/isdn/hisax/avm_pci.c b/drivers/isdn/hisax/avm_pci.c index 14295a155e71..fcf4ed1cb4b9 100644 --- a/drivers/isdn/hisax/avm_pci.c +++ b/drivers/isdn/hisax/avm_pci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "isac.h" | 17 | #include "isac.h" |
| 18 | #include "isdnl1.h" | 18 | #include "isdnl1.h" |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/isapnp.h> | 21 | #include <linux/isapnp.h> |
| 21 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 22 | 23 | ||
diff --git a/drivers/isdn/hisax/callc.c b/drivers/isdn/hisax/callc.c index 475b1a020003..f58ded8f403f 100644 --- a/drivers/isdn/hisax/callc.c +++ b/drivers/isdn/hisax/callc.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | #include "hisax.h" | 22 | #include "hisax.h" |
| 22 | #include <linux/isdn/capicmd.h> | 23 | #include <linux/isdn/capicmd.h> |
diff --git a/drivers/isdn/hisax/config.c b/drivers/isdn/hisax/config.c index 4fab18d4d02f..544cf4b1cce3 100644 --- a/drivers/isdn/hisax/config.c +++ b/drivers/isdn/hisax/config.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel_stat.h> | 23 | #include <linux/kernel_stat.h> |
| 24 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #define HISAX_STATUS_BUFSIZE 4096 | 27 | #define HISAX_STATUS_BUFSIZE 4096 |
| 27 | 28 | ||
| 28 | /* | 29 | /* |
diff --git a/drivers/isdn/hisax/elsa.c b/drivers/isdn/hisax/elsa.c index 23c41fcd864e..5d9d338814aa 100644 --- a/drivers/isdn/hisax/elsa.c +++ b/drivers/isdn/hisax/elsa.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include "hisax.h" | 23 | #include "hisax.h" |
| 23 | #include "arcofi.h" | 24 | #include "arcofi.h" |
| 24 | #include "isac.h" | 25 | #include "isac.h" |
diff --git a/drivers/isdn/hisax/elsa_ser.c b/drivers/isdn/hisax/elsa_ser.c index 1657bba7879e..cbda3790a10d 100644 --- a/drivers/isdn/hisax/elsa_ser.c +++ b/drivers/isdn/hisax/elsa_ser.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/serial.h> | 10 | #include <linux/serial.h> |
| 11 | #include <linux/serial_reg.h> | 11 | #include <linux/serial_reg.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #define MAX_MODEM_BUF 256 | 14 | #define MAX_MODEM_BUF 256 |
| 14 | #define WAKEUP_CHARS (MAX_MODEM_BUF/2) | 15 | #define WAKEUP_CHARS (MAX_MODEM_BUF/2) |
diff --git a/drivers/isdn/hisax/fsm.c b/drivers/isdn/hisax/fsm.c index 34fade96a581..732ea633758c 100644 --- a/drivers/isdn/hisax/fsm.c +++ b/drivers/isdn/hisax/fsm.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include "hisax.h" | 20 | #include "hisax.h" |
| 20 | 21 | ||
diff --git a/drivers/isdn/hisax/hfc4s8s_l1.c b/drivers/isdn/hisax/hfc4s8s_l1.c index ab98e135bcbb..051b44e2556c 100644 --- a/drivers/isdn/hisax/hfc4s8s_l1.c +++ b/drivers/isdn/hisax/hfc4s8s_l1.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 29 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> |
| 30 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
diff --git a/drivers/isdn/hisax/hfc_2bds0.c b/drivers/isdn/hisax/hfc_2bds0.c index 8d22f50760eb..7250f56a5246 100644 --- a/drivers/isdn/hisax/hfc_2bds0.c +++ b/drivers/isdn/hisax/hfc_2bds0.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/sched.h> | 14 | #include <linux/sched.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include "hisax.h" | 16 | #include "hisax.h" |
| 16 | #include "hfc_2bds0.h" | 17 | #include "hfc_2bds0.h" |
| 17 | #include "isdnl1.h" | 18 | #include "isdnl1.h" |
diff --git a/drivers/isdn/hisax/hfc_2bs0.c b/drivers/isdn/hisax/hfc_2bs0.c index d0520ad30677..b1f6481e1193 100644 --- a/drivers/isdn/hisax/hfc_2bs0.c +++ b/drivers/isdn/hisax/hfc_2bs0.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "isac.h" | 16 | #include "isac.h" |
| 17 | #include "isdnl1.h" | 17 | #include "isdnl1.h" |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | static inline int | 21 | static inline int |
| 21 | WaitForBusy(struct IsdnCardState *cs) | 22 | WaitForBusy(struct IsdnCardState *cs) |
diff --git a/drivers/isdn/hisax/hfc_sx.c b/drivers/isdn/hisax/hfc_sx.c index 419f87cad8cb..be5faf4aa868 100644 --- a/drivers/isdn/hisax/hfc_sx.c +++ b/drivers/isdn/hisax/hfc_sx.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "isdnl1.h" | 17 | #include "isdnl1.h" |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/isapnp.h> | 19 | #include <linux/isapnp.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | static const char *hfcsx_revision = "$Revision: 1.12.2.5 $"; | 22 | static const char *hfcsx_revision = "$Revision: 1.12.2.5 $"; |
| 22 | 23 | ||
diff --git a/drivers/isdn/hisax/hfc_usb.c b/drivers/isdn/hisax/hfc_usb.c index aaaeaafd86f4..ed9527aa5f2c 100644 --- a/drivers/isdn/hisax/hfc_usb.c +++ b/drivers/isdn/hisax/hfc_usb.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 40 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
| 41 | #include <linux/moduleparam.h> | 41 | #include <linux/moduleparam.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include "hisax.h" | 43 | #include "hisax.h" |
| 43 | #include "hisax_if.h" | 44 | #include "hisax_if.h" |
| 44 | #include "hfc_usb.h" | 45 | #include "hfc_usb.h" |
diff --git a/drivers/isdn/hisax/hisax_isac.c b/drivers/isdn/hisax/hisax_isac.c index d0fefcf999cb..a8447fa2f470 100644 --- a/drivers/isdn/hisax/hisax_isac.c +++ b/drivers/isdn/hisax/hisax_isac.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/gfp.h> | ||
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
| 26 | #include "hisax_isac.h" | 27 | #include "hisax_isac.h" |
diff --git a/drivers/isdn/hisax/hscx.c b/drivers/isdn/hisax/hscx.c index c8f9951f7914..904b9100df95 100644 --- a/drivers/isdn/hisax/hscx.c +++ b/drivers/isdn/hisax/hscx.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "isac.h" | 16 | #include "isac.h" |
| 17 | #include "isdnl1.h" | 17 | #include "isdnl1.h" |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | static char *HSCXVer[] = | 21 | static char *HSCXVer[] = |
| 21 | {"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", | 22 | {"A1", "?1", "A2", "?3", "A3", "V2.1", "?6", "?7", |
diff --git a/drivers/isdn/hisax/icc.c b/drivers/isdn/hisax/icc.c index c80cbb8a2ef9..63057268cc3d 100644 --- a/drivers/isdn/hisax/icc.c +++ b/drivers/isdn/hisax/icc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | // #include "arcofi.h" | 20 | // #include "arcofi.h" |
| 21 | #include "isdnl1.h" | 21 | #include "isdnl1.h" |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #define DBUSY_TIMER_VALUE 80 | 25 | #define DBUSY_TIMER_VALUE 80 |
| 25 | #define ARCOFI_USE 0 | 26 | #define ARCOFI_USE 0 |
diff --git a/drivers/isdn/hisax/ipacx.c b/drivers/isdn/hisax/ipacx.c index 00afd5538909..751b25f2ff58 100644 --- a/drivers/isdn/hisax/ipacx.c +++ b/drivers/isdn/hisax/ipacx.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | #include "hisax_if.h" | 15 | #include "hisax_if.h" |
| 15 | #include "hisax.h" | 16 | #include "hisax.h" |
diff --git a/drivers/isdn/hisax/isac.c b/drivers/isdn/hisax/isac.c index a19354d94343..2b66728136d5 100644 --- a/drivers/isdn/hisax/isac.c +++ b/drivers/isdn/hisax/isac.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include "arcofi.h" | 18 | #include "arcofi.h" |
| 19 | #include "isdnl1.h" | 19 | #include "isdnl1.h" |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 22 | 23 | ||
| 23 | #define DBUSY_TIMER_VALUE 80 | 24 | #define DBUSY_TIMER_VALUE 80 |
diff --git a/drivers/isdn/hisax/isar.c b/drivers/isdn/hisax/isar.c index 6bde16c00fb5..40b914bded8c 100644 --- a/drivers/isdn/hisax/isar.c +++ b/drivers/isdn/hisax/isar.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include "isar.h" | 13 | #include "isar.h" |
| 14 | #include "isdnl1.h" | 14 | #include "isdnl1.h" |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define DBG_LOADFIRM 0 | 18 | #define DBG_LOADFIRM 0 |
| 18 | #define DUMP_MBOXFRAME 2 | 19 | #define DUMP_MBOXFRAME 2 |
diff --git a/drivers/isdn/hisax/isdnl1.c b/drivers/isdn/hisax/isdnl1.c index 9ce6abe05b1a..d5eeacf565d6 100644 --- a/drivers/isdn/hisax/isdnl1.c +++ b/drivers/isdn/hisax/isdnl1.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/gfp.h> | ||
| 22 | #include "hisax.h" | 23 | #include "hisax.h" |
| 23 | #include "isdnl1.h" | 24 | #include "isdnl1.h" |
| 24 | 25 | ||
diff --git a/drivers/isdn/hisax/isdnl2.c b/drivers/isdn/hisax/isdnl2.c index 7b9496a63b5f..0858791978d8 100644 --- a/drivers/isdn/hisax/isdnl2.c +++ b/drivers/isdn/hisax/isdnl2.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | #include "hisax.h" | 20 | #include "hisax.h" |
| 20 | #include "isdnl2.h" | 21 | #include "isdnl2.h" |
| 21 | 22 | ||
diff --git a/drivers/isdn/hisax/isdnl3.c b/drivers/isdn/hisax/isdnl3.c index 06766022d3ae..fd0b643ab740 100644 --- a/drivers/isdn/hisax/isdnl3.c +++ b/drivers/isdn/hisax/isdnl3.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "hisax.h" | 20 | #include "hisax.h" |
| 20 | #include "isdnl3.h" | 21 | #include "isdnl3.h" |
| 21 | 22 | ||
diff --git a/drivers/isdn/hisax/jade.c b/drivers/isdn/hisax/jade.c index 70840a710acf..ea8f840871d0 100644 --- a/drivers/isdn/hisax/jade.c +++ b/drivers/isdn/hisax/jade.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "jade.h" | 17 | #include "jade.h" |
| 18 | #include "isdnl1.h" | 18 | #include "isdnl1.h" |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | 22 | ||
| 22 | int | 23 | int |
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index a12fa4d34903..cc6ee2d39880 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include "isdnl3.h" | 23 | #include "isdnl3.h" |
| 24 | #include "l3dss1.h" | 24 | #include "l3dss1.h" |
| 25 | #include <linux/ctype.h> | 25 | #include <linux/ctype.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | extern char *HiSax_getrev(const char *revision); | 28 | extern char *HiSax_getrev(const char *revision); |
| 28 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; | 29 | static const char *dss1_revision = "$Revision: 2.32.2.3 $"; |
diff --git a/drivers/isdn/hisax/l3ni1.c b/drivers/isdn/hisax/l3ni1.c index 4622d43c7e10..f9584491fe8e 100644 --- a/drivers/isdn/hisax/l3ni1.c +++ b/drivers/isdn/hisax/l3ni1.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include "isdnl3.h" | 22 | #include "isdnl3.h" |
| 23 | #include "l3ni1.h" | 23 | #include "l3ni1.h" |
| 24 | #include <linux/ctype.h> | 24 | #include <linux/ctype.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | extern char *HiSax_getrev(const char *revision); | 27 | extern char *HiSax_getrev(const char *revision); |
| 27 | static const char *ni1_revision = "$Revision: 2.8.2.3 $"; | 28 | static const char *ni1_revision = "$Revision: 2.8.2.3 $"; |
diff --git a/drivers/isdn/hisax/netjet.c b/drivers/isdn/hisax/netjet.c index 02c6fbaeccf8..5d7f0f2ff9b9 100644 --- a/drivers/isdn/hisax/netjet.c +++ b/drivers/isdn/hisax/netjet.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include "isdnl1.h" | 21 | #include "isdnl1.h" |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/ppp_defs.h> | 23 | #include <linux/ppp_defs.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 25 | #include "netjet.h" | 26 | #include "netjet.h" |
| 26 | 27 | ||
diff --git a/drivers/isdn/hisax/st5481_b.c b/drivers/isdn/hisax/st5481_b.c index 95b1cdd97958..e56e5af889b6 100644 --- a/drivers/isdn/hisax/st5481_b.c +++ b/drivers/isdn/hisax/st5481_b.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
| 17 | #include <linux/bitrev.h> | 17 | #include <linux/bitrev.h> |
| 18 | #include "st5481.h" | 18 | #include "st5481.h" |
diff --git a/drivers/isdn/hisax/st5481_d.c b/drivers/isdn/hisax/st5481_d.c index 39e8e49cfd2d..b7876b19fe73 100644 --- a/drivers/isdn/hisax/st5481_d.c +++ b/drivers/isdn/hisax/st5481_d.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/netdevice.h> | 16 | #include <linux/netdevice.h> |
| 17 | #include "st5481.h" | 17 | #include "st5481.h" |
| 18 | 18 | ||
diff --git a/drivers/isdn/hisax/tei.c b/drivers/isdn/hisax/tei.c index 6e65424f1f04..f4cb178b0666 100644 --- a/drivers/isdn/hisax/tei.c +++ b/drivers/isdn/hisax/tei.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include "hisax.h" | 18 | #include "hisax.h" |
| 19 | #include "isdnl2.h" | 19 | #include "isdnl2.h" |
| 20 | #include <linux/gfp.h> | ||
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | #include <linux/random.h> | 22 | #include <linux/random.h> |
| 22 | 23 | ||
diff --git a/drivers/isdn/hisax/w6692.c b/drivers/isdn/hisax/w6692.c index 9d6e864023fe..e2cfb6f5aa42 100644 --- a/drivers/isdn/hisax/w6692.c +++ b/drivers/isdn/hisax/w6692.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include "isdnl1.h" | 16 | #include "isdnl1.h" |
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | /* table entry in the PCI devices list */ | 21 | /* table entry in the PCI devices list */ |
| 21 | typedef struct { | 22 | typedef struct { |
diff --git a/drivers/isdn/hysdn/hycapi.c b/drivers/isdn/hysdn/hycapi.c index fe874afa4f81..6299b06ae009 100644 --- a/drivers/isdn/hysdn/hycapi.c +++ b/drivers/isdn/hysdn/hycapi.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/skbuff.h> | 18 | #include <linux/skbuff.h> |
| 19 | #include <linux/netdevice.h> | 19 | #include <linux/netdevice.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #define VER_DRIVER 0 | 22 | #define VER_DRIVER 0 |
| 22 | #define VER_CARDTYPE 1 | 23 | #define VER_CARDTYPE 1 |
diff --git a/drivers/isdn/hysdn/hysdn_procconf.c b/drivers/isdn/hysdn/hysdn_procconf.c index 90b35e1a4b7e..80966462d6dc 100644 --- a/drivers/isdn/hysdn/hysdn_procconf.c +++ b/drivers/isdn/hysdn/hysdn_procconf.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
| 17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
| 20 | #include <net/net_namespace.h> | 21 | #include <net/net_namespace.h> |
| 21 | 22 | ||
diff --git a/drivers/isdn/hysdn/hysdn_proclog.c b/drivers/isdn/hysdn/hysdn_proclog.c index 8bcae28c4409..e83f6fda32fe 100644 --- a/drivers/isdn/hysdn/hysdn_proclog.c +++ b/drivers/isdn/hysdn/hysdn_proclog.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/poll.h> | 14 | #include <linux/poll.h> |
| 15 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
| 16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/smp_lock.h> | 18 | #include <linux/smp_lock.h> |
| 18 | 19 | ||
| 19 | #include "hysdn_defs.h" | 20 | #include "hysdn_defs.h" |
diff --git a/drivers/isdn/i4l/isdn_audio.c b/drivers/isdn/i4l/isdn_audio.c index fb350c567c6b..861bdf3421f2 100644 --- a/drivers/isdn/i4l/isdn_audio.c +++ b/drivers/isdn/i4l/isdn_audio.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/isdn.h> | 14 | #include <linux/isdn.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include "isdn_audio.h" | 16 | #include "isdn_audio.h" |
| 16 | #include "isdn_common.h" | 17 | #include "isdn_common.h" |
| 17 | 18 | ||
diff --git a/drivers/isdn/i4l/isdn_common.c b/drivers/isdn/i4l/isdn_common.c index 00c60e2e0ff7..70044ee4b228 100644 --- a/drivers/isdn/i4l/isdn_common.c +++ b/drivers/isdn/i4l/isdn_common.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/poll.h> | 16 | #include <linux/poll.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 18 | #include <linux/isdn.h> | 19 | #include <linux/isdn.h> |
| 19 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c index 507e13d9a57c..8c85d1e88cc6 100644 --- a/drivers/isdn/i4l/isdn_net.c +++ b/drivers/isdn/i4l/isdn_net.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/isdn.h> | 25 | #include <linux/isdn.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <net/arp.h> | 27 | #include <net/arp.h> |
| 27 | #include <net/dst.h> | 28 | #include <net/dst.h> |
| 28 | #include <net/pkt_sched.h> | 29 | #include <net/pkt_sched.h> |
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index 45df6675e8ed..f37b8f68d0aa 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/isdn.h> | 12 | #include <linux/isdn.h> |
| 13 | #include <linux/poll.h> | 13 | #include <linux/poll.h> |
| 14 | #include <linux/ppp-comp.h> | 14 | #include <linux/ppp-comp.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #ifdef CONFIG_IPPP_FILTER | 16 | #ifdef CONFIG_IPPP_FILTER |
| 16 | #include <linux/filter.h> | 17 | #include <linux/filter.h> |
| 17 | #endif | 18 | #endif |
diff --git a/drivers/isdn/i4l/isdn_tty.c b/drivers/isdn/i4l/isdn_tty.c index 2881a66c1aa9..fc8454d2eea5 100644 --- a/drivers/isdn/i4l/isdn_tty.c +++ b/drivers/isdn/i4l/isdn_tty.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #undef ISDN_TTY_STAT_DEBUG | 12 | #undef ISDN_TTY_STAT_DEBUG |
| 13 | 13 | ||
| 14 | #include <linux/isdn.h> | 14 | #include <linux/isdn.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 16 | #include <linux/smp_lock.h> | 17 | #include <linux/smp_lock.h> |
| 17 | #include "isdn_common.h" | 18 | #include "isdn_common.h" |
diff --git a/drivers/isdn/i4l/isdn_x25iface.c b/drivers/isdn/i4l/isdn_x25iface.c index 8b3efc243161..efcf1f9327e5 100644 --- a/drivers/isdn/i4l/isdn_x25iface.c +++ b/drivers/isdn/i4l/isdn_x25iface.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | /* #include <linux/isdn.h> */ | 20 | /* #include <linux/isdn.h> */ |
| 21 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 22 | #include <linux/concap.h> | 22 | #include <linux/concap.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/wanrouter.h> | 24 | #include <linux/wanrouter.h> |
| 24 | #include <net/x25device.h> | 25 | #include <net/x25device.h> |
| 25 | #include "isdn_x25iface.h" | 26 | #include "isdn_x25iface.h" |
diff --git a/drivers/isdn/icn/icn.c b/drivers/isdn/icn/icn.c index bf7997abc4ac..2e847a90bad0 100644 --- a/drivers/isdn/icn/icn.c +++ b/drivers/isdn/icn/icn.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "icn.h" | 12 | #include "icn.h" |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 16 | 17 | ||
| 17 | static int portbase = ICN_BASEADDR; | 18 | static int portbase = ICN_BASEADDR; |
diff --git a/drivers/isdn/isdnloop/isdnloop.c b/drivers/isdn/isdnloop/isdnloop.c index a335c85a736e..b8a1098b66ed 100644 --- a/drivers/isdn/isdnloop/isdnloop.c +++ b/drivers/isdn/isdnloop/isdnloop.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
| 16 | #include "isdnloop.h" | 17 | #include "isdnloop.h" |
diff --git a/drivers/isdn/mISDN/clock.c b/drivers/isdn/mISDN/clock.c index f1bbc88763b2..1fa629b3b940 100644 --- a/drivers/isdn/mISDN/clock.c +++ b/drivers/isdn/mISDN/clock.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | * | 33 | * |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 37 | #include <linux/stddef.h> | 38 | #include <linux/stddef.h> |
| 38 | #include <linux/spinlock.h> | 39 | #include <linux/spinlock.h> |
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 21d34be5af6a..afeebb00fe0b 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * | 12 | * |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 16 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
| 17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
diff --git a/drivers/isdn/mISDN/dsp_cmx.c b/drivers/isdn/mISDN/dsp_cmx.c index 9c7c0d1ba55f..713ef2b805a2 100644 --- a/drivers/isdn/mISDN/dsp_cmx.c +++ b/drivers/isdn/mISDN/dsp_cmx.c | |||
| @@ -124,6 +124,7 @@ | |||
| 124 | 124 | ||
| 125 | /* delay.h is required for hw_lock.h */ | 125 | /* delay.h is required for hw_lock.h */ |
| 126 | 126 | ||
| 127 | #include <linux/slab.h> | ||
| 127 | #include <linux/delay.h> | 128 | #include <linux/delay.h> |
| 128 | #include <linux/mISDNif.h> | 129 | #include <linux/mISDNif.h> |
| 129 | #include <linux/mISDNdsp.h> | 130 | #include <linux/mISDNdsp.h> |
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 6eac588e0a37..6f5b54864283 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c | |||
| @@ -154,6 +154,7 @@ | |||
| 154 | */ | 154 | */ |
| 155 | 155 | ||
| 156 | #include <linux/delay.h> | 156 | #include <linux/delay.h> |
| 157 | #include <linux/gfp.h> | ||
| 157 | #include <linux/mISDNif.h> | 158 | #include <linux/mISDNif.h> |
| 158 | #include <linux/mISDNdsp.h> | 159 | #include <linux/mISDNdsp.h> |
| 159 | #include <linux/module.h> | 160 | #include <linux/module.h> |
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index e9941678edfa..621f31007095 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/list.h> | 29 | #include <linux/list.h> |
| 29 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 30 | #include <linux/mISDNif.h> | 31 | #include <linux/mISDNif.h> |
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c index 1debf53670de..7dbe54ed1deb 100644 --- a/drivers/isdn/mISDN/dsp_tones.c +++ b/drivers/isdn/mISDN/dsp_tones.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * | 8 | * |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/gfp.h> | ||
| 11 | #include <linux/mISDNif.h> | 12 | #include <linux/mISDNif.h> |
| 12 | #include <linux/mISDNdsp.h> | 13 | #include <linux/mISDNdsp.h> |
| 13 | #include "core.h" | 14 | #include "core.h" |
diff --git a/drivers/isdn/mISDN/hwchannel.c b/drivers/isdn/mISDN/hwchannel.c index e8049be552aa..307bd6e8988b 100644 --- a/drivers/isdn/mISDN/hwchannel.c +++ b/drivers/isdn/mISDN/hwchannel.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/gfp.h> | ||
| 18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 19 | #include <linux/mISDNhw.h> | 20 | #include <linux/mISDNhw.h> |
| 20 | 21 | ||
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 325b1ad7d4b8..22f38e48ac4e 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c | |||
| @@ -233,6 +233,7 @@ socket process and create a new one. | |||
| 233 | #include <linux/inet.h> | 233 | #include <linux/inet.h> |
| 234 | #include <linux/workqueue.h> | 234 | #include <linux/workqueue.h> |
| 235 | #include <linux/kthread.h> | 235 | #include <linux/kthread.h> |
| 236 | #include <linux/slab.h> | ||
| 236 | #include <net/sock.h> | 237 | #include <net/sock.h> |
| 237 | #include "core.h" | 238 | #include "core.h" |
| 238 | #include "l1oip.h" | 239 | #include "l1oip.h" |
diff --git a/drivers/isdn/mISDN/layer1.c b/drivers/isdn/mISDN/layer1.c index e826eeb1ecec..ac4aa18c632b 100644 --- a/drivers/isdn/mISDN/layer1.c +++ b/drivers/isdn/mISDN/layer1.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | 18 | ||
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 20 | #include <linux/mISDNhw.h> | 21 | #include <linux/mISDNhw.h> |
| 21 | #include "core.h" | 22 | #include "core.h" |
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c index e17f0044e0b6..c97371788764 100644 --- a/drivers/isdn/mISDN/layer2.c +++ b/drivers/isdn/mISDN/layer2.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/mISDNif.h> | 18 | #include <linux/mISDNif.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "core.h" | 20 | #include "core.h" |
| 20 | #include "fsm.h" | 21 | #include "fsm.h" |
| 21 | #include "layer2.h" | 22 | #include "layer2.h" |
diff --git a/drivers/isdn/mISDN/socket.c b/drivers/isdn/mISDN/socket.c index fcfe17a19a61..3232206406b1 100644 --- a/drivers/isdn/mISDN/socket.c +++ b/drivers/isdn/mISDN/socket.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/mISDNif.h> | 18 | #include <linux/mISDNif.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "core.h" | 20 | #include "core.h" |
| 20 | 21 | ||
| 21 | static u_int *debug; | 22 | static u_int *debug; |
diff --git a/drivers/isdn/mISDN/stack.c b/drivers/isdn/mISDN/stack.c index 0d05ec43012c..b159bd59e64e 100644 --- a/drivers/isdn/mISDN/stack.c +++ b/drivers/isdn/mISDN/stack.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * | 15 | * |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/mISDNif.h> | 19 | #include <linux/mISDNif.h> |
| 19 | #include <linux/kthread.h> | 20 | #include <linux/kthread.h> |
| 20 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index 6d4da6095885..34e898fe2f4f 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | #include "layer2.h" | 17 | #include "layer2.h" |
| 18 | #include <linux/random.h> | 18 | #include <linux/random.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "core.h" | 20 | #include "core.h" |
| 20 | 21 | ||
| 21 | #define ID_REQUEST 1 | 22 | #define ID_REQUEST 1 |
diff --git a/drivers/isdn/mISDN/timerdev.c b/drivers/isdn/mISDN/timerdev.c index 5b7e9bf514f1..8785004e85e0 100644 --- a/drivers/isdn/mISDN/timerdev.c +++ b/drivers/isdn/mISDN/timerdev.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
| 21 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/timer.h> | 23 | #include <linux/timer.h> |
| 23 | #include <linux/miscdevice.h> | 24 | #include <linux/miscdevice.h> |
| 24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
diff --git a/drivers/isdn/pcbit/callbacks.c b/drivers/isdn/pcbit/callbacks.c index 43ecd0f54235..976143b2346d 100644 --- a/drivers/isdn/pcbit/callbacks.c +++ b/drivers/isdn/pcbit/callbacks.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | 20 | ||
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 25 | 24 | ||
diff --git a/drivers/isdn/pcbit/edss1.c b/drivers/isdn/pcbit/edss1.c index 37e9626cebf6..d5920ae22d73 100644 --- a/drivers/isdn/pcbit/edss1.c +++ b/drivers/isdn/pcbit/edss1.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | 20 | ||
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 24 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 25 | 24 | ||
diff --git a/drivers/isdn/sc/init.c b/drivers/isdn/sc/init.c index 5a0774880d56..ca710ab278ec 100644 --- a/drivers/isdn/sc/init.c +++ b/drivers/isdn/sc/init.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include "includes.h" | 13 | #include "includes.h" |
| 13 | #include "hardware.h" | 14 | #include "hardware.h" |
| 14 | #include "card.h" | 15 | #include "card.h" |
diff --git a/drivers/leds/dell-led.c b/drivers/leds/dell-led.c index ee310891fff8..52590296af33 100644 --- a/drivers/leds/dell-led.c +++ b/drivers/leds/dell-led.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/acpi.h> | 14 | #include <linux/acpi.h> |
| 15 | #include <linux/leds.h> | 15 | #include <linux/leds.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | MODULE_AUTHOR("Louis Davis/Jim Dailey"); | 18 | MODULE_AUTHOR("Louis Davis/Jim Dailey"); |
| 18 | MODULE_DESCRIPTION("Dell LED Control Driver"); | 19 | MODULE_DESCRIPTION("Dell LED Control Driver"); |
diff --git a/drivers/leds/led-triggers.c b/drivers/leds/led-triggers.c index d8ddd9ef8994..f1c00db88b5e 100644 --- a/drivers/leds/led-triggers.c +++ b/drivers/leds/led-triggers.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/timer.h> | 21 | #include <linux/timer.h> |
| 22 | #include <linux/rwsem.h> | 22 | #include <linux/rwsem.h> |
| 23 | #include <linux/leds.h> | 23 | #include <linux/leds.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include "leds.h" | 25 | #include "leds.h" |
| 25 | 26 | ||
| 26 | /* | 27 | /* |
diff --git a/drivers/leds/leds-88pm860x.c b/drivers/leds/leds-88pm860x.c index d196073a6aeb..16a60c06c96c 100644 --- a/drivers/leds/leds-88pm860x.c +++ b/drivers/leds/leds-88pm860x.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/workqueue.h> | 19 | #include <linux/workqueue.h> |
| 19 | #include <linux/mfd/88pm860x.h> | 20 | #include <linux/mfd/88pm860x.h> |
| 20 | 21 | ||
diff --git a/drivers/leds/leds-adp5520.c b/drivers/leds/leds-adp5520.c index a8f315902131..7ba4c7b5b97e 100644 --- a/drivers/leds/leds-adp5520.c +++ b/drivers/leds/leds-adp5520.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/leds.h> | 20 | #include <linux/leds.h> |
| 21 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
| 22 | #include <linux/mfd/adp5520.h> | 22 | #include <linux/mfd/adp5520.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | struct adp5520_led { | 25 | struct adp5520_led { |
| 25 | struct led_classdev cdev; | 26 | struct led_classdev cdev; |
diff --git a/drivers/leds/leds-atmel-pwm.c b/drivers/leds/leds-atmel-pwm.c index 52297c3ab246..c941d906bba6 100644 --- a/drivers/leds/leds-atmel-pwm.c +++ b/drivers/leds/leds-atmel-pwm.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/leds.h> | 3 | #include <linux/leds.h> |
| 4 | #include <linux/io.h> | 4 | #include <linux/io.h> |
| 5 | #include <linux/atmel_pwm.h> | 5 | #include <linux/atmel_pwm.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | 7 | ||
| 7 | 8 | ||
| 8 | struct pwmled { | 9 | struct pwmled { |
diff --git a/drivers/leds/leds-bd2802.c b/drivers/leds/leds-bd2802.c index 779d7f262c04..286b501a3573 100644 --- a/drivers/leds/leds-bd2802.c +++ b/drivers/leds/leds-bd2802.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/leds.h> | 19 | #include <linux/leds.h> |
| 20 | #include <linux/leds-bd2802.h> | 20 | #include <linux/leds-bd2802.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | 23 | ||
| 23 | #define LED_CTL(rgb2en, rgb1en) ((rgb2en) << 4 | ((rgb1en) << 0)) | 24 | #define LED_CTL(rgb2en, rgb1en) ((rgb2en) << 4 | ((rgb1en) << 0)) |
diff --git a/drivers/leds/leds-da903x.c b/drivers/leds/leds-da903x.c index 1f3cc512eff8..f28931cf6781 100644 --- a/drivers/leds/leds-da903x.c +++ b/drivers/leds/leds-da903x.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/leds.h> | 19 | #include <linux/leds.h> |
| 20 | #include <linux/workqueue.h> | 20 | #include <linux/workqueue.h> |
| 21 | #include <linux/mfd/da903x.h> | 21 | #include <linux/mfd/da903x.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define DA9030_LED1_CONTROL 0x20 | 24 | #define DA9030_LED1_CONTROL 0x20 |
| 24 | #define DA9030_LED2_CONTROL 0x21 | 25 | #define DA9030_LED2_CONTROL 0x21 |
diff --git a/drivers/leds/leds-dac124s085.c b/drivers/leds/leds-dac124s085.c index 2913d76ad3d2..31cf0d60a9a5 100644 --- a/drivers/leds/leds-dac124s085.c +++ b/drivers/leds/leds-dac124s085.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | * LED driver for the DAC124S085 SPI DAC | 9 | * LED driver for the DAC124S085 SPI DAC |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/gfp.h> | ||
| 13 | #include <linux/leds.h> | 12 | #include <linux/leds.h> |
| 14 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 15 | #include <linux/mutex.h> | 14 | #include <linux/mutex.h> |
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c index 0823e2622e8c..c6e4b772b757 100644 --- a/drivers/leds/leds-gpio.c +++ b/drivers/leds/leds-gpio.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/leds.h> | 16 | #include <linux/leds.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
| 18 | 19 | ||
| 19 | #include <asm/gpio.h> | 20 | #include <asm/gpio.h> |
diff --git a/drivers/leds/leds-lp3944.c b/drivers/leds/leds-lp3944.c index 5946208ba26e..8d5ecceba181 100644 --- a/drivers/leds/leds-lp3944.c +++ b/drivers/leds/leds-lp3944.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/i2c.h> | 30 | #include <linux/i2c.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/leds.h> | 32 | #include <linux/leds.h> |
| 32 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
| 33 | #include <linux/workqueue.h> | 34 | #include <linux/workqueue.h> |
diff --git a/drivers/leds/leds-lt3593.c b/drivers/leds/leds-lt3593.c index fee40a841959..2579678f97a6 100644 --- a/drivers/leds/leds-lt3593.c +++ b/drivers/leds/leds-lt3593.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/gpio.h> | 25 | #include <linux/gpio.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | struct lt3593_led_data { | 28 | struct lt3593_led_data { |
| 28 | struct led_classdev cdev; | 29 | struct led_classdev cdev; |
diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c index adc561eb59d2..6682175fa9f7 100644 --- a/drivers/leds/leds-pca9532.c +++ b/drivers/leds/leds-pca9532.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
| 17 | #include <linux/input.h> | 18 | #include <linux/input.h> |
| 18 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c index 4e2d1a42b48f..8ff50f234190 100644 --- a/drivers/leds/leds-pca955x.c +++ b/drivers/leds/leds-pca955x.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/err.h> | 48 | #include <linux/err.h> |
| 49 | #include <linux/i2c.h> | 49 | #include <linux/i2c.h> |
| 50 | #include <linux/workqueue.h> | 50 | #include <linux/workqueue.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | 52 | ||
| 52 | /* LED select registers determine the source that drives LED outputs */ | 53 | /* LED select registers determine the source that drives LED outputs */ |
| 53 | #define PCA955X_LS_LED_ON 0x0 /* Output LOW */ | 54 | #define PCA955X_LS_LED_ON 0x0 /* Output LOW */ |
diff --git a/drivers/leds/leds-pwm.c b/drivers/leds/leds-pwm.c index 88b1dd091cfb..da3fa8dcdf5b 100644 --- a/drivers/leds/leds-pwm.c +++ b/drivers/leds/leds-pwm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/pwm.h> | 22 | #include <linux/pwm.h> |
| 23 | #include <linux/leds_pwm.h> | 23 | #include <linux/leds_pwm.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | struct led_pwm_data { | 26 | struct led_pwm_data { |
| 26 | struct led_classdev cdev; | 27 | struct led_classdev cdev; |
diff --git a/drivers/leds/leds-regulator.c b/drivers/leds/leds-regulator.c index 7f00de3ef922..3790816643be 100644 --- a/drivers/leds/leds-regulator.c +++ b/drivers/leds/leds-regulator.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
| 17 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
| 18 | #include <linux/leds-regulator.h> | 19 | #include <linux/leds-regulator.h> |
diff --git a/drivers/leds/leds-s3c24xx.c b/drivers/leds/leds-s3c24xx.c index aa7acf3b9224..a77771dc2e95 100644 --- a/drivers/leds/leds-s3c24xx.c +++ b/drivers/leds/leds-s3c24xx.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/leds.h> | 17 | #include <linux/leds.h> |
| 18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <mach/hardware.h> | 21 | #include <mach/hardware.h> |
| 21 | #include <mach/regs-gpio.h> | 22 | #include <mach/regs-gpio.h> |
diff --git a/drivers/leds/leds-sunfire.c b/drivers/leds/leds-sunfire.c index 6b008f0c3f62..ab6d18f5c39f 100644 --- a/drivers/leds/leds-sunfire.c +++ b/drivers/leds/leds-sunfire.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/leds.h> | 9 | #include <linux/leds.h> |
| 10 | #include <linux/io.h> | 10 | #include <linux/io.h> |
| 11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #include <asm/fhc.h> | 14 | #include <asm/fhc.h> |
| 14 | #include <asm/upa.h> | 15 | #include <asm/upa.h> |
diff --git a/drivers/leds/leds-wm831x-status.c b/drivers/leds/leds-wm831x-status.c index c586d05e336a..ef5c24140a44 100644 --- a/drivers/leds/leds-wm831x-status.c +++ b/drivers/leds/leds-wm831x-status.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/leds.h> | 16 | #include <linux/leds.h> |
| 16 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 17 | #include <linux/mfd/wm831x/core.h> | 18 | #include <linux/mfd/wm831x/core.h> |
diff --git a/drivers/leds/leds-wm8350.c b/drivers/leds/leds-wm8350.c index 38c6bcb07e6c..5aab32ce4f4d 100644 --- a/drivers/leds/leds-wm8350.c +++ b/drivers/leds/leds-wm8350.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 17 | #include <linux/mfd/wm8350/pmic.h> | 17 | #include <linux/mfd/wm8350/pmic.h> |
| 18 | #include <linux/regulator/consumer.h> | 18 | #include <linux/regulator/consumer.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | /* Microamps */ | 21 | /* Microamps */ |
| 21 | static const int isink_cur[] = { | 22 | static const int isink_cur[] = { |
diff --git a/drivers/leds/ledtrig-backlight.c b/drivers/leds/ledtrig-backlight.c index d3dfcfb417b8..f948e57bd9b8 100644 --- a/drivers/leds/ledtrig-backlight.c +++ b/drivers/leds/ledtrig-backlight.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 16 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
| 17 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
diff --git a/drivers/leds/ledtrig-gpio.c b/drivers/leds/ledtrig-gpio.c index f5913372d691..991d93be0f44 100644 --- a/drivers/leds/ledtrig-gpio.c +++ b/drivers/leds/ledtrig-gpio.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
| 18 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include "leds.h" | 20 | #include "leds.h" |
| 20 | 21 | ||
| 21 | struct gpio_trig_data { | 22 | struct gpio_trig_data { |
diff --git a/drivers/leds/ledtrig-heartbeat.c b/drivers/leds/ledtrig-heartbeat.c index c1c1ea6f817b..759c0bba4a8f 100644 --- a/drivers/leds/ledtrig-heartbeat.c +++ b/drivers/leds/ledtrig-heartbeat.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
| 18 | #include <linux/sched.h> | 19 | #include <linux/sched.h> |
| 19 | #include <linux/leds.h> | 20 | #include <linux/leds.h> |
diff --git a/drivers/leds/ledtrig-timer.c b/drivers/leds/ledtrig-timer.c index 38b3378be442..82b77bd482ff 100644 --- a/drivers/leds/ledtrig-timer.c +++ b/drivers/leds/ledtrig-timer.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/timer.h> | 22 | #include <linux/timer.h> |
| 23 | #include <linux/ctype.h> | 23 | #include <linux/ctype.h> |
| 24 | #include <linux/leds.h> | 24 | #include <linux/leds.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "leds.h" | 26 | #include "leds.h" |
| 26 | 27 | ||
| 27 | struct timer_trig_data { | 28 | struct timer_trig_data { |
diff --git a/drivers/lguest/core.c b/drivers/lguest/core.c index 8744d24ac6e6..efa202499e37 100644 --- a/drivers/lguest/core.c +++ b/drivers/lguest/core.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/cpu.h> | 12 | #include <linux/cpu.h> |
| 13 | #include <linux/freezer.h> | 13 | #include <linux/freezer.h> |
| 14 | #include <linux/highmem.h> | 14 | #include <linux/highmem.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <asm/paravirt.h> | 16 | #include <asm/paravirt.h> |
| 16 | #include <asm/pgtable.h> | 17 | #include <asm/pgtable.h> |
| 17 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
diff --git a/drivers/lguest/lg.h b/drivers/lguest/lg.h index bc28745d05af..9136411fadd5 100644 --- a/drivers/lguest/lg.h +++ b/drivers/lguest/lg.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/wait.h> | 10 | #include <linux/wait.h> |
| 11 | #include <linux/hrtimer.h> | 11 | #include <linux/hrtimer.h> |
| 12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | 14 | ||
| 14 | #include <asm/lguest.h> | 15 | #include <asm/lguest.h> |
| 15 | 16 | ||
diff --git a/drivers/lguest/lguest_device.c b/drivers/lguest/lguest_device.c index b6200bc39b58..07090f379c63 100644 --- a/drivers/lguest/lguest_device.c +++ b/drivers/lguest/lguest_device.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/virtio_ring.h> | 16 | #include <linux/virtio_ring.h> |
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | #include <asm/paravirt.h> | 20 | #include <asm/paravirt.h> |
| 20 | #include <asm/lguest_hcall.h> | 21 | #include <asm/lguest_hcall.h> |
diff --git a/drivers/lguest/lguest_user.c b/drivers/lguest/lguest_user.c index bd1632388e4a..85b714df8eae 100644 --- a/drivers/lguest/lguest_user.c +++ b/drivers/lguest/lguest_user.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 11 | #include <linux/eventfd.h> | 11 | #include <linux/eventfd.h> |
| 12 | #include <linux/file.h> | 12 | #include <linux/file.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include "lg.h" | 14 | #include "lg.h" |
| 14 | 15 | ||
| 15 | /*L:056 | 16 | /*L:056 |
diff --git a/drivers/lguest/page_tables.c b/drivers/lguest/page_tables.c index cf94326f1b59..04b22128a474 100644 --- a/drivers/lguest/page_tables.c +++ b/drivers/lguest/page_tables.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | /* Copyright (C) Rusty Russell IBM Corporation 2006. | 10 | /* Copyright (C) Rusty Russell IBM Corporation 2006. |
| 11 | * GPL v2 and any later version */ | 11 | * GPL v2 and any later version */ |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/gfp.h> | ||
| 13 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 14 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
| 15 | #include <linux/random.h> | 16 | #include <linux/random.h> |
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c index e943d2a29253..067f9962f499 100644 --- a/drivers/macintosh/mac_hid.c +++ b/drivers/macintosh/mac_hid.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/sysctl.h> | 13 | #include <linux/sysctl.h> |
| 14 | #include <linux/input.h> | 14 | #include <linux/input.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | MODULE_LICENSE("GPL"); | 18 | MODULE_LICENSE("GPL"); |
| 18 | 19 | ||
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c index 93fb32038b14..7c54d80c4fb2 100644 --- a/drivers/macintosh/rack-meter.c +++ b/drivers/macintosh/rack-meter.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 22 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c index f96feeb6b9ce..888448cf7f1f 100644 --- a/drivers/macintosh/smu.c +++ b/drivers/macintosh/smu.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/mutex.h> | 38 | #include <linux/mutex.h> |
| 39 | #include <linux/of_device.h> | 39 | #include <linux/of_device.h> |
| 40 | #include <linux/of_platform.h> | 40 | #include <linux/of_platform.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/byteorder.h> | 43 | #include <asm/byteorder.h> |
| 43 | #include <asm/io.h> | 44 | #include <asm/io.h> |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 921373e4e3af..b18fa948f3d1 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
| @@ -114,7 +114,6 @@ | |||
| 114 | #include <linux/kernel.h> | 114 | #include <linux/kernel.h> |
| 115 | #include <linux/delay.h> | 115 | #include <linux/delay.h> |
| 116 | #include <linux/sched.h> | 116 | #include <linux/sched.h> |
| 117 | #include <linux/slab.h> | ||
| 118 | #include <linux/init.h> | 117 | #include <linux/init.h> |
| 119 | #include <linux/spinlock.h> | 118 | #include <linux/spinlock.h> |
| 120 | #include <linux/wait.h> | 119 | #include <linux/wait.h> |
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c index 7fb8b4da35a7..0839770e4ec5 100644 --- a/drivers/macintosh/therm_windtunnel.c +++ b/drivers/macintosh/therm_windtunnel.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 39 | #include <linux/kthread.h> | 38 | #include <linux/kthread.h> |
| 40 | #include <linux/of_platform.h> | 39 | #include <linux/of_platform.h> |
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c index fb9fa614a0e8..aeb30d07d5a2 100644 --- a/drivers/macintosh/via-pmu68k.c +++ b/drivers/macintosh/via-pmu68k.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/miscdevice.h> | 25 | #include <linux/miscdevice.h> |
| 26 | #include <linux/blkdev.h> | 26 | #include <linux/blkdev.h> |
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 31 | 30 | ||
diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c index 419795f4a2aa..c092354591bb 100644 --- a/drivers/macintosh/windfarm_core.c +++ b/drivers/macintosh/windfarm_core.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 30 | #include <linux/kthread.h> | 31 | #include <linux/kthread.h> |
diff --git a/drivers/md/dm-log-userspace-base.c b/drivers/md/dm-log-userspace-base.c index 7ac2c1450d10..1ed0094f064b 100644 --- a/drivers/md/dm-log-userspace-base.c +++ b/drivers/md/dm-log-userspace-base.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #include <linux/bio.h> | 7 | #include <linux/bio.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | #include <linux/dm-dirty-log.h> | 9 | #include <linux/dm-dirty-log.h> |
| 9 | #include <linux/device-mapper.h> | 10 | #include <linux/device-mapper.h> |
| 10 | #include <linux/dm-log-userspace.h> | 11 | #include <linux/dm-log-userspace.h> |
diff --git a/drivers/md/dm-log-userspace-transfer.c b/drivers/md/dm-log-userspace-transfer.c index f1c8cae70b4b..075cbcf8a9f5 100644 --- a/drivers/md/dm-log-userspace-transfer.c +++ b/drivers/md/dm-log-userspace-transfer.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/module.h> | 8 | #include <linux/module.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <net/sock.h> | 10 | #include <net/sock.h> |
| 10 | #include <linux/workqueue.h> | 11 | #include <linux/workqueue.h> |
| 11 | #include <linux/connector.h> | 12 | #include <linux/connector.h> |
diff --git a/drivers/md/dm-region-hash.c b/drivers/md/dm-region-hash.c index 168bd38f5006..bd5c58b28868 100644 --- a/drivers/md/dm-region-hash.c +++ b/drivers/md/dm-region-hash.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/ctype.h> | 11 | #include <linux/ctype.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/vmalloc.h> | 15 | #include <linux/vmalloc.h> |
| 15 | 16 | ||
| 16 | #include "dm.h" | 17 | #include "dm.h" |
diff --git a/drivers/md/dm-service-time.c b/drivers/md/dm-service-time.c index cfa668f46c40..9c6c2e47ad62 100644 --- a/drivers/md/dm-service-time.c +++ b/drivers/md/dm-service-time.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | #include "dm.h" | 11 | #include "dm.h" |
| 12 | #include "dm-path-selector.h" | 12 | #include "dm-path-selector.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #define DM_MSG_PREFIX "multipath service-time" | 16 | #define DM_MSG_PREFIX "multipath service-time" |
| 15 | #define ST_MIN_IO 1 | 17 | #define ST_MIN_IO 1 |
| 16 | #define ST_MAX_RELATIVE_THROUGHPUT 100 | 18 | #define ST_MAX_RELATIVE_THROUGHPUT 100 |
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c index 04feccf2a997..11dea11dc0b6 100644 --- a/drivers/md/dm-target.c +++ b/drivers/md/dm-target.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/kmod.h> | 11 | #include <linux/kmod.h> |
| 12 | #include <linux/bio.h> | 12 | #include <linux/bio.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | 13 | ||
| 15 | #define DM_MSG_PREFIX "target" | 14 | #define DM_MSG_PREFIX "target" |
| 16 | 15 | ||
diff --git a/drivers/md/faulty.c b/drivers/md/faulty.c index 713acd02ab39..8e3850b98cca 100644 --- a/drivers/md/faulty.c +++ b/drivers/md/faulty.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #define MaxFault 50 | 64 | #define MaxFault 50 |
| 65 | #include <linux/blkdev.h> | 65 | #include <linux/blkdev.h> |
| 66 | #include <linux/raid/md_u.h> | 66 | #include <linux/raid/md_u.h> |
| 67 | #include <linux/slab.h> | ||
| 67 | #include "md.h" | 68 | #include "md.h" |
| 68 | #include <linux/seq_file.h> | 69 | #include <linux/seq_file.h> |
| 69 | 70 | ||
diff --git a/drivers/md/linear.c b/drivers/md/linear.c index bb2a23159b21..09437e958235 100644 --- a/drivers/md/linear.c +++ b/drivers/md/linear.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/blkdev.h> | 19 | #include <linux/blkdev.h> |
| 20 | #include <linux/raid/md_u.h> | 20 | #include <linux/raid/md_u.h> |
| 21 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include "md.h" | 23 | #include "md.h" |
| 23 | #include "linear.h" | 24 | #include "linear.h" |
| 24 | 25 | ||
diff --git a/drivers/md/md.c b/drivers/md/md.c index fdc1890b6ac5..9712b2e97be4 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 50 | #include <linux/raid/md_p.h> | 50 | #include <linux/raid/md_p.h> |
| 51 | #include <linux/raid/md_u.h> | 51 | #include <linux/raid/md_u.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include "md.h" | 53 | #include "md.h" |
| 53 | #include "bitmap.h" | 54 | #include "bitmap.h" |
| 54 | 55 | ||
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 5558ebc705c8..789bf535d29c 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/raid/md_u.h> | 23 | #include <linux/raid/md_u.h> |
| 24 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "md.h" | 26 | #include "md.h" |
| 26 | #include "multipath.h" | 27 | #include "multipath.h" |
| 27 | 28 | ||
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 377cf2a3c333..c3bec024612e 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/blkdev.h> | 21 | #include <linux/blkdev.h> |
| 22 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "md.h" | 24 | #include "md.h" |
| 24 | #include "raid0.h" | 25 | #include "raid0.h" |
| 25 | 26 | ||
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index f741f77eeb2b..e59b10e66edb 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 31 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 35 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
| 36 | #include <linux/seq_file.h> | 37 | #include <linux/seq_file.h> |
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index b4ba41ecbd20..e2766d8251a1 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 22 | #include <linux/blkdev.h> | 23 | #include <linux/blkdev.h> |
| 23 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 70ffbd071b2e..e3e9a36ea3b7 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/async.h> | 50 | #include <linux/async.h> |
| 51 | #include <linux/seq_file.h> | 51 | #include <linux/seq_file.h> |
| 52 | #include <linux/cpu.h> | 52 | #include <linux/cpu.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | #include "md.h" | 54 | #include "md.h" |
| 54 | #include "raid5.h" | 55 | #include "raid5.h" |
| 55 | #include "bitmap.h" | 56 | #include "bitmap.h" |
diff --git a/drivers/md/raid6algos.c b/drivers/md/raid6algos.c index bffc61bff5ab..1f8784bfd44d 100644 --- a/drivers/md/raid6algos.c +++ b/drivers/md/raid6algos.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/raid/pq.h> | 19 | #include <linux/raid/pq.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | #ifndef __KERNEL__ | 21 | #ifndef __KERNEL__ |
| 21 | #include <sys/mman.h> | 22 | #include <sys/mman.h> |
| 22 | #include <stdio.h> | 23 | #include <stdio.h> |
diff --git a/drivers/media/IR/ir-keytable.c b/drivers/media/IR/ir-keytable.c index 0a3b4ed38e48..bfca26d51827 100644 --- a/drivers/media/IR/ir-keytable.c +++ b/drivers/media/IR/ir-keytable.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <media/ir-common.h> | 18 | #include <media/ir-common.h> |
| 18 | 19 | ||
| 19 | #define IR_TAB_MIN_SIZE 32 | 20 | #define IR_TAB_MIN_SIZE 32 |
diff --git a/drivers/media/IR/ir-sysfs.c b/drivers/media/IR/ir-sysfs.c index bf5fbcd84238..e14e6c486b52 100644 --- a/drivers/media/IR/ir-sysfs.c +++ b/drivers/media/IR/ir-sysfs.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * GNU General Public License for more details. | 12 | * GNU General Public License for more details. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/input.h> | 16 | #include <linux/input.h> |
| 16 | #include <linux/device.h> | 17 | #include <linux/device.h> |
| 17 | #include <media/ir-core.h> | 18 | #include <media/ir-core.h> |
diff --git a/drivers/media/common/tuners/max2165.c b/drivers/media/common/tuners/max2165.c index 3d03640cf1fe..937e4b00d7ee 100644 --- a/drivers/media/common/tuners/max2165.c +++ b/drivers/media/common/tuners/max2165.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/dvb/frontend.h> | 26 | #include <linux/dvb/frontend.h> |
| 27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "dvb_frontend.h" | 30 | #include "dvb_frontend.h" |
| 30 | 31 | ||
diff --git a/drivers/media/common/tuners/mc44s803.c b/drivers/media/common/tuners/mc44s803.c index 20c4485ce16a..fe5c4b8d83ee 100644 --- a/drivers/media/common/tuners/mc44s803.c +++ b/drivers/media/common/tuners/mc44s803.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/dvb/frontend.h> | 24 | #include <linux/dvb/frontend.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "dvb_frontend.h" | 28 | #include "dvb_frontend.h" |
| 28 | 29 | ||
diff --git a/drivers/media/common/tuners/mt2060.c b/drivers/media/common/tuners/mt2060.c index c7abe3d8f90e..2d0e7689c6a2 100644 --- a/drivers/media/common/tuners/mt2060.c +++ b/drivers/media/common/tuners/mt2060.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/dvb/frontend.h> | 26 | #include <linux/dvb/frontend.h> |
| 27 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "dvb_frontend.h" | 30 | #include "dvb_frontend.h" |
| 30 | 31 | ||
diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/common/tuners/mt20xx.c index 44608ad4e2d2..d0e70e10a717 100644 --- a/drivers/media/common/tuners/mt20xx.c +++ b/drivers/media/common/tuners/mt20xx.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
| 8 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/videodev2.h> | 10 | #include <linux/videodev2.h> |
| 10 | #include "tuner-i2c.h" | 11 | #include "tuner-i2c.h" |
| 11 | #include "mt20xx.h" | 12 | #include "mt20xx.h" |
diff --git a/drivers/media/common/tuners/mt2131.c b/drivers/media/common/tuners/mt2131.c index e8d3c48f8605..a4f830bb25d1 100644 --- a/drivers/media/common/tuners/mt2131.c +++ b/drivers/media/common/tuners/mt2131.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/dvb/frontend.h> | 24 | #include <linux/dvb/frontend.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "dvb_frontend.h" | 28 | #include "dvb_frontend.h" |
| 28 | 29 | ||
diff --git a/drivers/media/common/tuners/mt2266.c b/drivers/media/common/tuners/mt2266.c index 54b18f94b14b..25a8ea342c46 100644 --- a/drivers/media/common/tuners/mt2266.c +++ b/drivers/media/common/tuners/mt2266.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/dvb/frontend.h> | 19 | #include <linux/dvb/frontend.h> |
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include "dvb_frontend.h" | 23 | #include "dvb_frontend.h" |
| 23 | #include "mt2266.h" | 24 | #include "mt2266.h" |
diff --git a/drivers/media/common/tuners/tda827x.c b/drivers/media/common/tuners/tda827x.c index 36a7bc7585ab..b21b6ea68b25 100644 --- a/drivers/media/common/tuners/tda827x.c +++ b/drivers/media/common/tuners/tda827x.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <asm/types.h> | 23 | #include <asm/types.h> |
| 23 | #include <linux/dvb/frontend.h> | 24 | #include <linux/dvb/frontend.h> |
| 24 | #include <linux/videodev2.h> | 25 | #include <linux/videodev2.h> |
diff --git a/drivers/media/common/tuners/tda8290.c b/drivers/media/common/tuners/tda8290.c index 2833137fa819..c9062ceddc71 100644 --- a/drivers/media/common/tuners/tda8290.c +++ b/drivers/media/common/tuners/tda8290.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | #include <linux/videodev2.h> | 26 | #include <linux/videodev2.h> |
| 26 | #include "tuner-i2c.h" | 27 | #include "tuner-i2c.h" |
diff --git a/drivers/media/common/tuners/tda9887.c b/drivers/media/common/tuners/tda9887.c index a71c100c95df..bf14bd79e2fc 100644 --- a/drivers/media/common/tuners/tda9887.c +++ b/drivers/media/common/tuners/tda9887.c | |||
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 6 | #include <linux/errno.h> | 6 | #include <linux/errno.h> |
| 7 | #include <linux/slab.h> | ||
| 8 | #include <linux/delay.h> | 7 | #include <linux/delay.h> |
| 9 | #include <linux/videodev2.h> | 8 | #include <linux/videodev2.h> |
| 10 | #include <media/v4l2-common.h> | 9 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/common/tuners/tea5761.c b/drivers/media/common/tuners/tea5761.c index 60ed872f3d44..925399dffbed 100644 --- a/drivers/media/common/tuners/tea5761.c +++ b/drivers/media/common/tuners/tea5761.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/i2c.h> | 10 | #include <linux/i2c.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 12 | #include <linux/videodev2.h> | 13 | #include <linux/videodev2.h> |
| 13 | #include <media/tuner.h> | 14 | #include <media/tuner.h> |
diff --git a/drivers/media/common/tuners/tea5767.c b/drivers/media/common/tuners/tea5767.c index 223a226d20a1..36e85d81acb2 100644 --- a/drivers/media/common/tuners/tea5767.c +++ b/drivers/media/common/tuners/tea5767.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include <linux/videodev2.h> | 16 | #include <linux/videodev2.h> |
| 16 | #include "tuner-i2c.h" | 17 | #include "tuner-i2c.h" |
diff --git a/drivers/media/common/tuners/tuner-i2c.h b/drivers/media/common/tuners/tuner-i2c.h index cb1c7141f0c6..18f005634c67 100644 --- a/drivers/media/common/tuners/tuner-i2c.h +++ b/drivers/media/common/tuners/tuner-i2c.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define __TUNER_I2C_H__ | 22 | #define __TUNER_I2C_H__ |
| 23 | 23 | ||
| 24 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | struct tuner_i2c_props { | 27 | struct tuner_i2c_props { |
| 27 | u8 addr; | 28 | u8 addr; |
diff --git a/drivers/media/common/tuners/tuner-xc2028.c b/drivers/media/common/tuners/tuner-xc2028.c index be51c294b375..96d61707f501 100644 --- a/drivers/media/common/tuners/tuner-xc2028.c +++ b/drivers/media/common/tuners/tuner-xc2028.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <media/tuner.h> | 16 | #include <media/tuner.h> |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/unaligned.h> | 19 | #include <asm/unaligned.h> |
| 19 | #include "tuner-i2c.h" | 20 | #include "tuner-i2c.h" |
| 20 | #include "tuner-xc2028.h" | 21 | #include "tuner-xc2028.h" |
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index 0e246eaad05a..770243c720d2 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/smp_lock.h> | 25 | #include <linux/smp_lock.h> |
| 25 | #include <linux/string.h> | 26 | #include <linux/string.h> |
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 383cca378b8c..b6d46961a99e 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/input.h> | 29 | #include <linux/input.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <media/ir-common.h> | 31 | #include <media/ir-common.h> |
| 31 | 32 | ||
| 32 | #include "demux.h" | 33 | #include "demux.h" |
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h index c1379b56dfb4..02ebe28f830d 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.h +++ b/drivers/media/dvb/dvb-core/dmxdev.h | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
| 32 | #include <linux/string.h> | 32 | #include <linux/string.h> |
| 33 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <linux/dvb/dmx.h> | 36 | #include <linux/dvb/dmx.h> |
| 36 | 37 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 80dda308ff74..bf0e6bed28dd 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/mutex.h> | 38 | #include <linux/mutex.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <linux/dvb/frontend.h> | 41 | #include <linux/dvb/frontend.h> |
| 41 | 42 | ||
diff --git a/drivers/media/dvb/dvb-usb/af9015.c b/drivers/media/dvb/dvb-usb/af9015.c index d7975383d31b..74d94e45324d 100644 --- a/drivers/media/dvb/dvb-usb/af9015.c +++ b/drivers/media/dvb/dvb-usb/af9015.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/hash.h> | 24 | #include <linux/hash.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "af9015.h" | 27 | #include "af9015.h" |
| 27 | #include "af9013.h" | 28 | #include "af9013.h" |
diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c index a7b8405c291e..960376da7d59 100644 --- a/drivers/media/dvb/dvb-usb/cxusb.c +++ b/drivers/media/dvb/dvb-usb/cxusb.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | #include <media/tuner.h> | 26 | #include <media/tuner.h> |
| 27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "cxusb.h" | 30 | #include "cxusb.h" |
| 30 | 31 | ||
diff --git a/drivers/media/dvb/firewire/firedtv-1394.c b/drivers/media/dvb/firewire/firedtv-1394.c index c3e0ec2dcfca..26333b4f4d3e 100644 --- a/drivers/media/dvb/firewire/firedtv-1394.c +++ b/drivers/media/dvb/firewire/firedtv-1394.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 19 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 20 | 21 | ||
diff --git a/drivers/media/dvb/firewire/firedtv-rc.c b/drivers/media/dvb/firewire/firedtv-rc.c index 599d66e5843d..fcf3828472b8 100644 --- a/drivers/media/dvb/firewire/firedtv-rc.c +++ b/drivers/media/dvb/firewire/firedtv-rc.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/bitops.h> | 12 | #include <linux/bitops.h> |
| 13 | #include <linux/input.h> | 13 | #include <linux/input.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 17 | #include <linux/workqueue.h> | 18 | #include <linux/workqueue.h> |
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c index 956b80f4979c..a1fed0fa8ed4 100644 --- a/drivers/media/dvb/frontends/au8522_dig.c +++ b/drivers/media/dvb/frontends/au8522_dig.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 28 | #include "dvb_frontend.h" | 27 | #include "dvb_frontend.h" |
| 29 | #include "au8522.h" | 28 | #include "au8522.h" |
diff --git a/drivers/media/dvb/frontends/dib0070.c b/drivers/media/dvb/frontends/dib0070.c index 0d12763603b4..d4e466a90e43 100644 --- a/drivers/media/dvb/frontends/dib0070.c +++ b/drivers/media/dvb/frontends/dib0070.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
| 29 | 30 | ||
| 30 | #include "dvb_frontend.h" | 31 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/dib0090.c b/drivers/media/dvb/frontends/dib0090.c index 7eac178f57b2..65240b7801e8 100644 --- a/drivers/media/dvb/frontends/dib0090.c +++ b/drivers/media/dvb/frontends/dib0090.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
| 29 | 30 | ||
| 30 | #include "dvb_frontend.h" | 31 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/dib3000mc.c b/drivers/media/dvb/frontends/dib3000mc.c index fa851601e7d4..40a099810279 100644 --- a/drivers/media/dvb/frontends/dib3000mc.c +++ b/drivers/media/dvb/frontends/dib3000mc.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 16 | 17 | ||
| 17 | #include "dvb_frontend.h" | 18 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/dib7000m.c b/drivers/media/dvb/frontends/dib7000m.c index 0109720353bd..0f09fd31cb29 100644 --- a/drivers/media/dvb/frontends/dib7000m.c +++ b/drivers/media/dvb/frontends/dib7000m.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * published by the Free Software Foundation, version 2. | 9 | * published by the Free Software Foundation, version 2. |
| 10 | */ | 10 | */ |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 13 | 14 | ||
| 14 | #include "dvb_frontend.h" | 15 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/dib7000p.c b/drivers/media/dvb/frontends/dib7000p.c index 750ae61a20f4..85468a45c344 100644 --- a/drivers/media/dvb/frontends/dib7000p.c +++ b/drivers/media/dvb/frontends/dib7000p.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * published by the Free Software Foundation, version 2. | 8 | * published by the Free Software Foundation, version 2. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/i2c.h> | 12 | #include <linux/i2c.h> |
| 12 | 13 | ||
| 13 | #include "dvb_math.h" | 14 | #include "dvb_math.h" |
diff --git a/drivers/media/dvb/frontends/dib8000.c b/drivers/media/dvb/frontends/dib8000.c index 2aa97dd6a8af..df17b91b3250 100644 --- a/drivers/media/dvb/frontends/dib8000.c +++ b/drivers/media/dvb/frontends/dib8000.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * published by the Free Software Foundation, version 2. | 8 | * published by the Free Software Foundation, version 2. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/i2c.h> | 12 | #include <linux/i2c.h> |
| 12 | #include "dvb_math.h" | 13 | #include "dvb_math.h" |
| 13 | 14 | ||
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index 868b78bfae75..f74cca6dc26b 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 28 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/div64.h> | 30 | #include <asm/div64.h> |
| 30 | 31 | ||
| 31 | #include "dvb_frontend.h" | 32 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/dvb-pll.c b/drivers/media/dvb/frontends/dvb-pll.c index 6d865d6161d7..4d4d0bb5920a 100644 --- a/drivers/media/dvb/frontends/dvb-pll.c +++ b/drivers/media/dvb/frontends/dvb-pll.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 18 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 22 | #include <linux/dvb/frontend.h> | 23 | #include <linux/dvb/frontend.h> |
| 23 | #include <asm/types.h> | 24 | #include <asm/types.h> |
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c index 600dad6b41ea..f7a40a18777a 100644 --- a/drivers/media/dvb/frontends/itd1000.c +++ b/drivers/media/dvb/frontends/itd1000.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/dvb/frontend.h> | 25 | #include <linux/dvb/frontend.h> |
| 26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "dvb_frontend.h" | 29 | #include "dvb_frontend.h" |
| 29 | 30 | ||
diff --git a/drivers/media/dvb/frontends/lgdt3304.c b/drivers/media/dvb/frontends/lgdt3304.c index e334b5d4e578..45a529b06b9d 100644 --- a/drivers/media/dvb/frontends/lgdt3304.c +++ b/drivers/media/dvb/frontends/lgdt3304.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | 7 | ||
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 11 | #include "dvb_frontend.h" | 12 | #include "dvb_frontend.h" |
| 12 | #include "lgdt3304.h" | 13 | #include "lgdt3304.h" |
diff --git a/drivers/media/dvb/frontends/lgdt3305.c b/drivers/media/dvb/frontends/lgdt3305.c index fde8c59700fb..d69c775f8645 100644 --- a/drivers/media/dvb/frontends/lgdt3305.c +++ b/drivers/media/dvb/frontends/lgdt3305.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <asm/div64.h> | 22 | #include <asm/div64.h> |
| 23 | #include <linux/dvb/frontend.h> | 23 | #include <linux/dvb/frontend.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include "dvb_math.h" | 25 | #include "dvb_math.h" |
| 25 | #include "lgdt3305.h" | 26 | #include "lgdt3305.h" |
| 26 | 27 | ||
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c index d05f7500e0c5..599d1aa519a3 100644 --- a/drivers/media/dvb/frontends/mb86a16.c +++ b/drivers/media/dvb/frontends/mb86a16.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "dvb_frontend.h" | 27 | #include "dvb_frontend.h" |
| 27 | #include "mb86a16.h" | 28 | #include "mb86a16.h" |
diff --git a/drivers/media/dvb/frontends/s921_module.c b/drivers/media/dvb/frontends/s921_module.c index 3156b64cfc96..0eefff61cc50 100644 --- a/drivers/media/dvb/frontends/s921_module.c +++ b/drivers/media/dvb/frontends/s921_module.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 13 | #include "dvb_frontend.h" | 14 | #include "dvb_frontend.h" |
| 14 | #include "s921_module.h" | 15 | #include "s921_module.h" |
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c index 1570669837ea..8e38fcee564e 100644 --- a/drivers/media/dvb/frontends/stb0899_drv.c +++ b/drivers/media/dvb/frontends/stb0899_drv.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 26 | 27 | ||
| 27 | #include <linux/dvb/frontend.h> | 28 | #include <linux/dvb/frontend.h> |
diff --git a/drivers/media/dvb/frontends/stb6000.c b/drivers/media/dvb/frontends/stb6000.c index 0e2cb0df1441..ed699647050e 100644 --- a/drivers/media/dvb/frontends/stb6000.c +++ b/drivers/media/dvb/frontends/stb6000.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/dvb/frontend.h> | 25 | #include <linux/dvb/frontend.h> |
| 25 | #include <asm/types.h> | 26 | #include <asm/types.h> |
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c index 60ee18a94f43..f73c13323e90 100644 --- a/drivers/media/dvb/frontends/stb6100.c +++ b/drivers/media/dvb/frontends/stb6100.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 26 | 27 | ||
| 27 | #include "dvb_frontend.h" | 28 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c index c52c3357dc54..a3c07fe0e6c4 100644 --- a/drivers/media/dvb/frontends/stv090x.c +++ b/drivers/media/dvb/frontends/stv090x.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 27 | 28 | ||
| 28 | #include <linux/dvb/frontend.h> | 29 | #include <linux/dvb/frontend.h> |
diff --git a/drivers/media/dvb/frontends/stv6110.c b/drivers/media/dvb/frontends/stv6110.c index bef0cc838471..2dca7c8e5148 100644 --- a/drivers/media/dvb/frontends/stv6110.c +++ b/drivers/media/dvb/frontends/stv6110.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 22 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 26 | #include <linux/dvb/frontend.h> | 27 | #include <linux/dvb/frontend.h> |
| 27 | 28 | ||
diff --git a/drivers/media/dvb/frontends/stv6110x.c b/drivers/media/dvb/frontends/stv6110x.c index f931ed07e92d..dea4245f077c 100644 --- a/drivers/media/dvb/frontends/stv6110x.c +++ b/drivers/media/dvb/frontends/stv6110x.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 27 | 28 | ||
| 28 | #include "dvb_frontend.h" | 29 | #include "dvb_frontend.h" |
diff --git a/drivers/media/dvb/frontends/tda665x.c b/drivers/media/dvb/frontends/tda665x.c index c44fefe92d97..2c1c759a4f42 100644 --- a/drivers/media/dvb/frontends/tda665x.c +++ b/drivers/media/dvb/frontends/tda665x.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "dvb_frontend.h" | 25 | #include "dvb_frontend.h" |
| 25 | #include "tda665x.h" | 26 | #include "tda665x.h" |
diff --git a/drivers/media/dvb/frontends/tda8261.c b/drivers/media/dvb/frontends/tda8261.c index 614afcec05f1..1742056a34e8 100644 --- a/drivers/media/dvb/frontends/tda8261.c +++ b/drivers/media/dvb/frontends/tda8261.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "dvb_frontend.h" | 26 | #include "dvb_frontend.h" |
| 26 | #include "tda8261.h" | 27 | #include "tda8261.h" |
diff --git a/drivers/media/dvb/frontends/tda826x.c b/drivers/media/dvb/frontends/tda826x.c index a051554b5e25..06c94800b940 100644 --- a/drivers/media/dvb/frontends/tda826x.c +++ b/drivers/media/dvb/frontends/tda826x.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/dvb/frontend.h> | 25 | #include <linux/dvb/frontend.h> |
| 25 | #include <asm/types.h> | 26 | #include <asm/types.h> |
diff --git a/drivers/media/dvb/frontends/tua6100.c b/drivers/media/dvb/frontends/tua6100.c index 1790baee014c..bcb95c2ef296 100644 --- a/drivers/media/dvb/frontends/tua6100.c +++ b/drivers/media/dvb/frontends/tua6100.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 32 | #include <linux/dvb/frontend.h> | 33 | #include <linux/dvb/frontend.h> |
| 33 | #include <asm/types.h> | 34 | #include <asm/types.h> |
diff --git a/drivers/media/dvb/frontends/zl10036.c b/drivers/media/dvb/frontends/zl10036.c index 34c5de491d2b..4627f491656b 100644 --- a/drivers/media/dvb/frontends/zl10036.c +++ b/drivers/media/dvb/frontends/zl10036.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/dvb/frontend.h> | 31 | #include <linux/dvb/frontend.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 33 | 34 | ||
| 34 | #include "zl10036.h" | 35 | #include "zl10036.h" |
diff --git a/drivers/media/dvb/mantis/hopper_cards.c b/drivers/media/dvb/mantis/hopper_cards.c index d073c61e3c0d..09e9fc785189 100644 --- a/drivers/media/dvb/mantis/hopper_cards.c +++ b/drivers/media/dvb/mantis/hopper_cards.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 26 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 27 | 28 | ||
diff --git a/drivers/media/dvb/mantis/mantis_ca.c b/drivers/media/dvb/mantis/mantis_ca.c index 403ce043d00e..330216febd78 100644 --- a/drivers/media/dvb/mantis/mantis_ca.c +++ b/drivers/media/dvb/mantis/mantis_ca.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/signal.h> | 21 | #include <linux/signal.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | 25 | ||
diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c index 16f1708fd3bc..cf4b39ffdaad 100644 --- a/drivers/media/dvb/mantis/mantis_cards.c +++ b/drivers/media/dvb/mantis/mantis_cards.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/moduleparam.h> | 22 | #include <linux/moduleparam.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <asm/irq.h> | 26 | #include <asm/irq.h> |
| 26 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 27 | 28 | ||
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c index 0150dfe7cfbb..645e8b8a7137 100644 --- a/drivers/media/dvb/ngene/ngene-core.c +++ b/drivers/media/dvb/ngene/ngene-core.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/poll.h> | 33 | #include <linux/poll.h> |
| 35 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 36 | #include <asm/div64.h> | 35 | #include <asm/div64.h> |
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index 80d14a065bad..1c798219dc7c 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include "demux.h" | 35 | #include "demux.h" |
| 35 | #include "dmxdev.h" | 36 | #include "dmxdev.h" |
diff --git a/drivers/media/dvb/pt1/pt1.c b/drivers/media/dvb/pt1/pt1.c index 81e623a90f09..6aded234aa61 100644 --- a/drivers/media/dvb/pt1/pt1.c +++ b/drivers/media/dvb/pt1/pt1.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 27 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 28 | #include <linux/kthread.h> | 29 | #include <linux/kthread.h> |
diff --git a/drivers/media/dvb/siano/smscoreapi.c b/drivers/media/dvb/siano/smscoreapi.c index 4bfd3451b568..0c87a3c3899a 100644 --- a/drivers/media/dvb/siano/smscoreapi.c +++ b/drivers/media/dvb/siano/smscoreapi.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #include <linux/firmware.h> | 33 | #include <linux/firmware.h> |
| 33 | #include <linux/wait.h> | 34 | #include <linux/wait.h> |
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c index 5f3939821ca3..b80d09b035a1 100644 --- a/drivers/media/dvb/siano/smsdvb.c +++ b/drivers/media/dvb/siano/smsdvb.c | |||
| @@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 20 | ****************************************************************/ | 20 | ****************************************************************/ |
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | 25 | ||
| 25 | #include "dmxdev.h" | 26 | #include "dmxdev.h" |
diff --git a/drivers/media/dvb/siano/smssdio.c b/drivers/media/dvb/siano/smssdio.c index 195244a3e69b..e57d38b0197c 100644 --- a/drivers/media/dvb/siano/smssdio.c +++ b/drivers/media/dvb/siano/smssdio.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/moduleparam.h> | 35 | #include <linux/moduleparam.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
| 37 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 38 | #include <linux/mmc/card.h> | 39 | #include <linux/mmc/card.h> |
diff --git a/drivers/media/dvb/siano/smsusb.c b/drivers/media/dvb/siano/smsusb.c index 5eac27287d9c..a9c27fb69ba7 100644 --- a/drivers/media/dvb/siano/smsusb.c +++ b/drivers/media/dvb/siano/smsusb.c | |||
| @@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "smscoreapi.h" | 28 | #include "smscoreapi.h" |
| 28 | #include "sms-cards.h" | 29 | #include "sms-cards.h" |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index baf3159a3aa6..38915591c6e5 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/crc32.h> | 49 | #include <linux/crc32.h> |
| 50 | #include <linux/i2c.h> | 50 | #include <linux/i2c.h> |
| 51 | #include <linux/kthread.h> | 51 | #include <linux/kthread.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <asm/unaligned.h> | 53 | #include <asm/unaligned.h> |
| 53 | #include <asm/byteorder.h> | 54 | #include <asm/byteorder.h> |
| 54 | 55 | ||
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c index c7a65b1544a3..ac7779c45c5b 100644 --- a/drivers/media/dvb/ttpci/av7110_ca.c +++ b/drivers/media/dvb/ttpci/av7110_ca.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
| 36 | #include <linux/poll.h> | 36 | #include <linux/poll.h> |
| 37 | #include <linux/gfp.h> | ||
| 37 | 38 | ||
| 38 | #include "av7110.h" | 39 | #include "av7110.h" |
| 39 | #include "av7110_hw.h" | 40 | #include "av7110_hw.h" |
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c index 000f4d34087c..79039674a0e0 100644 --- a/drivers/media/radio/radio-gemtek-pci.c +++ b/drivers/media/radio/radio-gemtek-pci.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 49 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 49 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
| 50 | #include <linux/io.h> | 50 | #include <linux/io.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | #include <media/v4l2-device.h> | 52 | #include <media/v4l2-device.h> |
| 52 | #include <media/v4l2-ioctl.h> | 53 | #include <media/v4l2-ioctl.h> |
| 53 | 54 | ||
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index f8213b7c8ddc..08f1051979ca 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/videodev2.h> | 27 | #include <linux/videodev2.h> |
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <media/v4l2-device.h> | 30 | #include <media/v4l2-device.h> |
| 30 | #include <media/v4l2-ioctl.h> | 31 | #include <media/v4l2-ioctl.h> |
| 31 | 32 | ||
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c index 44b4dbedb322..4349213b403b 100644 --- a/drivers/media/radio/radio-maxiradio.c +++ b/drivers/media/radio/radio-maxiradio.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/videodev2.h> | 42 | #include <linux/videodev2.h> |
| 43 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ | 43 | #include <linux/version.h> /* for KERNEL_VERSION MACRO */ |
| 44 | #include <linux/io.h> | 44 | #include <linux/io.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <media/v4l2-device.h> | 46 | #include <media/v4l2-device.h> |
| 46 | #include <media/v4l2-ioctl.h> | 47 | #include <media/v4l2-ioctl.h> |
| 47 | 48 | ||
diff --git a/drivers/media/radio/radio-si4713.c b/drivers/media/radio/radio-si4713.c index 170bbe554787..13554ab13f76 100644 --- a/drivers/media/radio/radio-si4713.c +++ b/drivers/media/radio/radio-si4713.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/videodev2.h> | 29 | #include <linux/videodev2.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <media/v4l2-device.h> | 31 | #include <media/v4l2-device.h> |
| 31 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
| 32 | #include <media/v4l2-ioctl.h> | 33 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/radio/radio-tea5764.c b/drivers/media/radio/radio-tea5764.c index 8e718bfcdad3..789d2ec66e19 100644 --- a/drivers/media/radio/radio-tea5764.c +++ b/drivers/media/radio/radio-tea5764.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | * add RDS support | 32 | * add RDS support |
| 33 | */ | 33 | */ |
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 36 | #include <linux/init.h> /* Initdata */ | 37 | #include <linux/init.h> /* Initdata */ |
| 37 | #include <linux/videodev2.h> /* kernel radio structs */ | 38 | #include <linux/videodev2.h> /* kernel radio structs */ |
diff --git a/drivers/media/radio/radio-timb.c b/drivers/media/radio/radio-timb.c index 0de457f6e6eb..b8bb3ef47df5 100644 --- a/drivers/media/radio/radio-timb.c +++ b/drivers/media/radio/radio-timb.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <media/v4l2-device.h> | 22 | #include <media/v4l2-device.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 26 | #include <media/timb_radio.h> | 27 | #include <media/timb_radio.h> |
| 27 | 28 | ||
diff --git a/drivers/media/radio/saa7706h.c b/drivers/media/radio/saa7706h.c index 5db5528a8b25..585680ffbfb6 100644 --- a/drivers/media/radio/saa7706h.c +++ b/drivers/media/radio/saa7706h.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <media/v4l2-device.h> | 27 | #include <media/v4l2-device.h> |
| 27 | #include <media/v4l2-chip-ident.h> | 28 | #include <media/v4l2-chip-ident.h> |
| 28 | 29 | ||
diff --git a/drivers/media/radio/si470x/radio-si470x-i2c.c b/drivers/media/radio/si470x/radio-si470x-i2c.c index 5466015346a1..a5844d08d8b7 100644 --- a/drivers/media/radio/si470x/radio-si470x-i2c.c +++ b/drivers/media/radio/si470x/radio-si470x-i2c.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | /* kernel includes */ | 32 | /* kernel includes */ |
| 33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 35 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 36 | 37 | ||
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c index 6f60841828da..5ec13e50a9f0 100644 --- a/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/drivers/media/radio/si470x/radio-si470x-usb.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | /* kernel includes */ | 37 | /* kernel includes */ |
| 38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
| 39 | #include <linux/hid.h> | 39 | #include <linux/hid.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include "radio-si470x.h" | 42 | #include "radio-si470x.h" |
| 42 | 43 | ||
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c index 6a0028eb461f..ab63dd5b25c4 100644 --- a/drivers/media/radio/si4713-i2c.c +++ b/drivers/media/radio/si4713-i2c.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <media/v4l2-device.h> | 30 | #include <media/v4l2-device.h> |
| 30 | #include <media/v4l2-ioctl.h> | 31 | #include <media/v4l2-ioctl.h> |
| 31 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/radio/tef6862.c b/drivers/media/radio/tef6862.c index 6e607ff0c169..90cae90277e7 100644 --- a/drivers/media/radio/tef6862.c +++ b/drivers/media/radio/tef6862.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 25 | #include <linux/i2c-id.h> | 25 | #include <linux/i2c-id.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <media/v4l2-ioctl.h> | 27 | #include <media/v4l2-ioctl.h> |
| 27 | #include <media/v4l2-device.h> | 28 | #include <media/v4l2-device.h> |
| 28 | #include <media/v4l2-chip-ident.h> | 29 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/adv7170.c b/drivers/media/video/adv7170.c index 97b003449c91..48e89fbf391b 100644 --- a/drivers/media/video/adv7170.c +++ b/drivers/media/video/adv7170.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/ioctl.h> | 34 | #include <linux/ioctl.h> |
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c index cf8c06c85ded..f1ba0d742c65 100644 --- a/drivers/media/video/adv7175.c +++ b/drivers/media/video/adv7175.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/ioctl.h> | 30 | #include <linux/ioctl.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 31 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/adv7180.c b/drivers/media/video/adv7180.c index 0826f0dabc17..23e610f62736 100644 --- a/drivers/media/video/adv7180.c +++ b/drivers/media/video/adv7180.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 25 | #include <linux/i2c-id.h> | 25 | #include <linux/i2c-id.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <media/v4l2-ioctl.h> | 27 | #include <media/v4l2-ioctl.h> |
| 27 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
| 28 | #include <media/v4l2-device.h> | 29 | #include <media/v4l2-device.h> |
diff --git a/drivers/media/video/adv7343.c b/drivers/media/video/adv7343.c index df26f2fe44eb..41b2930d0ce4 100644 --- a/drivers/media/video/adv7343.c +++ b/drivers/media/video/adv7343.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/ctype.h> | 20 | #include <linux/ctype.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
| 22 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/drivers/media/video/au0828/au0828-core.c b/drivers/media/video/au0828/au0828-core.c index 3544a2f12f13..ca342e4c61fc 100644 --- a/drivers/media/video/au0828/au0828-core.c +++ b/drivers/media/video/au0828/au0828-core.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
| 24 | #include <media/v4l2-common.h> | 25 | #include <media/v4l2-common.h> |
| 25 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
diff --git a/drivers/media/video/au0828/au0828-dvb.c b/drivers/media/video/au0828/au0828-dvb.c index b8a4b52e8d47..f1edf1d4afe8 100644 --- a/drivers/media/video/au0828/au0828-dvb.c +++ b/drivers/media/video/au0828/au0828-dvb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 25 | #include <linux/suspend.h> | 26 | #include <linux/suspend.h> |
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c index dc67bc40f36f..8c140c01c5e6 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/video/au0828/au0828-video.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 33 | #include <linux/device.h> | 34 | #include <linux/device.h> |
| 34 | #include <linux/suspend.h> | 35 | #include <linux/suspend.h> |
diff --git a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c index 547e1a93c421..770cb9accf81 100644 --- a/drivers/media/video/bt819.c +++ b/drivers/media/video/bt819.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/i2c.h> | 35 | #include <linux/i2c.h> |
| 36 | #include <linux/i2c-id.h> | 36 | #include <linux/i2c-id.h> |
| 37 | #include <linux/videodev2.h> | 37 | #include <linux/videodev2.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <media/v4l2-device.h> | 39 | #include <media/v4l2-device.h> |
| 39 | #include <media/v4l2-chip-ident.h> | 40 | #include <media/v4l2-chip-ident.h> |
| 40 | #include <media/v4l2-i2c-drv.h> | 41 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c index d0b4d4925ff8..ae3337392505 100644 --- a/drivers/media/video/bt856.c +++ b/drivers/media/video/bt856.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/ioctl.h> | 34 | #include <linux/ioctl.h> |
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c index af7e3a5bac9f..62ac422bb159 100644 --- a/drivers/media/video/bt866.c +++ b/drivers/media/video/bt866.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/ioctl.h> | 34 | #include <linux/ioctl.h> |
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index cb46e8fa8aaa..f4860f03dfc3 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 41 | #include <linux/fs.h> | 42 | #include <linux/fs.h> |
| 42 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c index 74c325e594a2..fd604d32bbb9 100644 --- a/drivers/media/video/bt8xx/bttv-gpio.c +++ b/drivers/media/video/bt8xx/bttv-gpio.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | 35 | ||
| 35 | #include "bttvp.h" | 36 | #include "bttvp.h" |
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c index b320dbd635aa..aa153a986ade 100644 --- a/drivers/media/video/bt8xx/bttv-input.c +++ b/drivers/media/video/bt8xx/bttv-input.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "bttv.h" | 28 | #include "bttv.h" |
| 28 | #include "bttvp.h" | 29 | #include "bttvp.h" |
diff --git a/drivers/media/video/bt8xx/bttv-risc.c b/drivers/media/video/bt8xx/bttv-risc.c index d16af2836379..c24b1c100e13 100644 --- a/drivers/media/video/bt8xx/bttv-risc.c +++ b/drivers/media/video/bt8xx/bttv-risc.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 30 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
| 31 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c index cbbf7e80d2cf..be35e6965829 100644 --- a/drivers/media/video/cafe_ccic.c +++ b/drivers/media/video/cafe_ccic.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
| 33 | #include <linux/videodev2.h> | 33 | #include <linux/videodev2.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
| 35 | #include <media/v4l2-ioctl.h> | 36 | #include <media/v4l2-ioctl.h> |
| 36 | #include <media/v4l2-chip-ident.h> | 37 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/cpia_pp.c b/drivers/media/video/cpia_pp.c index c431df8248d6..f5604c16a092 100644 --- a/drivers/media/video/cpia_pp.c +++ b/drivers/media/video/cpia_pp.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <linux/kmod.h> | 40 | #include <linux/kmod.h> |
| 40 | 41 | ||
diff --git a/drivers/media/video/cs5345.c b/drivers/media/video/cs5345.c index 57dc1704b6c0..8362db509e2c 100644 --- a/drivers/media/video/cs5345.c +++ b/drivers/media/video/cs5345.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 24 | #include <linux/videodev2.h> | 24 | #include <linux/videodev2.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <media/v4l2-device.h> | 26 | #include <media/v4l2-device.h> |
| 26 | #include <media/v4l2-chip-ident.h> | 27 | #include <media/v4l2-chip-ident.h> |
| 27 | #include <media/v4l2-i2c-drv.h> | 28 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c index 80bca8df9fbf..3cc135a98d82 100644 --- a/drivers/media/video/cs53l32a.c +++ b/drivers/media/video/cs53l32a.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c index eb41d7ec65b9..b5d7cbf4528a 100644 --- a/drivers/media/video/cx18/cx18-alsa-main.c +++ b/drivers/media/video/cx18/cx18-alsa-main.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 27 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 28 | #include <linux/device.h> | 29 | #include <linux/device.h> |
diff --git a/drivers/media/video/cx18/cx18-controls.c b/drivers/media/video/cx18/cx18-controls.c index 93f0dae01350..7fa589240ff2 100644 --- a/drivers/media/video/cx18/cx18-controls.c +++ b/drivers/media/video/cx18/cx18-controls.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * 02111-1307 USA | 21 | * 02111-1307 USA |
| 22 | */ | 22 | */ |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "cx18-driver.h" | 26 | #include "cx18-driver.h" |
| 26 | #include "cx18-cards.h" | 27 | #include "cx18-cards.h" |
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h index 23ad6d548dc5..b9728e8eee40 100644 --- a/drivers/media/video/cx18/cx18-driver.h +++ b/drivers/media/video/cx18/cx18-driver.h | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/pagemap.h> | 42 | #include <linux/pagemap.h> |
| 43 | #include <linux/workqueue.h> | 43 | #include <linux/workqueue.h> |
| 44 | #include <linux/mutex.h> | 44 | #include <linux/mutex.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <asm/byteorder.h> | 46 | #include <asm/byteorder.h> |
| 46 | 47 | ||
| 47 | #include <linux/dvb/video.h> | 48 | #include <linux/dvb/video.h> |
diff --git a/drivers/media/video/cx231xx/cx231xx-cards.c b/drivers/media/video/cx231xx/cx231xx-cards.c index a54908235009..6bdc0ef18119 100644 --- a/drivers/media/video/cx231xx/cx231xx-cards.c +++ b/drivers/media/video/cx231xx/cx231xx-cards.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 26 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 27 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
diff --git a/drivers/media/video/cx231xx/cx231xx-core.c b/drivers/media/video/cx231xx/cx231xx-core.c index 4a60dfbc347d..b24eee115e7e 100644 --- a/drivers/media/video/cx231xx/cx231xx-core.c +++ b/drivers/media/video/cx231xx/cx231xx-core.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | #include <linux/vmalloc.h> | 28 | #include <linux/vmalloc.h> |
| 28 | #include <media/v4l2-common.h> | 29 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/cx231xx/cx231xx-dvb.c b/drivers/media/video/cx231xx/cx231xx-dvb.c index 64e025e2bdf1..4ea3776b39fb 100644 --- a/drivers/media/video/cx231xx/cx231xx-dvb.c +++ b/drivers/media/video/cx231xx/cx231xx-dvb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 24 | 25 | ||
| 25 | #include "cx231xx.h" | 26 | #include "cx231xx.h" |
diff --git a/drivers/media/video/cx231xx/cx231xx-input.c b/drivers/media/video/cx231xx/cx231xx-input.c index c5771db3bfce..b473cd8367f5 100644 --- a/drivers/media/video/cx231xx/cx231xx-input.c +++ b/drivers/media/video/cx231xx/cx231xx-input.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include "cx231xx.h" | 32 | #include "cx231xx.h" |
| 32 | 33 | ||
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c index e97b8023a655..689c5e25776c 100644 --- a/drivers/media/video/cx231xx/cx231xx-vbi.c +++ b/drivers/media/video/cx231xx/cx231xx-vbi.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #include <media/v4l2-common.h> | 33 | #include <media/v4l2-common.h> |
| 33 | #include <media/v4l2-ioctl.h> | 34 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c index d4f546f11d74..16a73eab6726 100644 --- a/drivers/media/video/cx231xx/cx231xx-video.c +++ b/drivers/media/video/cx231xx/cx231xx-video.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/version.h> | 32 | #include <linux/version.h> |
| 33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
| 34 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
| 37 | #include <media/v4l2-ioctl.h> | 38 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/video/cx23885/cx23885-417.c b/drivers/media/video/cx23885/cx23885-417.c index 2ab97ad7b6fb..a8ddc227cf86 100644 --- a/drivers/media/video/cx23885/cx23885-417.c +++ b/drivers/media/video/cx23885/cx23885-417.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/device.h> | 32 | #include <linux/device.h> |
| 33 | #include <linux/firmware.h> | 33 | #include <linux/firmware.h> |
| 34 | #include <linux/smp_lock.h> | 34 | #include <linux/smp_lock.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <media/v4l2-common.h> | 36 | #include <media/v4l2-common.h> |
| 36 | #include <media/v4l2-ioctl.h> | 37 | #include <media/v4l2-ioctl.h> |
| 37 | #include <media/cx2341x.h> | 38 | #include <media/cx2341x.h> |
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c index 9c6620f86dca..8e9d990dbe93 100644 --- a/drivers/media/video/cx23885/cx23885-input.c +++ b/drivers/media/video/cx23885/cx23885-input.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | */ | 36 | */ |
| 37 | 37 | ||
| 38 | #include <linux/input.h> | 38 | #include <linux/input.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <media/ir-common.h> | 40 | #include <media/ir-common.h> |
| 40 | #include <media/v4l2-subdev.h> | 41 | #include <media/v4l2-subdev.h> |
| 41 | 42 | ||
diff --git a/drivers/media/video/cx23885/cx23885-vbi.c b/drivers/media/video/cx23885/cx23885-vbi.c index 5b297f0323b6..708a8c766d1a 100644 --- a/drivers/media/video/cx23885/cx23885-vbi.c +++ b/drivers/media/video/cx23885/cx23885-vbi.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | 26 | ||
| 28 | #include "cx23885.h" | 27 | #include "cx23885.h" |
| 29 | 28 | ||
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h index 0e3a98d243c5..8d6a55e54ee7 100644 --- a/drivers/media/video/cx23885/cx23885.h +++ b/drivers/media/video/cx23885/cx23885.h | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 24 | #include <linux/i2c-algo-bit.h> | 24 | #include <linux/i2c-algo-bit.h> |
| 25 | #include <linux/kdev_t.h> | 25 | #include <linux/kdev_t.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <media/v4l2-device.h> | 28 | #include <media/v4l2-device.h> |
| 28 | #include <media/tuner.h> | 29 | #include <media/tuner.h> |
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c index 2bf57a4527d3..ad728d767d69 100644 --- a/drivers/media/video/cx23885/cx23888-ir.c +++ b/drivers/media/video/cx23885/cx23888-ir.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/kfifo.h> | 24 | #include <linux/kfifo.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <media/v4l2-device.h> | 27 | #include <media/v4l2-device.h> |
| 27 | #include <media/v4l2-chip-ident.h> | 28 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/cx88/cx88-alsa.c b/drivers/media/video/cx88/cx88-alsa.c index 64b350df78e3..33082c96745e 100644 --- a/drivers/media/video/cx88/cx88-alsa.c +++ b/drivers/media/video/cx88/cx88-alsa.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
| 32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/delay.h> | 36 | #include <asm/delay.h> |
| 36 | #include <sound/core.h> | 37 | #include <sound/core.h> |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 6fe30e6c4262..e46e1ceef72c 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
| 32 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 33 | #include <linux/device.h> | 34 | #include <linux/device.h> |
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c index eaf0ee7de832..2918a6e38fe8 100644 --- a/drivers/media/video/cx88/cx88-cards.c +++ b/drivers/media/video/cx88/cx88-cards.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "cx88.h" | 29 | #include "cx88.h" |
| 29 | #include "tea5767.h" | 30 | #include "tea5767.h" |
diff --git a/drivers/media/video/cx88/cx88-dsp.c b/drivers/media/video/cx88/cx88-dsp.c index 3e5eaf3fe2a6..a94e00a4ac5d 100644 --- a/drivers/media/video/cx88/cx88-dsp.c +++ b/drivers/media/video/cx88/cx88-dsp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/jiffies.h> | 25 | #include <linux/jiffies.h> |
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index de180d4d5a21..6b6abf062c21 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/hrtimer.h> | 26 | #include <linux/hrtimer.h> |
| 27 | #include <linux/input.h> | 27 | #include <linux/input.h> |
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 30 | 31 | ||
| 31 | #include "cx88.h" | 32 | #include "cx88.h" |
diff --git a/drivers/media/video/cx88/cx88-mpeg.c b/drivers/media/video/cx88/cx88-mpeg.c index 338af77f7f01..6aba7af9160a 100644 --- a/drivers/media/video/cx88/cx88-mpeg.c +++ b/drivers/media/video/cx88/cx88-mpeg.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 27 | #include <linux/device.h> | 28 | #include <linux/device.h> |
| 28 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c index e8316cf7f32f..239631568f3b 100644 --- a/drivers/media/video/cx88/cx88-tvaudio.c +++ b/drivers/media/video/cx88/cx88-tvaudio.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 40 | #include <linux/freezer.h> | 40 | #include <linux/freezer.h> |
| 41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
| 44 | #include <linux/poll.h> | 43 | #include <linux/poll.h> |
| 45 | #include <linux/signal.h> | 44 | #include <linux/signal.h> |
diff --git a/drivers/media/video/cx88/cx88-vbi.c b/drivers/media/video/cx88/cx88-vbi.c index 0943060682bc..d9445b0e7ab2 100644 --- a/drivers/media/video/cx88/cx88-vbi.c +++ b/drivers/media/video/cx88/cx88-vbi.c | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | #include <linux/kernel.h> | 3 | #include <linux/kernel.h> |
| 4 | #include <linux/module.h> | 4 | #include <linux/module.h> |
| 5 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 6 | #include <linux/slab.h> | ||
| 7 | 6 | ||
| 8 | #include "cx88.h" | 7 | #include "cx88.h" |
| 9 | 8 | ||
diff --git a/drivers/media/video/cx88/cx88-vp3054-i2c.c b/drivers/media/video/cx88/cx88-vp3054-i2c.c index 20800425c51e..794f2932b755 100644 --- a/drivers/media/video/cx88/cx88-vp3054-i2c.c +++ b/drivers/media/video/cx88/cx88-vp3054-i2c.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 27 | 28 | ||
| 28 | #include <asm/io.h> | 29 | #include <asm/io.h> |
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c index 0c394cade22a..b4cc96dc99ef 100644 --- a/drivers/media/video/davinci/dm644x_ccdc.c +++ b/drivers/media/video/davinci/dm644x_ccdc.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/platform_device.h> | 37 | #include <linux/platform_device.h> |
| 38 | #include <linux/uaccess.h> | 38 | #include <linux/uaccess.h> |
| 39 | #include <linux/videodev2.h> | 39 | #include <linux/videodev2.h> |
| 40 | #include <linux/gfp.h> | ||
| 40 | #include <linux/clk.h> | 41 | #include <linux/clk.h> |
| 41 | #include <linux/err.h> | 42 | #include <linux/err.h> |
| 42 | 43 | ||
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c index 885cd54499cf..7cf042f9b377 100644 --- a/drivers/media/video/davinci/vpfe_capture.c +++ b/drivers/media/video/davinci/vpfe_capture.c | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | * - Support for control ioctls | 67 | * - Support for control ioctls |
| 68 | */ | 68 | */ |
| 69 | #include <linux/module.h> | 69 | #include <linux/module.h> |
| 70 | #include <linux/slab.h> | ||
| 70 | #include <linux/init.h> | 71 | #include <linux/init.h> |
| 71 | #include <linux/platform_device.h> | 72 | #include <linux/platform_device.h> |
| 72 | #include <linux/interrupt.h> | 73 | #include <linux/interrupt.h> |
diff --git a/drivers/media/video/davinci/vpif_capture.c b/drivers/media/video/davinci/vpif_capture.c index 78130721f578..2e5a7fb2d0c9 100644 --- a/drivers/media/video/davinci/vpif_capture.c +++ b/drivers/media/video/davinci/vpif_capture.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/io.h> | 35 | #include <linux/io.h> |
| 36 | #include <linux/version.h> | 36 | #include <linux/version.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <media/v4l2-device.h> | 38 | #include <media/v4l2-device.h> |
| 38 | #include <media/v4l2-ioctl.h> | 39 | #include <media/v4l2-ioctl.h> |
| 39 | 40 | ||
diff --git a/drivers/media/video/davinci/vpif_display.c b/drivers/media/video/davinci/vpif_display.c index dfddef7228dd..13c3a1b97760 100644 --- a/drivers/media/video/davinci/vpif_display.c +++ b/drivers/media/video/davinci/vpif_display.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/io.h> | 31 | #include <linux/io.h> |
| 32 | #include <linux/version.h> | 32 | #include <linux/version.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 35 | #include <asm/page.h> | 36 | #include <asm/page.h> |
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index ecbcefb08739..b0fb08337710 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 28 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
| 29 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 5a37eccbd7d6..a41cc5566778 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/list.h> | 25 | #include <linux/list.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 28 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
| 29 | #include <media/v4l2-common.h> | 30 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c index 1b96356b3ab2..bcd3c371009b 100644 --- a/drivers/media/video/em28xx/em28xx-dvb.c +++ b/drivers/media/video/em28xx/em28xx-dvb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 24 | 25 | ||
| 25 | #include "em28xx.h" | 26 | #include "em28xx.h" |
diff --git a/drivers/media/video/em28xx/em28xx-input.c b/drivers/media/video/em28xx/em28xx-input.c index 1fb754e20875..20a0001e8885 100644 --- a/drivers/media/video/em28xx/em28xx-input.c +++ b/drivers/media/video/em28xx/em28xx-input.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/input.h> | 28 | #include <linux/input.h> |
| 29 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include "em28xx.h" | 32 | #include "em28xx.h" |
| 32 | 33 | ||
diff --git a/drivers/media/video/em28xx/em28xx-vbi.c b/drivers/media/video/em28xx/em28xx-vbi.c index c7dce39823d8..7f1c4a2173b6 100644 --- a/drivers/media/video/em28xx/em28xx-vbi.c +++ b/drivers/media/video/em28xx/em28xx-vbi.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | 27 | ||
| 29 | #include "em28xx.h" | 28 | #include "em28xx.h" |
| 30 | 29 | ||
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index ac2bd935927e..0fe20110bfd6 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/version.h> | 35 | #include <linux/version.h> |
| 36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 37 | #include <linux/mutex.h> | 37 | #include <linux/mutex.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include "em28xx.h" | 40 | #include "em28xx.h" |
| 40 | #include <media/v4l2-common.h> | 41 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/gspca/gspca.h b/drivers/media/video/gspca/gspca.h index 02c696a22be0..8bb242fb79de 100644 --- a/drivers/media/video/gspca/gspca.h +++ b/drivers/media/video/gspca/gspca.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/videodev2.h> | 7 | #include <linux/videodev2.h> |
| 8 | #include <media/v4l2-common.h> | 8 | #include <media/v4l2-common.h> |
| 9 | #include <linux/mutex.h> | 9 | #include <linux/mutex.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | 11 | ||
| 11 | /* compilation option */ | 12 | /* compilation option */ |
| 12 | #define GSPCA_DEBUG 1 | 13 | #define GSPCA_DEBUG 1 |
diff --git a/drivers/media/video/gspca/jeilinj.c b/drivers/media/video/gspca/jeilinj.c index 2019b04f9235..84ecd56c6470 100644 --- a/drivers/media/video/gspca/jeilinj.c +++ b/drivers/media/video/gspca/jeilinj.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #define MODULE_NAME "jeilinj" | 24 | #define MODULE_NAME "jeilinj" |
| 25 | 25 | ||
| 26 | #include <linux/workqueue.h> | 26 | #include <linux/workqueue.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "gspca.h" | 28 | #include "gspca.h" |
| 28 | #include "jpeg.h" | 29 | #include "jpeg.h" |
| 29 | 30 | ||
diff --git a/drivers/media/video/gspca/m5602/m5602_s5k83a.c b/drivers/media/video/gspca/m5602/m5602_s5k83a.c index fbd91545497a..6b3be4fa2c06 100644 --- a/drivers/media/video/gspca/m5602/m5602_s5k83a.c +++ b/drivers/media/video/gspca/m5602/m5602_s5k83a.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/kthread.h> | 19 | #include <linux/kthread.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include "m5602_s5k83a.h" | 21 | #include "m5602_s5k83a.h" |
| 21 | 22 | ||
| 22 | static int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); | 23 | static int s5k83a_set_gain(struct gspca_dev *gspca_dev, __s32 val); |
diff --git a/drivers/media/video/gspca/sn9c20x.c b/drivers/media/video/gspca/sn9c20x.c index 4a1bc08f82b9..38a6e15e096b 100644 --- a/drivers/media/video/gspca/sn9c20x.c +++ b/drivers/media/video/gspca/sn9c20x.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
| 24 | #include <linux/usb/input.h> | 24 | #include <linux/usb/input.h> |
| 25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #endif | 27 | #endif |
| 27 | 28 | ||
| 28 | #include "gspca.h" | 29 | #include "gspca.h" |
diff --git a/drivers/media/video/gspca/sonixj.c b/drivers/media/video/gspca/sonixj.c index 83d5773d4629..1d61b92f6bfc 100644 --- a/drivers/media/video/gspca/sonixj.c +++ b/drivers/media/video/gspca/sonixj.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define MODULE_NAME "sonixj" | 22 | #define MODULE_NAME "sonixj" |
| 23 | 23 | ||
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "gspca.h" | 26 | #include "gspca.h" |
| 26 | #include "jpeg.h" | 27 | #include "jpeg.h" |
| 27 | 28 | ||
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c index 1fcaca6a87f7..09b3f93fa4d6 100644 --- a/drivers/media/video/gspca/sq905.c +++ b/drivers/media/video/gspca/sq905.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #define MODULE_NAME "sq905" | 36 | #define MODULE_NAME "sq905" |
| 37 | 37 | ||
| 38 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include "gspca.h" | 40 | #include "gspca.h" |
| 40 | 41 | ||
| 41 | MODULE_AUTHOR("Adam Baker <linux@baker-net.org.uk>, " | 42 | MODULE_AUTHOR("Adam Baker <linux@baker-net.org.uk>, " |
diff --git a/drivers/media/video/gspca/sq905c.c b/drivers/media/video/gspca/sq905c.c index e64662052992..4c70628ca615 100644 --- a/drivers/media/video/gspca/sq905c.c +++ b/drivers/media/video/gspca/sq905c.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #define MODULE_NAME "sq905c" | 30 | #define MODULE_NAME "sq905c" |
| 31 | 31 | ||
| 32 | #include <linux/workqueue.h> | 32 | #include <linux/workqueue.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include "gspca.h" | 34 | #include "gspca.h" |
| 34 | 35 | ||
| 35 | MODULE_AUTHOR("Theodore Kilgore <kilgota@auburn.edu>"); | 36 | MODULE_AUTHOR("Theodore Kilgore <kilgota@auburn.edu>"); |
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c index 50986da3d912..7d7814c43f92 100644 --- a/drivers/media/video/gspca/zc3xx.c +++ b/drivers/media/video/gspca/zc3xx.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #define MODULE_NAME "zc3xx" | 22 | #define MODULE_NAME "zc3xx" |
| 23 | 23 | ||
| 24 | #include <linux/input.h> | 24 | #include <linux/input.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "gspca.h" | 26 | #include "gspca.h" |
| 26 | #include "jpeg.h" | 27 | #include "jpeg.h" |
| 27 | 28 | ||
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c index 296330a0e1e5..463b81bef6e2 100644 --- a/drivers/media/video/hdpvr/hdpvr-i2c.c +++ b/drivers/media/video/hdpvr/hdpvr-i2c.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include "hdpvr.h" | 16 | #include "hdpvr.h" |
| 16 | 17 | ||
diff --git a/drivers/media/video/ivtv/ivtv-controls.c b/drivers/media/video/ivtv/ivtv-controls.c index 4a9c8ce0ecb3..b59475bfc243 100644 --- a/drivers/media/video/ivtv/ivtv-controls.c +++ b/drivers/media/video/ivtv/ivtv-controls.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include "ivtv-driver.h" | 23 | #include "ivtv-driver.h" |
| 23 | #include "ivtv-cards.h" | 24 | #include "ivtv-cards.h" |
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h index e4816da6482b..5028e31c564a 100644 --- a/drivers/media/video/ivtv/ivtv-driver.h +++ b/drivers/media/video/ivtv/ivtv-driver.h | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/scatterlist.h> | 53 | #include <linux/scatterlist.h> |
| 54 | #include <linux/workqueue.h> | 54 | #include <linux/workqueue.h> |
| 55 | #include <linux/mutex.h> | 55 | #include <linux/mutex.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | #include <asm/uaccess.h> | 57 | #include <asm/uaccess.h> |
| 57 | #include <asm/system.h> | 58 | #include <asm/system.h> |
| 58 | #include <asm/byteorder.h> | 59 | #include <asm/byteorder.h> |
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index fa6bb85cb4b0..de2ff1c6ac34 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/kernel.h> | 42 | #include <linux/kernel.h> |
| 43 | #include <linux/fb.h> | 43 | #include <linux/fb.h> |
| 44 | #include <linux/ivtvfb.h> | 44 | #include <linux/ivtvfb.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | 46 | ||
| 46 | #ifdef CONFIG_MTRR | 47 | #ifdef CONFIG_MTRR |
| 47 | #include <asm/mtrr.h> | 48 | #include <asm/mtrr.h> |
diff --git a/drivers/media/video/ks0127.c b/drivers/media/video/ks0127.c index fab8e0254bbc..94734828053b 100644 --- a/drivers/media/video/ks0127.c +++ b/drivers/media/video/ks0127.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/i2c.h> | 41 | #include <linux/i2c.h> |
| 42 | #include <linux/videodev2.h> | 42 | #include <linux/videodev2.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <media/v4l2-device.h> | 44 | #include <media/v4l2-device.h> |
| 44 | #include <media/v4l2-chip-ident.h> | 45 | #include <media/v4l2-chip-ident.h> |
| 45 | #include <media/v4l2-i2c-drv.h> | 46 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/m52790.c b/drivers/media/video/m52790.c index d7317e798cc4..4491d018eba6 100644 --- a/drivers/media/video/m52790.c +++ b/drivers/media/video/m52790.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/ioctl.h> | 26 | #include <linux/ioctl.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
| 27 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index b421858ccf90..4404e5ef818f 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/videodev.h> | 33 | #include <linux/videodev.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
| 35 | #include <media/v4l2-ioctl.h> | 36 | #include <media/v4l2-ioctl.h> |
| 36 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index 168bca703614..d5a69c5ee5e4 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 26 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 27 | #include <linux/freezer.h> | 26 | #include <linux/freezer.h> |
| 28 | #include <linux/videodev2.h> | 27 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/mt9v011.c b/drivers/media/video/mt9v011.c index cc85f77a5706..72e55be0b4ab 100644 --- a/drivers/media/video/mt9v011.c +++ b/drivers/media/video/mt9v011.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/videodev2.h> | 10 | #include <linux/videodev2.h> |
| 10 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 11 | #include <asm/div64.h> | 12 | #include <asm/div64.h> |
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index c167cc3de492..3c8ebfcb742e 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/time.h> | 33 | #include <linux/time.h> |
| 33 | #include <linux/version.h> | 34 | #include <linux/version.h> |
| 34 | #include <linux/videodev2.h> | 35 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 142c327afb32..b189fe63394b 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
| 36 | #include <linux/clk.h> | 36 | #include <linux/clk.h> |
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <media/v4l2-common.h> | 40 | #include <media/v4l2-common.h> |
| 40 | #include <media/v4l2-ioctl.h> | 41 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/video/ov7670.c b/drivers/media/video/ov7670.c index 0e2184ec994e..aaa50f9b8e78 100644 --- a/drivers/media/video/ov7670.c +++ b/drivers/media/video/ov7670.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 16 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 17 | #include <linux/videodev2.h> | 18 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/pms.c b/drivers/media/video/pms.c index 11a2c26399b5..0598bbd3f368 100644 --- a/drivers/media/video/pms.c +++ b/drivers/media/video/pms.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/fs.h> | 26 | #include <linux/fs.h> |
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 30 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c index 68980e19409f..88320900dbd4 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cs53l32a.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/videodev2.h> | 34 | #include <linux/videodev2.h> |
| 35 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | 37 | ||
| 39 | struct routing_scheme { | 38 | struct routing_scheme { |
| 40 | const int *def; | 39 | const int *def; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index 82c135835753..2222da8d0ca6 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/videodev2.h> | 36 | #include <linux/videodev2.h> |
| 37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
| 38 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | 39 | ||
| 41 | 40 | ||
| 42 | struct routing_scheme_item { | 41 | struct routing_scheme_item { |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c index ae977668c496..e9b11e119f62 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-debugifc.c +++ b/drivers/media/video/pvrusb2/pvrusb2-debugifc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include "pvrusb2-debugifc.h" | 22 | #include "pvrusb2-debugifc.h" |
| 24 | #include "pvrusb2-hdw.h" | 23 | #include "pvrusb2-hdw.h" |
| 25 | #include "pvrusb2-debug.h" | 24 | #include "pvrusb2-debug.h" |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/video/pvrusb2/pvrusb2-dvb.c index b7f5c49b1dbc..8c95793433e7 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/kthread.h> | 21 | #include <linux/kthread.h> |
| 22 | #include <linux/freezer.h> | 22 | #include <linux/freezer.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 24 | #include "dvbdev.h" | 25 | #include "dvbdev.h" |
| 25 | #include "pvrusb2-debug.h" | 26 | #include "pvrusb2-debug.h" |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c index 299afa4fa969..aeed1c2945fb 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c +++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * | 19 | * |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include "pvrusb2-eeprom.h" | 23 | #include "pvrusb2-eeprom.h" |
| 23 | #include "pvrusb2-hdw-internal.h" | 24 | #include "pvrusb2-hdw-internal.h" |
| 24 | #include "pvrusb2-debug.h" | 25 | #include "pvrusb2-debug.h" |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-main.c b/drivers/media/video/pvrusb2/pvrusb2-main.c index 8689ddb54420..eeacd0f67855 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-main.c +++ b/drivers/media/video/pvrusb2/pvrusb2-main.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 26 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
| 27 | #include <linux/videodev2.h> | 26 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c index cc8ddb2d2382..bf1e0fe9f4d2 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-v4l2.c +++ b/drivers/media/video/pvrusb2/pvrusb2-v4l2.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/version.h> | 24 | #include <linux/version.h> |
| 24 | #include "pvrusb2-context.h" | 25 | #include "pvrusb2-context.h" |
| 25 | #include "pvrusb2-hdw.h" | 26 | #include "pvrusb2-hdw.h" |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index 4c96cf48c796..2e205c99eb96 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <media/v4l2-common.h> | 37 | #include <media/v4l2-common.h> |
| 38 | #include <media/saa7115.h> | 38 | #include <media/saa7115.h> |
| 39 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | 40 | ||
| 42 | struct routing_scheme { | 41 | struct routing_scheme { |
| 43 | const int *def; | 42 | const int *def; |
diff --git a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c index 8c1eae05aa08..3ac8d751a5c0 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-wm8775.c +++ b/drivers/media/video/pvrusb2/pvrusb2-wm8775.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/videodev2.h> | 34 | #include <linux/videodev2.h> |
| 35 | #include <media/v4l2-common.h> | 35 | #include <media/v4l2-common.h> |
| 36 | #include <linux/errno.h> | 36 | #include <linux/errno.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | 37 | ||
| 39 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | 38 | void pvr2_wm8775_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) |
| 40 | { | 39 | { |
diff --git a/drivers/media/video/pwc/pwc-dec23.c b/drivers/media/video/pwc/pwc-dec23.c index 9e2d91f26bfe..0c801b8f3eca 100644 --- a/drivers/media/video/pwc/pwc-dec23.c +++ b/drivers/media/video/pwc/pwc-dec23.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <media/pwc-ioctl.h> | 30 | #include <media/pwc-ioctl.h> |
| 31 | 31 | ||
| 32 | #include <linux/string.h> | 32 | #include <linux/string.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | /* | 35 | /* |
| 35 | * USE_LOOKUP_TABLE_TO_CLAMP | 36 | * USE_LOOKUP_TABLE_TO_CLAMP |
diff --git a/drivers/media/video/pwc/pwc-v4l.c b/drivers/media/video/pwc/pwc-v4l.c index bdb4ced57496..62d89b3113a4 100644 --- a/drivers/media/video/pwc/pwc-v4l.c +++ b/drivers/media/video/pwc/pwc-v4l.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/poll.h> | 32 | #include <linux/poll.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/vmalloc.h> | 33 | #include <linux/vmalloc.h> |
| 35 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 36 | 35 | ||
diff --git a/drivers/media/video/pwc/pwc.h b/drivers/media/video/pwc/pwc.h index 0902355dfa77..f1b206632957 100644 --- a/drivers/media/video/pwc/pwc.h +++ b/drivers/media/video/pwc/pwc.h | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/version.h> | 32 | #include <linux/version.h> |
| 33 | #include <linux/mutex.h> | 33 | #include <linux/mutex.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <asm/errno.h> | 36 | #include <asm/errno.h> |
| 36 | #include <linux/videodev.h> | 37 | #include <linux/videodev.h> |
| 37 | #include <media/v4l2-common.h> | 38 | #include <media/v4l2-common.h> |
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c index 322ac4eecf0a..5ecc30daef2d 100644 --- a/drivers/media/video/pxa_camera.c +++ b/drivers/media/video/pxa_camera.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <media/v4l2-common.h> | 32 | #include <media/v4l2-common.h> |
| 32 | #include <media/v4l2-dev.h> | 33 | #include <media/v4l2-dev.h> |
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c index fb742f1ae711..3de914deb8ee 100644 --- a/drivers/media/video/s2255drv.c +++ b/drivers/media/video/s2255drv.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/firmware.h> | 45 | #include <linux/firmware.h> |
| 46 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 47 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/videodev2.h> | 49 | #include <linux/videodev2.h> |
| 49 | #include <linux/version.h> | 50 | #include <linux/version.h> |
| 50 | #include <linux/mm.h> | 51 | #include <linux/mm.h> |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 5ab6a0f901c0..6b3b09ef8978 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/mm.h> | 43 | #include <linux/mm.h> |
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/i2c.h> | 45 | #include <linux/i2c.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
| 47 | #include <linux/videotext.h> | 48 | #include <linux/videotext.h> |
| 48 | #include <linux/videodev2.h> | 49 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 12835fb82c95..31ff27df4cbf 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/videotext.h> | 51 | #include <linux/videotext.h> |
| 52 | #include <linux/videodev2.h> | 52 | #include <linux/videodev2.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | #include <media/v4l2-device.h> | 54 | #include <media/v4l2-device.h> |
| 54 | #include <media/v4l2-chip-ident.h> | 55 | #include <media/v4l2-chip-ident.h> |
| 55 | #include <media/v4l2-ioctl.h> | 56 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c index 73739d2a63dd..4ab4a987c9b9 100644 --- a/drivers/media/video/saa7134/saa7134-dvb.c +++ b/drivers/media/video/saa7134/saa7134-dvb.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/kthread.h> | 28 | #include <linux/kthread.h> |
| 30 | #include <linux/suspend.h> | 29 | #include <linux/suspend.h> |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index ee5bff02a92c..ea877a50f52d 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/list.h> | 21 | #include <linux/list.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/smp_lock.h> | 24 | #include <linux/smp_lock.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | 26 | ||
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 8096dace5f6c..da41b6b1e64a 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | 28 | ||
| 30 | #include "saa7134-reg.h" | 29 | #include "saa7134-reg.h" |
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c index 9499000f66b6..58a0cdc8414a 100644 --- a/drivers/media/video/saa7134/saa7134-input.c +++ b/drivers/media/video/saa7134/saa7134-input.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/input.h> | 25 | #include <linux/input.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "saa7134-reg.h" | 28 | #include "saa7134-reg.h" |
| 28 | #include "saa7134.h" | 29 | #include "saa7134.h" |
diff --git a/drivers/media/video/saa7134/saa7134-ts.c b/drivers/media/video/saa7134/saa7134-ts.c index b9817d74943f..2e3f4b412d8c 100644 --- a/drivers/media/video/saa7134/saa7134-ts.c +++ b/drivers/media/video/saa7134/saa7134-ts.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | 28 | ||
| 30 | #include "saa7134-reg.h" | 29 | #include "saa7134-reg.h" |
diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c index 76b16407b01e..3e7d2fd1688f 100644 --- a/drivers/media/video/saa7134/saa7134-tvaudio.c +++ b/drivers/media/video/saa7134/saa7134-tvaudio.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/kthread.h> | 27 | #include <linux/kthread.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/freezer.h> | 29 | #include <linux/freezer.h> |
| 31 | #include <asm/div64.h> | 30 | #include <asm/div64.h> |
diff --git a/drivers/media/video/saa7134/saa7134-vbi.c b/drivers/media/video/saa7134/saa7134-vbi.c index cb0304298a96..e9aa94b807f1 100644 --- a/drivers/media/video/saa7134/saa7134-vbi.c +++ b/drivers/media/video/saa7134/saa7134-vbi.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | 27 | ||
| 29 | #include "saa7134-reg.h" | 28 | #include "saa7134-reg.h" |
| 30 | #include "saa7134.h" | 29 | #include "saa7134.h" |
diff --git a/drivers/media/video/saa7164/saa7164-api.c b/drivers/media/video/saa7164/saa7164-api.c index 1d487c150340..3f1262b00cc0 100644 --- a/drivers/media/video/saa7164/saa7164-api.c +++ b/drivers/media/video/saa7164/saa7164-api.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "saa7164.h" | 25 | #include "saa7164.h" |
| 25 | 26 | ||
diff --git a/drivers/media/video/saa7164/saa7164-buffer.c b/drivers/media/video/saa7164/saa7164-buffer.c index 9ca5c83d165b..5713f3a4b76c 100644 --- a/drivers/media/video/saa7164/saa7164-buffer.c +++ b/drivers/media/video/saa7164/saa7164-buffer.c | |||
| @@ -19,6 +19,8 @@ | |||
| 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 23 | |||
| 22 | #include "saa7164.h" | 24 | #include "saa7164.h" |
| 23 | 25 | ||
| 24 | /* The PCI address space for buffer handling looks like this: | 26 | /* The PCI address space for buffer handling looks like this: |
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c index ee0af3534ede..270245d275ab 100644 --- a/drivers/media/video/saa7164/saa7164-fw.c +++ b/drivers/media/video/saa7164/saa7164-fw.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/firmware.h> | 22 | #include <linux/firmware.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "saa7164.h" | 25 | #include "saa7164.h" |
| 25 | 26 | ||
diff --git a/drivers/media/video/saa717x.c b/drivers/media/video/saa717x.c index 6818df571168..d521c648e157 100644 --- a/drivers/media/video/saa717x.c +++ b/drivers/media/video/saa717x.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 36 | 37 | ||
| 37 | #include <linux/videodev2.h> | 38 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c index 212baa10829b..77db20392910 100644 --- a/drivers/media/video/saa7185.c +++ b/drivers/media/video/saa7185.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/ioctl.h> | 30 | #include <linux/ioctl.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 31 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index fb88c63188f3..6e16b3979326 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/time.h> | 28 | #include <linux/time.h> |
| 29 | #include <linux/version.h> | 29 | #include <linux/version.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/device.h> | 31 | #include <linux/device.h> |
| 31 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 32 | #include <linux/videodev2.h> | 33 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 80f6bfa2632b..a24174ddec46 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/mutex.h> | 24 | #include <linux/mutex.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/vmalloc.h> | 28 | #include <linux/vmalloc.h> |
| 28 | 29 | ||
| 29 | #include <media/soc_camera.h> | 30 | #include <media/soc_camera.h> |
diff --git a/drivers/media/video/tda9840.c b/drivers/media/video/tda9840.c index d381fce3db40..92d22d8931c1 100644 --- a/drivers/media/video/tda9840.c +++ b/drivers/media/video/tda9840.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/ioctl.h> | 30 | #include <linux/ioctl.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
| 32 | #include <media/v4l2-device.h> | 33 | #include <media/v4l2-device.h> |
| 33 | #include <media/v4l2-chip-ident.h> | 34 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/tea6415c.c b/drivers/media/video/tea6415c.c index 1585839bd0bd..3021a1e6b7bb 100644 --- a/drivers/media/video/tea6415c.c +++ b/drivers/media/video/tea6415c.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/ioctl.h> | 32 | #include <linux/ioctl.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
| 34 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
| 35 | #include <media/v4l2-chip-ident.h> | 36 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/tea6420.c b/drivers/media/video/tea6420.c index 6bf6bc7dbc7f..49dafc5e1e2f 100644 --- a/drivers/media/video/tea6420.c +++ b/drivers/media/video/tea6420.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/ioctl.h> | 32 | #include <linux/ioctl.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/i2c.h> | 34 | #include <linux/i2c.h> |
| 34 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
| 35 | #include <media/v4l2-chip-ident.h> | 36 | #include <media/v4l2-chip-ident.h> |
diff --git a/drivers/media/video/ths7303.c b/drivers/media/video/ths7303.c index 21781f8a0e8e..61b1dd118364 100644 --- a/drivers/media/video/ths7303.c +++ b/drivers/media/video/ths7303.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/ctype.h> | 18 | #include <linux/ctype.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 20 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/media/video/tlg2300/pd-alsa.c b/drivers/media/video/tlg2300/pd-alsa.c index 6f42621ad478..9f8b7da56b67 100644 --- a/drivers/media/video/tlg2300/pd-alsa.c +++ b/drivers/media/video/tlg2300/pd-alsa.c | |||
| @@ -4,10 +4,10 @@ | |||
| 4 | #include <linux/sound.h> | 4 | #include <linux/sound.h> |
| 5 | #include <linux/spinlock.h> | 5 | #include <linux/spinlock.h> |
| 6 | #include <linux/soundcard.h> | 6 | #include <linux/soundcard.h> |
| 7 | #include <linux/slab.h> | ||
| 8 | #include <linux/vmalloc.h> | 7 | #include <linux/vmalloc.h> |
| 9 | #include <linux/proc_fs.h> | 8 | #include <linux/proc_fs.h> |
| 10 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/gfp.h> | ||
| 11 | #include <sound/core.h> | 11 | #include <sound/core.h> |
| 12 | #include <sound/pcm.h> | 12 | #include <sound/pcm.h> |
| 13 | #include <sound/pcm_params.h> | 13 | #include <sound/pcm_params.h> |
diff --git a/drivers/media/video/tlg2300/pd-dvb.c b/drivers/media/video/tlg2300/pd-dvb.c index 4133aee568bf..ebd9cb5bec74 100644 --- a/drivers/media/video/tlg2300/pd-dvb.c +++ b/drivers/media/video/tlg2300/pd-dvb.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/usb.h> | 3 | #include <linux/usb.h> |
| 4 | #include <linux/dvb/dmx.h> | 4 | #include <linux/dvb/dmx.h> |
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/gfp.h> | ||
| 6 | 7 | ||
| 7 | #include "vendorcmds.h" | 8 | #include "vendorcmds.h" |
| 8 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
diff --git a/drivers/media/video/tlg2300/pd-video.c b/drivers/media/video/tlg2300/pd-video.c index becfba6a3041..cf8f18c007e6 100644 --- a/drivers/media/video/tlg2300/pd-video.c +++ b/drivers/media/video/tlg2300/pd-video.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/usb.h> | 4 | #include <linux/usb.h> |
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | 8 | ||
| 8 | #include <media/v4l2-ioctl.h> | 9 | #include <media/v4l2-ioctl.h> |
| 9 | #include <media/v4l2-dev.h> | 10 | #include <media/v4l2-dev.h> |
diff --git a/drivers/media/video/tlv320aic23b.c b/drivers/media/video/tlv320aic23b.c index 07789c64814c..9ddb32bc7af0 100644 --- a/drivers/media/video/tlv320aic23b.c +++ b/drivers/media/video/tlv320aic23b.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/ioctl.h> | 29 | #include <linux/ioctl.h> |
| 29 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
| 30 | #include <linux/i2c.h> | 31 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c index 26b4e718cd6d..e4815a1806e3 100644 --- a/drivers/media/video/tvp514x.c +++ b/drivers/media/video/tvp514x.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/i2c.h> | 31 | #include <linux/i2c.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 33 | #include <linux/videodev2.h> | 34 | #include <linux/videodev2.h> |
| 34 | 35 | ||
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 2d38e253f14e..908ffb68e926 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/videodev2.h> | 10 | #include <linux/videodev2.h> |
| 10 | #include <linux/delay.h> | 11 | #include <linux/delay.h> |
| 11 | #include <media/v4l2-device.h> | 12 | #include <media/v4l2-device.h> |
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c index 5a878bca02d4..4a69bcc738f3 100644 --- a/drivers/media/video/tvp7002.c +++ b/drivers/media/video/tvp7002.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/videodev2.h> | 30 | #include <linux/videodev2.h> |
| 30 | #include <media/tvp7002.h> | 31 | #include <media/tvp7002.h> |
| 31 | #include <media/v4l2-device.h> | 32 | #include <media/v4l2-device.h> |
diff --git a/drivers/media/video/upd64031a.c b/drivers/media/video/upd64031a.c index a07a3fbb51eb..36c0c461d8be 100644 --- a/drivers/media/video/upd64031a.c +++ b/drivers/media/video/upd64031a.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 27 | #include <linux/videodev2.h> | 27 | #include <linux/videodev2.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <media/v4l2-device.h> | 29 | #include <media/v4l2-device.h> |
| 29 | #include <media/v4l2-chip-ident.h> | 30 | #include <media/v4l2-chip-ident.h> |
| 30 | #include <media/v4l2-i2c-drv.h> | 31 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/upd64083.c b/drivers/media/video/upd64083.c index 6eb0e5b00c32..c5af93b30a2b 100644 --- a/drivers/media/video/upd64083.c +++ b/drivers/media/video/upd64083.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 27 | #include <linux/videodev2.h> | 27 | #include <linux/videodev2.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <media/v4l2-device.h> | 29 | #include <media/v4l2-device.h> |
| 29 | #include <media/v4l2-chip-ident.h> | 30 | #include <media/v4l2-chip-ident.h> |
| 30 | #include <media/v4l2-i2c-drv.h> | 31 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/media/video/usbvideo/konicawc.c b/drivers/media/video/usbvideo/konicawc.c index a0addcb04295..562e1d170be0 100644 --- a/drivers/media/video/usbvideo/konicawc.c +++ b/drivers/media/video/usbvideo/konicawc.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/usb/input.h> | 18 | #include <linux/usb/input.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | 20 | ||
| 20 | #include "usbvideo.h" | 21 | #include "usbvideo.h" |
| 21 | 22 | ||
diff --git a/drivers/media/video/usbvideo/quickcam_messenger.c b/drivers/media/video/usbvideo/quickcam_messenger.c index c4d1b96b5cee..fab48ec6c0ea 100644 --- a/drivers/media/video/usbvideo/quickcam_messenger.c +++ b/drivers/media/video/usbvideo/quickcam_messenger.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/input.h> | 35 | #include <linux/input.h> |
| 36 | #include <linux/usb/input.h> | 36 | #include <linux/usb/input.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include "usbvideo.h" | 39 | #include "usbvideo.h" |
| 39 | #include "quickcam_messenger.h" | 40 | #include "quickcam_messenger.h" |
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index e0f91e4ab653..f7aae2293758 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <linux/timer.h> | 28 | #include <linux/timer.h> |
| 29 | #include <linux/slab.h> | 29 | #include <linux/gfp.h> |
| 30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 31 | #include <linux/highmem.h> | 31 | #include <linux/highmem.h> |
| 32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/usbvision/usbvision-i2c.c b/drivers/media/video/usbvision/usbvision-i2c.c index 0613922997e0..083765238a6a 100644 --- a/drivers/media/video/usbvision/usbvision-i2c.c +++ b/drivers/media/video/usbvision/usbvision-i2c.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
| 33 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
diff --git a/drivers/media/video/uvc/uvc_ctrl.c b/drivers/media/video/uvc/uvc_ctrl.c index 3b2e7800d56f..6d3850b37161 100644 --- a/drivers/media/video/uvc/uvc_ctrl.c +++ b/drivers/media/video/uvc/uvc_ctrl.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/uaccess.h> | 18 | #include <linux/uaccess.h> |
| 18 | #include <linux/usb.h> | 19 | #include <linux/usb.h> |
| 19 | #include <linux/videodev2.h> | 20 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/uvc/uvc_driver.c b/drivers/media/video/uvc/uvc_driver.c index a814820a3f6e..86ff8c12ea58 100644 --- a/drivers/media/video/uvc/uvc_driver.c +++ b/drivers/media/video/uvc/uvc_driver.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
| 30 | #include <linux/videodev2.h> | 31 | #include <linux/videodev2.h> |
| 31 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/uvc/uvc_status.c b/drivers/media/video/uvc/uvc_status.c index 1ca6dff73612..85019bdacdf7 100644 --- a/drivers/media/video/uvc/uvc_status.c +++ b/drivers/media/video/uvc/uvc_status.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/usb.h> | 17 | #include <linux/usb.h> |
| 17 | #include <linux/usb/input.h> | 18 | #include <linux/usb/input.h> |
| 18 | 19 | ||
diff --git a/drivers/media/video/uvc/uvc_v4l2.c b/drivers/media/video/uvc/uvc_v4l2.c index 43152aa52227..7c9ab2933496 100644 --- a/drivers/media/video/uvc/uvc_v4l2.c +++ b/drivers/media/video/uvc/uvc_v4l2.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/version.h> | 15 | #include <linux/version.h> |
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/usb.h> | 19 | #include <linux/usb.h> |
| 19 | #include <linux/videodev2.h> | 20 | #include <linux/videodev2.h> |
| 20 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c index 6b0666be370f..821a9969b7bf 100644 --- a/drivers/media/video/uvc/uvc_video.c +++ b/drivers/media/video/uvc/uvc_video.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/usb.h> | 18 | #include <linux/usb.h> |
| 18 | #include <linux/videodev2.h> | 19 | #include <linux/videodev2.h> |
| 19 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 4b11257c3184..7d59c107f13b 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 18 | 19 | ||
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 22c01097e8a8..dce4f3aa4af1 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/pagemap.h> | 20 | #include <linux/pagemap.h> |
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <media/videobuf-dma-contig.h> | 24 | #include <media/videobuf-dma-contig.h> |
| 24 | 25 | ||
| 25 | struct videobuf_dma_contig_memory { | 26 | struct videobuf_dma_contig_memory { |
diff --git a/drivers/media/video/videobuf-dvb.c b/drivers/media/video/videobuf-dvb.c index a56cf0d3a6d6..0afb62e63d99 100644 --- a/drivers/media/video/videobuf-dvb.c +++ b/drivers/media/video/videobuf-dvb.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 20 | #include <linux/kthread.h> | 20 | #include <linux/kthread.h> |
| 21 | #include <linux/file.h> | 21 | #include <linux/file.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/freezer.h> | 24 | #include <linux/freezer.h> |
| 24 | 25 | ||
diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c index a15d1e7cbed8..3eb15f72ac09 100644 --- a/drivers/media/video/vino.c +++ b/drivers/media/video/vino.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/fs.h> | 33 | #include <linux/fs.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/kernel.h> | 35 | #include <linux/kernel.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 37 | #include <linux/time.h> | 38 | #include <linux/time.h> |
| 38 | #include <linux/version.h> | 39 | #include <linux/version.h> |
diff --git a/drivers/media/video/vp27smpx.c b/drivers/media/video/vp27smpx.c index 38e53b303cc3..ca8303bd2401 100644 --- a/drivers/media/video/vp27smpx.c +++ b/drivers/media/video/vp27smpx.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 28 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c index 33205d7537d8..77ebcea7c3da 100644 --- a/drivers/media/video/vpx3220.c +++ b/drivers/media/video/vpx3220.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 26 | #include <linux/i2c.h> | 27 | #include <linux/i2c.h> |
| 27 | #include <linux/videodev2.h> | 28 | #include <linux/videodev2.h> |
diff --git a/drivers/media/video/w9966.c b/drivers/media/video/w9966.c index dcade619cbd8..bf9bf650a317 100644 --- a/drivers/media/video/w9966.c +++ b/drivers/media/video/w9966.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/init.h> | 58 | #include <linux/init.h> |
| 59 | #include <linux/delay.h> | 59 | #include <linux/delay.h> |
| 60 | #include <linux/videodev.h> | 60 | #include <linux/videodev.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <media/v4l2-common.h> | 62 | #include <media/v4l2-common.h> |
| 62 | #include <media/v4l2-ioctl.h> | 63 | #include <media/v4l2-ioctl.h> |
| 63 | #include <linux/parport.h> | 64 | #include <linux/parport.h> |
diff --git a/drivers/media/video/wm8739.c b/drivers/media/video/wm8739.c index b572ce288e14..a11b99b4226b 100644 --- a/drivers/media/video/wm8739.c +++ b/drivers/media/video/wm8739.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 28 | #include <linux/i2c.h> | 29 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c index f1f261a35245..5c2ba599c0c7 100644 --- a/drivers/media/video/wm8775.c +++ b/drivers/media/video/wm8775.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/ioctl.h> | 31 | #include <linux/ioctl.h> |
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 32 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
diff --git a/drivers/media/video/zoran/zoran_card.c b/drivers/media/video/zoran/zoran_card.c index be70574870de..bfcd3aef50f9 100644 --- a/drivers/media/video/zoran/zoran_card.c +++ b/drivers/media/video/zoran/zoran_card.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/vmalloc.h> | 36 | #include <linux/vmalloc.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <linux/proc_fs.h> | 39 | #include <linux/proc_fs.h> |
| 39 | #include <linux/i2c.h> | 40 | #include <linux/i2c.h> |
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index b3bf1c44d74d..c00fe8253c51 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/idr.h> | 16 | #include <linux/idr.h> |
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define DRIVER_NAME "memstick" | 21 | #define DRIVER_NAME "memstick" |
| 21 | 22 | ||
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 972b87069d55..8327e248520a 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/hdreg.h> | 17 | #include <linux/hdreg.h> |
| 18 | #include <linux/kthread.h> | 18 | #include <linux/kthread.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/memstick.h> | 21 | #include <linux/memstick.h> |
| 21 | 22 | ||
| 22 | #define DRIVER_NAME "mspro_block" | 23 | #define DRIVER_NAME "mspro_block" |
diff --git a/drivers/memstick/host/jmb38x_ms.c b/drivers/memstick/host/jmb38x_ms.c index f4a162a4bece..f2b894cd8b02 100644 --- a/drivers/memstick/host/jmb38x_ms.c +++ b/drivers/memstick/host/jmb38x_ms.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/memstick.h> | 18 | #include <linux/memstick.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define DRIVER_NAME "jmb38x_ms" | 21 | #define DRIVER_NAME "jmb38x_ms" |
| 21 | 22 | ||
diff --git a/drivers/message/fusion/mptfc.c b/drivers/message/fusion/mptfc.c index 612ab3c51a6b..33f7256055b1 100644 --- a/drivers/message/fusion/mptfc.c +++ b/drivers/message/fusion/mptfc.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include <linux/reboot.h> /* notifier code */ | 54 | #include <linux/reboot.h> /* notifier code */ |
| 55 | #include <linux/workqueue.h> | 55 | #include <linux/workqueue.h> |
| 56 | #include <linux/sort.h> | 56 | #include <linux/sort.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | 58 | ||
| 58 | #include <scsi/scsi.h> | 59 | #include <scsi/scsi.h> |
| 59 | #include <scsi/scsi_cmnd.h> | 60 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c index 34f3f36f819b..4fa9665cbe93 100644 --- a/drivers/message/fusion/mptlan.c +++ b/drivers/message/fusion/mptlan.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #include <linux/module.h> | 57 | #include <linux/module.h> |
| 58 | #include <linux/fs.h> | 58 | #include <linux/fs.h> |
| 59 | #include <linux/sched.h> | 59 | #include <linux/sched.h> |
| 60 | #include <linux/slab.h> | ||
| 60 | 61 | ||
| 61 | #define my_VERSION MPT_LINUX_VERSION_COMMON | 62 | #define my_VERSION MPT_LINUX_VERSION_COMMON |
| 62 | #define MYNAM "mptlan" | 63 | #define MYNAM "mptlan" |
diff --git a/drivers/message/fusion/mptsas.c b/drivers/message/fusion/mptsas.c index c20bbe45da82..76687126b573 100644 --- a/drivers/message/fusion/mptsas.c +++ b/drivers/message/fusion/mptsas.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | 45 | ||
| 46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 47 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 49 | #include <linux/errno.h> | 50 | #include <linux/errno.h> |
| 50 | #include <linux/jiffies.h> | 51 | #include <linux/jiffies.h> |
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c index 4a7d1afcb666..6796597dcee0 100644 --- a/drivers/message/fusion/mptscsih.c +++ b/drivers/message/fusion/mptscsih.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 50 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 51 | #include <linux/kdev_t.h> | 52 | #include <linux/kdev_t.h> |
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c index 69f4257419b5..e44365193fdf 100644 --- a/drivers/message/fusion/mptspi.c +++ b/drivers/message/fusion/mptspi.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 50 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 51 | #include <linux/kdev_t.h> | 52 | #include <linux/kdev_t.h> |
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 2658b1484a2c..fc593fbab696 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | #include <linux/i2o.h> | 55 | #include <linux/i2o.h> |
| 55 | 56 | ||
| 56 | #include <linux/mempool.h> | 57 | #include <linux/mempool.h> |
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c index 3d5f40cd69df..11073fa3d9f4 100644 --- a/drivers/message/i2o/i2o_config.c +++ b/drivers/message/i2o/i2o_config.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/miscdevice.h> | 33 | #include <linux/miscdevice.h> |
| 34 | #include <linux/smp_lock.h> | 34 | #include <linux/smp_lock.h> |
| 35 | #include <linux/compat.h> | 35 | #include <linux/compat.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
| 38 | 39 | ||
diff --git a/drivers/message/i2o/i2o_proc.c b/drivers/message/i2o/i2o_proc.c index 949a648f8e2e..07dbeaf9df99 100644 --- a/drivers/message/i2o/i2o_proc.c +++ b/drivers/message/i2o/i2o_proc.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/pci.h> | 41 | #include <linux/pci.h> |
| 42 | #include <linux/i2o.h> | 42 | #include <linux/i2o.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <linux/proc_fs.h> | 44 | #include <linux/proc_fs.h> |
| 44 | #include <linux/seq_file.h> | 45 | #include <linux/seq_file.h> |
| 45 | #include <linux/init.h> | 46 | #include <linux/init.h> |
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index ef5ce2676f05..090d2a3a6548 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/i2o.h> | 29 | #include <linux/i2o.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include "core.h" | 33 | #include "core.h" |
| 33 | 34 | ||
| 34 | #define OSM_NAME "i2o" | 35 | #define OSM_NAME "i2o" |
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 35ba2ae38b42..73e4658af53c 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/i2o.h> | 33 | #include <linux/i2o.h> |
| 33 | #include "core.h" | 34 | #include "core.h" |
| 34 | 35 | ||
diff --git a/drivers/mfd/88pm860x-i2c.c b/drivers/mfd/88pm860x-i2c.c index c37e12bf3004..4a6e7186334e 100644 --- a/drivers/mfd/88pm860x-i2c.c +++ b/drivers/mfd/88pm860x-i2c.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/mfd/88pm860x.h> | 15 | #include <linux/mfd/88pm860x.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | static inline int pm860x_read_device(struct i2c_client *i2c, | 18 | static inline int pm860x_read_device(struct i2c_client *i2c, |
| 18 | int reg, int bytes, void *dest) | 19 | int reg, int bytes, void *dest) |
diff --git a/drivers/mfd/ab3100-core.c b/drivers/mfd/ab3100-core.c index a2ce3b6af4a2..e4ca5909e424 100644 --- a/drivers/mfd/ab3100-core.c +++ b/drivers/mfd/ab3100-core.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/mutex.h> | 10 | #include <linux/mutex.h> |
| 11 | #include <linux/list.h> | 11 | #include <linux/list.h> |
| 12 | #include <linux/notifier.h> | 12 | #include <linux/notifier.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 14 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
diff --git a/drivers/mfd/ab3100-otp.c b/drivers/mfd/ab3100-otp.c index b603469dff69..2d14655fdebd 100644 --- a/drivers/mfd/ab3100-otp.c +++ b/drivers/mfd/ab3100-otp.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 13 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 14 | #include <linux/mfd/ab3100.h> | 15 | #include <linux/mfd/ab3100.h> |
diff --git a/drivers/mfd/ab4500-core.c b/drivers/mfd/ab4500-core.c index 1c44c19e073a..c275daa3ab1a 100644 --- a/drivers/mfd/ab4500-core.c +++ b/drivers/mfd/ab4500-core.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * Interrupt management to be added - TODO. | 15 | * Interrupt management to be added - TODO. |
| 16 | */ | 16 | */ |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 20 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
diff --git a/drivers/mfd/adp5520.c b/drivers/mfd/adp5520.c index b26644772d02..005532865654 100644 --- a/drivers/mfd/adp5520.c +++ b/drivers/mfd/adp5520.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
| 26 | #include <linux/err.h> | 27 | #include <linux/err.h> |
diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index 95c1e6bd1729..7de708d15d72 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/irq.h> | 21 | #include <linux/irq.h> |
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 25 | #include <linux/platform_device.h> | 26 | #include <linux/platform_device.h> |
| 26 | 27 | ||
diff --git a/drivers/mfd/da903x.c b/drivers/mfd/da903x.c index e5ffe5617393..67181b147ab3 100644 --- a/drivers/mfd/da903x.c +++ b/drivers/mfd/da903x.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/mfd/da903x.h> | 20 | #include <linux/mfd/da903x.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define DA9030_CHIP_ID 0x00 | 23 | #define DA9030_CHIP_ID 0x00 |
| 23 | #define DA9030_EVENT_A 0x01 | 24 | #define DA9030_EVENT_A 0x01 |
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c index df405af968fa..134c69aa4790 100644 --- a/drivers/mfd/ezx-pcap.c +++ b/drivers/mfd/ezx-pcap.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/mfd/ezx-pcap.h> | 18 | #include <linux/mfd/ezx-pcap.h> |
| 19 | #include <linux/spi/spi.h> | 19 | #include <linux/spi/spi.h> |
| 20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define PCAP_ADC_MAXQ 8 | 23 | #define PCAP_ADC_MAXQ 8 |
| 23 | struct pcap_adc_request { | 24 | struct pcap_adc_request { |
diff --git a/drivers/mfd/htc-egpio.c b/drivers/mfd/htc-egpio.c index addb846c1e34..d3e74f8585e0 100644 --- a/drivers/mfd/htc-egpio.c +++ b/drivers/mfd/htc-egpio.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 19 | #include <linux/mfd/htc-egpio.h> | 20 | #include <linux/mfd/htc-egpio.h> |
| 20 | 21 | ||
diff --git a/drivers/mfd/htc-i2cpld.c b/drivers/mfd/htc-i2cpld.c index 37b9fdab4f36..594c9a8e25e1 100644 --- a/drivers/mfd/htc-i2cpld.c +++ b/drivers/mfd/htc-i2cpld.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/htcpld.h> | 36 | #include <linux/htcpld.h> |
| 37 | #include <linux/gpio.h> | 37 | #include <linux/gpio.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | struct htcpld_chip { | 40 | struct htcpld_chip { |
| 40 | spinlock_t lock; | 41 | spinlock_t lock; |
diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c index cb73051e43db..f04300e05fd6 100644 --- a/drivers/mfd/htc-pasic3.c +++ b/drivers/mfd/htc-pasic3.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mfd/core.h> | 19 | #include <linux/mfd/core.h> |
| 20 | #include <linux/mfd/ds1wm.h> | 20 | #include <linux/mfd/ds1wm.h> |
| 21 | #include <linux/mfd/htc-pasic3.h> | 21 | #include <linux/mfd/htc-pasic3.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | struct pasic3_data { | 24 | struct pasic3_data { |
| 24 | void __iomem *mapping; | 25 | void __iomem *mapping; |
diff --git a/drivers/mfd/max8925-i2c.c b/drivers/mfd/max8925-i2c.c index c0b883c14f41..d9fd8785da4d 100644 --- a/drivers/mfd/max8925-i2c.c +++ b/drivers/mfd/max8925-i2c.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/mfd/max8925.h> | 15 | #include <linux/mfd/max8925.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define RTC_I2C_ADDR 0x68 | 18 | #define RTC_I2C_ADDR 0x68 |
| 18 | #define ADC_I2C_ADDR 0x47 | 19 | #define ADC_I2C_ADDR 0x47 |
diff --git a/drivers/mfd/mc13783-core.c b/drivers/mfd/mc13783-core.c index 62a847e4c2d8..1f68ecadddc2 100644 --- a/drivers/mfd/mc13783-core.c +++ b/drivers/mfd/mc13783-core.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * the terms of the GNU General Public License version 2 as published by the | 9 | * the terms of the GNU General Public License version 2 as published by the |
| 10 | * Free Software Foundation. | 10 | * Free Software Foundation. |
| 11 | */ | 11 | */ |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 13 | #include <linux/spi/spi.h> | 14 | #include <linux/spi/spi.h> |
| 14 | #include <linux/mfd/core.h> | 15 | #include <linux/mfd/core.h> |
diff --git a/drivers/mfd/mcp-sa11x0.c b/drivers/mfd/mcp-sa11x0.c index 258427232728..2dab02d9ac8b 100644 --- a/drivers/mfd/mcp-sa11x0.c +++ b/drivers/mfd/mcp-sa11x0.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/spinlock.h> | 19 | #include <linux/spinlock.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 22 | #include <linux/mfd/mcp.h> | 21 | #include <linux/mfd/mcp.h> |
| 23 | 22 | ||
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 970afa103261..a94b131a18ef 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
| 41 | #include <linux/rtc.h> | 41 | #include <linux/rtc.h> |
| 42 | #include <linux/bcd.h> | 42 | #include <linux/bcd.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include <asm/mach/irq.h> | 45 | #include <asm/mach/irq.h> |
| 45 | 46 | ||
diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c index aa17f4bddc56..8ffbb7a85a7e 100644 --- a/drivers/mfd/mfd-core.c +++ b/drivers/mfd/mfd-core.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/acpi.h> | 16 | #include <linux/acpi.h> |
| 17 | #include <linux/mfd/core.h> | 17 | #include <linux/mfd/core.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | static int mfd_add_device(struct device *parent, int id, | 20 | static int mfd_add_device(struct device *parent, int id, |
| 20 | const struct mfd_cell *cell, | 21 | const struct mfd_cell *cell, |
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c index 6d2e8466df1d..fe8f922f6654 100644 --- a/drivers/mfd/pcf50633-adc.c +++ b/drivers/mfd/pcf50633-adc.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 21 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 22 | #include <linux/device.h> | 23 | #include <linux/device.h> |
diff --git a/drivers/mfd/pcf50633-core.c b/drivers/mfd/pcf50633-core.c index 03dcc9200707..63a614d696c1 100644 --- a/drivers/mfd/pcf50633-core.c +++ b/drivers/mfd/pcf50633-core.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/i2c.h> | 23 | #include <linux/i2c.h> |
| 24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <linux/mfd/pcf50633/core.h> | 27 | #include <linux/mfd/pcf50633/core.h> |
| 27 | 28 | ||
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c index 468fd366d4da..497f91b6138e 100644 --- a/drivers/mfd/sh_mobile_sdhi.c +++ b/drivers/mfd/sh_mobile_sdhi.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 24 | #include <linux/mmc/host.h> | 25 | #include <linux/mmc/host.h> |
| 25 | #include <linux/mfd/core.h> | 26 | #include <linux/mfd/core.h> |
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index 7b6652f60117..bc9275c12133 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/i2c-gpio.h> | 22 | #include <linux/i2c-gpio.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <linux/sm501.h> | 25 | #include <linux/sm501.h> |
| 25 | #include <linux/sm501-regs.h> | 26 | #include <linux/sm501-regs.h> |
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 26d9176fca91..da6383a934ac 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
| 30 | #include <linux/clk.h> | 31 | #include <linux/clk.h> |
| 31 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
diff --git a/drivers/mfd/tc6387xb.c b/drivers/mfd/tc6387xb.c index 5c7f04343d5c..517f9bcdeaac 100644 --- a/drivers/mfd/tc6387xb.c +++ b/drivers/mfd/tc6387xb.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/mfd/core.h> | 17 | #include <linux/mfd/core.h> |
| 18 | #include <linux/mfd/tmio.h> | 18 | #include <linux/mfd/tmio.h> |
| 19 | #include <linux/mfd/tc6387xb.h> | 19 | #include <linux/mfd/tc6387xb.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | enum { | 22 | enum { |
| 22 | TC6387XB_CELL_MMC, | 23 | TC6387XB_CELL_MMC, |
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c index c59e5c5737d0..fcf9068810fb 100644 --- a/drivers/mfd/tc6393xb.c +++ b/drivers/mfd/tc6393xb.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/mfd/tmio.h> | 25 | #include <linux/mfd/tmio.h> |
| 26 | #include <linux/mfd/tc6393xb.h> | 26 | #include <linux/mfd/tc6393xb.h> |
| 27 | #include <linux/gpio.h> | 27 | #include <linux/gpio.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #define SCR_REVID 0x08 /* b Revision ID */ | 30 | #define SCR_REVID 0x08 /* b Revision ID */ |
| 30 | #define SCR_ISR 0x50 /* b Interrupt Status */ | 31 | #define SCR_ISR 0x50 /* b Interrupt Status */ |
diff --git a/drivers/mfd/timberdale.c b/drivers/mfd/timberdale.c index 1ed44d283803..7f478ec4184b 100644 --- a/drivers/mfd/timberdale.c +++ b/drivers/mfd/timberdale.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/msi.h> | 26 | #include <linux/msi.h> |
| 27 | #include <linux/mfd/core.h> | 27 | #include <linux/mfd/core.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <linux/timb_gpio.h> | 30 | #include <linux/timb_gpio.h> |
| 30 | 31 | ||
diff --git a/drivers/mfd/twl4030-codec.c b/drivers/mfd/twl4030-codec.c index 700b149c1b91..add6f67d8032 100644 --- a/drivers/mfd/twl4030-codec.c +++ b/drivers/mfd/twl4030-codec.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 27 | #include <linux/fs.h> | 28 | #include <linux/fs.h> |
| 28 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 9df9a5ad38f9..202bdd59632d 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 32 | #include <linux/irq.h> | 32 | #include <linux/irq.h> |
| 33 | #include <linux/kthread.h> | 33 | #include <linux/kthread.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <linux/i2c/twl.h> | 36 | #include <linux/i2c/twl.h> |
| 36 | 37 | ||
diff --git a/drivers/mfd/ucb1400_core.c b/drivers/mfd/ucb1400_core.c index 85fd9421be94..dbe280153f9e 100644 --- a/drivers/mfd/ucb1400_core.c +++ b/drivers/mfd/ucb1400_core.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/ucb1400.h> | 26 | #include <linux/ucb1400.h> |
| 26 | 27 | ||
| 27 | unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, | 28 | unsigned int ucb1400_adc_read(struct snd_ac97 *ac97, u16 adc_channel, |
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c index 07101e9e1cba..a3d5728b6449 100644 --- a/drivers/mfd/wm831x-core.c +++ b/drivers/mfd/wm831x-core.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/bcd.h> | 18 | #include <linux/bcd.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/mfd/core.h> | 20 | #include <linux/mfd/core.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <linux/mfd/wm831x/core.h> | 23 | #include <linux/mfd/wm831x/core.h> |
| 23 | #include <linux/mfd/wm831x/pdata.h> | 24 | #include <linux/mfd/wm831x/pdata.h> |
diff --git a/drivers/mfd/wm8350-core.c b/drivers/mfd/wm8350-core.c index bd75807d5302..e400a3bed063 100644 --- a/drivers/mfd/wm8350-core.c +++ b/drivers/mfd/wm8350-core.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/bug.h> | 19 | #include <linux/bug.h> |
| 19 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/drivers/mfd/wm8350-i2c.c b/drivers/mfd/wm8350-i2c.c index 8d8c93217572..65830f57c093 100644 --- a/drivers/mfd/wm8350-i2c.c +++ b/drivers/mfd/wm8350-i2c.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/mfd/wm8350/core.h> | 21 | #include <linux/mfd/wm8350/core.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg, | 24 | static int wm8350_i2c_read_device(struct wm8350 *wm8350, char reg, |
| 24 | int bytes, void *dest) | 25 | int bytes, void *dest) |
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c index ecfc8bbe89b9..865ce013a821 100644 --- a/drivers/mfd/wm8400-core.c +++ b/drivers/mfd/wm8400-core.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/mfd/core.h> | 18 | #include <linux/mfd/core.h> |
| 19 | #include <linux/mfd/wm8400-private.h> | 19 | #include <linux/mfd/wm8400-private.h> |
| 20 | #include <linux/mfd/wm8400-audio.h> | 20 | #include <linux/mfd/wm8400-audio.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | static struct { | 23 | static struct { |
| 23 | u16 readable; /* Mask of readable bits */ | 24 | u16 readable; /* Mask of readable bits */ |
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 844e1c1b7d90..cc524df10aa1 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
| 18 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 19 | #include <linux/mfd/core.h> | 20 | #include <linux/mfd/core.h> |
diff --git a/drivers/misc/atmel-ssc.c b/drivers/misc/atmel-ssc.c index 558bf3f2c276..4afffe610f99 100644 --- a/drivers/misc/atmel-ssc.c +++ b/drivers/misc/atmel-ssc.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
| 17 | #include <linux/atmel-ssc.h> | 17 | #include <linux/atmel-ssc.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | /* Serialize access to ssc_list and user count */ | 20 | /* Serialize access to ssc_list and user count */ |
| 20 | static DEFINE_SPINLOCK(user_lock); | 21 | static DEFINE_SPINLOCK(user_lock); |
diff --git a/drivers/misc/atmel_pwm.c b/drivers/misc/atmel_pwm.c index 6aa5294dfec4..0f3fb4f03bdf 100644 --- a/drivers/misc/atmel_pwm.c +++ b/drivers/misc/atmel_pwm.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <linux/module.h> | 1 | #include <linux/module.h> |
| 2 | #include <linux/clk.h> | 2 | #include <linux/clk.h> |
| 3 | #include <linux/err.h> | 3 | #include <linux/err.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/io.h> | 5 | #include <linux/io.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 6 | #include <linux/platform_device.h> | 7 | #include <linux/platform_device.h> |
diff --git a/drivers/misc/atmel_tclib.c b/drivers/misc/atmel_tclib.c index 05dc8a31f280..3891124001f2 100644 --- a/drivers/misc/atmel_tclib.c +++ b/drivers/misc/atmel_tclib.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/ioport.h> | 6 | #include <linux/ioport.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/platform_device.h> | 8 | #include <linux/platform_device.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | 10 | ||
| 10 | /* Number of bytes to reserve for the iomem resource */ | 11 | /* Number of bytes to reserve for the iomem resource */ |
| 11 | #define ATMEL_TC_IOMEM_SIZE 256 | 12 | #define ATMEL_TC_IOMEM_SIZE 256 |
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c index b7a85f46a6c2..ed090e77c9cd 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/idr.h> | 21 | #include <linux/idr.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <linux/c2port.h> | 25 | #include <linux/c2port.h> |
| 25 | 26 | ||
diff --git a/drivers/misc/cb710/core.c b/drivers/misc/cb710/core.c index b14eab0f2ba5..efec4139c3f6 100644 --- a/drivers/misc/cb710/core.c +++ b/drivers/misc/cb710/core.c | |||
| @@ -9,11 +9,11 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
| 15 | #include <linux/idr.h> | 14 | #include <linux/idr.h> |
| 16 | #include <linux/cb710.h> | 15 | #include <linux/cb710.h> |
| 16 | #include <linux/gfp.h> | ||
| 17 | 17 | ||
| 18 | static DEFINE_IDA(cb710_ida); | 18 | static DEFINE_IDA(cb710_ida); |
| 19 | static DEFINE_SPINLOCK(cb710_ida_lock); | 19 | static DEFINE_SPINLOCK(cb710_ida_lock); |
diff --git a/drivers/misc/cb710/debug.c b/drivers/misc/cb710/debug.c index 02358d086e03..fcb3b8e30c52 100644 --- a/drivers/misc/cb710/debug.c +++ b/drivers/misc/cb710/debug.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/cb710.h> | 10 | #include <linux/cb710.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | 13 | ||
| 15 | #define CB710_REG_COUNT 0x80 | 14 | #define CB710_REG_COUNT 0x80 |
| 16 | 15 | ||
diff --git a/drivers/misc/cs5535-mfgpt.c b/drivers/misc/cs5535-mfgpt.c index 8110460558ff..9bec24db4d41 100644 --- a/drivers/misc/cs5535-mfgpt.c +++ b/drivers/misc/cs5535-mfgpt.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/cs5535.h> | 20 | #include <linux/cs5535.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define DRV_NAME "cs5535-mfgpt" | 23 | #define DRV_NAME "cs5535-mfgpt" |
| 23 | #define MFGPT_BAR 2 | 24 | #define MFGPT_BAR 2 |
diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c index f3ee4a1abb77..9197cfc55015 100644 --- a/drivers/misc/ds1682.c +++ b/drivers/misc/ds1682.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/i2c.h> | 36 | #include <linux/i2c.h> |
| 38 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 39 | #include <linux/list.h> | 38 | #include <linux/list.h> |
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c index 1eac626e710a..48c84a58163e 100644 --- a/drivers/misc/enclosure.c +++ b/drivers/misc/enclosure.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | static LIST_HEAD(container_list); | 32 | static LIST_HEAD(container_list); |
| 32 | static DEFINE_MUTEX(container_list_lock); | 33 | static DEFINE_MUTEX(container_list_lock); |
diff --git a/drivers/misc/ep93xx_pwm.c b/drivers/misc/ep93xx_pwm.c index ba4694169d79..46b3439673e9 100644 --- a/drivers/misc/ep93xx_pwm.c +++ b/drivers/misc/ep93xx_pwm.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 23 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 24 | #include <linux/io.h> | 25 | #include <linux/io.h> |
diff --git a/drivers/misc/hpilo.c b/drivers/misc/hpilo.c index a92a3a742b43..98ad0120aa9b 100644 --- a/drivers/misc/hpilo.c +++ b/drivers/misc/hpilo.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/wait.h> | 26 | #include <linux/wait.h> |
| 27 | #include <linux/poll.h> | 27 | #include <linux/poll.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "hpilo.h" | 29 | #include "hpilo.h" |
| 29 | 30 | ||
| 30 | static struct class *ilo_class; | 31 | static struct class *ilo_class; |
diff --git a/drivers/misc/ibmasm/command.c b/drivers/misc/ibmasm/command.c index e2031739aa29..5c766b4fb238 100644 --- a/drivers/misc/ibmasm/command.c +++ b/drivers/misc/ibmasm/command.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "ibmasm.h" | 27 | #include "ibmasm.h" |
| 27 | #include "lowlevel.h" | 28 | #include "lowlevel.h" |
| 28 | 29 | ||
diff --git a/drivers/misc/ibmasm/event.c b/drivers/misc/ibmasm/event.c index 572d41ffc186..76bfda1ffaa9 100644 --- a/drivers/misc/ibmasm/event.c +++ b/drivers/misc/ibmasm/event.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "ibmasm.h" | 27 | #include "ibmasm.h" |
| 27 | #include "lowlevel.h" | 28 | #include "lowlevel.h" |
| 28 | 29 | ||
diff --git a/drivers/misc/ibmasm/ibmasmfs.c b/drivers/misc/ibmasm/ibmasmfs.c index aecf40ecb3a4..8844a3f45381 100644 --- a/drivers/misc/ibmasm/ibmasmfs.c +++ b/drivers/misc/ibmasm/ibmasmfs.c | |||
| @@ -75,6 +75,7 @@ | |||
| 75 | 75 | ||
| 76 | #include <linux/fs.h> | 76 | #include <linux/fs.h> |
| 77 | #include <linux/pagemap.h> | 77 | #include <linux/pagemap.h> |
| 78 | #include <linux/slab.h> | ||
| 78 | #include <asm/uaccess.h> | 79 | #include <asm/uaccess.h> |
| 79 | #include <asm/io.h> | 80 | #include <asm/io.h> |
| 80 | #include "ibmasm.h" | 81 | #include "ibmasm.h" |
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index dc14b0b9cbfa..a234d965243b 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | 52 | ||
| 53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/slab.h> | ||
| 55 | #include "ibmasm.h" | 56 | #include "ibmasm.h" |
| 56 | #include "lowlevel.h" | 57 | #include "lowlevel.h" |
| 57 | #include "remote.h" | 58 | #include "remote.h" |
diff --git a/drivers/misc/ics932s401.c b/drivers/misc/ics932s401.c index 395a4ea64e9c..152e9d93eecb 100644 --- a/drivers/misc/ics932s401.c +++ b/drivers/misc/ics932s401.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/log2.h> | 28 | #include <linux/log2.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | /* Addresses to scan */ | 31 | /* Addresses to scan */ |
| 31 | static const unsigned short normal_i2c[] = { 0x69, I2C_CLIENT_END }; | 32 | static const unsigned short normal_i2c[] = { 0x69, I2C_CLIENT_END }; |
diff --git a/drivers/misc/ioc4.c b/drivers/misc/ioc4.c index 09dcb699e667..193206602d88 100644 --- a/drivers/misc/ioc4.c +++ b/drivers/misc/ioc4.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/ioc4.h> | 31 | #include <linux/ioc4.h> |
| 32 | #include <linux/ktime.h> | 32 | #include <linux/ktime.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/mutex.h> | 34 | #include <linux/mutex.h> |
| 34 | #include <linux/time.h> | 35 | #include <linux/time.h> |
| 35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/drivers/misc/iwmc3200top/debugfs.c b/drivers/misc/iwmc3200top/debugfs.c index 0c8ea0a1c8a3..e9eda471f6e0 100644 --- a/drivers/misc/iwmc3200top/debugfs.c +++ b/drivers/misc/iwmc3200top/debugfs.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 29 | #include <linux/ctype.h> | 30 | #include <linux/ctype.h> |
| 30 | #include <linux/mmc/sdio_func.h> | 31 | #include <linux/mmc/sdio_func.h> |
diff --git a/drivers/misc/iwmc3200top/fw-download.c b/drivers/misc/iwmc3200top/fw-download.c index 9dbaeb574e63..e27afde6e99f 100644 --- a/drivers/misc/iwmc3200top/fw-download.c +++ b/drivers/misc/iwmc3200top/fw-download.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/firmware.h> | 27 | #include <linux/firmware.h> |
| 28 | #include <linux/mmc/sdio_func.h> | 28 | #include <linux/mmc/sdio_func.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/unaligned.h> | 30 | #include <asm/unaligned.h> |
| 30 | 31 | ||
| 31 | #include "iwmc3200top.h" | 32 | #include "iwmc3200top.h" |
diff --git a/drivers/misc/iwmc3200top/log.c b/drivers/misc/iwmc3200top/log.c index d569279698f6..a36a55a49cac 100644 --- a/drivers/misc/iwmc3200top/log.c +++ b/drivers/misc/iwmc3200top/log.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/mmc/sdio_func.h> | 28 | #include <linux/mmc/sdio_func.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/ctype.h> | 30 | #include <linux/ctype.h> |
| 30 | #include "fw-msg.h" | 31 | #include "fw-msg.h" |
| 31 | #include "iwmc3200top.h" | 32 | #include "iwmc3200top.h" |
diff --git a/drivers/misc/iwmc3200top/main.c b/drivers/misc/iwmc3200top/main.c index 3b7292a5cea9..c73cef2c3c5e 100644 --- a/drivers/misc/iwmc3200top/main.c +++ b/drivers/misc/iwmc3200top/main.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 30 | #include <linux/debugfs.h> | 31 | #include <linux/debugfs.h> |
diff --git a/drivers/misc/kgdbts.c b/drivers/misc/kgdbts.c index fcb6ec1af173..72450237a0f4 100644 --- a/drivers/misc/kgdbts.c +++ b/drivers/misc/kgdbts.c | |||
| @@ -295,6 +295,10 @@ static int check_and_rewind_pc(char *put_str, char *arg) | |||
| 295 | /* On x86 a breakpoint stop requires it to be decremented */ | 295 | /* On x86 a breakpoint stop requires it to be decremented */ |
| 296 | if (addr + 1 == kgdbts_regs.ip) | 296 | if (addr + 1 == kgdbts_regs.ip) |
| 297 | offset = -1; | 297 | offset = -1; |
| 298 | #elif defined(CONFIG_SUPERH) | ||
| 299 | /* On SUPERH a breakpoint stop requires it to be decremented */ | ||
| 300 | if (addr + 2 == kgdbts_regs.pc) | ||
| 301 | offset = -2; | ||
| 298 | #endif | 302 | #endif |
| 299 | if (strcmp(arg, "silent") && | 303 | if (strcmp(arg, "silent") && |
| 300 | instruction_pointer(&kgdbts_regs) + offset != addr) { | 304 | instruction_pointer(&kgdbts_regs) + offset != addr) { |
| @@ -305,6 +309,8 @@ static int check_and_rewind_pc(char *put_str, char *arg) | |||
| 305 | #ifdef CONFIG_X86 | 309 | #ifdef CONFIG_X86 |
| 306 | /* On x86 adjust the instruction pointer if needed */ | 310 | /* On x86 adjust the instruction pointer if needed */ |
| 307 | kgdbts_regs.ip += offset; | 311 | kgdbts_regs.ip += offset; |
| 312 | #elif defined(CONFIG_SUPERH) | ||
| 313 | kgdbts_regs.pc += offset; | ||
| 308 | #endif | 314 | #endif |
| 309 | return 0; | 315 | return 0; |
| 310 | } | 316 | } |
diff --git a/drivers/misc/lkdtm.c b/drivers/misc/lkdtm.c index 4a0648301fdf..31a991161f0a 100644 --- a/drivers/misc/lkdtm.c +++ b/drivers/misc/lkdtm.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
| 42 | #include <linux/hrtimer.h> | 42 | #include <linux/hrtimer.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <scsi/scsi_cmnd.h> | 44 | #include <scsi/scsi_cmnd.h> |
| 44 | #include <linux/debugfs.h> | 45 | #include <linux/debugfs.h> |
| 45 | 46 | ||
diff --git a/drivers/misc/phantom.c b/drivers/misc/phantom.c index 779aa8ebe4cf..75ee0d3f6f45 100644 --- a/drivers/misc/phantom.c +++ b/drivers/misc/phantom.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/poll.h> | 21 | #include <linux/poll.h> |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/cdev.h> | 23 | #include <linux/cdev.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/phantom.h> | 25 | #include <linux/phantom.h> |
| 25 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 26 | #include <linux/smp_lock.h> | 27 | #include <linux/smp_lock.h> |
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c index 832ed4c88cf7..8d082b46426b 100644 --- a/drivers/misc/sgi-xp/xpc_main.c +++ b/drivers/misc/sgi-xp/xpc_main.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <linux/sysctl.h> | 48 | #include <linux/sysctl.h> |
| 48 | #include <linux/device.h> | 49 | #include <linux/device.h> |
| 49 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
diff --git a/drivers/misc/sgi-xp/xpc_partition.c b/drivers/misc/sgi-xp/xpc_partition.c index 9a6268c89fdd..d551f09ccb79 100644 --- a/drivers/misc/sgi-xp/xpc_partition.c +++ b/drivers/misc/sgi-xp/xpc_partition.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 19 | #include <linux/hardirq.h> | 19 | #include <linux/hardirq.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include "xpc.h" | 21 | #include "xpc.h" |
| 21 | #include <asm/uv/uv_hub.h> | 22 | #include <asm/uv/uv_hub.h> |
| 22 | 23 | ||
diff --git a/drivers/misc/sgi-xp/xpc_sn2.c b/drivers/misc/sgi-xp/xpc_sn2.c index 8b70e03f939f..7d71c04fc938 100644 --- a/drivers/misc/sgi-xp/xpc_sn2.c +++ b/drivers/misc/sgi-xp/xpc_sn2.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <asm/uncached.h> | 18 | #include <asm/uncached.h> |
| 18 | #include <asm/sn/mspec.h> | 19 | #include <asm/sn/mspec.h> |
| 19 | #include <asm/sn/sn_sal.h> | 20 | #include <asm/sn/sn_sal.h> |
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c index 8725d5e8ab0c..1f59ee2226ca 100644 --- a/drivers/misc/sgi-xp/xpc_uv.c +++ b/drivers/misc/sgi-xp/xpc_uv.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <asm/uv/uv_hub.h> | 23 | #include <asm/uv/uv_hub.h> |
| 23 | #if defined CONFIG_X86_64 | 24 | #if defined CONFIG_X86_64 |
| 24 | #include <asm/uv/bios.h> | 25 | #include <asm/uv/bios.h> |
diff --git a/drivers/misc/sgi-xp/xpnet.c b/drivers/misc/sgi-xp/xpnet.c index 57b152f8d1b9..ee5109a3cd98 100644 --- a/drivers/misc/sgi-xp/xpnet.c +++ b/drivers/misc/sgi-xp/xpnet.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 24 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 25 | #include <linux/etherdevice.h> | 26 | #include <linux/etherdevice.h> |
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c index 98bcba521da2..5f6852dff40b 100644 --- a/drivers/misc/tifm_core.c +++ b/drivers/misc/tifm_core.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/tifm.h> | 12 | #include <linux/tifm.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | #include <linux/idr.h> | 15 | #include <linux/idr.h> |
| 15 | 16 | ||
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index 1f552c6e7579..cb9fbc83b090 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 27 | #include <linux/hdreg.h> | 28 | #include <linux/hdreg.h> |
| 28 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
diff --git a/drivers/mmc/card/mmc_test.c b/drivers/mmc/card/mmc_test.c index e7f8027165e6..445d7db2277e 100644 --- a/drivers/mmc/card/mmc_test.c +++ b/drivers/mmc/card/mmc_test.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/mmc/card.h> | 13 | #include <linux/mmc/card.h> |
| 14 | #include <linux/mmc/host.h> | 14 | #include <linux/mmc/host.h> |
| 15 | #include <linux/mmc/mmc.h> | 15 | #include <linux/mmc/mmc.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/scatterlist.h> | 18 | #include <linux/scatterlist.h> |
| 18 | 19 | ||
diff --git a/drivers/mmc/card/queue.c b/drivers/mmc/card/queue.c index 381fe032caa1..d6ded247d941 100644 --- a/drivers/mmc/card/queue.c +++ b/drivers/mmc/card/queue.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * published by the Free Software Foundation. | 9 | * published by the Free Software Foundation. |
| 10 | * | 10 | * |
| 11 | */ | 11 | */ |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 13 | #include <linux/blkdev.h> | 14 | #include <linux/blkdev.h> |
| 14 | #include <linux/freezer.h> | 15 | #include <linux/freezer.h> |
diff --git a/drivers/mmc/card/sdio_uart.c b/drivers/mmc/card/sdio_uart.c index 723e50894db9..a0716967b7c8 100644 --- a/drivers/mmc/card/sdio_uart.c +++ b/drivers/mmc/card/sdio_uart.c | |||
| @@ -34,10 +34,10 @@ | |||
| 34 | #include <linux/seq_file.h> | 34 | #include <linux/seq_file.h> |
| 35 | #include <linux/serial_reg.h> | 35 | #include <linux/serial_reg.h> |
| 36 | #include <linux/circ_buf.h> | 36 | #include <linux/circ_buf.h> |
| 37 | #include <linux/gfp.h> | ||
| 38 | #include <linux/tty.h> | 37 | #include <linux/tty.h> |
| 39 | #include <linux/tty_flip.h> | 38 | #include <linux/tty_flip.h> |
| 40 | #include <linux/kfifo.h> | 39 | #include <linux/kfifo.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | 41 | ||
| 42 | #include <linux/mmc/core.h> | 42 | #include <linux/mmc/core.h> |
| 43 | #include <linux/mmc/card.h> | 43 | #include <linux/mmc/card.h> |
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c index bdb165f93046..49d9dcaeca49 100644 --- a/drivers/mmc/core/bus.c +++ b/drivers/mmc/core/bus.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/mmc/card.h> | 18 | #include <linux/mmc/card.h> |
| 18 | #include <linux/mmc/host.h> | 19 | #include <linux/mmc/host.h> |
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c index 96d10f40fb23..53cb380c0987 100644 --- a/drivers/mmc/core/debugfs.c +++ b/drivers/mmc/core/debugfs.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/debugfs.h> | 10 | #include <linux/debugfs.h> |
| 11 | #include <linux/fs.h> | 11 | #include <linux/fs.h> |
| 12 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/stat.h> | 14 | #include <linux/stat.h> |
| 14 | 15 | ||
| 15 | #include <linux/mmc/card.h> | 16 | #include <linux/mmc/card.h> |
diff --git a/drivers/mmc/core/host.c b/drivers/mmc/core/host.c index a268d12f1af0..47353909e345 100644 --- a/drivers/mmc/core/host.c +++ b/drivers/mmc/core/host.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/idr.h> | 16 | #include <linux/idr.h> |
| 17 | #include <linux/pagemap.h> | 17 | #include <linux/pagemap.h> |
| 18 | #include <linux/leds.h> | 18 | #include <linux/leds.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <linux/mmc/host.h> | 21 | #include <linux/mmc/host.h> |
| 21 | 22 | ||
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index e041c003db22..89f7a25b7ac1 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include <linux/mmc/host.h> | 16 | #include <linux/mmc/host.h> |
| 16 | #include <linux/mmc/card.h> | 17 | #include <linux/mmc/card.h> |
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index d2cb5c634392..326447c9ede8 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * your option) any later version. | 9 | * your option) any later version. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 13 | #include <linux/scatterlist.h> | 14 | #include <linux/scatterlist.h> |
| 14 | 15 | ||
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index fdd414eded09..5eac21df4809 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include <linux/mmc/host.h> | 16 | #include <linux/mmc/host.h> |
| 16 | #include <linux/mmc/card.h> | 17 | #include <linux/mmc/card.h> |
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 9e060c87e64d..4a890dcb95ab 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/mmc/card.h> | 18 | #include <linux/mmc/card.h> |
| 18 | #include <linux/mmc/sdio_func.h> | 19 | #include <linux/mmc/sdio_func.h> |
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c index 9538389783c1..541bdb89e0c5 100644 --- a/drivers/mmc/core/sdio_cis.c +++ b/drivers/mmc/core/sdio_cis.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #include <linux/mmc/host.h> | 19 | #include <linux/mmc/host.h> |
| 19 | #include <linux/mmc/card.h> | 20 | #include <linux/mmc/card.h> |
diff --git a/drivers/mmc/host/at91_mci.c b/drivers/mmc/host/at91_mci.c index 91dc60cd032b..a6dd7da37357 100644 --- a/drivers/mmc/host/at91_mci.c +++ b/drivers/mmc/host/at91_mci.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #include <linux/dma-mapping.h> | 65 | #include <linux/dma-mapping.h> |
| 66 | #include <linux/clk.h> | 66 | #include <linux/clk.h> |
| 67 | #include <linux/atmel_pdc.h> | 67 | #include <linux/atmel_pdc.h> |
| 68 | #include <linux/gfp.h> | ||
| 68 | 69 | ||
| 69 | #include <linux/mmc/host.h> | 70 | #include <linux/mmc/host.h> |
| 70 | 71 | ||
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 8072128e933b..88be37d9e9a5 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/scatterlist.h> | 23 | #include <linux/scatterlist.h> |
| 24 | #include <linux/seq_file.h> | 24 | #include <linux/seq_file.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/stat.h> | 26 | #include <linux/stat.h> |
| 26 | 27 | ||
| 27 | #include <linux/mmc/host.h> | 28 | #include <linux/mmc/host.h> |
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 57b21198828f..f5834449400e 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/scatterlist.h> | 41 | #include <linux/scatterlist.h> |
| 42 | #include <linux/leds.h> | 42 | #include <linux/leds.h> |
| 43 | #include <linux/mmc/host.h> | 43 | #include <linux/mmc/host.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 46 | #include <asm/mach-au1x00/au1000.h> | 47 | #include <asm/mach-au1x00/au1000.h> |
diff --git a/drivers/mmc/host/bfin_sdh.c b/drivers/mmc/host/bfin_sdh.c index 56f7b448b911..6919e844072c 100644 --- a/drivers/mmc/host/bfin_sdh.c +++ b/drivers/mmc/host/bfin_sdh.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | #include <linux/mmc/host.h> | 18 | #include <linux/mmc/host.h> |
| 19 | #include <linux/proc_fs.h> | 19 | #include <linux/proc_fs.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/cacheflush.h> | 22 | #include <asm/cacheflush.h> |
| 22 | #include <asm/dma.h> | 23 | #include <asm/dma.h> |
diff --git a/drivers/mmc/host/cb710-mmc.c b/drivers/mmc/host/cb710-mmc.c index 4e72964a7b43..92a324f7417c 100644 --- a/drivers/mmc/host/cb710-mmc.c +++ b/drivers/mmc/host/cb710-mmc.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | */ | 9 | */ |
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 13 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include "cb710-mmc.h" | 14 | #include "cb710-mmc.h" |
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index d55fe4fb7935..ad847a24a675 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/bio.h> | 30 | #include <linux/bio.h> |
| 30 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| 31 | #include <linux/crc7.h> | 32 | #include <linux/crc7.h> |
diff --git a/drivers/mmc/host/msm_sdcc.c b/drivers/mmc/host/msm_sdcc.c index 4c068e5fe6b2..04ae884383f6 100644 --- a/drivers/mmc/host/msm_sdcc.c +++ b/drivers/mmc/host/msm_sdcc.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/debugfs.h> | 33 | #include <linux/debugfs.h> |
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/memory.h> | 35 | #include <linux/memory.h> |
| 36 | #include <linux/gfp.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
| 38 | #include <asm/div64.h> | 39 | #include <asm/div64.h> |
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c index 0c7a63c1f12f..bb6cc54b558e 100644 --- a/drivers/mmc/host/of_mmc_spi.c +++ b/drivers/mmc/host/of_mmc_spi.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/of.h> | 19 | #include <linux/of.h> |
| 19 | #include <linux/of_gpio.h> | 20 | #include <linux/of_gpio.h> |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index c6d7e8ecadbf..84d280406341 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 27 | #include <linux/scatterlist.h> | 27 | #include <linux/scatterlist.h> |
| 28 | #include <linux/i2c/tps65010.h> | 28 | #include <linux/i2c/tps65010.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/io.h> | 31 | #include <asm/io.h> |
| 31 | #include <asm/irq.h> | 32 | #include <asm/irq.h> |
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 0d783f3e79ed..0ed48959b590 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | #include <linux/regulator/consumer.h> | 30 | #include <linux/regulator/consumer.h> |
| 31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/sizes.h> | 34 | #include <asm/sizes.h> |
| 34 | 35 | ||
diff --git a/drivers/mmc/host/sdhci-pci.c b/drivers/mmc/host/sdhci-pci.c index 8e1020cf73f4..6701af629c30 100644 --- a/drivers/mmc/host/sdhci-pci.c +++ b/drivers/mmc/host/sdhci-pci.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/highmem.h> | 16 | #include <linux/highmem.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <linux/mmc/host.h> | 21 | #include <linux/mmc/host.h> |
| 21 | 22 | ||
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c index 50997d2a63e7..2136794c0cfa 100644 --- a/drivers/mmc/host/sdhci-s3c.c +++ b/drivers/mmc/host/sdhci-s3c.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/dma-mapping.h> | 16 | #include <linux/dma-mapping.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 19 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 20 | 21 | ||
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d6ab62d539fb..9d4fdfa685e5 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/highmem.h> | 17 | #include <linux/highmem.h> |
| 18 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 19 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/scatterlist.h> | 21 | #include <linux/scatterlist.h> |
| 21 | 22 | ||
| 22 | #include <linux/leds.h> | 23 | #include <linux/leds.h> |
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index 89bf8cd25cac..69efe01eece8 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/highmem.h> | 34 | #include <linux/highmem.h> |
| 35 | #include <linux/mmc/host.h> | 35 | #include <linux/mmc/host.h> |
| 36 | #include <linux/scatterlist.h> | 36 | #include <linux/scatterlist.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
| 39 | #include <asm/dma.h> | 40 | #include <asm/dma.h> |
diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index 8c295f40d2ac..ce6424008ed9 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/buffer_head.h> | 17 | #include <linux/buffer_head.h> |
| 18 | #include <linux/mutex.h> | 18 | #include <linux/mutex.h> |
| 19 | #include <linux/mount.h> | 19 | #include <linux/mount.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args) | 22 | #define ERROR(fmt, args...) printk(KERN_ERR "block2mtd: " fmt "\n" , ## args) |
| 22 | #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args) | 23 | #define INFO(fmt, args...) printk(KERN_INFO "block2mtd: " fmt "\n" , ## args) |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index f3f4768d6e18..81e49a9b017e 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/mutex.h> | 22 | #include <linux/mutex.h> |
| 23 | #include <linux/math64.h> | 23 | #include <linux/math64.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 25 | #include <linux/mod_devicetable.h> | 26 | #include <linux/mod_devicetable.h> |
| 26 | 27 | ||
diff --git a/drivers/mtd/devices/sst25l.c b/drivers/mtd/devices/sst25l.c index 0a11721f146e..fe17054ee2fe 100644 --- a/drivers/mtd/devices/sst25l.c +++ b/drivers/mtd/devices/sst25l.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/sched.h> | 24 | #include <linux/sched.h> |
| 24 | 25 | ||
| 25 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
diff --git a/drivers/mtd/lpddr/lpddr_cmds.c b/drivers/mtd/lpddr/lpddr_cmds.c index e22ca49583e7..a73ee12aad81 100644 --- a/drivers/mtd/lpddr/lpddr_cmds.c +++ b/drivers/mtd/lpddr/lpddr_cmds.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #include <linux/mtd/pfow.h> | 27 | #include <linux/mtd/pfow.h> |
| 28 | #include <linux/mtd/qinfo.h> | 28 | #include <linux/mtd/qinfo.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | static int lpddr_read(struct mtd_info *mtd, loff_t adr, size_t len, | 31 | static int lpddr_read(struct mtd_info *mtd, loff_t adr, size_t len, |
| 31 | size_t *retlen, u_char *buf); | 32 | size_t *retlen, u_char *buf); |
diff --git a/drivers/mtd/maps/amd76xrom.c b/drivers/mtd/maps/amd76xrom.c index 237733d094c4..19fe92db0c46 100644 --- a/drivers/mtd/maps/amd76xrom.c +++ b/drivers/mtd/maps/amd76xrom.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 12 | #include <linux/mtd/mtd.h> | 13 | #include <linux/mtd/mtd.h> |
| 13 | #include <linux/mtd/map.h> | 14 | #include <linux/mtd/map.h> |
diff --git a/drivers/mtd/maps/bfin-async-flash.c b/drivers/mtd/maps/bfin-async-flash.c index a7c808b577d3..c0fd99b0c525 100644 --- a/drivers/mtd/maps/bfin-async-flash.c +++ b/drivers/mtd/maps/bfin-async-flash.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
| 23 | #include <linux/mtd/physmap.h> | 23 | #include <linux/mtd/physmap.h> |
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/types.h> | 26 | #include <linux/types.h> |
| 26 | 27 | ||
| 27 | #include <asm/blackfin.h> | 28 | #include <asm/blackfin.h> |
diff --git a/drivers/mtd/maps/ck804xrom.c b/drivers/mtd/maps/ck804xrom.c index 424f17d6ffd1..ddb462bea9b5 100644 --- a/drivers/mtd/maps/ck804xrom.c +++ b/drivers/mtd/maps/ck804xrom.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <asm/io.h> | 15 | #include <asm/io.h> |
| 15 | #include <linux/mtd/mtd.h> | 16 | #include <linux/mtd/mtd.h> |
| 16 | #include <linux/mtd/map.h> | 17 | #include <linux/mtd/map.h> |
diff --git a/drivers/mtd/maps/esb2rom.c b/drivers/mtd/maps/esb2rom.c index 11a2f57df9cf..d12c93dc1aad 100644 --- a/drivers/mtd/maps/esb2rom.c +++ b/drivers/mtd/maps/esb2rom.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <asm/io.h> | 18 | #include <asm/io.h> |
| 18 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 19 | #include <linux/mtd/map.h> | 20 | #include <linux/mtd/map.h> |
diff --git a/drivers/mtd/maps/gpio-addr-flash.c b/drivers/mtd/maps/gpio-addr-flash.c index 1ad5caf9fe69..32e89d773b4e 100644 --- a/drivers/mtd/maps/gpio-addr-flash.c +++ b/drivers/mtd/maps/gpio-addr-flash.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/mtd/partitions.h> | 23 | #include <linux/mtd/partitions.h> |
| 24 | #include <linux/mtd/physmap.h> | 24 | #include <linux/mtd/physmap.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 27 | 28 | ||
| 28 | #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) | 29 | #define pr_devinit(fmt, args...) ({ static const __devinitconst char __fmt[] = fmt; printk(__fmt, ## args); }) |
diff --git a/drivers/mtd/maps/ichxrom.c b/drivers/mtd/maps/ichxrom.c index c32bc28920b3..f102bf243a74 100644 --- a/drivers/mtd/maps/ichxrom.c +++ b/drivers/mtd/maps/ichxrom.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <asm/io.h> | 12 | #include <asm/io.h> |
| 12 | #include <linux/mtd/mtd.h> | 13 | #include <linux/mtd/mtd.h> |
| 13 | #include <linux/mtd/map.h> | 14 | #include <linux/mtd/map.h> |
diff --git a/drivers/mtd/maps/intel_vr_nor.c b/drivers/mtd/maps/intel_vr_nor.c index 1e7814ae212a..fc1998512eb4 100644 --- a/drivers/mtd/maps/intel_vr_nor.c +++ b/drivers/mtd/maps/intel_vr_nor.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 33 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 34 | #include <linux/mtd/mtd.h> | 35 | #include <linux/mtd/mtd.h> |
diff --git a/drivers/mtd/maps/octagon-5066.c b/drivers/mtd/maps/octagon-5066.c index 2b2e45093218..23fe1786770f 100644 --- a/drivers/mtd/maps/octagon-5066.c +++ b/drivers/mtd/maps/octagon-5066.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | ##################################################################### */ | 24 | ##################################################################### */ |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <asm/io.h> | 29 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c index 61e4eb48bb2d..101ee6ead05c 100644 --- a/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/mtd/concat.h> | 23 | #include <linux/mtd/concat.h> |
| 24 | #include <linux/of.h> | 24 | #include <linux/of.h> |
| 25 | #include <linux/of_platform.h> | 25 | #include <linux/of_platform.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | struct of_flash_list { | 28 | struct of_flash_list { |
| 28 | struct mtd_info *mtd; | 29 | struct mtd_info *mtd; |
diff --git a/drivers/mtd/maps/pismo.c b/drivers/mtd/maps/pismo.c index 30e12c88d1da..60c068db452d 100644 --- a/drivers/mtd/maps/pismo.c +++ b/drivers/mtd/maps/pismo.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/i2c.h> | 12 | #include <linux/i2c.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 14 | #include <linux/spinlock.h> | 15 | #include <linux/spinlock.h> |
| 15 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index c8fd8da4bc87..acb13fa5001c 100644 --- a/drivers/mtd/maps/pmcmsp-flash.c +++ b/drivers/mtd/maps/pmcmsp-flash.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 28 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 29 | */ | 29 | */ |
| 30 | 30 | ||
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 32 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 33 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index b13f6417b5b2..91dc6331053f 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/drivers/mtd/maps/sbc_gxx.c b/drivers/mtd/maps/sbc_gxx.c index 1b1c0b7e11ef..04b2781fc627 100644 --- a/drivers/mtd/maps/sbc_gxx.c +++ b/drivers/mtd/maps/sbc_gxx.c | |||
| @@ -45,7 +45,6 @@ separate MTD devices. | |||
| 45 | // Includes | 45 | // Includes |
| 46 | 46 | ||
| 47 | #include <linux/module.h> | 47 | #include <linux/module.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | #include <linux/ioport.h> | 48 | #include <linux/ioport.h> |
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 51 | #include <asm/io.h> | 50 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c index fd7a1017399a..fadc4c45b455 100644 --- a/drivers/mtd/maps/sun_uflash.c +++ b/drivers/mtd/maps/sun_uflash.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
| 16 | #include <linux/of.h> | 16 | #include <linux/of.h> |
| 17 | #include <linux/of_device.h> | 17 | #include <linux/of_device.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/prom.h> | 19 | #include <asm/prom.h> |
| 19 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
| 20 | #include <asm/io.h> | 21 | #include <asm/io.h> |
diff --git a/drivers/mtd/maps/vmax301.c b/drivers/mtd/maps/vmax301.c index 6d452dcdfe34..6adaa6acc193 100644 --- a/drivers/mtd/maps/vmax301.c +++ b/drivers/mtd/maps/vmax301.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | ##################################################################### */ | 16 | ##################################################################### */ |
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
diff --git a/drivers/mtd/maps/vmu-flash.c b/drivers/mtd/maps/vmu-flash.c index 82afad0ddd72..4afc167731ef 100644 --- a/drivers/mtd/maps/vmu-flash.c +++ b/drivers/mtd/maps/vmu-flash.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * GNU General Public Licence | 8 | * GNU General Public Licence |
| 9 | */ | 9 | */ |
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/sched.h> | 12 | #include <linux/sched.h> |
| 12 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 13 | #include <linux/maple.h> | 14 | #include <linux/maple.h> |
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index c356c0a30c3e..5b38b17d2229 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/ptrace.h> | 9 | #include <linux/ptrace.h> |
| 10 | #include <linux/slab.h> | ||
| 11 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 12 | #include <linux/timer.h> | 11 | #include <linux/timer.h> |
| 13 | #include <linux/major.h> | 12 | #include <linux/major.h> |
diff --git a/drivers/mtd/nand/bcm_umi_nand.c b/drivers/mtd/nand/bcm_umi_nand.c index 7d1cca7a31a9..c997f98eeb3d 100644 --- a/drivers/mtd/nand/bcm_umi_nand.c +++ b/drivers/mtd/nand/bcm_umi_nand.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 22 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
| 23 | #include <linux/device.h> | 24 | #include <linux/device.h> |
diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c index c828d9ac7bd7..e5a9f9ccea60 100644 --- a/drivers/mtd/nand/cafe_nand.c +++ b/drivers/mtd/nand/cafe_nand.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/dma-mapping.h> | 22 | #include <linux/dma-mapping.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <asm/io.h> | 24 | #include <asm/io.h> |
| 24 | 25 | ||
| 25 | #define CAFE_NAND_CTRL1 0x00 | 26 | #define CAFE_NAND_CTRL1 0x00 |
diff --git a/drivers/mtd/nand/cmx270_nand.c b/drivers/mtd/nand/cmx270_nand.c index 826cacffcefc..6e6495278258 100644 --- a/drivers/mtd/nand/cmx270_nand.c +++ b/drivers/mtd/nand/cmx270_nand.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/mtd/nand.h> | 21 | #include <linux/mtd/nand.h> |
| 22 | #include <linux/mtd/partitions.h> | 22 | #include <linux/mtd/partitions.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 24 | 25 | ||
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c index fe3eba87de40..76e2dc8e62f7 100644 --- a/drivers/mtd/nand/davinci_nand.c +++ b/drivers/mtd/nand/davinci_nand.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/mtd/nand.h> | 33 | #include <linux/mtd/nand.h> |
| 34 | #include <linux/mtd/partitions.h> | 34 | #include <linux/mtd/partitions.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <mach/nand.h> | 37 | #include <mach/nand.h> |
| 37 | 38 | ||
diff --git a/drivers/mtd/nand/diskonchip.c b/drivers/mtd/nand/diskonchip.c index b126cf887476..47067bc98248 100644 --- a/drivers/mtd/nand/diskonchip.c +++ b/drivers/mtd/nand/diskonchip.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/rslib.h> | 24 | #include <linux/rslib.h> |
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 27 | 28 | ||
| 28 | #include <linux/mtd/mtd.h> | 29 | #include <linux/mtd/mtd.h> |
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 071a60cb4204..4b96296af321 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/of_platform.h> | 21 | #include <linux/of_platform.h> |
| 22 | #include <linux/of_gpio.h> | 22 | #include <linux/of_gpio.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/fsl_lbc.h> | 25 | #include <asm/fsl_lbc.h> |
| 25 | 26 | ||
| 26 | #define FSL_UPM_WAIT_RUN_PATTERN 0x1 | 27 | #define FSL_UPM_WAIT_RUN_PATTERN 0x1 |
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 40b5658bdbe6..b983cae8c298 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/mtd/nand_ecc.h> | 28 | #include <linux/mtd/nand_ecc.h> |
| 29 | #include <linux/mtd/partitions.h> | 29 | #include <linux/mtd/partitions.h> |
| 30 | #include <linux/mtd/ndfc.h> | 30 | #include <linux/mtd/ndfc.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/mtd/mtd.h> | 32 | #include <linux/mtd/mtd.h> |
| 32 | #include <linux/of_platform.h> | 33 | #include <linux/of_platform.h> |
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c index 66123419f65d..1f6f741af5da 100644 --- a/drivers/mtd/nand/nomadik_nand.c +++ b/drivers/mtd/nand/nomadik_nand.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/mtd/partitions.h> | 31 | #include <linux/mtd/partitions.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <mach/nand.h> | 34 | #include <mach/nand.h> |
| 34 | #include <mach/fsmc.h> | 35 | #include <mach/fsmc.h> |
| 35 | 36 | ||
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c index 26aec0080184..7545568fce47 100644 --- a/drivers/mtd/nand/omap2.c +++ b/drivers/mtd/nand/omap2.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/mtd/nand.h> | 17 | #include <linux/mtd/nand.h> |
| 18 | #include <linux/mtd/partitions.h> | 18 | #include <linux/mtd/partitions.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include <plat/dma.h> | 22 | #include <plat/dma.h> |
| 22 | #include <plat/gpmc.h> | 23 | #include <plat/gpmc.h> |
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 1a5a0365c983..5d55152162cf 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <mach/dma.h> | 26 | #include <mach/dma.h> |
| 26 | #include <plat/pxa3xx_nand.h> | 27 | #include <plat/pxa3xx_nand.h> |
diff --git a/drivers/mtd/nand/sh_flctl.c b/drivers/mtd/nand/sh_flctl.c index 1842df8bdd93..34752fce0793 100644 --- a/drivers/mtd/nand/sh_flctl.c +++ b/drivers/mtd/nand/sh_flctl.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <linux/mtd/mtd.h> | 31 | #include <linux/mtd/mtd.h> |
| 31 | #include <linux/mtd/nand.h> | 32 | #include <linux/mtd/nand.h> |
diff --git a/drivers/mtd/nand/tmio_nand.c b/drivers/mtd/nand/tmio_nand.c index 92c73344a669..fa28f01ae009 100644 --- a/drivers/mtd/nand/tmio_nand.c +++ b/drivers/mtd/nand/tmio_nand.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/mtd/nand.h> | 37 | #include <linux/mtd/nand.h> |
| 38 | #include <linux/mtd/nand_ecc.h> | 38 | #include <linux/mtd/nand_ecc.h> |
| 39 | #include <linux/mtd/partitions.h> | 39 | #include <linux/mtd/partitions.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | /*--------------------------------------------------------------------------*/ | 42 | /*--------------------------------------------------------------------------*/ |
| 42 | 43 | ||
diff --git a/drivers/mtd/ofpart.c b/drivers/mtd/ofpart.c index 62d6a78c4eee..4f0d635674f3 100644 --- a/drivers/mtd/ofpart.c +++ b/drivers/mtd/ofpart.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/of.h> | 18 | #include <linux/of.h> |
| 19 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/mtd/partitions.h> | 21 | #include <linux/mtd/partitions.h> |
| 21 | 22 | ||
| 22 | int __devinit of_mtd_parse_partitions(struct device *dev, | 23 | int __devinit of_mtd_parse_partitions(struct device *dev, |
diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 75f38b95811e..fd406348fdfd 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 36 | #include <linux/io.h> | 36 | #include <linux/io.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/mach/flash.h> | 39 | #include <asm/mach/flash.h> |
| 39 | #include <plat/gpmc.h> | 40 | #include <plat/gpmc.h> |
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index f63b1db3ffb3..32f0ed33afe0 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 28 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
diff --git a/drivers/mtd/onenand/onenand_sim.c b/drivers/mtd/onenand/onenand_sim.c index f6e3c8aebd3a..8b246061d511 100644 --- a/drivers/mtd/onenand/onenand_sim.c +++ b/drivers/mtd/onenand/onenand_sim.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
diff --git a/drivers/mtd/tests/mtd_nandecctest.c b/drivers/mtd/tests/mtd_nandecctest.c index c1f31051784c..70d6d7d0d656 100644 --- a/drivers/mtd/tests/mtd_nandecctest.c +++ b/drivers/mtd/tests/mtd_nandecctest.c | |||
| @@ -1,7 +1,6 @@ | |||
| 1 | #include <linux/kernel.h> | 1 | #include <linux/kernel.h> |
| 2 | #include <linux/module.h> | 2 | #include <linux/module.h> |
| 3 | #include <linux/list.h> | 3 | #include <linux/list.h> |
| 4 | #include <linux/slab.h> | ||
| 5 | #include <linux/random.h> | 4 | #include <linux/random.h> |
| 6 | #include <linux/string.h> | 5 | #include <linux/string.h> |
| 7 | #include <linux/bitops.h> | 6 | #include <linux/bitops.h> |
diff --git a/drivers/mtd/tests/mtd_oobtest.c b/drivers/mtd/tests/mtd_oobtest.c index 5813920e79a5..dec92ae6111a 100644 --- a/drivers/mtd/tests/mtd_oobtest.c +++ b/drivers/mtd/tests/mtd_oobtest.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 27 | #include <linux/mtd/mtd.h> | 27 | #include <linux/mtd/mtd.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 29 | 30 | ||
| 30 | #define PRINT_PREF KERN_INFO "mtd_oobtest: " | 31 | #define PRINT_PREF KERN_INFO "mtd_oobtest: " |
diff --git a/drivers/mtd/tests/mtd_pagetest.c b/drivers/mtd/tests/mtd_pagetest.c index ce17cbe918c5..921a85df9196 100644 --- a/drivers/mtd/tests/mtd_pagetest.c +++ b/drivers/mtd/tests/mtd_pagetest.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 27 | #include <linux/mtd/mtd.h> | 27 | #include <linux/mtd/mtd.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 29 | 30 | ||
| 30 | #define PRINT_PREF KERN_INFO "mtd_pagetest: " | 31 | #define PRINT_PREF KERN_INFO "mtd_pagetest: " |
diff --git a/drivers/mtd/tests/mtd_readtest.c b/drivers/mtd/tests/mtd_readtest.c index 25c5dd03a837..7107fccbc7de 100644 --- a/drivers/mtd/tests/mtd_readtest.c +++ b/drivers/mtd/tests/mtd_readtest.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 28 | 29 | ||
| 29 | #define PRINT_PREF KERN_INFO "mtd_readtest: " | 30 | #define PRINT_PREF KERN_INFO "mtd_readtest: " |
diff --git a/drivers/mtd/tests/mtd_speedtest.c b/drivers/mtd/tests/mtd_speedtest.c index 7fbb51d4eabe..56ca62bb96bf 100644 --- a/drivers/mtd/tests/mtd_speedtest.c +++ b/drivers/mtd/tests/mtd_speedtest.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 28 | 29 | ||
| 29 | #define PRINT_PREF KERN_INFO "mtd_speedtest: " | 30 | #define PRINT_PREF KERN_INFO "mtd_speedtest: " |
diff --git a/drivers/mtd/tests/mtd_stresstest.c b/drivers/mtd/tests/mtd_stresstest.c index a99d3cd737d8..3854afec56d0 100644 --- a/drivers/mtd/tests/mtd_stresstest.c +++ b/drivers/mtd/tests/mtd_stresstest.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 28 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
| 29 | 30 | ||
diff --git a/drivers/mtd/tests/mtd_subpagetest.c b/drivers/mtd/tests/mtd_subpagetest.c index 5b889724268e..700237a3d120 100644 --- a/drivers/mtd/tests/mtd_subpagetest.c +++ b/drivers/mtd/tests/mtd_subpagetest.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 25 | #include <linux/err.h> | 25 | #include <linux/err.h> |
| 26 | #include <linux/mtd/mtd.h> | 26 | #include <linux/mtd/mtd.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 28 | 29 | ||
| 29 | #define PRINT_PREF KERN_INFO "mtd_subpagetest: " | 30 | #define PRINT_PREF KERN_INFO "mtd_subpagetest: " |
diff --git a/drivers/mtd/tests/mtd_torturetest.c b/drivers/mtd/tests/mtd_torturetest.c index 631a0ab3a33c..5c6c3d248901 100644 --- a/drivers/mtd/tests/mtd_torturetest.c +++ b/drivers/mtd/tests/mtd_torturetest.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/moduleparam.h> | 28 | #include <linux/moduleparam.h> |
| 29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/mtd/mtd.h> | 30 | #include <linux/mtd/mtd.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 32 | 33 | ||
| 33 | #define PRINT_PREF KERN_INFO "mtd_torturetest: " | 34 | #define PRINT_PREF KERN_INFO "mtd_torturetest: " |
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index fad40aa6f099..55c726dde942 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/kthread.h> | 44 | #include <linux/kthread.h> |
| 45 | #include <linux/reboot.h> | 45 | #include <linux/reboot.h> |
| 46 | #include <linux/kernel.h> | 46 | #include <linux/kernel.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include "ubi.h" | 48 | #include "ubi.h" |
| 48 | 49 | ||
| 49 | /* Maximum length of the 'mtd=' parameter */ | 50 | /* Maximum length of the 'mtd=' parameter */ |
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index 111ea41c4ecd..72ebb3f06b86 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | #include <linux/module.h> | 38 | #include <linux/module.h> |
| 39 | #include <linux/stat.h> | 39 | #include <linux/stat.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/ioctl.h> | 41 | #include <linux/ioctl.h> |
| 41 | #include <linux/capability.h> | 42 | #include <linux/capability.h> |
| 42 | #include <linux/uaccess.h> | 43 | #include <linux/uaccess.h> |
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c index b5e478fa2661..9aa81584c8a2 100644 --- a/drivers/mtd/ubi/gluebi.c +++ b/drivers/mtd/ubi/gluebi.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 33 | #include <linux/list.h> | 33 | #include <linux/list.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 35 | #include <linux/math64.h> | 36 | #include <linux/math64.h> |
| 36 | #include <linux/module.h> | 37 | #include <linux/module.h> |
diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c index b4ecc84c7549..533b1a4b9af1 100644 --- a/drivers/mtd/ubi/io.c +++ b/drivers/mtd/ubi/io.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | 88 | ||
| 89 | #include <linux/crc32.h> | 89 | #include <linux/crc32.h> |
| 90 | #include <linux/err.h> | 90 | #include <linux/err.h> |
| 91 | #include <linux/slab.h> | ||
| 91 | #include "ubi.h" | 92 | #include "ubi.h" |
| 92 | 93 | ||
| 93 | #ifdef CONFIG_MTD_UBI_DEBUG_PARANOID | 94 | #ifdef CONFIG_MTD_UBI_DEBUG_PARANOID |
diff --git a/drivers/mtd/ubi/kapi.c b/drivers/mtd/ubi/kapi.c index 1361574e2b00..17f287decc36 100644 --- a/drivers/mtd/ubi/kapi.c +++ b/drivers/mtd/ubi/kapi.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/err.h> | 24 | #include <linux/err.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/namei.h> | 26 | #include <linux/namei.h> |
| 26 | #include <linux/fs.h> | 27 | #include <linux/fs.h> |
| 27 | #include <asm/div64.h> | 28 | #include <asm/div64.h> |
diff --git a/drivers/mtd/ubi/scan.c b/drivers/mtd/ubi/scan.c index 594184bbd56a..dc5f688699da 100644 --- a/drivers/mtd/ubi/scan.c +++ b/drivers/mtd/ubi/scan.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | */ | 41 | */ |
| 42 | 42 | ||
| 43 | #include <linux/err.h> | 43 | #include <linux/err.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include <linux/crc32.h> | 45 | #include <linux/crc32.h> |
| 45 | #include <linux/math64.h> | 46 | #include <linux/math64.h> |
| 46 | #include "ubi.h" | 47 | #include "ubi.h" |
diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index 1af08178defd..5176d4886518 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/fs.h> | 34 | #include <linux/fs.h> |
| 35 | #include <linux/cdev.h> | 35 | #include <linux/cdev.h> |
| 36 | #include <linux/device.h> | 36 | #include <linux/device.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 38 | #include <linux/vmalloc.h> | 39 | #include <linux/vmalloc.h> |
| 39 | #include <linux/notifier.h> | 40 | #include <linux/notifier.h> |
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index ab64cb56df6e..e42afab9a9fe 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/err.h> | 26 | #include <linux/err.h> |
| 27 | #include <linux/math64.h> | 27 | #include <linux/math64.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "ubi.h" | 29 | #include "ubi.h" |
| 29 | 30 | ||
| 30 | #ifdef CONFIG_MTD_UBI_DEBUG_PARANOID | 31 | #ifdef CONFIG_MTD_UBI_DEBUG_PARANOID |
diff --git a/drivers/mtd/ubi/vtbl.c b/drivers/mtd/ubi/vtbl.c index 40044028d682..cd90ff3b76b1 100644 --- a/drivers/mtd/ubi/vtbl.c +++ b/drivers/mtd/ubi/vtbl.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | 58 | ||
| 59 | #include <linux/crc32.h> | 59 | #include <linux/crc32.h> |
| 60 | #include <linux/err.h> | 60 | #include <linux/err.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <asm/div64.h> | 62 | #include <asm/div64.h> |
| 62 | #include "ubi.h" | 63 | #include "ubi.h" |
| 63 | 64 | ||
diff --git a/drivers/net/3c501.c b/drivers/net/3c501.c index b6de7b1e2a5c..3ea42ff17657 100644 --- a/drivers/net/3c501.c +++ b/drivers/net/3c501.c | |||
| @@ -117,7 +117,6 @@ static const char version[] = | |||
| 117 | #include <linux/fcntl.h> | 117 | #include <linux/fcntl.h> |
| 118 | #include <linux/ioport.h> | 118 | #include <linux/ioport.h> |
| 119 | #include <linux/interrupt.h> | 119 | #include <linux/interrupt.h> |
| 120 | #include <linux/slab.h> | ||
| 121 | #include <linux/string.h> | 120 | #include <linux/string.h> |
| 122 | #include <linux/errno.h> | 121 | #include <linux/errno.h> |
| 123 | #include <linux/spinlock.h> | 122 | #include <linux/spinlock.h> |
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 04b5bba19021..29b8d1d63bde 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
| @@ -102,12 +102,12 @@ | |||
| 102 | #include <linux/interrupt.h> | 102 | #include <linux/interrupt.h> |
| 103 | #include <linux/errno.h> | 103 | #include <linux/errno.h> |
| 104 | #include <linux/in.h> | 104 | #include <linux/in.h> |
| 105 | #include <linux/slab.h> | ||
| 106 | #include <linux/ioport.h> | 105 | #include <linux/ioport.h> |
| 107 | #include <linux/spinlock.h> | 106 | #include <linux/spinlock.h> |
| 108 | #include <linux/ethtool.h> | 107 | #include <linux/ethtool.h> |
| 109 | #include <linux/delay.h> | 108 | #include <linux/delay.h> |
| 110 | #include <linux/bitops.h> | 109 | #include <linux/bitops.h> |
| 110 | #include <linux/gfp.h> | ||
| 111 | 111 | ||
| 112 | #include <asm/uaccess.h> | 112 | #include <asm/uaccess.h> |
| 113 | #include <asm/io.h> | 113 | #include <asm/io.h> |
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index 77cf0901a441..b32b7a1710b7 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
| @@ -58,7 +58,6 @@ static const char version[] = | |||
| 58 | #include <linux/etherdevice.h> | 58 | #include <linux/etherdevice.h> |
| 59 | #include <linux/if_ether.h> | 59 | #include <linux/if_ether.h> |
| 60 | #include <linux/skbuff.h> | 60 | #include <linux/skbuff.h> |
| 61 | #include <linux/slab.h> | ||
| 62 | #include <linux/init.h> | 61 | #include <linux/init.h> |
| 63 | #include <linux/bitops.h> | 62 | #include <linux/bitops.h> |
| 64 | 63 | ||
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index 902435a76466..ab9bb3c52002 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
| @@ -76,7 +76,6 @@ | |||
| 76 | #include <linux/interrupt.h> | 76 | #include <linux/interrupt.h> |
| 77 | #include <linux/errno.h> | 77 | #include <linux/errno.h> |
| 78 | #include <linux/in.h> | 78 | #include <linux/in.h> |
| 79 | #include <linux/slab.h> | ||
| 80 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> |
| 81 | #include <linux/init.h> | 80 | #include <linux/init.h> |
| 82 | #include <linux/netdevice.h> | 81 | #include <linux/netdevice.h> |
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 1e898b1c8068..2e17837be546 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c | |||
| @@ -65,7 +65,6 @@ static int max_interrupt_work = 20; | |||
| 65 | #include <linux/errno.h> | 65 | #include <linux/errno.h> |
| 66 | #include <linux/in.h> | 66 | #include <linux/in.h> |
| 67 | #include <linux/ioport.h> | 67 | #include <linux/ioport.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/skbuff.h> | 68 | #include <linux/skbuff.h> |
| 70 | #include <linux/etherdevice.h> | 69 | #include <linux/etherdevice.h> |
| 71 | #include <linux/interrupt.h> | 70 | #include <linux/interrupt.h> |
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c index beed4fa10c6e..1719079cc498 100644 --- a/drivers/net/3c523.c +++ b/drivers/net/3c523.c | |||
| @@ -99,7 +99,6 @@ | |||
| 99 | #include <linux/errno.h> | 99 | #include <linux/errno.h> |
| 100 | #include <linux/ioport.h> | 100 | #include <linux/ioport.h> |
| 101 | #include <linux/skbuff.h> | 101 | #include <linux/skbuff.h> |
| 102 | #include <linux/slab.h> | ||
| 103 | #include <linux/interrupt.h> | 102 | #include <linux/interrupt.h> |
| 104 | #include <linux/delay.h> | 103 | #include <linux/delay.h> |
| 105 | #include <linux/mca-legacy.h> | 104 | #include <linux/mca-legacy.h> |
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c index f965431f4924..5f92fdbe66e2 100644 --- a/drivers/net/3c59x.c +++ b/drivers/net/3c59x.c | |||
| @@ -77,7 +77,6 @@ static int vortex_debug = 1; | |||
| 77 | #include <linux/errno.h> | 77 | #include <linux/errno.h> |
| 78 | #include <linux/in.h> | 78 | #include <linux/in.h> |
| 79 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> |
| 80 | #include <linux/slab.h> | ||
| 81 | #include <linux/interrupt.h> | 80 | #include <linux/interrupt.h> |
| 82 | #include <linux/pci.h> | 81 | #include <linux/pci.h> |
| 83 | #include <linux/mii.h> | 82 | #include <linux/mii.h> |
| @@ -90,6 +89,7 @@ static int vortex_debug = 1; | |||
| 90 | #include <linux/eisa.h> | 89 | #include <linux/eisa.h> |
| 91 | #include <linux/bitops.h> | 90 | #include <linux/bitops.h> |
| 92 | #include <linux/jiffies.h> | 91 | #include <linux/jiffies.h> |
| 92 | #include <linux/gfp.h> | ||
| 93 | #include <asm/irq.h> /* For nr_irqs only. */ | 93 | #include <asm/irq.h> /* For nr_irqs only. */ |
| 94 | #include <asm/io.h> | 94 | #include <asm/io.h> |
| 95 | #include <asm/uaccess.h> | 95 | #include <asm/uaccess.h> |
diff --git a/drivers/net/7990.c b/drivers/net/7990.c index 4e9a5a20b6a6..500e135723bd 100644 --- a/drivers/net/7990.c +++ b/drivers/net/7990.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
| 27 | #include <linux/in.h> | 27 | #include <linux/in.h> |
| 28 | #include <linux/route.h> | 28 | #include <linux/route.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 31 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> |
| 32 | #include <asm/irq.h> | 31 | #include <asm/irq.h> |
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c index 3d4406b16658..a09e6ce3eaa0 100644 --- a/drivers/net/8139cp.c +++ b/drivers/net/8139cp.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/dma-mapping.h> | 64 | #include <linux/dma-mapping.h> |
| 65 | #include <linux/delay.h> | 65 | #include <linux/delay.h> |
| 66 | #include <linux/ethtool.h> | 66 | #include <linux/ethtool.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | #include <linux/mii.h> | 68 | #include <linux/mii.h> |
| 68 | #include <linux/if_vlan.h> | 69 | #include <linux/if_vlan.h> |
| 69 | #include <linux/crc32.h> | 70 | #include <linux/crc32.h> |
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c index b4efc913978b..a03d291de854 100644 --- a/drivers/net/8139too.c +++ b/drivers/net/8139too.c | |||
| @@ -110,6 +110,7 @@ | |||
| 110 | #include <linux/crc32.h> | 110 | #include <linux/crc32.h> |
| 111 | #include <linux/io.h> | 111 | #include <linux/io.h> |
| 112 | #include <linux/uaccess.h> | 112 | #include <linux/uaccess.h> |
| 113 | #include <linux/gfp.h> | ||
| 113 | #include <asm/irq.h> | 114 | #include <asm/irq.h> |
| 114 | 115 | ||
| 115 | #define RTL8139_DRIVER_NAME DRV_NAME " Fast Ethernet driver " DRV_VERSION | 116 | #define RTL8139_DRIVER_NAME DRV_NAME " Fast Ethernet driver " DRV_VERSION |
diff --git a/drivers/net/82596.c b/drivers/net/82596.c index f94d17d78bb0..56e68db48861 100644 --- a/drivers/net/82596.c +++ b/drivers/net/82596.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/string.h> | 45 | #include <linux/string.h> |
| 46 | #include <linux/errno.h> | 46 | #include <linux/errno.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | #include <linux/interrupt.h> | 48 | #include <linux/interrupt.h> |
| 50 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 51 | #include <linux/netdevice.h> | 50 | #include <linux/netdevice.h> |
| @@ -53,6 +52,7 @@ | |||
| 53 | #include <linux/skbuff.h> | 52 | #include <linux/skbuff.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 55 | #include <linux/bitops.h> | 54 | #include <linux/bitops.h> |
| 55 | #include <linux/gfp.h> | ||
| 56 | 56 | ||
| 57 | #include <asm/io.h> | 57 | #include <asm/io.h> |
| 58 | #include <asm/dma.h> | 58 | #include <asm/dma.h> |
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c index bd4d829eca12..ed5e9742be2c 100644 --- a/drivers/net/a2065.c +++ b/drivers/net/a2065.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/interrupt.h> | 46 | #include <linux/interrupt.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/skbuff.h> | 48 | #include <linux/skbuff.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 51 | #include <linux/init.h> | 50 | #include <linux/init.h> |
| 52 | #include <linux/crc32.h> | 51 | #include <linux/crc32.h> |
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c index 4ae750ef1e10..97a3dfd94dfa 100644 --- a/drivers/net/acenic.c +++ b/drivers/net/acenic.c | |||
| @@ -67,6 +67,7 @@ | |||
| 67 | #include <linux/highmem.h> | 67 | #include <linux/highmem.h> |
| 68 | #include <linux/sockios.h> | 68 | #include <linux/sockios.h> |
| 69 | #include <linux/firmware.h> | 69 | #include <linux/firmware.h> |
| 70 | #include <linux/slab.h> | ||
| 70 | 71 | ||
| 71 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) | 72 | #if defined(CONFIG_VLAN_8021Q) || defined(CONFIG_VLAN_8021Q_MODULE) |
| 72 | #include <linux/if_vlan.h> | 73 | #include <linux/if_vlan.h> |
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c index b8a59d255b49..8d58f0a8f42f 100644 --- a/drivers/net/amd8111e.c +++ b/drivers/net/amd8111e.c | |||
| @@ -73,7 +73,6 @@ Revision History: | |||
| 73 | #include <linux/kernel.h> | 73 | #include <linux/kernel.h> |
| 74 | #include <linux/types.h> | 74 | #include <linux/types.h> |
| 75 | #include <linux/compiler.h> | 75 | #include <linux/compiler.h> |
| 76 | #include <linux/slab.h> | ||
| 77 | #include <linux/delay.h> | 76 | #include <linux/delay.h> |
| 78 | #include <linux/init.h> | 77 | #include <linux/init.h> |
| 79 | #include <linux/ioport.h> | 78 | #include <linux/ioport.h> |
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 73b38c204eb9..6f8d6206b5c4 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -56,7 +56,6 @@ static const char *version = | |||
| 56 | #include <linux/ptrace.h> | 56 | #include <linux/ptrace.h> |
| 57 | #include <linux/ioport.h> | 57 | #include <linux/ioport.h> |
| 58 | #include <linux/in.h> | 58 | #include <linux/in.h> |
| 59 | #include <linux/slab.h> | ||
| 60 | #include <linux/string.h> | 59 | #include <linux/string.h> |
| 61 | #include <linux/errno.h> | 60 | #include <linux/errno.h> |
| 62 | #include <linux/init.h> | 61 | #include <linux/init.h> |
diff --git a/drivers/net/appletalk/ipddp.c b/drivers/net/appletalk/ipddp.c index eb0448b03f41..79636ee35829 100644 --- a/drivers/net/appletalk/ipddp.c +++ b/drivers/net/appletalk/ipddp.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/ip.h> | 31 | #include <linux/ip.h> |
| 32 | #include <linux/atalk.h> | 32 | #include <linux/atalk.h> |
| 33 | #include <linux/if_arp.h> | 33 | #include <linux/if_arp.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <net/route.h> | 35 | #include <net/route.h> |
| 35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
| 36 | 37 | ||
diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c index 8ea4ec705bef..6af65b656f31 100644 --- a/drivers/net/appletalk/ltpc.c +++ b/drivers/net/appletalk/ltpc.c | |||
| @@ -215,7 +215,6 @@ static int dma; | |||
| 215 | #include <linux/ioport.h> | 215 | #include <linux/ioport.h> |
| 216 | #include <linux/spinlock.h> | 216 | #include <linux/spinlock.h> |
| 217 | #include <linux/in.h> | 217 | #include <linux/in.h> |
| 218 | #include <linux/slab.h> | ||
| 219 | #include <linux/string.h> | 218 | #include <linux/string.h> |
| 220 | #include <linux/errno.h> | 219 | #include <linux/errno.h> |
| 221 | #include <linux/init.h> | 220 | #include <linux/init.h> |
| @@ -228,6 +227,7 @@ static int dma; | |||
| 228 | #include <linux/timer.h> | 227 | #include <linux/timer.h> |
| 229 | #include <linux/atalk.h> | 228 | #include <linux/atalk.h> |
| 230 | #include <linux/bitops.h> | 229 | #include <linux/bitops.h> |
| 230 | #include <linux/gfp.h> | ||
| 231 | 231 | ||
| 232 | #include <asm/system.h> | 232 | #include <asm/system.h> |
| 233 | #include <asm/dma.h> | 233 | #include <asm/dma.h> |
diff --git a/drivers/net/arcnet/arc-rawmode.c b/drivers/net/arcnet/arc-rawmode.c index 8ea9c7545c12..705e6ce2eb90 100644 --- a/drivers/net/arcnet/arc-rawmode.c +++ b/drivers/net/arcnet/arc-rawmode.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/gfp.h> | ||
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/if_arp.h> | 30 | #include <linux/if_arp.h> |
| 30 | #include <net/arp.h> | 31 | #include <net/arp.h> |
diff --git a/drivers/net/arcnet/arc-rimi.c b/drivers/net/arcnet/arc-rimi.c index e6afab2455b1..9efbbbae47ca 100644 --- a/drivers/net/arcnet/arc-rimi.c +++ b/drivers/net/arcnet/arc-rimi.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/moduleparam.h> | 29 | #include <linux/moduleparam.h> |
| 30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
| 34 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
diff --git a/drivers/net/arcnet/capmode.c b/drivers/net/arcnet/capmode.c index 66bcbbb6babc..355797f70048 100644 --- a/drivers/net/arcnet/capmode.c +++ b/drivers/net/arcnet/capmode.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/if_arp.h> | 32 | #include <linux/if_arp.h> |
| 32 | #include <net/arp.h> | 33 | #include <net/arp.h> |
diff --git a/drivers/net/arcnet/com20020-isa.c b/drivers/net/arcnet/com20020-isa.c index db08fc24047a..0402da30a4ed 100644 --- a/drivers/net/arcnet/com20020-isa.c +++ b/drivers/net/arcnet/com20020-isa.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 35 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 36 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
diff --git a/drivers/net/arcnet/com20020-pci.c b/drivers/net/arcnet/com20020-pci.c index b68e1eb405ff..2c712af6c265 100644 --- a/drivers/net/arcnet/com20020-pci.c +++ b/drivers/net/arcnet/com20020-pci.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 36 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
diff --git a/drivers/net/arcnet/com20020.c b/drivers/net/arcnet/com20020.c index 0a74f21409c5..c9e459400ff9 100644 --- a/drivers/net/arcnet/com20020.c +++ b/drivers/net/arcnet/com20020.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 35 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
diff --git a/drivers/net/arcnet/com90io.c b/drivers/net/arcnet/com90io.c index 28dea518d554..4cb401813b7e 100644 --- a/drivers/net/arcnet/com90io.c +++ b/drivers/net/arcnet/com90io.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
| 31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 34 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 35 | #include <linux/bootmem.h> | 34 | #include <linux/bootmem.h> |
diff --git a/drivers/net/arcnet/com90xx.c b/drivers/net/arcnet/com90xx.c index 112e230cb13d..f3b46f71e293 100644 --- a/drivers/net/arcnet/com90xx.c +++ b/drivers/net/arcnet/com90xx.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/ioport.h> | 30 | #include <linux/ioport.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | #include <linux/arcdevice.h> | 35 | #include <linux/arcdevice.h> |
| 35 | 36 | ||
diff --git a/drivers/net/arcnet/rfc1051.c b/drivers/net/arcnet/rfc1051.c index 06f8fa2f8f2f..f81db4070a57 100644 --- a/drivers/net/arcnet/rfc1051.c +++ b/drivers/net/arcnet/rfc1051.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * ********************** | 24 | * ********************** |
| 25 | */ | 25 | */ |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/gfp.h> | ||
| 27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 28 | #include <linux/if_arp.h> | 29 | #include <linux/if_arp.h> |
| 29 | #include <net/arp.h> | 30 | #include <net/arp.h> |
diff --git a/drivers/net/arcnet/rfc1201.c b/drivers/net/arcnet/rfc1201.c index 745530651c45..b71431aae084 100644 --- a/drivers/net/arcnet/rfc1201.c +++ b/drivers/net/arcnet/rfc1201.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * | 23 | * |
| 24 | * ********************** | 24 | * ********************** |
| 25 | */ | 25 | */ |
| 26 | #include <linux/gfp.h> | ||
| 26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 28 | #include <linux/if_arp.h> | 29 | #include <linux/if_arp.h> |
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c index 08d8be47dae0..fa1a2354f5f9 100644 --- a/drivers/net/ariadne.c +++ b/drivers/net/ariadne.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 41 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 42 | #include <linux/ioport.h> | 42 | #include <linux/ioport.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/netdevice.h> | 43 | #include <linux/netdevice.h> |
| 45 | #include <linux/etherdevice.h> | 44 | #include <linux/etherdevice.h> |
| 46 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c index 8b23d5a175bf..aed5b5479b50 100644 --- a/drivers/net/arm/at91_ether.c +++ b/drivers/net/arm/at91_ether.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/ethtool.h> | 27 | #include <linux/ethtool.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/clk.h> | 29 | #include <linux/clk.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/io.h> | 32 | #include <asm/io.h> |
| 32 | #include <asm/uaccess.h> | 33 | #include <asm/uaccess.h> |
diff --git a/drivers/net/arm/ep93xx_eth.c b/drivers/net/arm/ep93xx_eth.c index bf72d57a0afd..6995169d285a 100644 --- a/drivers/net/arm/ep93xx_eth.c +++ b/drivers/net/arm/ep93xx_eth.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/hardware.h> | 28 | #include <mach/hardware.h> |
| 28 | 29 | ||
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c index f52f668c49bf..4af235d41fda 100644 --- a/drivers/net/arm/etherh.c +++ b/drivers/net/arm/etherh.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 34 | #include <linux/ioport.h> | 34 | #include <linux/ioport.h> |
| 35 | #include <linux/in.h> | 35 | #include <linux/in.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/string.h> | 36 | #include <linux/string.h> |
| 38 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 39 | #include <linux/netdevice.h> | 38 | #include <linux/netdevice.h> |
diff --git a/drivers/net/arm/ixp4xx_eth.c b/drivers/net/arm/ixp4xx_eth.c index 6e2ae1d06df1..6be8b098b8b4 100644 --- a/drivers/net/arm/ixp4xx_eth.c +++ b/drivers/net/arm/ixp4xx_eth.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/phy.h> | 33 | #include <linux/phy.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <mach/npe.h> | 36 | #include <mach/npe.h> |
| 36 | #include <mach/qmgr.h> | 37 | #include <mach/qmgr.h> |
| 37 | 38 | ||
diff --git a/drivers/net/arm/ks8695net.c b/drivers/net/arm/ks8695net.c index e7810b74f396..84f8a8f73802 100644 --- a/drivers/net/arm/ks8695net.c +++ b/drivers/net/arm/ks8695net.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/irq.h> | 31 | #include <linux/irq.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 35 | 36 | ||
diff --git a/drivers/net/arm/w90p910_ether.c b/drivers/net/arm/w90p910_ether.c index febd813c916d..f7c9ca1dfb17 100644 --- a/drivers/net/arm/w90p910_ether.c +++ b/drivers/net/arm/w90p910_ether.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/ethtool.h> | 18 | #include <linux/ethtool.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/clk.h> | 20 | #include <linux/clk.h> |
| 21 | #include <linux/gfp.h> | ||
| 21 | 22 | ||
| 22 | #define DRV_MODULE_NAME "w90p910-emc" | 23 | #define DRV_MODULE_NAME "w90p910-emc" |
| 23 | #define DRV_MODULE_VERSION "0.1" | 24 | #define DRV_MODULE_VERSION "0.1" |
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c index 309843ab8869..10a20fb9ae65 100644 --- a/drivers/net/at1700.c +++ b/drivers/net/at1700.c | |||
| @@ -47,7 +47,6 @@ | |||
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/in.h> | 48 | #include <linux/in.h> |
| 49 | #include <linux/skbuff.h> | 49 | #include <linux/skbuff.h> |
| 50 | #include <linux/slab.h> | ||
| 51 | #include <linux/string.h> | 50 | #include <linux/string.h> |
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/crc32.h> | 52 | #include <linux/crc32.h> |
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index 280cfff48b49..a8686bfec7a1 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
| @@ -53,7 +53,6 @@ static char version[] = "atarilance.c: v1.3 04/04/96 " | |||
| 53 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 54 | #include <linux/errno.h> | 54 | #include <linux/errno.h> |
| 55 | #include <linux/skbuff.h> | 55 | #include <linux/skbuff.h> |
| 56 | #include <linux/slab.h> | ||
| 57 | #include <linux/interrupt.h> | 56 | #include <linux/interrupt.h> |
| 58 | #include <linux/init.h> | 57 | #include <linux/init.h> |
| 59 | #include <linux/bitops.h> | 58 | #include <linux/bitops.h> |
diff --git a/drivers/net/atl1c/atl1c_ethtool.c b/drivers/net/atl1c/atl1c_ethtool.c index 61a0f2ff11e9..32339243d61f 100644 --- a/drivers/net/atl1c/atl1c_ethtool.c +++ b/drivers/net/atl1c/atl1c_ethtool.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 24 | #include <linux/ethtool.h> | 24 | #include <linux/ethtool.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "atl1c.h" | 27 | #include "atl1c.h" |
| 27 | 28 | ||
diff --git a/drivers/net/atl1e/atl1e_ethtool.c b/drivers/net/atl1e/atl1e_ethtool.c index a76006c1bc6b..ffd696ee7c8e 100644 --- a/drivers/net/atl1e/atl1e_ethtool.c +++ b/drivers/net/atl1e/atl1e_ethtool.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 24 | #include <linux/ethtool.h> | 24 | #include <linux/ethtool.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "atl1e.h" | 27 | #include "atl1e.h" |
| 27 | 28 | ||
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 7061d7108f08..54662f24f9bb 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/pci_ids.h> | 39 | #include <linux/pci_ids.h> |
| 40 | #include <linux/pm.h> | 40 | #include <linux/pm.h> |
| 41 | #include <linux/skbuff.h> | 41 | #include <linux/skbuff.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/spinlock.h> | 43 | #include <linux/spinlock.h> |
| 43 | #include <linux/string.h> | 44 | #include <linux/string.h> |
| 44 | #include <linux/tcp.h> | 45 | #include <linux/tcp.h> |
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 6ad16205dc17..55039d44dc47 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
| @@ -129,7 +129,6 @@ static int xcvr[NUM_UNITS]; /* The data transfer mode. */ | |||
| 129 | #include <linux/interrupt.h> | 129 | #include <linux/interrupt.h> |
| 130 | #include <linux/ioport.h> | 130 | #include <linux/ioport.h> |
| 131 | #include <linux/in.h> | 131 | #include <linux/in.h> |
| 132 | #include <linux/slab.h> | ||
| 133 | #include <linux/string.h> | 132 | #include <linux/string.h> |
| 134 | #include <linux/errno.h> | 133 | #include <linux/errno.h> |
| 135 | #include <linux/init.h> | 134 | #include <linux/init.h> |
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c index 1dd4403247ca..b718dc60afc4 100644 --- a/drivers/net/ax88796.c +++ b/drivers/net/ax88796.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/ethtool.h> | 25 | #include <linux/ethtool.h> |
| 26 | #include <linux/mii.h> | 26 | #include <linux/mii.h> |
| 27 | #include <linux/eeprom_93cx6.h> | 27 | #include <linux/eeprom_93cx6.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <net/ax88796.h> | 30 | #include <net/ax88796.h> |
| 30 | 31 | ||
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 332c60356285..69d9f3d368ae 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/ssb/ssb.h> | 29 | #include <linux/ssb/ssb.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 32 | #include <asm/io.h> | 33 | #include <asm/io.h> |
diff --git a/drivers/net/bcm63xx_enet.c b/drivers/net/bcm63xx_enet.c index 8cdcab7655c0..17460aba3bae 100644 --- a/drivers/net/bcm63xx_enet.c +++ b/drivers/net/bcm63xx_enet.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/etherdevice.h> | 23 | #include <linux/etherdevice.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | #include <linux/ethtool.h> | 26 | #include <linux/ethtool.h> |
| 26 | #include <linux/crc32.h> | 27 | #include <linux/crc32.h> |
diff --git a/drivers/net/benet/be.h b/drivers/net/benet/be.h index 8f0752553681..56387b191c96 100644 --- a/drivers/net/benet/be.h +++ b/drivers/net/benet/be.h | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/workqueue.h> | 29 | #include <linux/workqueue.h> |
| 30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 31 | #include <linux/firmware.h> | 31 | #include <linux/firmware.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include "be_hw.h" | 34 | #include "be_hw.h" |
| 34 | 35 | ||
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c index 119468e76323..598b007f1991 100644 --- a/drivers/net/bmac.c +++ b/drivers/net/bmac.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/crc32.h> | 20 | #include <linux/crc32.h> |
| 21 | #include <linux/bitrev.h> | 21 | #include <linux/bitrev.h> |
| 22 | #include <linux/ethtool.h> | 22 | #include <linux/ethtool.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <asm/prom.h> | 24 | #include <asm/prom.h> |
| 24 | #include <asm/dbdma.h> | 25 | #include <asm/dbdma.h> |
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
diff --git a/drivers/net/can/dev.c b/drivers/net/can/dev.c index 904aa369f80e..d0f8c7e67e7d 100644 --- a/drivers/net/can/dev.c +++ b/drivers/net/can/dev.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 23 | #include <linux/if_arp.h> | 24 | #include <linux/if_arp.h> |
| 24 | #include <linux/can.h> | 25 | #include <linux/can.h> |
diff --git a/drivers/net/can/mcp251x.c b/drivers/net/can/mcp251x.c index f8cc168ec76c..b39b108318b4 100644 --- a/drivers/net/can/mcp251x.c +++ b/drivers/net/can/mcp251x.c | |||
| @@ -73,6 +73,7 @@ | |||
| 73 | #include <linux/module.h> | 73 | #include <linux/module.h> |
| 74 | #include <linux/netdevice.h> | 74 | #include <linux/netdevice.h> |
| 75 | #include <linux/platform_device.h> | 75 | #include <linux/platform_device.h> |
| 76 | #include <linux/slab.h> | ||
| 76 | #include <linux/spi/spi.h> | 77 | #include <linux/spi/spi.h> |
| 77 | #include <linux/uaccess.h> | 78 | #include <linux/uaccess.h> |
| 78 | 79 | ||
diff --git a/drivers/net/can/sja1000/ems_pci.c b/drivers/net/can/sja1000/ems_pci.c index 87300606abb9..5f53da0bc40c 100644 --- a/drivers/net/can/sja1000/ems_pci.c +++ b/drivers/net/can/sja1000/ems_pci.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 26 | #include <linux/can.h> | 27 | #include <linux/can.h> |
| 27 | #include <linux/can/dev.h> | 28 | #include <linux/can/dev.h> |
diff --git a/drivers/net/can/sja1000/plx_pci.c b/drivers/net/can/sja1000/plx_pci.c index 6b46a6395f80..4aff4070db96 100644 --- a/drivers/net/can/sja1000/plx_pci.c +++ b/drivers/net/can/sja1000/plx_pci.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 29 | #include <linux/can.h> | 30 | #include <linux/can.h> |
| 30 | #include <linux/can/dev.h> | 31 | #include <linux/can/dev.h> |
diff --git a/drivers/net/can/vcan.c b/drivers/net/can/vcan.c index d124d837ae58..a30b8f480f61 100644 --- a/drivers/net/can/vcan.c +++ b/drivers/net/can/vcan.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | #include <linux/if_ether.h> | 48 | #include <linux/if_ether.h> |
| 49 | #include <linux/can.h> | 49 | #include <linux/can.h> |
| 50 | #include <linux/can/dev.h> | 50 | #include <linux/can/dev.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | #include <net/rtnetlink.h> | 52 | #include <net/rtnetlink.h> |
| 52 | 53 | ||
| 53 | static __initdata const char banner[] = | 54 | static __initdata const char banner[] = |
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h index 2d11afe45310..036b2dfb1d40 100644 --- a/drivers/net/chelsio/common.h +++ b/drivers/net/chelsio/common.h | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/mdio.h> | 51 | #include <linux/mdio.h> |
| 52 | #include <linux/crc32.h> | 52 | #include <linux/crc32.h> |
| 53 | #include <linux/init.h> | 53 | #include <linux/init.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | #include <asm/io.h> | 55 | #include <asm/io.h> |
| 55 | #include <linux/pci_ids.h> | 56 | #include <linux/pci_ids.h> |
| 56 | 57 | ||
diff --git a/drivers/net/chelsio/pm3393.c b/drivers/net/chelsio/pm3393.c index a6eb30a6e2b9..9e631b9d3948 100644 --- a/drivers/net/chelsio/pm3393.c +++ b/drivers/net/chelsio/pm3393.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include "suni1x10gexp_regs.h" | 44 | #include "suni1x10gexp_regs.h" |
| 45 | 45 | ||
| 46 | #include <linux/crc32.h> | 46 | #include <linux/crc32.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | #define OFFSET(REG_ADDR) ((REG_ADDR) << 2) | 49 | #define OFFSET(REG_ADDR) ((REG_ADDR) << 2) |
| 49 | 50 | ||
diff --git a/drivers/net/chelsio/sge.c b/drivers/net/chelsio/sge.c index 55d99ca82f8a..df3a1410696e 100644 --- a/drivers/net/chelsio/sge.c +++ b/drivers/net/chelsio/sge.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/ip.h> | 53 | #include <linux/ip.h> |
| 54 | #include <linux/in.h> | 54 | #include <linux/in.h> |
| 55 | #include <linux/if_arp.h> | 55 | #include <linux/if_arp.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | 57 | ||
| 57 | #include "cpl5_cmd.h" | 58 | #include "cpl5_cmd.h" |
| 58 | #include "sge.h" | 59 | #include "sge.h" |
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index dd24aadb778c..61a33914e96f 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/ptrace.h> | 18 | #include <linux/ptrace.h> |
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <linux/in.h> | 20 | #include <linux/in.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 23 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 24 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c index b0208e474f7e..4c38491b8efb 100644 --- a/drivers/net/cs89x0.c +++ b/drivers/net/cs89x0.c | |||
| @@ -138,12 +138,12 @@ | |||
| 138 | #include <linux/ioport.h> | 138 | #include <linux/ioport.h> |
| 139 | #include <linux/in.h> | 139 | #include <linux/in.h> |
| 140 | #include <linux/skbuff.h> | 140 | #include <linux/skbuff.h> |
| 141 | #include <linux/slab.h> | ||
| 142 | #include <linux/spinlock.h> | 141 | #include <linux/spinlock.h> |
| 143 | #include <linux/string.h> | 142 | #include <linux/string.h> |
| 144 | #include <linux/init.h> | 143 | #include <linux/init.h> |
| 145 | #include <linux/bitops.h> | 144 | #include <linux/bitops.h> |
| 146 | #include <linux/delay.h> | 145 | #include <linux/delay.h> |
| 146 | #include <linux/gfp.h> | ||
| 147 | 147 | ||
| 148 | #include <asm/system.h> | 148 | #include <asm/system.h> |
| 149 | #include <asm/io.h> | 149 | #include <asm/io.h> |
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 9e3e8750b46a..aced6c5e635c 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/log2.h> | 46 | #include <linux/log2.h> |
| 47 | #include <linux/stringify.h> | 47 | #include <linux/stringify.h> |
| 48 | #include <linux/sched.h> | 48 | #include <linux/sched.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
| 50 | 51 | ||
| 51 | #include "common.h" | 52 | #include "common.h" |
diff --git a/drivers/net/cxgb3/cxgb3_offload.c b/drivers/net/cxgb3/cxgb3_offload.c index 9498361119d6..c6485b39eb0e 100644 --- a/drivers/net/cxgb3/cxgb3_offload.c +++ b/drivers/net/cxgb3/cxgb3_offload.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/list.h> | 33 | #include <linux/list.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <net/neighbour.h> | 35 | #include <net/neighbour.h> |
| 35 | #include <linux/notifier.h> | 36 | #include <linux/notifier.h> |
| 36 | #include <asm/atomic.h> | 37 | #include <asm/atomic.h> |
diff --git a/drivers/net/cxgb3/l2t.c b/drivers/net/cxgb3/l2t.c index ff1611f90e7a..2f3ee721c3e1 100644 --- a/drivers/net/cxgb3/l2t.c +++ b/drivers/net/cxgb3/l2t.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/if.h> | 34 | #include <linux/if.h> |
| 35 | #include <linux/if_vlan.h> | 35 | #include <linux/if_vlan.h> |
| 36 | #include <linux/jhash.h> | 36 | #include <linux/jhash.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <net/neighbour.h> | 38 | #include <net/neighbour.h> |
| 38 | #include "common.h" | 39 | #include "common.h" |
| 39 | #include "t3cdev.h" | 40 | #include "t3cdev.h" |
diff --git a/drivers/net/cxgb3/sge.c b/drivers/net/cxgb3/sge.c index 67e61b2a8c42..07d7e7fab3f5 100644 --- a/drivers/net/cxgb3/sge.c +++ b/drivers/net/cxgb3/sge.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/ip.h> | 36 | #include <linux/ip.h> |
| 37 | #include <linux/tcp.h> | 37 | #include <linux/tcp.h> |
| 38 | #include <linux/dma-mapping.h> | 38 | #include <linux/dma-mapping.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <net/arp.h> | 40 | #include <net/arp.h> |
| 40 | #include "common.h" | 41 | #include "common.h" |
| 41 | #include "regs.h" | 42 | #include "regs.h" |
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index 1c67f1138ca7..7f9960f718e3 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/irq.h> | 35 | #include <linux/irq.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/delay.h> | 38 | #include <asm/delay.h> |
| 38 | #include <asm/irq.h> | 39 | #include <asm/irq.h> |
diff --git a/drivers/net/e1000e/ethtool.c b/drivers/net/e1000e/ethtool.c index b33e3cbe9ab0..983493f2330c 100644 --- a/drivers/net/e1000e/ethtool.c +++ b/drivers/net/e1000e/ethtool.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/netdevice.h> | 31 | #include <linux/netdevice.h> |
| 32 | #include <linux/ethtool.h> | 32 | #include <linux/ethtool.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 35 | 36 | ||
| 36 | #include "e1000.h" | 37 | #include "e1000.h" |
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c index e1cceb606576..cfd09cea7214 100644 --- a/drivers/net/e1000e/netdev.c +++ b/drivers/net/e1000e/netdev.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/netdevice.h> | 36 | #include <linux/netdevice.h> |
| 37 | #include <linux/tcp.h> | 37 | #include <linux/tcp.h> |
| 38 | #include <linux/ipv6.h> | 38 | #include <linux/ipv6.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <net/checksum.h> | 40 | #include <net/checksum.h> |
| 40 | #include <net/ip6_checksum.h> | 41 | #include <net/ip6_checksum.h> |
| 41 | #include <linux/mii.h> | 42 | #include <linux/mii.h> |
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 1b05bdf62c3c..27c7bdbfa003 100644 --- a/drivers/net/eepro.c +++ b/drivers/net/eepro.c | |||
| @@ -137,7 +137,6 @@ static const char version[] = | |||
| 137 | #include <linux/interrupt.h> | 137 | #include <linux/interrupt.h> |
| 138 | #include <linux/ioport.h> | 138 | #include <linux/ioport.h> |
| 139 | #include <linux/in.h> | 139 | #include <linux/in.h> |
| 140 | #include <linux/slab.h> | ||
| 141 | #include <linux/string.h> | 140 | #include <linux/string.h> |
| 142 | #include <linux/errno.h> | 141 | #include <linux/errno.h> |
| 143 | #include <linux/netdevice.h> | 142 | #include <linux/netdevice.h> |
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index 7013dc8a6cbc..1a7322b80ea7 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
| @@ -111,7 +111,6 @@ | |||
| 111 | #include <linux/netdevice.h> | 111 | #include <linux/netdevice.h> |
| 112 | #include <linux/etherdevice.h> | 112 | #include <linux/etherdevice.h> |
| 113 | #include <linux/skbuff.h> | 113 | #include <linux/skbuff.h> |
| 114 | #include <linux/slab.h> | ||
| 115 | #include <linux/mca-legacy.h> | 114 | #include <linux/mca-legacy.h> |
| 116 | #include <linux/spinlock.h> | 115 | #include <linux/spinlock.h> |
| 117 | #include <linux/bitops.h> | 116 | #include <linux/bitops.h> |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index b004eaba3d7b..809ccc9ff09c 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/udp.h> | 32 | #include <linux/udp.h> |
| 33 | #include <linux/if.h> | 33 | #include <linux/if.h> |
| 34 | #include <linux/list.h> | 34 | #include <linux/list.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/if_ether.h> | 36 | #include <linux/if_ether.h> |
| 36 | #include <linux/notifier.h> | 37 | #include <linux/notifier.h> |
| 37 | #include <linux/reboot.h> | 38 | #include <linux/reboot.h> |
diff --git a/drivers/net/ehea/ehea_qmr.c b/drivers/net/ehea/ehea_qmr.c index 18d405f78c0f..a1b4c7e56367 100644 --- a/drivers/net/ehea/ehea_qmr.c +++ b/drivers/net/ehea/ehea_qmr.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/mm.h> | 29 | #include <linux/mm.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include "ehea.h" | 31 | #include "ehea.h" |
| 31 | #include "ehea_phyp.h" | 32 | #include "ehea_phyp.h" |
| 32 | #include "ehea_qmr.h" | 33 | #include "ehea_qmr.h" |
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c index 3ee32e58c7ec..ff27f728fd9d 100644 --- a/drivers/net/enc28j60.c +++ b/drivers/net/enc28j60.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 19 | #include <linux/fcntl.h> | 19 | #include <linux/fcntl.h> |
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 23 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c index 69b9b70c7da0..cf22de71014e 100644 --- a/drivers/net/enic/vnic_dev.c +++ b/drivers/net/enic/vnic_dev.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/if_ether.h> | 25 | #include <linux/if_ether.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "vnic_resource.h" | 28 | #include "vnic_resource.h" |
| 28 | #include "vnic_devcmd.h" | 29 | #include "vnic_devcmd.h" |
diff --git a/drivers/net/enic/vnic_rq.c b/drivers/net/enic/vnic_rq.c index 75583978a5e5..e186efaf9da1 100644 --- a/drivers/net/enic/vnic_rq.c +++ b/drivers/net/enic/vnic_rq.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "vnic_dev.h" | 27 | #include "vnic_dev.h" |
| 27 | #include "vnic_rq.h" | 28 | #include "vnic_rq.h" |
diff --git a/drivers/net/enic/vnic_wq.c b/drivers/net/enic/vnic_wq.c index d2e00e51b7b5..d5f984357f5c 100644 --- a/drivers/net/enic/vnic_wq.c +++ b/drivers/net/enic/vnic_wq.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "vnic_dev.h" | 27 | #include "vnic_dev.h" |
| 27 | #include "vnic_wq.h" | 28 | #include "vnic_wq.h" |
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 39c271b6be44..7a567201e829 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
| @@ -73,7 +73,6 @@ static int rx_copybreak; | |||
| 73 | #include <linux/timer.h> | 73 | #include <linux/timer.h> |
| 74 | #include <linux/errno.h> | 74 | #include <linux/errno.h> |
| 75 | #include <linux/ioport.h> | 75 | #include <linux/ioport.h> |
| 76 | #include <linux/slab.h> | ||
| 77 | #include <linux/interrupt.h> | 76 | #include <linux/interrupt.h> |
| 78 | #include <linux/pci.h> | 77 | #include <linux/pci.h> |
| 79 | #include <linux/delay.h> | 78 | #include <linux/delay.h> |
diff --git a/drivers/net/eql.c b/drivers/net/eql.c index f5b96cadeb25..b34a2ddeef4c 100644 --- a/drivers/net/eql.c +++ b/drivers/net/eql.c | |||
| @@ -115,6 +115,7 @@ | |||
| 115 | #include <linux/module.h> | 115 | #include <linux/module.h> |
| 116 | #include <linux/kernel.h> | 116 | #include <linux/kernel.h> |
| 117 | #include <linux/init.h> | 117 | #include <linux/init.h> |
| 118 | #include <linux/slab.h> | ||
| 118 | #include <linux/timer.h> | 119 | #include <linux/timer.h> |
| 119 | #include <linux/netdevice.h> | 120 | #include <linux/netdevice.h> |
| 120 | #include <net/net_namespace.h> | 121 | #include <net/net_namespace.h> |
diff --git a/drivers/net/eth16i.c b/drivers/net/eth16i.c index d3abeee3f110..d4e24f08b3ba 100644 --- a/drivers/net/eth16i.c +++ b/drivers/net/eth16i.c | |||
| @@ -152,7 +152,6 @@ static char *version = | |||
| 152 | #include <linux/interrupt.h> | 152 | #include <linux/interrupt.h> |
| 153 | #include <linux/ioport.h> | 153 | #include <linux/ioport.h> |
| 154 | #include <linux/in.h> | 154 | #include <linux/in.h> |
| 155 | #include <linux/slab.h> | ||
| 156 | #include <linux/string.h> | 155 | #include <linux/string.h> |
| 157 | #include <linux/errno.h> | 156 | #include <linux/errno.h> |
| 158 | #include <linux/init.h> | 157 | #include <linux/init.h> |
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index 209742304e20..a8d92503226e 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/phy.h> | 18 | #include <linux/phy.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/sched.h> | 20 | #include <linux/sched.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <net/ethoc.h> | 22 | #include <net/ethoc.h> |
| 22 | 23 | ||
| 23 | static int buffer_size = 0x8000; /* 32 KBytes */ | 24 | static int buffer_size = 0x8000; /* 32 KBytes */ |
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 9d5ad08a119f..d11ae5197f01 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
| @@ -74,7 +74,6 @@ static int full_duplex[MAX_UNITS] = { -1, -1, -1, -1, -1, -1, -1, -1 }; | |||
| 74 | #include <linux/timer.h> | 74 | #include <linux/timer.h> |
| 75 | #include <linux/errno.h> | 75 | #include <linux/errno.h> |
| 76 | #include <linux/ioport.h> | 76 | #include <linux/ioport.h> |
| 77 | #include <linux/slab.h> | ||
| 78 | #include <linux/interrupt.h> | 77 | #include <linux/interrupt.h> |
| 79 | #include <linux/pci.h> | 78 | #include <linux/pci.h> |
| 80 | #include <linux/netdevice.h> | 79 | #include <linux/netdevice.h> |
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c index 0dbd7219bbde..4a43e56b7394 100644 --- a/drivers/net/fec_mpc52xx.c +++ b/drivers/net/fec_mpc52xx.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/spinlock.h> | 21 | #include <linux/spinlock.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/crc32.h> | 25 | #include <linux/crc32.h> |
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c index ee0f3c6d3f88..7658a082e390 100644 --- a/drivers/net/fec_mpc52xx_phy.c +++ b/drivers/net/fec_mpc52xx_phy.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
| 15 | #include <linux/phy.h> | 15 | #include <linux/phy.h> |
| 16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/of_mdio.h> | 18 | #include <linux/of_mdio.h> |
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | #include <asm/mpc52xx.h> | 20 | #include <asm/mpc52xx.h> |
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index ca05e5662029..73b260c3c654 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
| @@ -59,6 +59,7 @@ | |||
| 59 | #include <linux/init.h> | 59 | #include <linux/init.h> |
| 60 | #include <linux/if_vlan.h> | 60 | #include <linux/if_vlan.h> |
| 61 | #include <linux/dma-mapping.h> | 61 | #include <linux/dma-mapping.h> |
| 62 | #include <linux/slab.h> | ||
| 62 | 63 | ||
| 63 | #include <asm/irq.h> | 64 | #include <asm/irq.h> |
| 64 | #include <asm/io.h> | 65 | #include <asm/io.h> |
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c index cf4f674f9e2e..0a973e71876b 100644 --- a/drivers/net/fs_enet/mac-fcc.c +++ b/drivers/net/fs_enet/mac-fcc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| @@ -34,6 +33,7 @@ | |||
| 34 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 35 | #include <linux/phy.h> | 34 | #include <linux/phy.h> |
| 36 | #include <linux/of_device.h> | 35 | #include <linux/of_device.h> |
| 36 | #include <linux/gfp.h> | ||
| 37 | 37 | ||
| 38 | #include <asm/immap_cpm2.h> | 38 | #include <asm/immap_cpm2.h> |
| 39 | #include <asm/mpc8260.h> | 39 | #include <asm/mpc8260.h> |
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c index cd2c6cca5f24..ec81f50d5919 100644 --- a/drivers/net/fs_enet/mac-fec.c +++ b/drivers/net/fs_enet/mac-fec.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| @@ -33,6 +32,7 @@ | |||
| 33 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
| 34 | #include <linux/platform_device.h> | 33 | #include <linux/platform_device.h> |
| 35 | #include <linux/of_device.h> | 34 | #include <linux/of_device.h> |
| 35 | #include <linux/gfp.h> | ||
| 36 | 36 | ||
| 37 | #include <asm/irq.h> | 37 | #include <asm/irq.h> |
| 38 | #include <asm/uaccess.h> | 38 | #include <asm/uaccess.h> |
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c index c490a466cae1..34d3da751eb4 100644 --- a/drivers/net/fs_enet/mac-scc.c +++ b/drivers/net/fs_enet/mac-scc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/ptrace.h> | 19 | #include <linux/ptrace.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/ioport.h> | 21 | #include <linux/ioport.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/drivers/net/gianfar_ethtool.c b/drivers/net/gianfar_ethtool.c index 1010367695e4..9bda023c0235 100644 --- a/drivers/net/gianfar_ethtool.c +++ b/drivers/net/gianfar_ethtool.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/drivers/net/gianfar_sysfs.c b/drivers/net/gianfar_sysfs.c index b98c6c512299..64f4094ac7f1 100644 --- a/drivers/net/gianfar_sysfs.c +++ b/drivers/net/gianfar_sysfs.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/unistd.h> | 26 | #include <linux/unistd.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/etherdevice.h> | 29 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/greth.c b/drivers/net/greth.c index 2b9c1cbc9ec1..3a90430de918 100644 --- a/drivers/net/greth.c +++ b/drivers/net/greth.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/mii.h> | 34 | #include <linux/mii.h> |
| 35 | #include <linux/of_device.h> | 35 | #include <linux/of_device.h> |
| 36 | #include <linux/of_platform.h> | 36 | #include <linux/of_platform.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <asm/cacheflush.h> | 38 | #include <asm/cacheflush.h> |
| 38 | #include <asm/byteorder.h> | 39 | #include <asm/byteorder.h> |
| 39 | 40 | ||
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 373546dd0831..5d6f13879592 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c | |||
| @@ -153,7 +153,6 @@ static int tx_params[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 153 | #include <linux/time.h> | 153 | #include <linux/time.h> |
| 154 | #include <linux/errno.h> | 154 | #include <linux/errno.h> |
| 155 | #include <linux/ioport.h> | 155 | #include <linux/ioport.h> |
| 156 | #include <linux/slab.h> | ||
| 157 | #include <linux/interrupt.h> | 156 | #include <linux/interrupt.h> |
| 158 | #include <linux/pci.h> | 157 | #include <linux/pci.h> |
| 159 | #include <linux/init.h> | 158 | #include <linux/init.h> |
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 689b9bd377a5..4b52c767ad05 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <net/ax25.h> | 28 | #include <net/ax25.h> |
| 28 | #include <linux/etherdevice.h> | 29 | #include <linux/etherdevice.h> |
| 29 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> |
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index bdadf3e23c94..14f01d156db9 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c | |||
| @@ -61,6 +61,7 @@ | |||
| 61 | #include <linux/kernel.h> | 61 | #include <linux/kernel.h> |
| 62 | #include <linux/string.h> | 62 | #include <linux/string.h> |
| 63 | #include <linux/net.h> | 63 | #include <linux/net.h> |
| 64 | #include <linux/slab.h> | ||
| 64 | #include <net/ax25.h> | 65 | #include <net/ax25.h> |
| 65 | #include <linux/inet.h> | 66 | #include <linux/inet.h> |
| 66 | #include <linux/netdevice.h> | 67 | #include <linux/netdevice.h> |
diff --git a/drivers/net/hamradio/dmascc.c b/drivers/net/hamradio/dmascc.c index 9ee76b42668f..52b14256e2c0 100644 --- a/drivers/net/hamradio/dmascc.c +++ b/drivers/net/hamradio/dmascc.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
| 34 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/rtnetlink.h> | 36 | #include <linux/rtnetlink.h> |
| 36 | #include <linux/sockios.h> | 37 | #include <linux/sockios.h> |
| 37 | #include <linux/workqueue.h> | 38 | #include <linux/workqueue.h> |
diff --git a/drivers/net/hamradio/hdlcdrv.c b/drivers/net/hamradio/hdlcdrv.c index 91c5790c9581..b8bdf9d51cd4 100644 --- a/drivers/net/hamradio/hdlcdrv.c +++ b/drivers/net/hamradio/hdlcdrv.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/net.h> | 48 | #include <linux/net.h> |
| 49 | #include <linux/in.h> | 49 | #include <linux/in.h> |
| 50 | #include <linux/if.h> | 50 | #include <linux/if.h> |
| 51 | #include <linux/slab.h> | ||
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
| 53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
| 54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 7db0a1c3216c..66e88bd59caa 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/in.h> | 27 | #include <linux/in.h> |
| 28 | #include <linux/inet.h> | 28 | #include <linux/inet.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/tty.h> | 30 | #include <linux/tty.h> |
| 30 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 31 | #include <linux/netdevice.h> | 32 | #include <linux/netdevice.h> |
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 35c936175bba..f3a96b843911 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c | |||
| @@ -158,7 +158,6 @@ | |||
| 158 | #include <linux/in.h> | 158 | #include <linux/in.h> |
| 159 | #include <linux/fcntl.h> | 159 | #include <linux/fcntl.h> |
| 160 | #include <linux/ptrace.h> | 160 | #include <linux/ptrace.h> |
| 161 | #include <linux/slab.h> | ||
| 162 | #include <linux/delay.h> | 161 | #include <linux/delay.h> |
| 163 | #include <linux/skbuff.h> | 162 | #include <linux/skbuff.h> |
| 164 | #include <linux/netdevice.h> | 163 | #include <linux/netdevice.h> |
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c index b766a69bf0ca..4daad8cd56ea 100644 --- a/drivers/net/hp100.c +++ b/drivers/net/hp100.c | |||
| @@ -102,7 +102,6 @@ | |||
| 102 | #include <linux/string.h> | 102 | #include <linux/string.h> |
| 103 | #include <linux/errno.h> | 103 | #include <linux/errno.h> |
| 104 | #include <linux/ioport.h> | 104 | #include <linux/ioport.h> |
| 105 | #include <linux/slab.h> | ||
| 106 | #include <linux/interrupt.h> | 105 | #include <linux/interrupt.h> |
| 107 | #include <linux/eisa.h> | 106 | #include <linux/eisa.h> |
| 108 | #include <linux/pci.h> | 107 | #include <linux/pci.h> |
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 3e3528ade259..b6060f7538df 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c index d496b6f4a478..24724b4ad709 100644 --- a/drivers/net/hydra.c +++ b/drivers/net/hydra.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/netdevice.h> | 21 | #include <linux/netdevice.h> |
| 23 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c index fb0ac6d7c040..dd873cc41c2b 100644 --- a/drivers/net/ibm_newemac/core.c +++ b/drivers/net/ibm_newemac/core.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/bitops.h> | 39 | #include <linux/bitops.h> |
| 40 | #include <linux/workqueue.h> | 40 | #include <linux/workqueue.h> |
| 41 | #include <linux/of.h> | 41 | #include <linux/of.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <asm/processor.h> | 44 | #include <asm/processor.h> |
| 44 | #include <asm/io.h> | 45 | #include <asm/io.h> |
diff --git a/drivers/net/ibm_newemac/core.h b/drivers/net/ibm_newemac/core.h index 18d56c6c4238..b1cbe6fdfc7a 100644 --- a/drivers/net/ibm_newemac/core.h +++ b/drivers/net/ibm_newemac/core.h | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/of_platform.h> | 36 | #include <linux/of_platform.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <asm/io.h> | 39 | #include <asm/io.h> |
| 39 | #include <asm/dcr.h> | 40 | #include <asm/dcr.h> |
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c index 2a2fc17b2878..5b3d94419fe6 100644 --- a/drivers/net/ibm_newemac/mal.c +++ b/drivers/net/ibm_newemac/mal.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "core.h" | 31 | #include "core.h" |
| 31 | #include <asm/dcr-regs.h> | 32 | #include <asm/dcr-regs.h> |
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c index 8d76cb89dbd6..5b90d34c8455 100644 --- a/drivers/net/ibm_newemac/rgmii.c +++ b/drivers/net/ibm_newemac/rgmii.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * option) any later version. | 21 | * option) any later version. |
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/ethtool.h> | 26 | #include <linux/ethtool.h> |
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c index 17b154124943..1f038f808ab3 100644 --- a/drivers/net/ibm_newemac/zmii.c +++ b/drivers/net/ibm_newemac/zmii.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * option) any later version. | 21 | * option) any later version. |
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/ethtool.h> | 26 | #include <linux/ethtool.h> |
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c index b5d0f4e973f7..7d6cf3340c11 100644 --- a/drivers/net/ibmlana.c +++ b/drivers/net/ibmlana.c | |||
| @@ -79,7 +79,6 @@ History: | |||
| 79 | #include <linux/string.h> | 79 | #include <linux/string.h> |
| 80 | #include <linux/errno.h> | 80 | #include <linux/errno.h> |
| 81 | #include <linux/ioport.h> | 81 | #include <linux/ioport.h> |
| 82 | #include <linux/slab.h> | ||
| 83 | #include <linux/interrupt.h> | 82 | #include <linux/interrupt.h> |
| 84 | #include <linux/delay.h> | 83 | #include <linux/delay.h> |
| 85 | #include <linux/time.h> | 84 | #include <linux/time.h> |
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 0bc777bac9b4..cd508a8ee25b 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/proc_fs.h> | 49 | #include <linux/proc_fs.h> |
| 50 | #include <linux/in.h> | 50 | #include <linux/in.h> |
| 51 | #include <linux/ip.h> | 51 | #include <linux/ip.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <net/net_namespace.h> | 53 | #include <net/net_namespace.h> |
| 53 | #include <asm/hvcall.h> | 54 | #include <asm/hvcall.h> |
| 54 | #include <asm/atomic.h> | 55 | #include <asm/atomic.h> |
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index 0bc990ec4a8e..4a32bed77c71 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | */ | 30 | */ |
| 31 | 31 | ||
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/if_ether.h> | 33 | #include <linux/if_ether.h> |
| 35 | 34 | ||
| 36 | #include "e1000_mac.h" | 35 | #include "e1000_mac.h" |
diff --git a/drivers/net/igb/igb_ethtool.c b/drivers/net/igb/igb_ethtool.c index a4cead12fd98..d313fae992da 100644 --- a/drivers/net/igb/igb_ethtool.c +++ b/drivers/net/igb/igb_ethtool.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/if_ether.h> | 35 | #include <linux/if_ether.h> |
| 36 | #include <linux/ethtool.h> | 36 | #include <linux/ethtool.h> |
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include "igb.h" | 40 | #include "igb.h" |
| 40 | 41 | ||
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 01c65c7447e1..9b3c51ab1758 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/pagemap.h> | 32 | #include <linux/pagemap.h> |
| 33 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 34 | #include <linux/ipv6.h> | 34 | #include <linux/ipv6.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <net/checksum.h> | 36 | #include <net/checksum.h> |
| 36 | #include <net/ip6_checksum.h> | 37 | #include <net/ip6_checksum.h> |
| 37 | #include <linux/net_tstamp.h> | 38 | #include <linux/net_tstamp.h> |
diff --git a/drivers/net/igbvf/netdev.c b/drivers/net/igbvf/netdev.c index b41037ed8083..1b1edad1eb5e 100644 --- a/drivers/net/igbvf/netdev.c +++ b/drivers/net/igbvf/netdev.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/netdevice.h> | 35 | #include <linux/netdevice.h> |
| 36 | #include <linux/tcp.h> | 36 | #include <linux/tcp.h> |
| 37 | #include <linux/ipv6.h> | 37 | #include <linux/ipv6.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <net/checksum.h> | 39 | #include <net/checksum.h> |
| 39 | #include <net/ip6_checksum.h> | 40 | #include <net/ip6_checksum.h> |
| 40 | #include <linux/mii.h> | 41 | #include <linux/mii.h> |
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c index 70871b9b045a..8f6197d647c0 100644 --- a/drivers/net/ioc3-eth.c +++ b/drivers/net/ioc3-eth.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/tcp.h> | 44 | #include <linux/tcp.h> |
| 45 | #include <linux/udp.h> | 45 | #include <linux/udp.h> |
| 46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
| 47 | #include <linux/gfp.h> | ||
| 47 | 48 | ||
| 48 | #ifdef CONFIG_SERIAL_8250 | 49 | #ifdef CONFIG_SERIAL_8250 |
| 49 | #include <linux/serial_core.h> | 50 | #include <linux/serial_core.h> |
diff --git a/drivers/net/ipg.c b/drivers/net/ipg.c index 150415e83f61..639bf9fb0279 100644 --- a/drivers/net/ipg.c +++ b/drivers/net/ipg.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #include <linux/crc32.h> | 23 | #include <linux/crc32.h> |
| 24 | #include <linux/ethtool.h> | 24 | #include <linux/ethtool.h> |
| 25 | #include <linux/gfp.h> | ||
| 25 | #include <linux/mii.h> | 26 | #include <linux/mii.h> |
| 26 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 27 | 28 | ||
diff --git a/drivers/net/irda/ali-ircc.c b/drivers/net/irda/ali-ircc.c index 12c7b006f767..28992c815cba 100644 --- a/drivers/net/irda/ali-ircc.c +++ b/drivers/net/irda/ali-ircc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | ********************************************************************/ | 22 | ********************************************************************/ |
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/gfp.h> | ||
| 25 | 26 | ||
| 26 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 27 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| @@ -29,7 +30,6 @@ | |||
| 29 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 30 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
| 31 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/rtnetlink.h> | 34 | #include <linux/rtnetlink.h> |
| 35 | #include <linux/serial_reg.h> | 35 | #include <linux/serial_reg.h> |
diff --git a/drivers/net/irda/bfin_sir.h b/drivers/net/irda/bfin_sir.h index dac71b1f4f9b..b54a6f08db45 100644 --- a/drivers/net/irda/bfin_sir.h +++ b/drivers/net/irda/bfin_sir.h | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <net/irda/irda.h> | 21 | #include <net/irda/irda.h> |
| 21 | #include <net/irda/wrapper.h> | 22 | #include <net/irda/wrapper.h> |
diff --git a/drivers/net/irda/irtty-sir.c b/drivers/net/irda/irtty-sir.c index 20f9bc626688..ee1dde52e8fc 100644 --- a/drivers/net/irda/irtty-sir.c +++ b/drivers/net/irda/irtty-sir.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/tty.h> | 32 | #include <linux/tty.h> |
| 32 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
diff --git a/drivers/net/irda/nsc-ircc.c b/drivers/net/irda/nsc-ircc.c index 2413295ebd90..e30cdbb14745 100644 --- a/drivers/net/irda/nsc-ircc.c +++ b/drivers/net/irda/nsc-ircc.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | ********************************************************************/ | 43 | ********************************************************************/ |
| 44 | 44 | ||
| 45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 46 | #include <linux/gfp.h> | ||
| 46 | 47 | ||
| 47 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
| 48 | #include <linux/types.h> | 49 | #include <linux/types.h> |
| @@ -50,7 +51,6 @@ | |||
| 50 | #include <linux/netdevice.h> | 51 | #include <linux/netdevice.h> |
| 51 | #include <linux/ioport.h> | 52 | #include <linux/ioport.h> |
| 52 | #include <linux/delay.h> | 53 | #include <linux/delay.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/rtnetlink.h> | 55 | #include <linux/rtnetlink.h> |
| 56 | #include <linux/dma-mapping.h> | 56 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index 84db145d2b59..1a54f6bb68c5 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
| 19 | #include <linux/clk.h> | 19 | #include <linux/clk.h> |
| 20 | #include <linux/gpio.h> | 20 | #include <linux/gpio.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <net/irda/irda.h> | 23 | #include <net/irda/irda.h> |
| 23 | #include <net/irda/irmod.h> | 24 | #include <net/irda/irmod.h> |
diff --git a/drivers/net/irda/sh_sir.c b/drivers/net/irda/sh_sir.c index d7c983dc91ad..0745581c4b5e 100644 --- a/drivers/net/irda/sh_sir.c +++ b/drivers/net/irda/sh_sir.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <net/irda/wrapper.h> | 18 | #include <net/irda/wrapper.h> |
| 18 | #include <net/irda/irda_device.h> | 19 | #include <net/irda/irda_device.h> |
| 19 | #include <asm/clock.h> | 20 | #include <asm/clock.h> |
diff --git a/drivers/net/irda/sir_dev.c b/drivers/net/irda/sir_dev.c index 4b2a1a9eac2a..de91cd14016b 100644 --- a/drivers/net/irda/sir_dev.c +++ b/drivers/net/irda/sir_dev.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 17 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 18 | 19 | ||
diff --git a/drivers/net/irda/smsc-ircc2.c b/drivers/net/irda/smsc-ircc2.c index 8f7d0d146f24..6af84d88cd03 100644 --- a/drivers/net/irda/smsc-ircc2.c +++ b/drivers/net/irda/smsc-ircc2.c | |||
| @@ -48,13 +48,13 @@ | |||
| 48 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
| 49 | #include <linux/ioport.h> | 49 | #include <linux/ioport.h> |
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/slab.h> | ||
| 52 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 53 | #include <linux/rtnetlink.h> | 52 | #include <linux/rtnetlink.h> |
| 54 | #include <linux/serial_reg.h> | 53 | #include <linux/serial_reg.h> |
| 55 | #include <linux/dma-mapping.h> | 54 | #include <linux/dma-mapping.h> |
| 56 | #include <linux/pnp.h> | 55 | #include <linux/pnp.h> |
| 57 | #include <linux/platform_device.h> | 56 | #include <linux/platform_device.h> |
| 57 | #include <linux/gfp.h> | ||
| 58 | 58 | ||
| 59 | #include <asm/io.h> | 59 | #include <asm/io.h> |
| 60 | #include <asm/dma.h> | 60 | #include <asm/dma.h> |
diff --git a/drivers/net/irda/via-ircc.c b/drivers/net/irda/via-ircc.c index 6533c010cf5c..b0a6cd815be1 100644 --- a/drivers/net/irda/via-ircc.c +++ b/drivers/net/irda/via-ircc.c | |||
| @@ -45,11 +45,11 @@ F02 Oct/28/02: Add SB device ID for 3147 and 3177. | |||
| 45 | #include <linux/netdevice.h> | 45 | #include <linux/netdevice.h> |
| 46 | #include <linux/ioport.h> | 46 | #include <linux/ioport.h> |
| 47 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | #include <linux/init.h> | 48 | #include <linux/init.h> |
| 50 | #include <linux/rtnetlink.h> | 49 | #include <linux/rtnetlink.h> |
| 51 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
| 52 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
| 52 | #include <linux/gfp.h> | ||
| 53 | 53 | ||
| 54 | #include <asm/io.h> | 54 | #include <asm/io.h> |
| 55 | #include <asm/dma.h> | 55 | #include <asm/dma.h> |
diff --git a/drivers/net/irda/w83977af_ir.c b/drivers/net/irda/w83977af_ir.c index 980625feb2c0..cb0cb758be64 100644 --- a/drivers/net/irda/w83977af_ir.c +++ b/drivers/net/irda/w83977af_ir.c | |||
| @@ -46,10 +46,10 @@ | |||
| 46 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 51 | #include <linux/rtnetlink.h> | 50 | #include <linux/rtnetlink.h> |
| 52 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
| 52 | #include <linux/gfp.h> | ||
| 53 | 53 | ||
| 54 | #include <asm/io.h> | 54 | #include <asm/io.h> |
| 55 | #include <asm/dma.h> | 55 | #include <asm/dma.h> |
diff --git a/drivers/net/iseries_veth.c b/drivers/net/iseries_veth.c index e6e972d9b7ca..773c59c89691 100644 --- a/drivers/net/iseries_veth.c +++ b/drivers/net/iseries_veth.c | |||
| @@ -69,6 +69,7 @@ | |||
| 69 | #include <linux/mm.h> | 69 | #include <linux/mm.h> |
| 70 | #include <linux/ethtool.h> | 70 | #include <linux/ethtool.h> |
| 71 | #include <linux/if_ether.h> | 71 | #include <linux/if_ether.h> |
| 72 | #include <linux/slab.h> | ||
| 72 | 73 | ||
| 73 | #include <asm/abs_addr.h> | 74 | #include <asm/abs_addr.h> |
| 74 | #include <asm/iseries/mf.h> | 75 | #include <asm/iseries/mf.h> |
diff --git a/drivers/net/ixgbe/ixgbe_ethtool.c b/drivers/net/ixgbe/ixgbe_ethtool.c index 1959ef76c962..8f461d5cee77 100644 --- a/drivers/net/ixgbe/ixgbe_ethtool.c +++ b/drivers/net/ixgbe/ixgbe_ethtool.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 33 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
| 34 | #include <linux/ethtool.h> | 35 | #include <linux/ethtool.h> |
diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c index 9276d5965b0d..6493049b663d 100644 --- a/drivers/net/ixgbe/ixgbe_fcoe.c +++ b/drivers/net/ixgbe/ixgbe_fcoe.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "ixgbe_dcb_82599.h" | 31 | #include "ixgbe_dcb_82599.h" |
| 32 | #endif /* CONFIG_IXGBE_DCB */ | 32 | #endif /* CONFIG_IXGBE_DCB */ |
| 33 | #include <linux/if_ether.h> | 33 | #include <linux/if_ether.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <scsi/scsi_cmnd.h> | 35 | #include <scsi/scsi_cmnd.h> |
| 35 | #include <scsi/scsi_device.h> | 36 | #include <scsi/scsi_device.h> |
| 36 | #include <scsi/fc/fc_fs.h> | 37 | #include <scsi/fc/fc_fs.h> |
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c index 0c553f6cb534..8f677cb86290 100644 --- a/drivers/net/ixgbe/ixgbe_main.c +++ b/drivers/net/ixgbe/ixgbe_main.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/tcp.h> | 36 | #include <linux/tcp.h> |
| 37 | #include <linux/pkt_sched.h> | 37 | #include <linux/pkt_sched.h> |
| 38 | #include <linux/ipv6.h> | 38 | #include <linux/ipv6.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <net/checksum.h> | 40 | #include <net/checksum.h> |
| 40 | #include <net/ip6_checksum.h> | 41 | #include <net/ip6_checksum.h> |
| 41 | #include <linux/ethtool.h> | 42 | #include <linux/ethtool.h> |
diff --git a/drivers/net/ixgbevf/ethtool.c b/drivers/net/ixgbevf/ethtool.c index 6fdd651abcd1..4680b069b84f 100644 --- a/drivers/net/ixgbevf/ethtool.c +++ b/drivers/net/ixgbevf/ethtool.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 33 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
| 34 | #include <linux/ethtool.h> | 35 | #include <linux/ethtool.h> |
diff --git a/drivers/net/ixgbevf/ixgbevf_main.c b/drivers/net/ixgbevf/ixgbevf_main.c index 1bbbef3ee3f4..0cd6202dfacc 100644 --- a/drivers/net/ixgbevf/ixgbevf_main.c +++ b/drivers/net/ixgbevf/ixgbevf_main.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/ip.h> | 39 | #include <linux/ip.h> |
| 40 | #include <linux/tcp.h> | 40 | #include <linux/tcp.h> |
| 41 | #include <linux/ipv6.h> | 41 | #include <linux/ipv6.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <net/checksum.h> | 43 | #include <net/checksum.h> |
| 43 | #include <net/ip6_checksum.h> | 44 | #include <net/ip6_checksum.h> |
| 44 | #include <linux/ethtool.h> | 45 | #include <linux/ethtool.h> |
diff --git a/drivers/net/ixp2000/ixpdev.c b/drivers/net/ixp2000/ixpdev.c index e9d9d595e1b7..d5932ca3e27d 100644 --- a/drivers/net/ixp2000/ixpdev.c +++ b/drivers/net/ixp2000/ixpdev.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/etherdevice.h> | 15 | #include <linux/etherdevice.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/moduleparam.h> | 17 | #include <linux/moduleparam.h> |
| 18 | #include <linux/gfp.h> | ||
| 18 | #include <asm/hardware/uengine.h> | 19 | #include <asm/hardware/uengine.h> |
| 19 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 20 | #include "ixp2400_rx.ucode" | 21 | #include "ixp2400_rx.ucode" |
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index f47d4d663b19..3e6aaf9e5ce7 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c | |||
| @@ -22,11 +22,11 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/types.h> | 23 | #include <linux/types.h> |
| 24 | #include <linux/fcntl.h> | 24 | #include <linux/fcntl.h> |
| 25 | #include <linux/gfp.h> | ||
| 25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 27 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
| 28 | #include <linux/in.h> | 29 | #include <linux/in.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/string.h> | 30 | #include <linux/string.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/skbuff.h> | 35 | #include <linux/skbuff.h> |
| 36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
| 37 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/bootinfo.h> | 40 | #include <asm/bootinfo.h> |
| 40 | #include <asm/system.h> | 41 | #include <asm/system.h> |
diff --git a/drivers/net/jme.c b/drivers/net/jme.c index c0b59a555384..b705ad3a53a7 100644 --- a/drivers/net/jme.c +++ b/drivers/net/jme.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/tcp.h> | 37 | #include <linux/tcp.h> |
| 38 | #include <linux/udp.h> | 38 | #include <linux/udp.h> |
| 39 | #include <linux/if_vlan.h> | 39 | #include <linux/if_vlan.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <net/ip6_checksum.h> | 41 | #include <net/ip6_checksum.h> |
| 41 | #include "jme.h" | 42 | #include "jme.h" |
| 42 | 43 | ||
diff --git a/drivers/net/ks8851_mll.c b/drivers/net/ks8851_mll.c index 84b0e15831f9..6354ab3a45a6 100644 --- a/drivers/net/ks8851_mll.c +++ b/drivers/net/ks8851_mll.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/mii.h> | 31 | #include <linux/mii.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #define DRV_NAME "ks8851_mll" | 36 | #define DRV_NAME "ks8851_mll" |
| 36 | 37 | ||
diff --git a/drivers/net/ksz884x.c b/drivers/net/ksz884x.c index 6c5327af1bf9..0606a1f359fb 100644 --- a/drivers/net/ksz884x.c +++ b/drivers/net/ksz884x.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/if_vlan.h> | 30 | #include <linux/if_vlan.h> |
| 31 | #include <linux/crc32.h> | 31 | #include <linux/crc32.h> |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | 35 | ||
| 35 | /* DMA Registers */ | 36 | /* DMA Registers */ |
diff --git a/drivers/net/lasi_82596.c b/drivers/net/lasi_82596.c index b77238dbafb8..6eba352c52e0 100644 --- a/drivers/net/lasi_82596.c +++ b/drivers/net/lasi_82596.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | #include <linux/ptrace.h> | 74 | #include <linux/ptrace.h> |
| 75 | #include <linux/errno.h> | 75 | #include <linux/errno.h> |
| 76 | #include <linux/ioport.h> | 76 | #include <linux/ioport.h> |
| 77 | #include <linux/slab.h> | ||
| 78 | #include <linux/interrupt.h> | 77 | #include <linux/interrupt.h> |
| 79 | #include <linux/delay.h> | 78 | #include <linux/delay.h> |
| 80 | #include <linux/netdevice.h> | 79 | #include <linux/netdevice.h> |
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 443c39a3732f..973390b82ec2 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
| @@ -73,7 +73,6 @@ | |||
| 73 | #include <linux/string.h> | 73 | #include <linux/string.h> |
| 74 | #include <linux/errno.h> | 74 | #include <linux/errno.h> |
| 75 | #include <linux/ioport.h> | 75 | #include <linux/ioport.h> |
| 76 | #include <linux/slab.h> | ||
| 77 | #include <linux/interrupt.h> | 76 | #include <linux/interrupt.h> |
| 78 | #include <linux/delay.h> | 77 | #include <linux/delay.h> |
| 79 | #include <linux/netdevice.h> | 78 | #include <linux/netdevice.h> |
| @@ -85,6 +84,7 @@ | |||
| 85 | #include <linux/dma-mapping.h> | 84 | #include <linux/dma-mapping.h> |
| 86 | #include <linux/io.h> | 85 | #include <linux/io.h> |
| 87 | #include <linux/irq.h> | 86 | #include <linux/irq.h> |
| 87 | #include <linux/gfp.h> | ||
| 88 | 88 | ||
| 89 | /* DEBUG flags | 89 | /* DEBUG flags |
| 90 | */ | 90 | */ |
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c index a18e3485476e..ba617e3cf1bb 100644 --- a/drivers/net/ll_temac_main.c +++ b/drivers/net/ll_temac_main.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/in.h> | 49 | #include <linux/in.h> |
| 50 | #include <linux/io.h> | 50 | #include <linux/io.h> |
| 51 | #include <linux/ip.h> | 51 | #include <linux/ip.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | 53 | ||
| 53 | #include "ll_temac.h" | 54 | #include "ll_temac.h" |
| 54 | 55 | ||
diff --git a/drivers/net/ll_temac_mdio.c b/drivers/net/ll_temac_mdio.c index da0e462308d5..5ae28c975b38 100644 --- a/drivers/net/ll_temac_mdio.c +++ b/drivers/net/ll_temac_mdio.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/phy.h> | 10 | #include <linux/phy.h> |
| 11 | #include <linux/of.h> | 11 | #include <linux/of.h> |
| 12 | #include <linux/of_device.h> | 12 | #include <linux/of_device.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/of_mdio.h> | 14 | #include <linux/of_mdio.h> |
| 14 | 15 | ||
| 15 | #include "ll_temac.h" | 16 | #include "ll_temac.h" |
diff --git a/drivers/net/mac8390.c b/drivers/net/mac8390.c index a8768672dc5a..c8e68fde0664 100644 --- a/drivers/net/mac8390.c +++ b/drivers/net/mac8390.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
| 29 | #include <linux/nubus.h> | 29 | #include <linux/nubus.h> |
| 30 | #include <linux/in.h> | 30 | #include <linux/in.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 33 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 34 | #include <linux/init.h> | 33 | #include <linux/init.h> |
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c index c292a608f9a9..c0876e915eed 100644 --- a/drivers/net/mac89x0.c +++ b/drivers/net/mac89x0.c | |||
| @@ -88,7 +88,6 @@ static char *version = | |||
| 88 | #include <linux/interrupt.h> | 88 | #include <linux/interrupt.h> |
| 89 | #include <linux/ioport.h> | 89 | #include <linux/ioport.h> |
| 90 | #include <linux/in.h> | 90 | #include <linux/in.h> |
| 91 | #include <linux/slab.h> | ||
| 92 | #include <linux/string.h> | 91 | #include <linux/string.h> |
| 93 | #include <linux/nubus.h> | 92 | #include <linux/nubus.h> |
| 94 | #include <linux/errno.h> | 93 | #include <linux/errno.h> |
| @@ -98,6 +97,7 @@ static char *version = | |||
| 98 | #include <linux/skbuff.h> | 97 | #include <linux/skbuff.h> |
| 99 | #include <linux/delay.h> | 98 | #include <linux/delay.h> |
| 100 | #include <linux/bitops.h> | 99 | #include <linux/bitops.h> |
| 100 | #include <linux/gfp.h> | ||
| 101 | 101 | ||
| 102 | #include <asm/system.h> | 102 | #include <asm/system.h> |
| 103 | #include <asm/io.h> | 103 | #include <asm/io.h> |
diff --git a/drivers/net/mace.c b/drivers/net/mace.c index ab5f0bf6d1ae..962c41d0c8df 100644 --- a/drivers/net/mace.c +++ b/drivers/net/mace.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/crc32.h> | 16 | #include <linux/crc32.h> |
| 17 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 18 | #include <linux/bitrev.h> | 18 | #include <linux/bitrev.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
| 20 | #include <asm/dbdma.h> | 21 | #include <asm/dbdma.h> |
| 21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c index 13ba8f4afb7e..52e9a51c4c4f 100644 --- a/drivers/net/macmace.c +++ b/drivers/net/macmace.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/bitrev.h> | 30 | #include <linux/bitrev.h> |
| 31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 35 | #include <asm/macintosh.h> | 36 | #include <asm/macintosh.h> |
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c index 24109c288108..adb54fe2d82a 100644 --- a/drivers/net/macsonic.c +++ b/drivers/net/macsonic.c | |||
| @@ -35,11 +35,11 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 37 | #include <linux/fcntl.h> | 37 | #include <linux/fcntl.h> |
| 38 | #include <linux/gfp.h> | ||
| 38 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 39 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 40 | #include <linux/ioport.h> | 41 | #include <linux/ioport.h> |
| 41 | #include <linux/in.h> | 42 | #include <linux/in.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/string.h> | 43 | #include <linux/string.h> |
| 44 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
| 45 | #include <linux/nubus.h> | 45 | #include <linux/nubus.h> |
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/platform_device.h> | 50 | #include <linux/platform_device.h> |
| 51 | #include <linux/dma-mapping.h> | 51 | #include <linux/dma-mapping.h> |
| 52 | #include <linux/bitrev.h> | 52 | #include <linux/bitrev.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #include <asm/bootinfo.h> | 55 | #include <asm/bootinfo.h> |
| 55 | #include <asm/system.h> | 56 | #include <asm/system.h> |
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 55ceae09738e..abba3cc81f12 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/cache.h> | 9 | #include <linux/cache.h> |
| 10 | #include <linux/sched.h> | 10 | #include <linux/sched.h> |
| 11 | #include <linux/types.h> | 11 | #include <linux/types.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 13 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
| 14 | #include <linux/cdev.h> | 15 | #include <linux/cdev.h> |
diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c index 65ec77dc31f5..23cee7b6af91 100644 --- a/drivers/net/mlx4/cmd.c +++ b/drivers/net/mlx4/cmd.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 37 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 38 | 39 | ||
diff --git a/drivers/net/mlx4/cq.c b/drivers/net/mlx4/cq.c index ccfe276943f0..7cd34e9c7c7e 100644 --- a/drivers/net/mlx4/cq.c +++ b/drivers/net/mlx4/cq.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | #include <linux/hardirq.h> | 37 | #include <linux/hardirq.h> |
| 38 | #include <linux/gfp.h> | ||
| 38 | 39 | ||
| 39 | #include <linux/mlx4/cmd.h> | 40 | #include <linux/mlx4/cmd.h> |
| 40 | #include <linux/mlx4/cq.h> | 41 | #include <linux/mlx4/cq.h> |
diff --git a/drivers/net/mlx4/en_main.c b/drivers/net/mlx4/en_main.c index 507e11fce9ed..cbabf14f95d0 100644 --- a/drivers/net/mlx4/en_main.c +++ b/drivers/net/mlx4/en_main.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 37 | #include <linux/netdevice.h> | 37 | #include <linux/netdevice.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <linux/mlx4/driver.h> | 40 | #include <linux/mlx4/driver.h> |
| 40 | #include <linux/mlx4/device.h> | 41 | #include <linux/mlx4/device.h> |
diff --git a/drivers/net/mlx4/en_netdev.c b/drivers/net/mlx4/en_netdev.c index c48b0f4b17b7..73c3d20c6453 100644 --- a/drivers/net/mlx4/en_netdev.c +++ b/drivers/net/mlx4/en_netdev.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/tcp.h> | 35 | #include <linux/tcp.h> |
| 36 | #include <linux/if_vlan.h> | 36 | #include <linux/if_vlan.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include <linux/mlx4/driver.h> | 40 | #include <linux/mlx4/driver.h> |
| 40 | #include <linux/mlx4/device.h> | 41 | #include <linux/mlx4/device.h> |
diff --git a/drivers/net/mlx4/en_resources.c b/drivers/net/mlx4/en_resources.c index 16256784a943..0dfb4ec8a9dd 100644 --- a/drivers/net/mlx4/en_resources.c +++ b/drivers/net/mlx4/en_resources.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | * | 31 | * |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 35 | #include <linux/mlx4/qp.h> | 36 | #include <linux/mlx4/qp.h> |
| 36 | 37 | ||
diff --git a/drivers/net/mlx4/en_rx.c b/drivers/net/mlx4/en_rx.c index 64394647dddc..8e2fcb7103c3 100644 --- a/drivers/net/mlx4/en_rx.c +++ b/drivers/net/mlx4/en_rx.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/mlx4/cq.h> | 34 | #include <linux/mlx4/cq.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/mlx4/qp.h> | 36 | #include <linux/mlx4/qp.h> |
| 36 | #include <linux/skbuff.h> | 37 | #include <linux/skbuff.h> |
| 37 | #include <linux/if_ether.h> | 38 | #include <linux/if_ether.h> |
diff --git a/drivers/net/mlx4/en_tx.c b/drivers/net/mlx4/en_tx.c index 3d1396af9462..580968f304eb 100644 --- a/drivers/net/mlx4/en_tx.c +++ b/drivers/net/mlx4/en_tx.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | 33 | ||
| 34 | #include <asm/page.h> | 34 | #include <asm/page.h> |
| 35 | #include <linux/mlx4/cq.h> | 35 | #include <linux/mlx4/cq.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/mlx4/qp.h> | 37 | #include <linux/mlx4/qp.h> |
| 37 | #include <linux/skbuff.h> | 38 | #include <linux/skbuff.h> |
| 38 | #include <linux/if_vlan.h> | 39 | #include <linux/if_vlan.h> |
diff --git a/drivers/net/mlx4/eq.c b/drivers/net/mlx4/eq.c index bffb7995cb70..7365bf488b81 100644 --- a/drivers/net/mlx4/eq.c +++ b/drivers/net/mlx4/eq.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 36 | #include <linux/dma-mapping.h> | 37 | #include <linux/dma-mapping.h> |
| 37 | 38 | ||
diff --git a/drivers/net/mlx4/icm.c b/drivers/net/mlx4/icm.c index 04b382fcb8c8..57288ca1395f 100644 --- a/drivers/net/mlx4/icm.c +++ b/drivers/net/mlx4/icm.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
| 36 | #include <linux/scatterlist.h> | 36 | #include <linux/scatterlist.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include <linux/mlx4/cmd.h> | 39 | #include <linux/mlx4/cmd.h> |
| 39 | 40 | ||
diff --git a/drivers/net/mlx4/intf.c b/drivers/net/mlx4/intf.c index 0e7eb1038f9f..555067802751 100644 --- a/drivers/net/mlx4/intf.c +++ b/drivers/net/mlx4/intf.c | |||
| @@ -31,6 +31,8 @@ | |||
| 31 | * SOFTWARE. | 31 | * SOFTWARE. |
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/slab.h> | ||
| 35 | |||
| 34 | #include "mlx4.h" | 36 | #include "mlx4.h" |
| 35 | 37 | ||
| 36 | struct mlx4_device_context { | 38 | struct mlx4_device_context { |
diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index b402a95c87c7..e3e0d54a7c87 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 40 | #include <linux/dma-mapping.h> | 40 | #include <linux/dma-mapping.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | #include <linux/mlx4/device.h> | 43 | #include <linux/mlx4/device.h> |
| 43 | #include <linux/mlx4/doorbell.h> | 44 | #include <linux/mlx4/doorbell.h> |
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c index 5ccbce9866fe..c4f88b7ef7b6 100644 --- a/drivers/net/mlx4/mcg.c +++ b/drivers/net/mlx4/mcg.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | 35 | ||
| 37 | #include <linux/mlx4/cmd.h> | 36 | #include <linux/mlx4/cmd.h> |
| 38 | 37 | ||
diff --git a/drivers/net/mlx4/mr.c b/drivers/net/mlx4/mr.c index ca7ab8e7b4cc..3dc69be4949f 100644 --- a/drivers/net/mlx4/mr.c +++ b/drivers/net/mlx4/mr.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/errno.h> | 35 | #include <linux/errno.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <linux/mlx4/cmd.h> | 38 | #include <linux/mlx4/cmd.h> |
| 38 | 39 | ||
diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c index ca25b9dc8378..5caf0115fa5b 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/mlx4/profile.c | |||
| @@ -32,6 +32,8 @@ | |||
| 32 | * SOFTWARE. | 32 | * SOFTWARE. |
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/slab.h> | ||
| 36 | |||
| 35 | #include "mlx4.h" | 37 | #include "mlx4.h" |
| 36 | #include "fw.h" | 38 | #include "fw.h" |
| 37 | 39 | ||
diff --git a/drivers/net/mlx4/qp.c b/drivers/net/mlx4/qp.c index 42ab9fc01d3e..ec9350e5f21a 100644 --- a/drivers/net/mlx4/qp.c +++ b/drivers/net/mlx4/qp.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | * SOFTWARE. | 33 | * SOFTWARE. |
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include <linux/gfp.h> | ||
| 36 | #include <linux/mlx4/cmd.h> | 37 | #include <linux/mlx4/cmd.h> |
| 37 | #include <linux/mlx4/qp.h> | 38 | #include <linux/mlx4/qp.h> |
| 38 | 39 | ||
diff --git a/drivers/net/mlx4/srq.c b/drivers/net/mlx4/srq.c index 1377d0dc8f1f..3b07b80a0456 100644 --- a/drivers/net/mlx4/srq.c +++ b/drivers/net/mlx4/srq.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/mlx4/cmd.h> | 34 | #include <linux/mlx4/cmd.h> |
| 35 | #include <linux/gfp.h> | ||
| 35 | 36 | ||
| 36 | #include "mlx4.h" | 37 | #include "mlx4.h" |
| 37 | #include "icm.h" | 38 | #include "icm.h" |
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c index c97b6e4365a9..8613a52ddf17 100644 --- a/drivers/net/mv643xx_eth.c +++ b/drivers/net/mv643xx_eth.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include <linux/io.h> | 54 | #include <linux/io.h> |
| 55 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 56 | #include <linux/inet_lro.h> | 56 | #include <linux/inet_lro.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | #include <asm/system.h> | 58 | #include <asm/system.h> |
| 58 | 59 | ||
| 59 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; | 60 | static char mv643xx_eth_driver_name[] = "mv643xx_eth"; |
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c index 93c709d63e2f..3a7ad840d5b5 100644 --- a/drivers/net/mvme147.c +++ b/drivers/net/mvme147.c | |||
| @@ -10,11 +10,11 @@ | |||
| 10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/gfp.h> | ||
| 18 | /* Used for the temporal inet entries and routing */ | 18 | /* Used for the temporal inet entries and routing */ |
| 19 | #include <linux/socket.h> | 19 | #include <linux/socket.h> |
| 20 | #include <linux/route.h> | 20 | #include <linux/route.h> |
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c index e84dd3ee9c5a..471887742b02 100644 --- a/drivers/net/myri10ge/myri10ge.c +++ b/drivers/net/myri10ge/myri10ge.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | #include <linux/moduleparam.h> | 64 | #include <linux/moduleparam.h> |
| 65 | #include <linux/io.h> | 65 | #include <linux/io.h> |
| 66 | #include <linux/log2.h> | 66 | #include <linux/log2.h> |
| 67 | #include <linux/slab.h> | ||
| 67 | #include <net/checksum.h> | 68 | #include <net/checksum.h> |
| 68 | #include <net/ip.h> | 69 | #include <net/ip.h> |
| 69 | #include <net/tcp.h> | 70 | #include <net/tcp.h> |
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index 8b4313085359..b72e749afdf1 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -14,7 +14,6 @@ static char version[] = | |||
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/ioport.h> | 15 | #include <linux/ioport.h> |
| 16 | #include <linux/in.h> | 16 | #include <linux/in.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| @@ -26,6 +25,7 @@ static char version[] = | |||
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 28 | #include <linux/firmware.h> | 27 | #include <linux/firmware.h> |
| 28 | #include <linux/gfp.h> | ||
| 29 | 29 | ||
| 30 | #include <net/dst.h> | 30 | #include <net/dst.h> |
| 31 | #include <net/arp.h> | 31 | #include <net/arp.h> |
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c index a53bb201d3c7..ff3c4c814988 100644 --- a/drivers/net/ne2.c +++ b/drivers/net/ne2.c | |||
| @@ -66,7 +66,6 @@ static const char *version = "ne2.c:v0.91 Nov 16 1998 Wim Dumon <wimpie@kotnet.o | |||
| 66 | #include <linux/interrupt.h> | 66 | #include <linux/interrupt.h> |
| 67 | #include <linux/ioport.h> | 67 | #include <linux/ioport.h> |
| 68 | #include <linux/in.h> | 68 | #include <linux/in.h> |
| 69 | #include <linux/slab.h> | ||
| 70 | #include <linux/string.h> | 69 | #include <linux/string.h> |
| 71 | #include <linux/errno.h> | 70 | #include <linux/errno.h> |
| 72 | #include <linux/init.h> | 71 | #include <linux/init.h> |
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c index bf4af5248cb7..a361dea35574 100644 --- a/drivers/net/netconsole.c +++ b/drivers/net/netconsole.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
| 39 | #include <linux/module.h> | 39 | #include <linux/module.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/console.h> | 41 | #include <linux/console.h> |
| 41 | #include <linux/moduleparam.h> | 42 | #include <linux/moduleparam.h> |
| 42 | #include <linux/string.h> | 43 | #include <linux/string.h> |
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c index a945591298a8..b1cf46a0c48c 100644 --- a/drivers/net/netxen/netxen_nic_hw.c +++ b/drivers/net/netxen/netxen_nic_hw.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 26 | #include "netxen_nic.h" | 27 | #include "netxen_nic.h" |
| 27 | #include "netxen_nic_hw.h" | 28 | #include "netxen_nic_hw.h" |
| 28 | 29 | ||
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 7eb925a9f36e..02876f59cbb2 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include "netxen_nic.h" | 29 | #include "netxen_nic.h" |
| 29 | #include "netxen_nic_hw.h" | 30 | #include "netxen_nic_hw.h" |
| 30 | 31 | ||
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 01808b28d1b6..ce838f7c8b0f 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * | 23 | * |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 27 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 28 | #include "netxen_nic_hw.h" | 29 | #include "netxen_nic_hw.h" |
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c index c16cbfb4061b..3892330f244a 100644 --- a/drivers/net/ni5010.c +++ b/drivers/net/ni5010.c | |||
| @@ -51,7 +51,6 @@ | |||
| 51 | #include <linux/string.h> | 51 | #include <linux/string.h> |
| 52 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 53 | #include <linux/ioport.h> | 53 | #include <linux/ioport.h> |
| 54 | #include <linux/slab.h> | ||
| 55 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 56 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
| 57 | #include <linux/init.h> | 56 | #include <linux/init.h> |
diff --git a/drivers/net/ni52.c b/drivers/net/ni52.c index 05c29c2cef2a..f7a8f707361e 100644 --- a/drivers/net/ni52.c +++ b/drivers/net/ni52.c | |||
| @@ -109,7 +109,6 @@ static int fifo = 0x8; /* don't change */ | |||
| 109 | #include <linux/string.h> | 109 | #include <linux/string.h> |
| 110 | #include <linux/errno.h> | 110 | #include <linux/errno.h> |
| 111 | #include <linux/ioport.h> | 111 | #include <linux/ioport.h> |
| 112 | #include <linux/slab.h> | ||
| 113 | #include <linux/interrupt.h> | 112 | #include <linux/interrupt.h> |
| 114 | #include <linux/delay.h> | 113 | #include <linux/delay.h> |
| 115 | #include <linux/init.h> | 114 | #include <linux/init.h> |
diff --git a/drivers/net/niu.c b/drivers/net/niu.c index 0678f3106cbc..d5cd16bfc907 100644 --- a/drivers/net/niu.c +++ b/drivers/net/niu.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/jiffies.h> | 25 | #include <linux/jiffies.h> |
| 26 | #include <linux/crc32.h> | 26 | #include <linux/crc32.h> |
| 27 | #include <linux/list.h> | 27 | #include <linux/list.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 30 | 31 | ||
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index 8dd509c09bc8..e88e97cd1b10 100644 --- a/drivers/net/ns83820.c +++ b/drivers/net/ns83820.c | |||
| @@ -116,6 +116,7 @@ | |||
| 116 | #include <linux/if_vlan.h> | 116 | #include <linux/if_vlan.h> |
| 117 | #include <linux/rtnetlink.h> | 117 | #include <linux/rtnetlink.h> |
| 118 | #include <linux/jiffies.h> | 118 | #include <linux/jiffies.h> |
| 119 | #include <linux/slab.h> | ||
| 119 | 120 | ||
| 120 | #include <asm/io.h> | 121 | #include <asm/io.h> |
| 121 | #include <asm/uaccess.h> | 122 | #include <asm/uaccess.h> |
diff --git a/drivers/net/octeon/octeon_mgmt.c b/drivers/net/octeon/octeon_mgmt.c index be368e5cbf75..8aadc8e2ddd7 100644 --- a/drivers/net/octeon/octeon_mgmt.c +++ b/drivers/net/octeon/octeon_mgmt.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 14 | #include <linux/etherdevice.h> | 14 | #include <linux/etherdevice.h> |
| 15 | #include <linux/if_vlan.h> | 15 | #include <linux/if_vlan.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/phy.h> | 17 | #include <linux/phy.h> |
| 17 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 18 | 19 | ||
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c index d44d4a208bbf..370c147d08a3 100644 --- a/drivers/net/pasemi_mac.c +++ b/drivers/net/pasemi_mac.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | #include <linux/dmaengine.h> | 25 | #include <linux/dmaengine.h> |
| 25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c index 09291e60d309..9f3d593f14ed 100644 --- a/drivers/net/pcmcia/axnet_cs.c +++ b/drivers/net/pcmcia/axnet_cs.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/ptrace.h> | 30 | #include <linux/ptrace.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/string.h> | 31 | #include <linux/string.h> |
| 33 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
| 34 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c index 1028fcb91a28..4c0368de1815 100644 --- a/drivers/net/pcmcia/pcnet_cs.c +++ b/drivers/net/pcmcia/pcnet_cs.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/ptrace.h> | 34 | #include <linux/ptrace.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/string.h> | 35 | #include <linux/string.h> |
| 37 | #include <linux/timer.h> | 36 | #include <linux/timer.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/cicada.c b/drivers/net/phy/cicada.c index a1bd599c8a5b..92282b31d94b 100644 --- a/drivers/net/phy/cicada.c +++ b/drivers/net/phy/cicada.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/davicom.c b/drivers/net/phy/davicom.c index d926168bc780..c722e95853ff 100644 --- a/drivers/net/phy/davicom.c +++ b/drivers/net/phy/davicom.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/et1011c.c b/drivers/net/phy/et1011c.c index b031fa21f1aa..7712ebeba9bf 100644 --- a/drivers/net/phy/et1011c.c +++ b/drivers/net/phy/et1011c.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/fixed.c b/drivers/net/phy/fixed.c index e7070515d2e3..1fa4d73c3cca 100644 --- a/drivers/net/phy/fixed.c +++ b/drivers/net/phy/fixed.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/phy.h> | 20 | #include <linux/phy.h> |
| 21 | #include <linux/phy_fixed.h> | 21 | #include <linux/phy_fixed.h> |
| 22 | #include <linux/err.h> | 22 | #include <linux/err.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #define MII_REGS_NUM 29 | 25 | #define MII_REGS_NUM 29 |
| 25 | 26 | ||
diff --git a/drivers/net/phy/icplus.c b/drivers/net/phy/icplus.c index af3f1f2a9f87..904208b95d4b 100644 --- a/drivers/net/phy/icplus.c +++ b/drivers/net/phy/icplus.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/unistd.h> | 15 | #include <linux/unistd.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index 4cf3324ba166..057ecaacde6b 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 65ed385c2ceb..64c7fbe0a8e7 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c index 2576055b350b..19e70d7e27ab 100644 --- a/drivers/net/phy/mdio-bitbang.c +++ b/drivers/net/phy/mdio-bitbang.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/mdio-bitbang.h> | 21 | #include <linux/mdio-bitbang.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | 24 | ||
diff --git a/drivers/net/phy/mdio-octeon.c b/drivers/net/phy/mdio-octeon.c index 61a4461cbda5..a872aea4ed74 100644 --- a/drivers/net/phy/mdio-octeon.c +++ b/drivers/net/phy/mdio-octeon.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * Copyright (C) 2009 Cavium Networks | 6 | * Copyright (C) 2009 Cavium Networks |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/gfp.h> | ||
| 9 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 10 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 11 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 0295097d6c44..64be4664ccab 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/unistd.h> | 21 | #include <linux/unistd.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/drivers/net/phy/qsemi.c b/drivers/net/phy/qsemi.c index 23062d067231..f6e190f73c32 100644 --- a/drivers/net/phy/qsemi.c +++ b/drivers/net/phy/qsemi.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 22 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
diff --git a/drivers/net/plip.c b/drivers/net/plip.c index 3327e9fc7b51..9a2103a69e17 100644 --- a/drivers/net/plip.c +++ b/drivers/net/plip.c | |||
| @@ -94,6 +94,7 @@ static const char version[] = "NET3 PLIP version 2.4-parport gniibe@mri.co.jp\n" | |||
| 94 | #include <linux/fcntl.h> | 94 | #include <linux/fcntl.h> |
| 95 | #include <linux/interrupt.h> | 95 | #include <linux/interrupt.h> |
| 96 | #include <linux/string.h> | 96 | #include <linux/string.h> |
| 97 | #include <linux/slab.h> | ||
| 97 | #include <linux/if_ether.h> | 98 | #include <linux/if_ether.h> |
| 98 | #include <linux/in.h> | 99 | #include <linux/in.h> |
| 99 | #include <linux/errno.h> | 100 | #include <linux/errno.h> |
diff --git a/drivers/net/ppp_async.c b/drivers/net/ppp_async.c index 6a375ea4947d..6c2e8fa0ca31 100644 --- a/drivers/net/ppp_async.c +++ b/drivers/net/ppp_async.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/jiffies.h> | 33 | #include <linux/jiffies.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | #include <asm/string.h> | 36 | #include <asm/string.h> |
| 36 | 37 | ||
diff --git a/drivers/net/ppp_generic.c b/drivers/net/ppp_generic.c index 6d61602208c1..6e281bc825e5 100644 --- a/drivers/net/ppp_generic.c +++ b/drivers/net/ppp_generic.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/stddef.h> | 46 | #include <linux/stddef.h> |
| 47 | #include <linux/device.h> | 47 | #include <linux/device.h> |
| 48 | #include <linux/mutex.h> | 48 | #include <linux/mutex.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <net/slhc_vj.h> | 50 | #include <net/slhc_vj.h> |
| 50 | #include <asm/atomic.h> | 51 | #include <asm/atomic.h> |
| 51 | 52 | ||
diff --git a/drivers/net/ppp_synctty.c b/drivers/net/ppp_synctty.c index 3a13cecae3e2..52938da1e542 100644 --- a/drivers/net/ppp_synctty.c +++ b/drivers/net/ppp_synctty.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
| 45 | #include <linux/completion.h> | 45 | #include <linux/completion.h> |
| 46 | #include <linux/init.h> | 46 | #include <linux/init.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
| 48 | 49 | ||
| 49 | #define PPP_VERSION "2.4.2" | 50 | #define PPP_VERSION "2.4.2" |
diff --git a/drivers/net/pppox.c b/drivers/net/pppox.c index ac806b27c658..d4191ef9cad1 100644 --- a/drivers/net/pppox.c +++ b/drivers/net/pppox.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/slab.h> | ||
| 26 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 27 | #include <linux/netdevice.h> | 26 | #include <linux/netdevice.h> |
| 28 | #include <linux/net.h> | 27 | #include <linux/net.h> |
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c index a849f6f23a17..5bf229bb34c2 100644 --- a/drivers/net/ps3_gelic_net.c +++ b/drivers/net/ps3_gelic_net.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <linux/etherdevice.h> | 35 | #include <linux/etherdevice.h> |
| 35 | #include <linux/ethtool.h> | 36 | #include <linux/ethtool.h> |
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c index 2663b2fdc0bb..f0be507e5324 100644 --- a/drivers/net/ps3_gelic_wireless.c +++ b/drivers/net/ps3_gelic_wireless.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/etherdevice.h> | 26 | #include <linux/etherdevice.h> |
| 26 | #include <linux/ethtool.h> | 27 | #include <linux/ethtool.h> |
diff --git a/drivers/net/qlcnic/qlcnic_hw.c b/drivers/net/qlcnic/qlcnic_hw.c index da00e162b6d3..a6ef266a2fe2 100644 --- a/drivers/net/qlcnic/qlcnic_hw.c +++ b/drivers/net/qlcnic/qlcnic_hw.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include "qlcnic.h" | 25 | #include "qlcnic.h" |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 27 | #include <net/ip.h> | 28 | #include <net/ip.h> |
| 28 | 29 | ||
| 29 | #define MASK(n) ((1ULL<<(n))-1) | 30 | #define MASK(n) ((1ULL<<(n))-1) |
diff --git a/drivers/net/qlcnic/qlcnic_init.c b/drivers/net/qlcnic/qlcnic_init.c index 7c34e4e29b3f..9d2c124048fa 100644 --- a/drivers/net/qlcnic/qlcnic_init.c +++ b/drivers/net/qlcnic/qlcnic_init.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "qlcnic.h" | 28 | #include "qlcnic.h" |
| 28 | 29 | ||
| 29 | struct crb_addr_pair { | 30 | struct crb_addr_pair { |
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index fc721564e69e..234dab1f9982 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | * | 22 | * |
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 26 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 27 | 28 | ||
diff --git a/drivers/net/qlge/qlge_dbg.c b/drivers/net/qlge/qlge_dbg.c index ff8550d2ca82..362664628937 100644 --- a/drivers/net/qlge/qlge_dbg.c +++ b/drivers/net/qlge/qlge_dbg.c | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | #include <linux/slab.h> | ||
| 2 | |||
| 1 | #include "qlge.h" | 3 | #include "qlge.h" |
| 2 | 4 | ||
| 3 | /* Read a NIC register from the alternate function. */ | 5 | /* Read a NIC register from the alternate function. */ |
diff --git a/drivers/net/qlge/qlge_ethtool.c b/drivers/net/qlge/qlge_ethtool.c index 7dbff87480dc..7e09ff4a5755 100644 --- a/drivers/net/qlge/qlge_ethtool.c +++ b/drivers/net/qlge/qlge_ethtool.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/dma-mapping.h> | 7 | #include <linux/dma-mapping.h> |
| 8 | #include <linux/pagemap.h> | 8 | #include <linux/pagemap.h> |
| 9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 10 | #include <linux/slab.h> | ||
| 11 | #include <linux/dmapool.h> | 10 | #include <linux/dmapool.h> |
| 12 | #include <linux/mempool.h> | 11 | #include <linux/mempool.h> |
| 13 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
diff --git a/drivers/net/r6040.c b/drivers/net/r6040.c index 15d5373dc8f3..43afdb6b25e6 100644 --- a/drivers/net/r6040.c +++ b/drivers/net/r6040.c | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
| 32 | #include <linux/slab.h> | ||
| 33 | #include <linux/interrupt.h> | 32 | #include <linux/interrupt.h> |
| 34 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 35 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c index ede937ee50c7..07eb884ff982 100644 --- a/drivers/net/rionet.c +++ b/drivers/net/rionet.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/rio.h> | 17 | #include <linux/rio.h> |
| 18 | #include <linux/rio_drv.h> | 18 | #include <linux/rio_drv.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/rio_ids.h> | 20 | #include <linux/rio_ids.h> |
| 20 | 21 | ||
| 21 | #include <linux/netdevice.h> | 22 | #include <linux/netdevice.h> |
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c index 266baf534964..f2e335f0d1b7 100644 --- a/drivers/net/rrunner.c +++ b/drivers/net/rrunner.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 42 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <net/sock.h> | 44 | #include <net/sock.h> |
| 44 | 45 | ||
| 45 | #include <asm/system.h> | 46 | #include <asm/system.h> |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 2eb7f8a0d926..92ae8d3de39b 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
| @@ -79,6 +79,7 @@ | |||
| 79 | #include <linux/tcp.h> | 79 | #include <linux/tcp.h> |
| 80 | #include <linux/uaccess.h> | 80 | #include <linux/uaccess.h> |
| 81 | #include <linux/io.h> | 81 | #include <linux/io.h> |
| 82 | #include <linux/slab.h> | ||
| 82 | #include <net/tcp.h> | 83 | #include <net/tcp.h> |
| 83 | 84 | ||
| 84 | #include <asm/system.h> | 85 | #include <asm/system.h> |
diff --git a/drivers/net/sb1000.c b/drivers/net/sb1000.c index 9f83a1197375..abc8eefdd4b6 100644 --- a/drivers/net/sb1000.c +++ b/drivers/net/sb1000.c | |||
| @@ -42,7 +42,6 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 42 | #include <linux/errno.h> | 42 | #include <linux/errno.h> |
| 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ | 43 | #include <linux/if_cablemodem.h> /* for SIOGCM/SIOSCM stuff */ |
| 44 | #include <linux/in.h> | 44 | #include <linux/in.h> |
| 45 | #include <linux/slab.h> | ||
| 46 | #include <linux/ioport.h> | 45 | #include <linux/ioport.h> |
| 47 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 48 | #include <linux/if_arp.h> | 47 | #include <linux/if_arp.h> |
| @@ -52,6 +51,7 @@ static char version[] = "sb1000.c:v1.1.2 6/01/98 (fventuri@mediaone.net)\n"; | |||
| 52 | #include <linux/pnp.h> | 51 | #include <linux/pnp.h> |
| 53 | #include <linux/init.h> | 52 | #include <linux/init.h> |
| 54 | #include <linux/bitops.h> | 53 | #include <linux/bitops.h> |
| 54 | #include <linux/gfp.h> | ||
| 55 | 55 | ||
| 56 | #include <asm/io.h> | 56 | #include <asm/io.h> |
| 57 | #include <asm/processor.h> | 57 | #include <asm/processor.h> |
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index fe806bd9b95f..374832cca11f 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
| @@ -37,7 +37,6 @@ static const char version[] = | |||
| 37 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| 38 | #include <linux/ioport.h> | 38 | #include <linux/ioport.h> |
| 39 | #include <linux/in.h> | 39 | #include <linux/in.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index 88f2fb193abe..6486657c47b8 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/crc32.h> | 20 | #include <linux/crc32.h> |
| 21 | #include <linux/ethtool.h> | 21 | #include <linux/ethtool.h> |
| 22 | #include <linux/topology.h> | 22 | #include <linux/topology.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include "net_driver.h" | 24 | #include "net_driver.h" |
| 24 | #include "efx.h" | 25 | #include "efx.h" |
| 25 | #include "mdio_10g.h" | 26 | #include "mdio_10g.h" |
diff --git a/drivers/net/sfc/falcon.c b/drivers/net/sfc/falcon.c index 1b8d83657aaa..d294d66fd600 100644 --- a/drivers/net/sfc/falcon.c +++ b/drivers/net/sfc/falcon.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/seq_file.h> | 15 | #include <linux/seq_file.h> |
| 16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 17 | #include <linux/mii.h> | 17 | #include <linux/mii.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include "net_driver.h" | 19 | #include "net_driver.h" |
| 19 | #include "bitfield.h" | 20 | #include "bitfield.h" |
| 20 | #include "efx.h" | 21 | #include "efx.h" |
diff --git a/drivers/net/sfc/mcdi_phy.c b/drivers/net/sfc/mcdi_phy.c index 34c22fa986e2..2f2354696663 100644 --- a/drivers/net/sfc/mcdi_phy.c +++ b/drivers/net/sfc/mcdi_phy.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | * Driver for PHY related operations via MCDI. | 11 | * Driver for PHY related operations via MCDI. |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 14 | #include "efx.h" | 15 | #include "efx.h" |
| 15 | #include "phy.h" | 16 | #include "phy.h" |
| 16 | #include "mcdi.h" | 17 | #include "mcdi.h" |
diff --git a/drivers/net/sfc/mtd.c b/drivers/net/sfc/mtd.c index 407bbaddfea6..f3ac7f30b5e7 100644 --- a/drivers/net/sfc/mtd.c +++ b/drivers/net/sfc/mtd.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/mtd/mtd.h> | 13 | #include <linux/mtd/mtd.h> |
| 14 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/rtnetlink.h> | 16 | #include <linux/rtnetlink.h> |
| 16 | 17 | ||
| 17 | #define EFX_DRIVER_NAME "sfc_mtd" | 18 | #define EFX_DRIVER_NAME "sfc_mtd" |
diff --git a/drivers/net/sfc/qt202x_phy.c b/drivers/net/sfc/qt202x_phy.c index 1bee62c83001..e077bef08a50 100644 --- a/drivers/net/sfc/qt202x_phy.c +++ b/drivers/net/sfc/qt202x_phy.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * Driver for AMCC QT202x SFP+ and XFP adapters; see www.amcc.com for details | 10 | * Driver for AMCC QT202x SFP+ and XFP adapters; see www.amcc.com for details |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include "efx.h" | 16 | #include "efx.h" |
diff --git a/drivers/net/sfc/rx.c b/drivers/net/sfc/rx.c index a97c923b560c..e308818b9f55 100644 --- a/drivers/net/sfc/rx.c +++ b/drivers/net/sfc/rx.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/socket.h> | 11 | #include <linux/socket.h> |
| 12 | #include <linux/in.h> | 12 | #include <linux/in.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/ip.h> | 14 | #include <linux/ip.h> |
| 14 | #include <linux/tcp.h> | 15 | #include <linux/tcp.h> |
| 15 | #include <linux/udp.h> | 16 | #include <linux/udp.h> |
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index cf0139a7d9a4..0106b1d9aae2 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/in.h> | 18 | #include <linux/in.h> |
| 19 | #include <linux/udp.h> | 19 | #include <linux/udp.h> |
| 20 | #include <linux/rtnetlink.h> | 20 | #include <linux/rtnetlink.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <asm/io.h> | 22 | #include <asm/io.h> |
| 22 | #include "net_driver.h" | 23 | #include "net_driver.h" |
| 23 | #include "efx.h" | 24 | #include "efx.h" |
diff --git a/drivers/net/sfc/siena.c b/drivers/net/sfc/siena.c index 1619fb5a64f5..38dcc42c4f79 100644 --- a/drivers/net/sfc/siena.c +++ b/drivers/net/sfc/siena.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include "net_driver.h" | 16 | #include "net_driver.h" |
| 16 | #include "bitfield.h" | 17 | #include "bitfield.h" |
| 17 | #include "efx.h" | 18 | #include "efx.h" |
diff --git a/drivers/net/sfc/tenxpress.c b/drivers/net/sfc/tenxpress.c index 10db071bd837..f21efe7bd316 100644 --- a/drivers/net/sfc/tenxpress.c +++ b/drivers/net/sfc/tenxpress.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | #include <linux/rtnetlink.h> | 11 | #include <linux/rtnetlink.h> |
| 12 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include "efx.h" | 14 | #include "efx.h" |
| 14 | #include "mdio_10g.h" | 15 | #include "mdio_10g.h" |
| 15 | #include "nic.h" | 16 | #include "nic.h" |
diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c index a8b70ef6d817..be0e110a1f73 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/sfc/tx.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/ip.h> | 13 | #include <linux/ip.h> |
| 14 | #include <linux/in.h> | 14 | #include <linux/in.h> |
| 15 | #include <linux/ipv6.h> | 15 | #include <linux/ipv6.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <net/ipv6.h> | 17 | #include <net/ipv6.h> |
| 17 | #include <linux/if_ether.h> | 18 | #include <linux/if_ether.h> |
| 18 | #include <linux/highmem.h> | 19 | #include <linux/highmem.h> |
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c index ed999d31f1fa..beb537dbe9a9 100644 --- a/drivers/net/sgiseeq.c +++ b/drivers/net/sgiseeq.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 13 | #include <linux/types.h> | 14 | #include <linux/types.h> |
diff --git a/drivers/net/sh_eth.c b/drivers/net/sh_eth.c index 42a35f086a9f..6242b85d5d15 100644 --- a/drivers/net/sh_eth.c +++ b/drivers/net/sh_eth.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/cache.h> | 31 | #include <linux/cache.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/pm_runtime.h> | 33 | #include <linux/pm_runtime.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/cacheflush.h> | 35 | #include <asm/cacheflush.h> |
| 35 | 36 | ||
| 36 | #include "sh_eth.h" | 37 | #include "sh_eth.h" |
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index 760d9e83a465..b30ce752bbf3 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/crc32.h> | 33 | #include <linux/crc32.h> |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
| 36 | 37 | ||
| 37 | #define PHY_MAX_ADDR 32 | 38 | #define PHY_MAX_ADDR 32 |
diff --git a/drivers/net/skfp/skfddi.c b/drivers/net/skfp/skfddi.c index 1921a54ea995..d9016b75abc2 100644 --- a/drivers/net/skfp/skfddi.c +++ b/drivers/net/skfp/skfddi.c | |||
| @@ -78,13 +78,13 @@ static const char * const boot_msg = | |||
| 78 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
| 79 | #include <linux/errno.h> | 79 | #include <linux/errno.h> |
| 80 | #include <linux/ioport.h> | 80 | #include <linux/ioport.h> |
| 81 | #include <linux/slab.h> | ||
| 82 | #include <linux/interrupt.h> | 81 | #include <linux/interrupt.h> |
| 83 | #include <linux/pci.h> | 82 | #include <linux/pci.h> |
| 84 | #include <linux/netdevice.h> | 83 | #include <linux/netdevice.h> |
| 85 | #include <linux/fddidevice.h> | 84 | #include <linux/fddidevice.h> |
| 86 | #include <linux/skbuff.h> | 85 | #include <linux/skbuff.h> |
| 87 | #include <linux/bitops.h> | 86 | #include <linux/bitops.h> |
| 87 | #include <linux/gfp.h> | ||
| 88 | 88 | ||
| 89 | #include <asm/byteorder.h> | 89 | #include <asm/byteorder.h> |
| 90 | #include <asm/io.h> | 90 | #include <asm/io.h> |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index d0058e5bb6ae..50eb70609f20 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
| 43 | #include <linux/seq_file.h> | 43 | #include <linux/seq_file.h> |
| 44 | #include <linux/mii.h> | 44 | #include <linux/mii.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <asm/irq.h> | 46 | #include <asm/irq.h> |
| 46 | 47 | ||
| 47 | #include "skge.h" | 48 | #include "skge.h" |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index d8ec4c11fd49..088c797eb73b 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/ethtool.h> | 33 | #include <linux/ethtool.h> |
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/ip.h> | 35 | #include <linux/ip.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <net/ip.h> | 37 | #include <net/ip.h> |
| 37 | #include <linux/tcp.h> | 38 | #include <linux/tcp.h> |
| 38 | #include <linux/in.h> | 39 | #include <linux/in.h> |
diff --git a/drivers/net/slhc.c b/drivers/net/slhc.c index d640c0f5470b..140d63f3cafa 100644 --- a/drivers/net/slhc.c +++ b/drivers/net/slhc.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | */ | 51 | */ |
| 52 | 52 | ||
| 53 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 55 | #include <linux/string.h> | 56 | #include <linux/string.h> |
| 56 | #include <linux/errno.h> | 57 | #include <linux/errno.h> |
diff --git a/drivers/net/slip.c b/drivers/net/slip.c index ba5bbc503446..89696156c059 100644 --- a/drivers/net/slip.c +++ b/drivers/net/slip.c | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | #include <linux/compat.h> | 83 | #include <linux/compat.h> |
| 84 | #include <linux/delay.h> | 84 | #include <linux/delay.h> |
| 85 | #include <linux/init.h> | 85 | #include <linux/init.h> |
| 86 | #include <linux/slab.h> | ||
| 86 | #include "slip.h" | 87 | #include "slip.h" |
| 87 | #ifdef CONFIG_INET | 88 | #ifdef CONFIG_INET |
| 88 | #include <linux/ip.h> | 89 | #include <linux/ip.h> |
diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 9871a2b61f86..635820d42b19 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c | |||
| @@ -59,7 +59,6 @@ static const char version[] = | |||
| 59 | #include <linux/module.h> | 59 | #include <linux/module.h> |
| 60 | #include <linux/kernel.h> | 60 | #include <linux/kernel.h> |
| 61 | #include <linux/sched.h> | 61 | #include <linux/sched.h> |
| 62 | #include <linux/slab.h> | ||
| 63 | #include <linux/delay.h> | 62 | #include <linux/delay.h> |
| 64 | #include <linux/interrupt.h> | 63 | #include <linux/interrupt.h> |
| 65 | #include <linux/errno.h> | 64 | #include <linux/errno.h> |
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c index f9a960e7fc1f..3f2f7843aa4e 100644 --- a/drivers/net/smc9194.c +++ b/drivers/net/smc9194.c | |||
| @@ -64,7 +64,6 @@ static const char version[] = | |||
| 64 | #include <linux/interrupt.h> | 64 | #include <linux/interrupt.h> |
| 65 | #include <linux/ioport.h> | 65 | #include <linux/ioport.h> |
| 66 | #include <linux/in.h> | 66 | #include <linux/in.h> |
| 67 | #include <linux/slab.h> | ||
| 68 | #include <linux/string.h> | 67 | #include <linux/string.h> |
| 69 | #include <linux/init.h> | 68 | #include <linux/init.h> |
| 70 | #include <linux/crc32.h> | 69 | #include <linux/crc32.h> |
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index fc1b5a1a3583..860339d51d58 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
| @@ -70,7 +70,6 @@ static const char version[] = | |||
| 70 | #include <linux/module.h> | 70 | #include <linux/module.h> |
| 71 | #include <linux/kernel.h> | 71 | #include <linux/kernel.h> |
| 72 | #include <linux/sched.h> | 72 | #include <linux/sched.h> |
| 73 | #include <linux/slab.h> | ||
| 74 | #include <linux/delay.h> | 73 | #include <linux/delay.h> |
| 75 | #include <linux/interrupt.h> | 74 | #include <linux/interrupt.h> |
| 76 | #include <linux/errno.h> | 75 | #include <linux/errno.h> |
diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c index 4fd1d8b38788..cbf520d38eac 100644 --- a/drivers/net/smsc911x.c +++ b/drivers/net/smsc911x.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/netdevice.h> | 41 | #include <linux/netdevice.h> |
| 42 | #include <linux/platform_device.h> | 42 | #include <linux/platform_device.h> |
| 43 | #include <linux/sched.h> | 43 | #include <linux/sched.h> |
| 44 | #include <linux/slab.h> | ||
| 45 | #include <linux/timer.h> | 44 | #include <linux/timer.h> |
| 46 | #include <linux/bug.h> | 45 | #include <linux/bug.h> |
| 47 | #include <linux/bitops.h> | 46 | #include <linux/bitops.h> |
diff --git a/drivers/net/smsc9420.c b/drivers/net/smsc9420.c index 34fa10d8ad40..aafaebf45748 100644 --- a/drivers/net/smsc9420.c +++ b/drivers/net/smsc9420.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/if_vlan.h> | 26 | #include <linux/if_vlan.h> |
| 27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
| 28 | #include <linux/crc32.h> | 28 | #include <linux/crc32.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/unaligned.h> | 30 | #include <asm/unaligned.h> |
| 30 | #include "smsc9420.h" | 31 | #include "smsc9420.h" |
| 31 | 32 | ||
diff --git a/drivers/net/sni_82596.c b/drivers/net/sni_82596.c index 854ccf2b4105..6b2a88817473 100644 --- a/drivers/net/sni_82596.c +++ b/drivers/net/sni_82596.c | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 9 | #include <linux/errno.h> | 9 | #include <linux/errno.h> |
| 10 | #include <linux/ioport.h> | 10 | #include <linux/ioport.h> |
| 11 | #include <linux/slab.h> | ||
| 12 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 13 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 14 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 5ba9d989f8fc..dd3cb0f2d21f 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/if_vlan.h> | 31 | #include <linux/if_vlan.h> |
| 32 | #include <linux/in.h> | 32 | #include <linux/in.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/gfp.h> | ||
| 34 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 35 | #include <linux/ip.h> | 36 | #include <linux/ip.h> |
| 36 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| @@ -40,7 +41,6 @@ | |||
| 40 | #include <linux/device.h> | 41 | #include <linux/device.h> |
| 41 | #include <linux/pci.h> | 42 | #include <linux/pci.h> |
| 42 | #include <linux/skbuff.h> | 43 | #include <linux/skbuff.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/tcp.h> | 44 | #include <linux/tcp.h> |
| 45 | #include <linux/types.h> | 45 | #include <linux/types.h> |
| 46 | #include <linux/vmalloc.h> | 46 | #include <linux/vmalloc.h> |
diff --git a/drivers/net/stmmac/dwmac100.c b/drivers/net/stmmac/dwmac100.c index 803b0373d843..4cacca614fc1 100644 --- a/drivers/net/stmmac/dwmac100.c +++ b/drivers/net/stmmac/dwmac100.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
| 31 | #include <linux/phy.h> | 31 | #include <linux/phy.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include "common.h" | 34 | #include "common.h" |
| 34 | #include "dwmac100.h" | 35 | #include "dwmac100.h" |
diff --git a/drivers/net/stmmac/dwmac1000_core.c b/drivers/net/stmmac/dwmac1000_core.c index a6538ae4694c..5bd95ebfe498 100644 --- a/drivers/net/stmmac/dwmac1000_core.c +++ b/drivers/net/stmmac/dwmac1000_core.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | *******************************************************************************/ | 27 | *******************************************************************************/ |
| 28 | 28 | ||
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include "dwmac1000.h" | 31 | #include "dwmac1000.h" |
| 31 | 32 | ||
| 32 | static void dwmac1000_core_init(unsigned long ioaddr) | 33 | static void dwmac1000_core_init(unsigned long ioaddr) |
diff --git a/drivers/net/stmmac/stmmac_main.c b/drivers/net/stmmac/stmmac_main.c index a6733612d64a..a214a1627e8b 100644 --- a/drivers/net/stmmac/stmmac_main.c +++ b/drivers/net/stmmac/stmmac_main.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/phy.h> | 44 | #include <linux/phy.h> |
| 45 | #include <linux/if_vlan.h> | 45 | #include <linux/if_vlan.h> |
| 46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include "stmmac.h" | 48 | #include "stmmac.h" |
| 48 | 49 | ||
| 49 | #define STMMAC_RESOURCE_NAME "stmmaceth" | 50 | #define STMMAC_RESOURCE_NAME "stmmaceth" |
diff --git a/drivers/net/stmmac/stmmac_mdio.c b/drivers/net/stmmac/stmmac_mdio.c index fffe1d037fe6..40b2c7929719 100644 --- a/drivers/net/stmmac/stmmac_mdio.c +++ b/drivers/net/stmmac/stmmac_mdio.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | 26 | ||
| 27 | #include <linux/mii.h> | 27 | #include <linux/mii.h> |
| 28 | #include <linux/phy.h> | 28 | #include <linux/phy.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "stmmac.h" | 31 | #include "stmmac.h" |
| 31 | 32 | ||
diff --git a/drivers/net/sun3_82586.c b/drivers/net/sun3_82586.c index 2f6a760e5f21..8b28c89a9a77 100644 --- a/drivers/net/sun3_82586.c +++ b/drivers/net/sun3_82586.c | |||
| @@ -33,7 +33,6 @@ static int fifo=0x8; /* don't change */ | |||
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/init.h> | 38 | #include <linux/init.h> |
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 99998862c22e..1694ca5bfb41 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
| @@ -28,7 +28,6 @@ static char *version = "sun3lance.c: v1.2 1/12/2001 Sam Creasey (sammy@sammy.ne | |||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/interrupt.h> | 31 | #include <linux/interrupt.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c index a0bd361d5eca..ed7865a0b5b2 100644 --- a/drivers/net/sunbmac.c +++ b/drivers/net/sunbmac.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/interrupt.h> | 11 | #include <linux/interrupt.h> |
| 12 | #include <linux/ioport.h> | 12 | #include <linux/ioport.h> |
| 13 | #include <linux/in.h> | 13 | #include <linux/in.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| @@ -25,6 +24,7 @@ | |||
| 25 | #include <linux/dma-mapping.h> | 24 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/of.h> | 25 | #include <linux/of.h> |
| 27 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
| 27 | #include <linux/gfp.h> | ||
| 28 | 28 | ||
| 29 | #include <asm/auxio.h> | 29 | #include <asm/auxio.h> |
| 30 | #include <asm/byteorder.h> | 30 | #include <asm/byteorder.h> |
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c index a855934dfc3b..8249a394a4e1 100644 --- a/drivers/net/sundance.c +++ b/drivers/net/sundance.c | |||
| @@ -84,7 +84,6 @@ static char *media[MAX_UNITS]; | |||
| 84 | #include <linux/timer.h> | 84 | #include <linux/timer.h> |
| 85 | #include <linux/errno.h> | 85 | #include <linux/errno.h> |
| 86 | #include <linux/ioport.h> | 86 | #include <linux/ioport.h> |
| 87 | #include <linux/slab.h> | ||
| 88 | #include <linux/interrupt.h> | 87 | #include <linux/interrupt.h> |
| 89 | #include <linux/pci.h> | 88 | #include <linux/pci.h> |
| 90 | #include <linux/netdevice.h> | 89 | #include <linux/netdevice.h> |
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c index 70196bc5fe61..e6880f1c4e8c 100644 --- a/drivers/net/sungem.c +++ b/drivers/net/sungem.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/ioport.h> | 39 | #include <linux/ioport.h> |
| 40 | #include <linux/in.h> | 40 | #include <linux/in.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/string.h> | 42 | #include <linux/string.h> |
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| @@ -58,6 +57,7 @@ | |||
| 58 | #include <linux/bitops.h> | 57 | #include <linux/bitops.h> |
| 59 | #include <linux/mutex.h> | 58 | #include <linux/mutex.h> |
| 60 | #include <linux/mm.h> | 59 | #include <linux/mm.h> |
| 60 | #include <linux/gfp.h> | ||
| 61 | 61 | ||
| 62 | #include <asm/system.h> | 62 | #include <asm/system.h> |
| 63 | #include <asm/io.h> | 63 | #include <asm/io.h> |
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index d7c73f478ef5..0c21653ff9f9 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
| @@ -78,7 +78,6 @@ static char lancestr[] = "LANCE"; | |||
| 78 | #include <linux/interrupt.h> | 78 | #include <linux/interrupt.h> |
| 79 | #include <linux/ioport.h> | 79 | #include <linux/ioport.h> |
| 80 | #include <linux/in.h> | 80 | #include <linux/in.h> |
| 81 | #include <linux/slab.h> | ||
| 82 | #include <linux/string.h> | 81 | #include <linux/string.h> |
| 83 | #include <linux/delay.h> | 82 | #include <linux/delay.h> |
| 84 | #include <linux/init.h> | 83 | #include <linux/init.h> |
| @@ -94,6 +93,7 @@ static char lancestr[] = "LANCE"; | |||
| 94 | #include <linux/dma-mapping.h> | 93 | #include <linux/dma-mapping.h> |
| 95 | #include <linux/of.h> | 94 | #include <linux/of.h> |
| 96 | #include <linux/of_device.h> | 95 | #include <linux/of_device.h> |
| 96 | #include <linux/gfp.h> | ||
| 97 | 97 | ||
| 98 | #include <asm/system.h> | 98 | #include <asm/system.h> |
| 99 | #include <asm/io.h> | 99 | #include <asm/io.h> |
diff --git a/drivers/net/tehuti.h b/drivers/net/tehuti.h index a19dcf8b6b56..cff98d07cba8 100644 --- a/drivers/net/tehuti.h +++ b/drivers/net/tehuti.h | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/firmware.h> | 32 | #include <linux/firmware.h> |
| 33 | #include <asm/byteorder.h> | 33 | #include <asm/byteorder.h> |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | /* Compile Time Switches */ | 37 | /* Compile Time Switches */ |
| 37 | /* start */ | 38 | /* start */ |
diff --git a/drivers/net/tokenring/3c359.c b/drivers/net/tokenring/3c359.c index 0fb930feea45..7d7f3eef1ab3 100644 --- a/drivers/net/tokenring/3c359.c +++ b/drivers/net/tokenring/3c359.c | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | #include <linux/spinlock.h> | 63 | #include <linux/spinlock.h> |
| 64 | #include <linux/bitops.h> | 64 | #include <linux/bitops.h> |
| 65 | #include <linux/firmware.h> | 65 | #include <linux/firmware.h> |
| 66 | #include <linux/slab.h> | ||
| 66 | 67 | ||
| 67 | #include <net/checksum.h> | 68 | #include <net/checksum.h> |
| 68 | 69 | ||
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c index dd028fee9dc2..7a5fbf5a9d71 100644 --- a/drivers/net/tokenring/lanstreamer.c +++ b/drivers/net/tokenring/lanstreamer.c | |||
| @@ -121,6 +121,7 @@ | |||
| 121 | #include <linux/spinlock.h> | 121 | #include <linux/spinlock.h> |
| 122 | #include <linux/bitops.h> | 122 | #include <linux/bitops.h> |
| 123 | #include <linux/jiffies.h> | 123 | #include <linux/jiffies.h> |
| 124 | #include <linux/slab.h> | ||
| 124 | 125 | ||
| 125 | #include <net/net_namespace.h> | 126 | #include <net/net_namespace.h> |
| 126 | #include <net/checksum.h> | 127 | #include <net/checksum.h> |
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c index 456f8bff40be..53f631ebb162 100644 --- a/drivers/net/tokenring/madgemc.c +++ b/drivers/net/tokenring/madgemc.c | |||
| @@ -21,6 +21,7 @@ static const char version[] = "madgemc.c: v0.91 23/01/2000 by Adam Fritzler\n"; | |||
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/mca.h> | 23 | #include <linux/mca.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 26 | #include <linux/init.h> | 27 | #include <linux/init.h> |
diff --git a/drivers/net/tokenring/smctr.c b/drivers/net/tokenring/smctr.c index 5401d86a7be4..e40560137c46 100644 --- a/drivers/net/tokenring/smctr.c +++ b/drivers/net/tokenring/smctr.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/ptrace.h> | 36 | #include <linux/ptrace.h> |
| 37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 38 | #include <linux/in.h> | 38 | #include <linux/in.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 41 | #include <linux/time.h> | 40 | #include <linux/time.h> |
| 42 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
diff --git a/drivers/net/tokenring/tms380tr.c b/drivers/net/tokenring/tms380tr.c index ee71bcfb3753..8b508c922410 100644 --- a/drivers/net/tokenring/tms380tr.c +++ b/drivers/net/tokenring/tms380tr.c | |||
| @@ -85,7 +85,6 @@ static const char version[] = "tms380tr.c: v1.10 30/12/2002 by Christoph Goos, A | |||
| 85 | #include <linux/ptrace.h> | 85 | #include <linux/ptrace.h> |
| 86 | #include <linux/ioport.h> | 86 | #include <linux/ioport.h> |
| 87 | #include <linux/in.h> | 87 | #include <linux/in.h> |
| 88 | #include <linux/slab.h> | ||
| 89 | #include <linux/string.h> | 88 | #include <linux/string.h> |
| 90 | #include <linux/time.h> | 89 | #include <linux/time.h> |
| 91 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 647cdd1d4e20..5b1fbb3c3b51 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c | |||
| @@ -38,7 +38,6 @@ | |||
| 38 | #include <linux/etherdevice.h> | 38 | #include <linux/etherdevice.h> |
| 39 | #include <linux/ethtool.h> | 39 | #include <linux/ethtool.h> |
| 40 | #include <linux/skbuff.h> | 40 | #include <linux/skbuff.h> |
| 41 | #include <linux/slab.h> | ||
| 42 | #include <linux/spinlock.h> | 41 | #include <linux/spinlock.h> |
| 43 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
| 44 | #include <linux/crc32.h> | 43 | #include <linux/crc32.h> |
| @@ -48,6 +47,7 @@ | |||
| 48 | #include <linux/rtnetlink.h> | 47 | #include <linux/rtnetlink.h> |
| 49 | #include <linux/timer.h> | 48 | #include <linux/timer.h> |
| 50 | #include <linux/platform_device.h> | 49 | #include <linux/platform_device.h> |
| 50 | #include <linux/gfp.h> | ||
| 51 | 51 | ||
| 52 | #include <asm/system.h> | 52 | #include <asm/system.h> |
| 53 | #include <asm/io.h> | 53 | #include <asm/io.h> |
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index cb429723b2c8..19cafc2b418d 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/compiler.h> | 42 | #include <linux/compiler.h> |
| 43 | #include <linux/rtnetlink.h> | 43 | #include <linux/rtnetlink.h> |
| 44 | #include <linux/crc32.h> | 44 | #include <linux/crc32.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | 46 | ||
| 46 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 47 | #include <asm/irq.h> | 48 | #include <asm/irq.h> |
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c index c4ecb9a95409..09b57193a16a 100644 --- a/drivers/net/tulip/de4x5.c +++ b/drivers/net/tulip/de4x5.c | |||
| @@ -450,7 +450,6 @@ | |||
| 450 | #include <linux/ptrace.h> | 450 | #include <linux/ptrace.h> |
| 451 | #include <linux/errno.h> | 451 | #include <linux/errno.h> |
| 452 | #include <linux/ioport.h> | 452 | #include <linux/ioport.h> |
| 453 | #include <linux/slab.h> | ||
| 454 | #include <linux/pci.h> | 453 | #include <linux/pci.h> |
| 455 | #include <linux/eisa.h> | 454 | #include <linux/eisa.h> |
| 456 | #include <linux/delay.h> | 455 | #include <linux/delay.h> |
| @@ -467,6 +466,7 @@ | |||
| 467 | #include <linux/dma-mapping.h> | 466 | #include <linux/dma-mapping.h> |
| 468 | #include <linux/moduleparam.h> | 467 | #include <linux/moduleparam.h> |
| 469 | #include <linux/bitops.h> | 468 | #include <linux/bitops.h> |
| 469 | #include <linux/gfp.h> | ||
| 470 | 470 | ||
| 471 | #include <asm/io.h> | 471 | #include <asm/io.h> |
| 472 | #include <asm/dma.h> | 472 | #include <asm/dma.h> |
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 95b38d803e9b..9568156dea98 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
| @@ -74,7 +74,6 @@ | |||
| 74 | #include <linux/ptrace.h> | 74 | #include <linux/ptrace.h> |
| 75 | #include <linux/errno.h> | 75 | #include <linux/errno.h> |
| 76 | #include <linux/ioport.h> | 76 | #include <linux/ioport.h> |
| 77 | #include <linux/slab.h> | ||
| 78 | #include <linux/interrupt.h> | 77 | #include <linux/interrupt.h> |
| 79 | #include <linux/pci.h> | 78 | #include <linux/pci.h> |
| 80 | #include <linux/dma-mapping.h> | 79 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/tulip/eeprom.c b/drivers/net/tulip/eeprom.c index 49f05d1431f5..6002e651b9ea 100644 --- a/drivers/net/tulip/eeprom.c +++ b/drivers/net/tulip/eeprom.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include "tulip.h" | 17 | #include "tulip.h" |
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <asm/unaligned.h> | 19 | #include <asm/unaligned.h> |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 7f544ef2f5fc..3810db9dc2de 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "tulip.h" | 28 | #include "tulip.h" |
| 28 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 29 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index a4f09d490531..a589dd34891e 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/timer.h> | 25 | #include <linux/timer.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 30 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c index 304f43866c44..98dbf6cc1d68 100644 --- a/drivers/net/tulip/winbond-840.c +++ b/drivers/net/tulip/winbond-840.c | |||
| @@ -114,7 +114,6 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; | |||
| 114 | #include <linux/timer.h> | 114 | #include <linux/timer.h> |
| 115 | #include <linux/errno.h> | 115 | #include <linux/errno.h> |
| 116 | #include <linux/ioport.h> | 116 | #include <linux/ioport.h> |
| 117 | #include <linux/slab.h> | ||
| 118 | #include <linux/interrupt.h> | 117 | #include <linux/interrupt.h> |
| 119 | #include <linux/pci.h> | 118 | #include <linux/pci.h> |
| 120 | #include <linux/dma-mapping.h> | 119 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c index cd24e5f2b2a2..98d818daa77e 100644 --- a/drivers/net/typhoon.c +++ b/drivers/net/typhoon.c | |||
| @@ -109,7 +109,6 @@ static const int multicast_filter_limit = 32; | |||
| 109 | #include <linux/timer.h> | 109 | #include <linux/timer.h> |
| 110 | #include <linux/errno.h> | 110 | #include <linux/errno.h> |
| 111 | #include <linux/ioport.h> | 111 | #include <linux/ioport.h> |
| 112 | #include <linux/slab.h> | ||
| 113 | #include <linux/interrupt.h> | 112 | #include <linux/interrupt.h> |
| 114 | #include <linux/pci.h> | 113 | #include <linux/pci.h> |
| 115 | #include <linux/netdevice.h> | 114 | #include <linux/netdevice.h> |
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index 7075f26e97da..6f92e48f02d3 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/stddef.h> | 21 | #include <linux/stddef.h> |
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 24 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
diff --git a/drivers/net/usb/asix.c b/drivers/net/usb/asix.c index 9e05639435f2..35f56fc82803 100644 --- a/drivers/net/usb/asix.c +++ b/drivers/net/usb/asix.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
| 35 | #include <linux/crc32.h> | 35 | #include <linux/crc32.h> |
| 36 | #include <linux/usb/usbnet.h> | 36 | #include <linux/usb/usbnet.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #define DRIVER_VERSION "14-Jun-2006" | 39 | #define DRIVER_VERSION "14-Jun-2006" |
| 39 | static const char driver_name [] = "asix"; | 40 | static const char driver_name [] = "asix"; |
diff --git a/drivers/net/usb/catc.c b/drivers/net/usb/catc.c index 96f1ebe0d348..602e123b2741 100644 --- a/drivers/net/usb/catc.c +++ b/drivers/net/usb/catc.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/netdevice.h> | 39 | #include <linux/netdevice.h> |
| 41 | #include <linux/etherdevice.h> | 40 | #include <linux/etherdevice.h> |
| 42 | #include <linux/skbuff.h> | 41 | #include <linux/skbuff.h> |
| @@ -44,6 +43,7 @@ | |||
| 44 | #include <linux/ethtool.h> | 43 | #include <linux/ethtool.h> |
| 45 | #include <linux/crc32.h> | 44 | #include <linux/crc32.h> |
| 46 | #include <linux/bitops.h> | 45 | #include <linux/bitops.h> |
| 46 | #include <linux/gfp.h> | ||
| 47 | #include <asm/uaccess.h> | 47 | #include <asm/uaccess.h> |
| 48 | 48 | ||
| 49 | #undef DEBUG | 49 | #undef DEBUG |
diff --git a/drivers/net/usb/cdc-phonet.c b/drivers/net/usb/cdc-phonet.c index 6491c9c00c83..dc9444525b49 100644 --- a/drivers/net/usb/cdc-phonet.c +++ b/drivers/net/usb/cdc-phonet.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/gfp.h> | ||
| 25 | #include <linux/usb.h> | 26 | #include <linux/usb.h> |
| 26 | #include <linux/usb/cdc.h> | 27 | #include <linux/usb/cdc.h> |
| 27 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
diff --git a/drivers/net/usb/cdc_eem.c b/drivers/net/usb/cdc_eem.c index a4a85a6ed86d..5f3b97668e63 100644 --- a/drivers/net/usb/cdc_eem.c +++ b/drivers/net/usb/cdc_eem.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/crc32.h> | 30 | #include <linux/crc32.h> |
| 31 | #include <linux/usb/cdc.h> | 31 | #include <linux/usb/cdc.h> |
| 32 | #include <linux/usb/usbnet.h> | 32 | #include <linux/usb/usbnet.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | 34 | ||
| 34 | 35 | ||
| 35 | /* | 36 | /* |
diff --git a/drivers/net/usb/dm9601.c b/drivers/net/usb/dm9601.c index 269339769f47..04b281002a76 100644 --- a/drivers/net/usb/dm9601.c +++ b/drivers/net/usb/dm9601.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/usb.h> | 21 | #include <linux/usb.h> |
| 22 | #include <linux/crc32.h> | 22 | #include <linux/crc32.h> |
| 23 | #include <linux/usb/usbnet.h> | 23 | #include <linux/usb/usbnet.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | /* datasheet: | 26 | /* datasheet: |
| 26 | http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-930914.pdf | 27 | http://ptm2.cc.utu.fi/ftp/network/cards/DM9601/From_NET/DM9601-DS-P01-930914.pdf |
diff --git a/drivers/net/usb/gl620a.c b/drivers/net/usb/gl620a.c index f7ccfad9384e..dcd57c37ef73 100644 --- a/drivers/net/usb/gl620a.c +++ b/drivers/net/usb/gl620a.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/mii.h> | 30 | #include <linux/mii.h> |
| 31 | #include <linux/usb.h> | 31 | #include <linux/usb.h> |
| 32 | #include <linux/usb/usbnet.h> | 32 | #include <linux/usb/usbnet.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | 34 | ||
| 34 | 35 | ||
| 35 | /* | 36 | /* |
diff --git a/drivers/net/usb/int51x1.c b/drivers/net/usb/int51x1.c index 3c228df57062..be02a25da71a 100644 --- a/drivers/net/usb/int51x1.c +++ b/drivers/net/usb/int51x1.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/netdevice.h> | 29 | #include <linux/netdevice.h> |
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/ethtool.h> | 31 | #include <linux/ethtool.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/mii.h> | 33 | #include <linux/mii.h> |
| 33 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
| 34 | #include <linux/usb/usbnet.h> | 35 | #include <linux/usb/usbnet.h> |
diff --git a/drivers/net/usb/mcs7830.c b/drivers/net/usb/mcs7830.c index 70978219e98a..9f24e3f871e1 100644 --- a/drivers/net/usb/mcs7830.c +++ b/drivers/net/usb/mcs7830.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/mii.h> | 44 | #include <linux/mii.h> |
| 45 | #include <linux/module.h> | 45 | #include <linux/module.h> |
| 46 | #include <linux/netdevice.h> | 46 | #include <linux/netdevice.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <linux/usb.h> | 48 | #include <linux/usb.h> |
| 48 | #include <linux/usb/usbnet.h> | 49 | #include <linux/usb/usbnet.h> |
| 49 | 50 | ||
diff --git a/drivers/net/usb/net1080.c b/drivers/net/usb/net1080.c index bdcad45954a3..961a8ed38d8f 100644 --- a/drivers/net/usb/net1080.c +++ b/drivers/net/usb/net1080.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/mii.h> | 29 | #include <linux/mii.h> |
| 30 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
| 31 | #include <linux/usb/usbnet.h> | 31 | #include <linux/usb/usbnet.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/unaligned.h> | 34 | #include <asm/unaligned.h> |
| 34 | 35 | ||
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 4ce331fb1e1e..dd8a4adf48ca 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
| 23 | #include <linux/ethtool.h> | 23 | #include <linux/ethtool.h> |
| 24 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/mii.h> | 26 | #include <linux/mii.h> |
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | #include <linux/usb/cdc.h> | 28 | #include <linux/usb/cdc.h> |
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index 300e3e764fa2..35b98b1b79e4 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/usb/usbnet.h> | 30 | #include <linux/usb/usbnet.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include "smsc75xx.h" | 32 | #include "smsc75xx.h" |
| 32 | 33 | ||
| 33 | #define SMSC_CHIPNAME "smsc75xx" | 34 | #define SMSC_CHIPNAME "smsc75xx" |
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 73f9a31cf94d..3135af63d378 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/usb/usbnet.h> | 30 | #include <linux/usb/usbnet.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include "smsc95xx.h" | 32 | #include "smsc95xx.h" |
| 32 | 33 | ||
| 33 | #define SMSC_CHIPNAME "smsc95xx" | 34 | #define SMSC_CHIPNAME "smsc95xx" |
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 17b6a62d206e..7177abc78dc6 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/mii.h> | 43 | #include <linux/mii.h> |
| 44 | #include <linux/usb.h> | 44 | #include <linux/usb.h> |
| 45 | #include <linux/usb/usbnet.h> | 45 | #include <linux/usb/usbnet.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | 47 | ||
| 47 | #define DRIVER_VERSION "22-Aug-2005" | 48 | #define DRIVER_VERSION "22-Aug-2005" |
| 48 | 49 | ||
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index b583d4968add..f9f0730b53d5 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/netdevice.h> | 11 | #include <linux/netdevice.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/ethtool.h> | 13 | #include <linux/ethtool.h> |
| 13 | #include <linux/etherdevice.h> | 14 | #include <linux/etherdevice.h> |
| 14 | 15 | ||
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 50f881aa3939..388751aa66e0 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
| @@ -89,7 +89,6 @@ static const int multicast_filter_limit = 32; | |||
| 89 | #include <linux/timer.h> | 89 | #include <linux/timer.h> |
| 90 | #include <linux/errno.h> | 90 | #include <linux/errno.h> |
| 91 | #include <linux/ioport.h> | 91 | #include <linux/ioport.h> |
| 92 | #include <linux/slab.h> | ||
| 93 | #include <linux/interrupt.h> | 92 | #include <linux/interrupt.h> |
| 94 | #include <linux/pci.h> | 93 | #include <linux/pci.h> |
| 95 | #include <linux/dma-mapping.h> | 94 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index 25dc77ccbf58..6fb783ce20b9 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/virtio_net.h> | 25 | #include <linux/virtio_net.h> |
| 26 | #include <linux/scatterlist.h> | 26 | #include <linux/scatterlist.h> |
| 27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | static int napi_weight = 128; | 30 | static int napi_weight = 128; |
| 30 | module_param(napi_weight, int, 0444); | 31 | module_param(napi_weight, int, 0444); |
diff --git a/drivers/net/vxge/vxge-config.c b/drivers/net/vxge/vxge-config.c index 32a75fa935ed..a21a25d218b6 100644 --- a/drivers/net/vxge/vxge-config.c +++ b/drivers/net/vxge/vxge-config.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/etherdevice.h> | 15 | #include <linux/etherdevice.h> |
| 16 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 17 | #include <linux/pci_hotplug.h> | 17 | #include <linux/pci_hotplug.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include "vxge-traffic.h" | 20 | #include "vxge-traffic.h" |
| 20 | #include "vxge-config.h" | 21 | #include "vxge-config.h" |
diff --git a/drivers/net/vxge/vxge-config.h b/drivers/net/vxge/vxge-config.h index e7877df092f3..13f5416307f8 100644 --- a/drivers/net/vxge/vxge-config.h +++ b/drivers/net/vxge/vxge-config.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #ifndef VXGE_CONFIG_H | 14 | #ifndef VXGE_CONFIG_H |
| 15 | #define VXGE_CONFIG_H | 15 | #define VXGE_CONFIG_H |
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #ifndef VXGE_CACHE_LINE_SIZE | 19 | #ifndef VXGE_CACHE_LINE_SIZE |
| 19 | #define VXGE_CACHE_LINE_SIZE 128 | 20 | #define VXGE_CACHE_LINE_SIZE 128 |
diff --git a/drivers/net/vxge/vxge-ethtool.c b/drivers/net/vxge/vxge-ethtool.c index c6736b972635..aaf374cfd322 100644 --- a/drivers/net/vxge/vxge-ethtool.c +++ b/drivers/net/vxge/vxge-ethtool.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * Copyright(c) 2002-2009 Neterion Inc. | 12 | * Copyright(c) 2002-2009 Neterion Inc. |
| 13 | ******************************************************************************/ | 13 | ******************************************************************************/ |
| 14 | #include<linux/ethtool.h> | 14 | #include<linux/ethtool.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 16 | #include <linux/etherdevice.h> | 17 | #include <linux/etherdevice.h> |
| 17 | 18 | ||
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c index 46a7c9e689ec..ba6d0da78c30 100644 --- a/drivers/net/vxge/vxge-main.c +++ b/drivers/net/vxge/vxge-main.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | 43 | ||
| 44 | #include <linux/if_vlan.h> | 44 | #include <linux/if_vlan.h> |
| 45 | #include <linux/pci.h> | 45 | #include <linux/pci.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/tcp.h> | 47 | #include <linux/tcp.h> |
| 47 | #include <net/ip.h> | 48 | #include <net/ip.h> |
| 48 | #include <linux/netdevice.h> | 49 | #include <linux/netdevice.h> |
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c index f88c07c13197..a4859f7a7cc0 100644 --- a/drivers/net/wan/dscc4.c +++ b/drivers/net/wan/dscc4.c | |||
| @@ -89,6 +89,7 @@ | |||
| 89 | #include <linux/pci.h> | 89 | #include <linux/pci.h> |
| 90 | #include <linux/kernel.h> | 90 | #include <linux/kernel.h> |
| 91 | #include <linux/mm.h> | 91 | #include <linux/mm.h> |
| 92 | #include <linux/slab.h> | ||
| 92 | 93 | ||
| 93 | #include <asm/system.h> | 94 | #include <asm/system.h> |
| 94 | #include <asm/cache.h> | 95 | #include <asm/cache.h> |
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 40d724a8e020..e087b9a6daaa 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/version.h> | 20 | #include <linux/version.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <linux/if.h> | 26 | #include <linux/if.h> |
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index 80114c93bae7..4dde2ea4a189 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/netdevice.h> | 38 | #include <linux/netdevice.h> |
| 39 | #include <linux/skbuff.h> | 39 | #include <linux/skbuff.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 42 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 43 | #include <asm/io.h> | 42 | #include <asm/io.h> |
diff --git a/drivers/net/wan/hd64572.c b/drivers/net/wan/hd64572.c index 84f01373e11f..aad9ed45c254 100644 --- a/drivers/net/wan/hd64572.c +++ b/drivers/net/wan/hd64572.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/netdevice.h> | 38 | #include <linux/netdevice.h> |
| 39 | #include <linux/skbuff.h> | 39 | #include <linux/skbuff.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 42 | #include <linux/types.h> | 41 | #include <linux/types.h> |
| 43 | #include <asm/io.h> | 42 | #include <asm/io.h> |
diff --git a/drivers/net/wan/hdlc_cisco.c b/drivers/net/wan/hdlc_cisco.c index 1ceccf1ca6c7..ee7083fbea50 100644 --- a/drivers/net/wan/hdlc_cisco.c +++ b/drivers/net/wan/hdlc_cisco.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
| 21 | #include <linux/rtnetlink.h> | 21 | #include <linux/rtnetlink.h> |
| 22 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | 23 | ||
| 25 | #undef DEBUG_HARD_HEADER | 24 | #undef DEBUG_HARD_HEADER |
| 26 | 25 | ||
diff --git a/drivers/net/wan/hdlc_raw.c b/drivers/net/wan/hdlc_raw.c index 19f51fdd5522..5dc153e8a29d 100644 --- a/drivers/net/wan/hdlc_raw.c +++ b/drivers/net/wan/hdlc_raw.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
| 21 | #include <linux/rtnetlink.h> | 21 | #include <linux/rtnetlink.h> |
| 22 | #include <linux/skbuff.h> | 22 | #include <linux/skbuff.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | 23 | ||
| 25 | 24 | ||
| 26 | static int raw_ioctl(struct net_device *dev, struct ifreq *ifr); | 25 | static int raw_ioctl(struct net_device *dev, struct ifreq *ifr); |
diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c index 1b30fcc24145..05c9b0b96239 100644 --- a/drivers/net/wan/hdlc_raw_eth.c +++ b/drivers/net/wan/hdlc_raw_eth.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/etherdevice.h> | 13 | #include <linux/etherdevice.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <linux/hdlc.h> | 15 | #include <linux/hdlc.h> |
| 15 | #include <linux/if_arp.h> | 16 | #include <linux/if_arp.h> |
| 16 | #include <linux/inetdevice.h> | 17 | #include <linux/inetdevice.h> |
| @@ -21,7 +22,6 @@ | |||
| 21 | #include <linux/poll.h> | 22 | #include <linux/poll.h> |
| 22 | #include <linux/rtnetlink.h> | 23 | #include <linux/rtnetlink.h> |
| 23 | #include <linux/skbuff.h> | 24 | #include <linux/skbuff.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | 25 | ||
| 26 | static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr); | 26 | static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr); |
| 27 | 27 | ||
diff --git a/drivers/net/wan/hdlc_x25.c b/drivers/net/wan/hdlc_x25.c index 6e1ca256effd..c7adbb79f7cc 100644 --- a/drivers/net/wan/hdlc_x25.c +++ b/drivers/net/wan/hdlc_x25.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/gfp.h> | ||
| 13 | #include <linux/hdlc.h> | 14 | #include <linux/hdlc.h> |
| 14 | #include <linux/if_arp.h> | 15 | #include <linux/if_arp.h> |
| 15 | #include <linux/inetdevice.h> | 16 | #include <linux/inetdevice.h> |
| @@ -21,7 +22,6 @@ | |||
| 21 | #include <linux/poll.h> | 22 | #include <linux/poll.h> |
| 22 | #include <linux/rtnetlink.h> | 23 | #include <linux/rtnetlink.h> |
| 23 | #include <linux/skbuff.h> | 24 | #include <linux/skbuff.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <net/x25device.h> | 25 | #include <net/x25device.h> |
| 26 | 26 | ||
| 27 | static int x25_ioctl(struct net_device *dev, struct ifreq *ifr); | 27 | static int x25_ioctl(struct net_device *dev, struct ifreq *ifr); |
diff --git a/drivers/net/wan/hostess_sv11.c b/drivers/net/wan/hostess_sv11.c index 74164d29524c..48edc5f4dac8 100644 --- a/drivers/net/wan/hostess_sv11.c +++ b/drivers/net/wan/hostess_sv11.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/hdlc.h> | 31 | #include <linux/hdlc.h> |
| 32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <net/arp.h> | 34 | #include <net/arp.h> |
| 34 | 35 | ||
| 35 | #include <asm/irq.h> | 36 | #include <asm/irq.h> |
diff --git a/drivers/net/wan/ixp4xx_hss.c b/drivers/net/wan/ixp4xx_hss.c index c705046d8615..0c2cdde686a0 100644 --- a/drivers/net/wan/ixp4xx_hss.c +++ b/drivers/net/wan/ixp4xx_hss.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <mach/npe.h> | 22 | #include <mach/npe.h> |
| 22 | #include <mach/qmgr.h> | 23 | #include <mach/qmgr.h> |
| 23 | 24 | ||
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index d1e3c673e9b2..98e2f99903d7 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/socket.h> | 25 | #include <linux/socket.h> |
| 26 | #include <linux/in.h> | 26 | #include <linux/in.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 28 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 29 | #include <linux/net.h> | 30 | #include <linux/net.h> |
diff --git a/drivers/net/wan/lmc/lmc_media.c b/drivers/net/wan/lmc/lmc_media.c index f327674fc93a..5920c996fcdf 100644 --- a/drivers/net/wan/lmc/lmc_media.c +++ b/drivers/net/wan/lmc/lmc_media.c | |||
| @@ -6,7 +6,6 @@ | |||
| 6 | #include <linux/ptrace.h> | 6 | #include <linux/ptrace.h> |
| 7 | #include <linux/errno.h> | 7 | #include <linux/errno.h> |
| 8 | #include <linux/ioport.h> | 8 | #include <linux/ioport.h> |
| 9 | #include <linux/slab.h> | ||
| 10 | #include <linux/interrupt.h> | 9 | #include <linux/interrupt.h> |
| 11 | #include <linux/in.h> | 10 | #include <linux/in.h> |
| 12 | #include <linux/if_arp.h> | 11 | #include <linux/if_arp.h> |
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index 044a48175c42..f600075e84a2 100644 --- a/drivers/net/wan/lmc/lmc_proto.c +++ b/drivers/net/wan/lmc/lmc_proto.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/ioport.h> | 27 | #include <linux/ioport.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 30 | #include <linux/in.h> | 29 | #include <linux/in.h> |
| 31 | #include <linux/if_arp.h> | 30 | #include <linux/if_arp.h> |
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index f4f1c00d0d23..3f744c643094 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
| @@ -228,6 +228,7 @@ static char rcsid[] = | |||
| 228 | #include <linux/etherdevice.h> | 228 | #include <linux/etherdevice.h> |
| 229 | #include <linux/spinlock.h> | 229 | #include <linux/spinlock.h> |
| 230 | #include <linux/if.h> | 230 | #include <linux/if.h> |
| 231 | #include <linux/slab.h> | ||
| 231 | #include <net/arp.h> | 232 | #include <net/arp.h> |
| 232 | 233 | ||
| 233 | #include <asm/io.h> | 234 | #include <asm/io.h> |
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 25477b5cde47..cff13a9597cd 100644 --- a/drivers/net/wan/sbni.c +++ b/drivers/net/wan/sbni.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | #include <linux/fcntl.h> | 43 | #include <linux/fcntl.h> |
| 44 | #include <linux/ioport.h> | 44 | #include <linux/ioport.h> |
| 45 | #include <linux/interrupt.h> | 45 | #include <linux/interrupt.h> |
| 46 | #include <linux/slab.h> | ||
| 47 | #include <linux/string.h> | 46 | #include <linux/string.h> |
| 48 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
| 49 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
diff --git a/drivers/net/wan/sealevel.c b/drivers/net/wan/sealevel.c index 61249f489e37..e91457d6023e 100644 --- a/drivers/net/wan/sealevel.c +++ b/drivers/net/wan/sealevel.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/hdlc.h> | 23 | #include <linux/hdlc.h> |
| 24 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <net/arp.h> | 27 | #include <net/arp.h> |
| 27 | 28 | ||
| 28 | #include <asm/irq.h> | 29 | #include <asm/irq.h> |
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c index b9f520b7db6a..80d5c5834a0b 100644 --- a/drivers/net/wan/x25_asy.c +++ b/drivers/net/wan/x25_asy.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/rtnetlink.h> | 35 | #include <linux/rtnetlink.h> |
| 36 | #include <linux/compat.h> | 36 | #include <linux/compat.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include "x25_asy.h" | 38 | #include "x25_asy.h" |
| 38 | 39 | ||
| 39 | #include <net/x25device.h> | 40 | #include <net/x25device.h> |
diff --git a/drivers/net/wan/z85230.c b/drivers/net/wan/z85230.c index 0be7ec7299db..fbf5e843d48c 100644 --- a/drivers/net/wan/z85230.c +++ b/drivers/net/wan/z85230.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/hdlc.h> | 47 | #include <linux/hdlc.h> |
| 48 | #include <linux/ioport.h> | 48 | #include <linux/ioport.h> |
| 49 | #include <linux/init.h> | 49 | #include <linux/init.h> |
| 50 | #include <linux/gfp.h> | ||
| 50 | #include <asm/dma.h> | 51 | #include <asm/dma.h> |
| 51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 52 | #define RT_LOCK | 53 | #define RT_LOCK |
diff --git a/drivers/net/wimax/i2400m/control.c b/drivers/net/wimax/i2400m/control.c index 944945540391..6180772dcc09 100644 --- a/drivers/net/wimax/i2400m/control.c +++ b/drivers/net/wimax/i2400m/control.c | |||
| @@ -76,6 +76,7 @@ | |||
| 76 | #include <stdarg.h> | 76 | #include <stdarg.h> |
| 77 | #include "i2400m.h" | 77 | #include "i2400m.h" |
| 78 | #include <linux/kernel.h> | 78 | #include <linux/kernel.h> |
| 79 | #include <linux/slab.h> | ||
| 79 | #include <linux/wimax/i2400m.h> | 80 | #include <linux/wimax/i2400m.h> |
| 80 | 81 | ||
| 81 | 82 | ||
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c index 6cead321bc15..94dc83c3969d 100644 --- a/drivers/net/wimax/i2400m/driver.c +++ b/drivers/net/wimax/i2400m/driver.c | |||
| @@ -69,6 +69,7 @@ | |||
| 69 | #include <linux/module.h> | 69 | #include <linux/module.h> |
| 70 | #include <linux/moduleparam.h> | 70 | #include <linux/moduleparam.h> |
| 71 | #include <linux/suspend.h> | 71 | #include <linux/suspend.h> |
| 72 | #include <linux/slab.h> | ||
| 72 | 73 | ||
| 73 | #define D_SUBMODULE driver | 74 | #define D_SUBMODULE driver |
| 74 | #include "debug-levels.h" | 75 | #include "debug-levels.h" |
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 25c24f0368d8..3f283bff0ff7 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c | |||
| @@ -156,6 +156,7 @@ | |||
| 156 | */ | 156 | */ |
| 157 | #include <linux/firmware.h> | 157 | #include <linux/firmware.h> |
| 158 | #include <linux/sched.h> | 158 | #include <linux/sched.h> |
| 159 | #include <linux/slab.h> | ||
| 159 | #include <linux/usb.h> | 160 | #include <linux/usb.h> |
| 160 | #include "i2400m.h" | 161 | #include "i2400m.h" |
| 161 | 162 | ||
diff --git a/drivers/net/wimax/i2400m/netdev.c b/drivers/net/wimax/i2400m/netdev.c index 599aa4eb9baa..b811c2f1f5e9 100644 --- a/drivers/net/wimax/i2400m/netdev.c +++ b/drivers/net/wimax/i2400m/netdev.c | |||
| @@ -73,6 +73,7 @@ | |||
| 73 | * alloc_netdev. | 73 | * alloc_netdev. |
| 74 | */ | 74 | */ |
| 75 | #include <linux/if_arp.h> | 75 | #include <linux/if_arp.h> |
| 76 | #include <linux/slab.h> | ||
| 76 | #include <linux/netdevice.h> | 77 | #include <linux/netdevice.h> |
| 77 | #include <linux/ethtool.h> | 78 | #include <linux/ethtool.h> |
| 78 | #include "i2400m.h" | 79 | #include "i2400m.h" |
diff --git a/drivers/net/wimax/i2400m/op-rfkill.c b/drivers/net/wimax/i2400m/op-rfkill.c index 43927b5d7ad6..035e4cf3e6ed 100644 --- a/drivers/net/wimax/i2400m/op-rfkill.c +++ b/drivers/net/wimax/i2400m/op-rfkill.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | */ | 34 | */ |
| 35 | #include "i2400m.h" | 35 | #include "i2400m.h" |
| 36 | #include <linux/wimax/i2400m.h> | 36 | #include <linux/wimax/i2400m.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | 39 | ||
| 39 | 40 | ||
diff --git a/drivers/net/wimax/i2400m/rx.c b/drivers/net/wimax/i2400m/rx.c index 7ddb173fd4a7..fa2e11e5b4b9 100644 --- a/drivers/net/wimax/i2400m/rx.c +++ b/drivers/net/wimax/i2400m/rx.c | |||
| @@ -144,6 +144,7 @@ | |||
| 144 | * i2400m_msg_size_check | 144 | * i2400m_msg_size_check |
| 145 | * wimax_msg | 145 | * wimax_msg |
| 146 | */ | 146 | */ |
| 147 | #include <linux/slab.h> | ||
| 147 | #include <linux/kernel.h> | 148 | #include <linux/kernel.h> |
| 148 | #include <linux/if_arp.h> | 149 | #include <linux/if_arp.h> |
| 149 | #include <linux/netdevice.h> | 150 | #include <linux/netdevice.h> |
diff --git a/drivers/net/wimax/i2400m/sdio-rx.c b/drivers/net/wimax/i2400m/sdio-rx.c index 8adf6c9b6f8f..d619da33f20b 100644 --- a/drivers/net/wimax/i2400m/sdio-rx.c +++ b/drivers/net/wimax/i2400m/sdio-rx.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #include <linux/skbuff.h> | 65 | #include <linux/skbuff.h> |
| 66 | #include <linux/mmc/sdio.h> | 66 | #include <linux/mmc/sdio.h> |
| 67 | #include <linux/mmc/sdio_func.h> | 67 | #include <linux/mmc/sdio_func.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include "i2400m-sdio.h" | 69 | #include "i2400m-sdio.h" |
| 69 | 70 | ||
| 70 | #define D_SUBMODULE rx | 71 | #define D_SUBMODULE rx |
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c index 14f876b1358b..7632f80954e3 100644 --- a/drivers/net/wimax/i2400m/sdio.c +++ b/drivers/net/wimax/i2400m/sdio.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | * __i2400ms_send_barker() | 48 | * __i2400ms_send_barker() |
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #include <linux/slab.h> | ||
| 51 | #include <linux/debugfs.h> | 52 | #include <linux/debugfs.h> |
| 52 | #include <linux/mmc/sdio_ids.h> | 53 | #include <linux/mmc/sdio_ids.h> |
| 53 | #include <linux/mmc/sdio.h> | 54 | #include <linux/mmc/sdio.h> |
diff --git a/drivers/net/wimax/i2400m/tx.c b/drivers/net/wimax/i2400m/tx.c index 54480e8947f1..b0cb90624cf6 100644 --- a/drivers/net/wimax/i2400m/tx.c +++ b/drivers/net/wimax/i2400m/tx.c | |||
| @@ -244,6 +244,7 @@ | |||
| 244 | * (FIFO empty). | 244 | * (FIFO empty). |
| 245 | */ | 245 | */ |
| 246 | #include <linux/netdevice.h> | 246 | #include <linux/netdevice.h> |
| 247 | #include <linux/slab.h> | ||
| 247 | #include "i2400m.h" | 248 | #include "i2400m.h" |
| 248 | 249 | ||
| 249 | 250 | ||
diff --git a/drivers/net/wimax/i2400m/usb-fw.c b/drivers/net/wimax/i2400m/usb-fw.c index ce6b9938fde0..b58ec56b86f8 100644 --- a/drivers/net/wimax/i2400m/usb-fw.c +++ b/drivers/net/wimax/i2400m/usb-fw.c | |||
| @@ -73,6 +73,7 @@ | |||
| 73 | * i2400m_notif_submit | 73 | * i2400m_notif_submit |
| 74 | */ | 74 | */ |
| 75 | #include <linux/usb.h> | 75 | #include <linux/usb.h> |
| 76 | #include <linux/gfp.h> | ||
| 76 | #include "i2400m-usb.h" | 77 | #include "i2400m-usb.h" |
| 77 | 78 | ||
| 78 | 79 | ||
diff --git a/drivers/net/wimax/i2400m/usb-notif.c b/drivers/net/wimax/i2400m/usb-notif.c index f88d1c6e35cb..7b6a1d98bd74 100644 --- a/drivers/net/wimax/i2400m/usb-notif.c +++ b/drivers/net/wimax/i2400m/usb-notif.c | |||
| @@ -56,6 +56,7 @@ | |||
| 56 | * i2400mu_rx_kick() | 56 | * i2400mu_rx_kick() |
| 57 | */ | 57 | */ |
| 58 | #include <linux/usb.h> | 58 | #include <linux/usb.h> |
| 59 | #include <linux/slab.h> | ||
| 59 | #include "i2400m-usb.h" | 60 | #include "i2400m-usb.h" |
| 60 | 61 | ||
| 61 | 62 | ||
diff --git a/drivers/net/wimax/i2400m/usb-rx.c b/drivers/net/wimax/i2400m/usb-rx.c index ba1b02362dfc..a26483a812a5 100644 --- a/drivers/net/wimax/i2400m/usb-rx.c +++ b/drivers/net/wimax/i2400m/usb-rx.c | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | * i2400mu_rx_release() called from i2400mu_bus_dev_stop() | 83 | * i2400mu_rx_release() called from i2400mu_bus_dev_stop() |
| 84 | */ | 84 | */ |
| 85 | #include <linux/workqueue.h> | 85 | #include <linux/workqueue.h> |
| 86 | #include <linux/slab.h> | ||
| 86 | #include <linux/usb.h> | 87 | #include <linux/usb.h> |
| 87 | #include "i2400m-usb.h" | 88 | #include "i2400m-usb.h" |
| 88 | 89 | ||
diff --git a/drivers/net/wimax/i2400m/usb.c b/drivers/net/wimax/i2400m/usb.c index 99f04c475898..d8c4d6497fdf 100644 --- a/drivers/net/wimax/i2400m/usb.c +++ b/drivers/net/wimax/i2400m/usb.c | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | #include "i2400m-usb.h" | 66 | #include "i2400m-usb.h" |
| 67 | #include <linux/wimax/i2400m.h> | 67 | #include <linux/wimax/i2400m.h> |
| 68 | #include <linux/debugfs.h> | 68 | #include <linux/debugfs.h> |
| 69 | #include <linux/slab.h> | ||
| 69 | 70 | ||
| 70 | 71 | ||
| 71 | #define D_SUBMODULE usb | 72 | #define D_SUBMODULE usb |
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c index 547912e6843f..ab61d2b558d6 100644 --- a/drivers/net/wireless/adm8211.c +++ b/drivers/net/wireless/adm8211.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/if.h> | 19 | #include <linux/if.h> |
| 20 | #include <linux/skbuff.h> | 20 | #include <linux/skbuff.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
| 22 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/ath/ar9170/main.c b/drivers/net/wireless/ath/ar9170/main.c index 257c734733d1..c53692980990 100644 --- a/drivers/net/wireless/ath/ar9170/main.c +++ b/drivers/net/wireless/ath/ar9170/main.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/init.h> | 40 | #include <linux/init.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/module.h> | 42 | #include <linux/module.h> |
| 42 | #include <linux/etherdevice.h> | 43 | #include <linux/etherdevice.h> |
| 43 | #include <net/mac80211.h> | 44 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c index 4e30197afff6..0b0d2dc2f38c 100644 --- a/drivers/net/wireless/ath/ar9170/usb.c +++ b/drivers/net/wireless/ath/ar9170/usb.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| 40 | #include <linux/module.h> | 40 | #include <linux/module.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/usb.h> | 42 | #include <linux/usb.h> |
| 42 | #include <linux/firmware.h> | 43 | #include <linux/firmware.h> |
| 43 | #include <linux/etherdevice.h> | 44 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/wireless/ath/ath5k/attach.c b/drivers/net/wireless/ath/ath5k/attach.c index 42284445b75e..dc0786cc2639 100644 --- a/drivers/net/wireless/ath/ath5k/attach.c +++ b/drivers/net/wireless/ath/ath5k/attach.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | \*************************************/ | 21 | \*************************************/ |
| 22 | 22 | ||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include "ath5k.h" | 25 | #include "ath5k.h" |
| 25 | #include "reg.h" | 26 | #include "reg.h" |
| 26 | #include "debug.h" | 27 | #include "debug.h" |
diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 8dce0077b023..3abbe7513ab5 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
| 51 | #include <linux/ethtool.h> | 51 | #include <linux/ethtool.h> |
| 52 | #include <linux/uaccess.h> | 52 | #include <linux/uaccess.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #include <net/ieee80211_radiotap.h> | 55 | #include <net/ieee80211_radiotap.h> |
| 55 | 56 | ||
diff --git a/drivers/net/wireless/ath/ath5k/eeprom.c b/drivers/net/wireless/ath/ath5k/eeprom.c index 10b52262b232..67665cdc7afe 100644 --- a/drivers/net/wireless/ath/ath5k/eeprom.c +++ b/drivers/net/wireless/ath/ath5k/eeprom.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | * EEPROM access functions and helpers * | 21 | * EEPROM access functions and helpers * |
| 22 | \*************************************/ | 22 | \*************************************/ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 25 | |||
| 24 | #include "ath5k.h" | 26 | #include "ath5k.h" |
| 25 | #include "reg.h" | 27 | #include "reg.h" |
| 26 | #include "debug.h" | 28 | #include "debug.h" |
diff --git a/drivers/net/wireless/ath/ath5k/phy.c b/drivers/net/wireless/ath/ath5k/phy.c index eff3323efb4b..68e2bccd90d3 100644 --- a/drivers/net/wireless/ath/ath5k/phy.c +++ b/drivers/net/wireless/ath/ath5k/phy.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #define _ATH5K_PHY | 23 | #define _ATH5K_PHY |
| 24 | 24 | ||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "ath5k.h" | 28 | #include "ath5k.h" |
| 28 | #include "reg.h" | 29 | #include "reg.h" |
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c index 42d2a506845a..081e0085ed4c 100644 --- a/drivers/net/wireless/ath/ath9k/debug.c +++ b/drivers/net/wireless/ath/ath9k/debug.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/slab.h> | ||
| 17 | #include <asm/unaligned.h> | 18 | #include <asm/unaligned.h> |
| 18 | 19 | ||
| 19 | #include "ath9k.h" | 20 | #include "ath9k.h" |
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 2e767cf22f1e..78b571129c92 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/unaligned.h> | 19 | #include <asm/unaligned.h> |
| 19 | 20 | ||
| 20 | #include "hw.h" | 21 | #include "hw.h" |
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c index 623c2f884987..3d4d897add6d 100644 --- a/drivers/net/wireless/ath/ath9k/init.c +++ b/drivers/net/wireless/ath/ath9k/init.c | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/slab.h> | ||
| 18 | |||
| 17 | #include "ath9k.h" | 19 | #include "ath9k.h" |
| 18 | 20 | ||
| 19 | static char *dev_info = "ath9k"; | 21 | static char *dev_info = "ath9k"; |
diff --git a/drivers/net/wireless/ath/ath9k/phy.c b/drivers/net/wireless/ath/ath9k/phy.c index c3b59390fe38..2547b3c4a26c 100644 --- a/drivers/net/wireless/ath/ath9k/phy.c +++ b/drivers/net/wireless/ath/ath9k/phy.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | * AR9287 - 11n single-band 1x1 MIMO for USB | 39 | * AR9287 - 11n single-band 1x1 MIMO for USB |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/slab.h> | ||
| 43 | |||
| 42 | #include "hw.h" | 44 | #include "hw.h" |
| 43 | 45 | ||
| 44 | /** | 46 | /** |
diff --git a/drivers/net/wireless/ath/ath9k/rc.c b/drivers/net/wireless/ath/ath9k/rc.c index 0e79e58cf4c9..244e1c629177 100644 --- a/drivers/net/wireless/ath/ath9k/rc.c +++ b/drivers/net/wireless/ath/ath9k/rc.c | |||
| @@ -15,6 +15,8 @@ | |||
| 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 15 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/slab.h> | ||
| 19 | |||
| 18 | #include "ath9k.h" | 20 | #include "ath9k.h" |
| 19 | 21 | ||
| 20 | static const struct ath_rate_table ar5416_11na_ratetable = { | 22 | static const struct ath_rate_table ar5416_11na_ratetable = { |
diff --git a/drivers/net/wireless/ath/ath9k/virtual.c b/drivers/net/wireless/ath/ath9k/virtual.c index a43fbf84dab9..00c0e21a4af7 100644 --- a/drivers/net/wireless/ath/ath9k/virtual.c +++ b/drivers/net/wireless/ath/ath9k/virtual.c | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/slab.h> | ||
| 18 | |||
| 17 | #include "ath9k.h" | 19 | #include "ath9k.h" |
| 18 | 20 | ||
| 19 | struct ath9k_vif_iter_data { | 21 | struct ath9k_vif_iter_data { |
diff --git a/drivers/net/wireless/ath/regd.c b/drivers/net/wireless/ath/regd.c index 04abd1f556b7..00489c40be0c 100644 --- a/drivers/net/wireless/ath/regd.c +++ b/drivers/net/wireless/ath/regd.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <net/cfg80211.h> | 18 | #include <net/cfg80211.h> |
| 20 | #include <net/mac80211.h> | 19 | #include <net/mac80211.h> |
| 21 | #include "regd.h" | 20 | #include "regd.h" |
diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c index be7abf8916ad..fa40fdfea719 100644 --- a/drivers/net/wireless/b43/dma.c +++ b/drivers/net/wireless/b43/dma.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 39 | #include <linux/skbuff.h> | 39 | #include <linux/skbuff.h> |
| 40 | #include <linux/etherdevice.h> | 40 | #include <linux/etherdevice.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <asm/div64.h> | 42 | #include <asm/div64.h> |
| 42 | 43 | ||
| 43 | 44 | ||
diff --git a/drivers/net/wireless/b43/lo.c b/drivers/net/wireless/b43/lo.c index 976104f634a1..94e4f1378fc3 100644 --- a/drivers/net/wireless/b43/lo.c +++ b/drivers/net/wireless/b43/lo.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | 34 | ||
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/sched.h> | 36 | #include <linux/sched.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | 39 | ||
| 39 | static struct b43_lo_calib *b43_find_lo_calib(struct b43_txpower_lo_control *lo, | 40 | static struct b43_lo_calib *b43_find_lo_calib(struct b43_txpower_lo_control *lo, |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 1521b1e78d21..9a374ef83a22 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/skbuff.h> | 42 | #include <linux/skbuff.h> |
| 43 | #include <linux/io.h> | 43 | #include <linux/io.h> |
| 44 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <asm/unaligned.h> | 46 | #include <asm/unaligned.h> |
| 46 | 47 | ||
| 47 | #include "b43.h" | 48 | #include "b43.h" |
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c index 984174bc7b0f..609e7051e018 100644 --- a/drivers/net/wireless/b43/pcmcia.c +++ b/drivers/net/wireless/b43/pcmcia.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include "pcmcia.h" | 24 | #include "pcmcia.h" |
| 25 | 25 | ||
| 26 | #include <linux/ssb/ssb.h> | 26 | #include <linux/ssb/ssb.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <pcmcia/cs_types.h> | 29 | #include <pcmcia/cs_types.h> |
| 29 | #include <pcmcia/cs.h> | 30 | #include <pcmcia/cs.h> |
diff --git a/drivers/net/wireless/b43/phy_a.c b/drivers/net/wireless/b43/phy_a.c index d90217c3a706..b6428ec16dd6 100644 --- a/drivers/net/wireless/b43/phy_a.c +++ b/drivers/net/wireless/b43/phy_a.c | |||
| @@ -26,6 +26,8 @@ | |||
| 26 | 26 | ||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/slab.h> | ||
| 30 | |||
| 29 | #include "b43.h" | 31 | #include "b43.h" |
| 30 | #include "phy_a.h" | 32 | #include "phy_a.h" |
| 31 | #include "phy_common.h" | 33 | #include "phy_common.h" |
diff --git a/drivers/net/wireless/b43/phy_g.c b/drivers/net/wireless/b43/phy_g.c index 382826a8da82..29bf34ced865 100644 --- a/drivers/net/wireless/b43/phy_g.c +++ b/drivers/net/wireless/b43/phy_g.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include "main.h" | 33 | #include "main.h" |
| 34 | 34 | ||
| 35 | #include <linux/bitrev.h> | 35 | #include <linux/bitrev.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | 38 | ||
| 38 | static const s8 b43_tssi2dbm_g_table[] = { | 39 | static const s8 b43_tssi2dbm_g_table[] = { |
diff --git a/drivers/net/wireless/b43/phy_lp.c b/drivers/net/wireless/b43/phy_lp.c index 185219e0a552..c6afe9d94590 100644 --- a/drivers/net/wireless/b43/phy_lp.c +++ b/drivers/net/wireless/b43/phy_lp.c | |||
| @@ -23,6 +23,8 @@ | |||
| 23 | 23 | ||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 27 | |||
| 26 | #include "b43.h" | 28 | #include "b43.h" |
| 27 | #include "main.h" | 29 | #include "main.h" |
| 28 | #include "phy_lp.h" | 30 | #include "phy_lp.h" |
diff --git a/drivers/net/wireless/b43/phy_n.c b/drivers/net/wireless/b43/phy_n.c index 795bb1e3345d..9c7cd282e46c 100644 --- a/drivers/net/wireless/b43/phy_n.c +++ b/drivers/net/wireless/b43/phy_n.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/types.h> | 27 | #include <linux/types.h> |
| 27 | 28 | ||
| 28 | #include "b43.h" | 29 | #include "b43.h" |
diff --git a/drivers/net/wireless/b43/pio.c b/drivers/net/wireless/b43/pio.c index a6062c3e89a5..aa12273ae716 100644 --- a/drivers/net/wireless/b43/pio.c +++ b/drivers/net/wireless/b43/pio.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | 36 | ||
| 36 | static u16 generate_cookie(struct b43_pio_txqueue *q, | 37 | static u16 generate_cookie(struct b43_pio_txqueue *q, |
diff --git a/drivers/net/wireless/b43/sdio.c b/drivers/net/wireless/b43/sdio.c index 0d3ac64147a5..4e56b7bbcebd 100644 --- a/drivers/net/wireless/b43/sdio.c +++ b/drivers/net/wireless/b43/sdio.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/mmc/card.h> | 16 | #include <linux/mmc/card.h> |
| 17 | #include <linux/mmc/sdio_func.h> | 17 | #include <linux/mmc/sdio_func.h> |
| 18 | #include <linux/mmc/sdio_ids.h> | 18 | #include <linux/mmc/sdio_ids.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/ssb/ssb.h> | 20 | #include <linux/ssb/ssb.h> |
| 20 | 21 | ||
| 21 | #include "sdio.h" | 22 | #include "sdio.h" |
diff --git a/drivers/net/wireless/b43legacy/dma.c b/drivers/net/wireless/b43legacy/dma.c index 8b9387c6ff36..e91520d0312e 100644 --- a/drivers/net/wireless/b43legacy/dma.c +++ b/drivers/net/wireless/b43legacy/dma.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/pci.h> | 37 | #include <linux/pci.h> |
| 38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 39 | #include <linux/skbuff.h> | 39 | #include <linux/skbuff.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <net/dst.h> | 41 | #include <net/dst.h> |
| 41 | 42 | ||
| 42 | /* 32bit DMA ops. */ | 43 | /* 32bit DMA ops. */ |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 1d070be5a678..bb2dd9329aa0 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/sched.h> | 40 | #include <linux/sched.h> |
| 41 | #include <linux/skbuff.h> | 41 | #include <linux/skbuff.h> |
| 42 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <net/dst.h> | 44 | #include <net/dst.h> |
| 44 | #include <asm/unaligned.h> | 45 | #include <asm/unaligned.h> |
| 45 | 46 | ||
diff --git a/drivers/net/wireless/b43legacy/phy.c b/drivers/net/wireless/b43legacy/phy.c index aaf227203a98..35033dd342ce 100644 --- a/drivers/net/wireless/b43legacy/phy.c +++ b/drivers/net/wireless/b43legacy/phy.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/types.h> | 36 | #include <linux/types.h> |
| 36 | 37 | ||
| 37 | #include "b43legacy.h" | 38 | #include "b43legacy.h" |
diff --git a/drivers/net/wireless/b43legacy/pio.c b/drivers/net/wireless/b43legacy/pio.c index 017c0e9c37ef..b033b0ed4ca0 100644 --- a/drivers/net/wireless/b43legacy/pio.c +++ b/drivers/net/wireless/b43legacy/pio.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include "xmit.h" | 29 | #include "xmit.h" |
| 30 | 30 | ||
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | 34 | ||
| 34 | static void tx_start(struct b43legacy_pioqueue *queue) | 35 | static void tx_start(struct b43legacy_pioqueue *queue) |
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c index 3816df96a663..f4c56121d387 100644 --- a/drivers/net/wireless/hostap/hostap_80211_rx.c +++ b/drivers/net/wireless/hostap/hostap_80211_rx.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/etherdevice.h> | 1 | #include <linux/etherdevice.h> |
| 2 | #include <linux/slab.h> | ||
| 2 | #include <net/lib80211.h> | 3 | #include <net/lib80211.h> |
| 3 | #include <linux/if_arp.h> | 4 | #include <linux/if_arp.h> |
| 4 | 5 | ||
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c index 90108b698f11..c34a3b7f1292 100644 --- a/drivers/net/wireless/hostap/hostap_80211_tx.c +++ b/drivers/net/wireless/hostap/hostap_80211_tx.c | |||
| @@ -1,3 +1,5 @@ | |||
| 1 | #include <linux/slab.h> | ||
| 2 | |||
| 1 | #include "hostap_80211.h" | 3 | #include "hostap_80211.h" |
| 2 | #include "hostap_common.h" | 4 | #include "hostap_common.h" |
| 3 | #include "hostap_wlan.h" | 5 | #include "hostap_wlan.h" |
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c index a2a203c90ba3..7e72ac1de49b 100644 --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/random.h> | 21 | #include <linux/random.h> |
| 22 | #include <linux/if_arp.h> | 22 | #include <linux/if_arp.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "hostap_wlan.h" | 25 | #include "hostap_wlan.h" |
| 25 | #include "hostap.h" | 26 | #include "hostap.h" |
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c index d19748d90aaf..a36501dbbe02 100644 --- a/drivers/net/wireless/hostap/hostap_cs.c +++ b/drivers/net/wireless/hostap/hostap_cs.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/init.h> | 4 | #include <linux/init.h> |
| 5 | #include <linux/if.h> | 5 | #include <linux/if.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/wait.h> | 7 | #include <linux/wait.h> |
| 7 | #include <linux/timer.h> | 8 | #include <linux/timer.h> |
| 8 | #include <linux/skbuff.h> | 9 | #include <linux/skbuff.h> |
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c index 4dfb40a84c96..d737091cf6ac 100644 --- a/drivers/net/wireless/hostap/hostap_info.c +++ b/drivers/net/wireless/hostap/hostap_info.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | #include <linux/if_arp.h> | 3 | #include <linux/if_arp.h> |
| 4 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
| 5 | #include <linux/slab.h> | ||
| 5 | #include "hostap_wlan.h" | 6 | #include "hostap_wlan.h" |
| 6 | #include "hostap.h" | 7 | #include "hostap.h" |
| 7 | #include "hostap_ap.h" | 8 | #include "hostap_ap.h" |
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 9419cebca8a5..9a082308a9d4 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */ | 1 | /* ioctl() (mostly Linux Wireless Extensions) routines for Host AP driver */ |
| 2 | 2 | ||
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/types.h> | 4 | #include <linux/types.h> |
| 4 | #include <linux/sched.h> | 5 | #include <linux/sched.h> |
| 5 | #include <linux/ethtool.h> | 6 | #include <linux/ethtool.h> |
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c index 4d97ae37499b..d24dc7dc0723 100644 --- a/drivers/net/wireless/hostap/hostap_pci.c +++ b/drivers/net/wireless/hostap/hostap_pci.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/if.h> | 9 | #include <linux/if.h> |
| 10 | #include <linux/skbuff.h> | 10 | #include <linux/skbuff.h> |
| 11 | #include <linux/netdevice.h> | 11 | #include <linux/netdevice.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/workqueue.h> | 13 | #include <linux/workqueue.h> |
| 13 | #include <linux/wireless.h> | 14 | #include <linux/wireless.h> |
| 14 | #include <net/iw_handler.h> | 15 | #include <net/iw_handler.h> |
diff --git a/drivers/net/wireless/hostap/hostap_plx.c b/drivers/net/wireless/hostap/hostap_plx.c index fc04ccdc5bef..33e79037770b 100644 --- a/drivers/net/wireless/hostap/hostap_plx.c +++ b/drivers/net/wireless/hostap/hostap_plx.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/if.h> | 12 | #include <linux/if.h> |
| 13 | #include <linux/skbuff.h> | 13 | #include <linux/skbuff.h> |
| 14 | #include <linux/netdevice.h> | 14 | #include <linux/netdevice.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/workqueue.h> | 16 | #include <linux/workqueue.h> |
| 16 | #include <linux/wireless.h> | 17 | #include <linux/wireless.h> |
| 17 | #include <net/iw_handler.h> | 18 | #include <net/iw_handler.h> |
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 5c7aa1b1eb56..8d72e3d19586 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | ******************************************************************************/ | 31 | ******************************************************************************/ |
| 32 | 32 | ||
| 33 | #include <linux/sched.h> | 33 | #include <linux/sched.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include "ipw2200.h" | 35 | #include "ipw2200.h" |
| 35 | 36 | ||
| 36 | 37 | ||
diff --git a/drivers/net/wireless/ipw2x00/libipw_geo.c b/drivers/net/wireless/ipw2x00/libipw_geo.c index 65e8c175a4a0..c9fe3c99cb00 100644 --- a/drivers/net/wireless/ipw2x00/libipw_geo.c +++ b/drivers/net/wireless/ipw2x00/libipw_geo.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/netdevice.h> | 34 | #include <linux/netdevice.h> |
| 35 | #include <linux/proc_fs.h> | 35 | #include <linux/proc_fs.h> |
| 36 | #include <linux/skbuff.h> | 36 | #include <linux/skbuff.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/tcp.h> | 37 | #include <linux/tcp.h> |
| 39 | #include <linux/types.h> | 38 | #include <linux/types.h> |
| 40 | #include <linux/wireless.h> | 39 | #include <linux/wireless.h> |
diff --git a/drivers/net/wireless/ipw2x00/libipw_rx.c b/drivers/net/wireless/ipw2x00/libipw_rx.c index 282b1f7ff1e9..39a34da52d52 100644 --- a/drivers/net/wireless/ipw2x00/libipw_rx.c +++ b/drivers/net/wireless/ipw2x00/libipw_rx.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/if_arp.h> | 18 | #include <linux/if_arp.h> |
| 19 | #include <linux/in6.h> | 19 | #include <linux/in6.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | #include <linux/in.h> | 21 | #include <linux/in.h> |
| 21 | #include <linux/ip.h> | 22 | #include <linux/ip.h> |
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| @@ -24,7 +25,6 @@ | |||
| 24 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 25 | #include <linux/proc_fs.h> | 26 | #include <linux/proc_fs.h> |
| 26 | #include <linux/skbuff.h> | 27 | #include <linux/skbuff.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/tcp.h> | 28 | #include <linux/tcp.h> |
| 29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 30 | #include <linux/wireless.h> | 30 | #include <linux/wireless.h> |
diff --git a/drivers/net/wireless/ipw2x00/libipw_wx.c b/drivers/net/wireless/ipw2x00/libipw_wx.c index 4d89f66f53b2..3633c6682e49 100644 --- a/drivers/net/wireless/ipw2x00/libipw_wx.c +++ b/drivers/net/wireless/ipw2x00/libipw_wx.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | ******************************************************************************/ | 31 | ******************************************************************************/ |
| 32 | 32 | ||
| 33 | #include <linux/kmod.h> | 33 | #include <linux/kmod.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 35 | #include <linux/jiffies.h> | 36 | #include <linux/jiffies.h> |
| 36 | 37 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c index 47909f94271e..902c4d4293e9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/skbuff.h> | 29 | #include <linux/skbuff.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/wireless.h> | 31 | #include <linux/wireless.h> |
| 31 | #include <net/mac80211.h> | 32 | #include <net/mac80211.h> |
| 32 | 33 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c index e0678d921055..0728054a22d4 100644 --- a/drivers/net/wireless/iwlwifi/iwl-3945.c +++ b/drivers/net/wireless/iwlwifi/iwl-3945.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 31 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/delay.h> | 33 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c index 8bf7c20b9d39..35f819ac87a3 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/skbuff.h> | 28 | #include <linux/skbuff.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/wireless.h> | 30 | #include <linux/wireless.h> |
| 30 | #include <net/mac80211.h> | 31 | #include <net/mac80211.h> |
| 31 | 32 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 818367b57bab..5e0c6bf3fbb1 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 36 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-calib.c b/drivers/net/wireless/iwlwifi/iwl-calib.c index 845831ac053e..de3b3f403d1f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-calib.c +++ b/drivers/net/wireless/iwlwifi/iwl-calib.c | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 60 | * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 61 | *****************************************************************************/ | 61 | *****************************************************************************/ |
| 62 | 62 | ||
| 63 | #include <linux/slab.h> | ||
| 63 | #include <net/mac80211.h> | 64 | #include <net/mac80211.h> |
| 64 | 65 | ||
| 65 | #include "iwl-dev.h" | 66 | #include "iwl-dev.h" |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.c b/drivers/net/wireless/iwlwifi/iwl-core.c index 112149e9b31e..db050b811232 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.c +++ b/drivers/net/wireless/iwlwifi/iwl-core.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <net/mac80211.h> | 34 | #include <net/mac80211.h> |
| 34 | 35 | ||
| 35 | #include "iwl-eeprom.h" | 36 | #include "iwl-eeprom.h" |
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c index 7bf44f146799..b6e1b0ebe230 100644 --- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c +++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 26 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
| 27 | *****************************************************************************/ | 27 | *****************************************************************************/ |
| 28 | 28 | ||
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 30 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 31 | #include <linux/debugfs.h> | 32 | #include <linux/debugfs.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.c b/drivers/net/wireless/iwlwifi/iwl-devtrace.c index 36580d8d8b8d..2ffc2edbf4f0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.c +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.c | |||
| @@ -28,6 +28,8 @@ | |||
| 28 | 28 | ||
| 29 | /* sparse doesn't like tracepoint macros */ | 29 | /* sparse doesn't like tracepoint macros */ |
| 30 | #ifndef __CHECKER__ | 30 | #ifndef __CHECKER__ |
| 31 | #include "iwl-dev.h" | ||
| 32 | |||
| 31 | #define CREATE_TRACE_POINTS | 33 | #define CREATE_TRACE_POINTS |
| 32 | #include "iwl-devtrace.h" | 34 | #include "iwl-devtrace.h" |
| 33 | 35 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-devtrace.h b/drivers/net/wireless/iwlwifi/iwl-devtrace.h index ff4d012ce260..ae7319bb3a99 100644 --- a/drivers/net/wireless/iwlwifi/iwl-devtrace.h +++ b/drivers/net/wireless/iwlwifi/iwl-devtrace.h | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #define __IWLWIFI_DEVICE_TRACE | 28 | #define __IWLWIFI_DEVICE_TRACE |
| 29 | 29 | ||
| 30 | #include <linux/tracepoint.h> | 30 | #include <linux/tracepoint.h> |
| 31 | #include "iwl-dev.h" | ||
| 32 | 31 | ||
| 33 | #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) | 32 | #if !defined(CONFIG_IWLWIFI_DEVICE_TRACING) || defined(__CHECKER__) |
| 34 | #undef TRACE_EVENT | 33 | #undef TRACE_EVENT |
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom.c b/drivers/net/wireless/iwlwifi/iwl-eeprom.c index fd37152abae3..fb5bb487f3bc 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom.c | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | 63 | ||
| 64 | #include <linux/kernel.h> | 64 | #include <linux/kernel.h> |
| 65 | #include <linux/module.h> | 65 | #include <linux/module.h> |
| 66 | #include <linux/slab.h> | ||
| 66 | #include <linux/init.h> | 67 | #include <linux/init.h> |
| 67 | 68 | ||
| 68 | #include <net/mac80211.h> | 69 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-io.h b/drivers/net/wireless/iwlwifi/iwl-io.h index c719baf2585a..16eb3ced9b30 100644 --- a/drivers/net/wireless/iwlwifi/iwl-io.h +++ b/drivers/net/wireless/iwlwifi/iwl-io.h | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | 31 | ||
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | 33 | ||
| 34 | #include "iwl-dev.h" | ||
| 34 | #include "iwl-debug.h" | 35 | #include "iwl-debug.h" |
| 35 | #include "iwl-devtrace.h" | 36 | #include "iwl-devtrace.h" |
| 36 | 37 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-power.c b/drivers/net/wireless/iwlwifi/iwl-power.c index 1a1a9f081cc7..548dac2f6a96 100644 --- a/drivers/net/wireless/iwlwifi/iwl-power.c +++ b/drivers/net/wireless/iwlwifi/iwl-power.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 33 | 34 | ||
| 34 | #include <net/mac80211.h> | 35 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-rx.c b/drivers/net/wireless/iwlwifi/iwl-rx.c index df257bc15f49..e5eb339107dd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-rx.c +++ b/drivers/net/wireless/iwlwifi/iwl-rx.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | *****************************************************************************/ | 28 | *****************************************************************************/ |
| 29 | 29 | ||
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <net/mac80211.h> | 32 | #include <net/mac80211.h> |
| 32 | #include <asm/unaligned.h> | 33 | #include <asm/unaligned.h> |
| 33 | #include "iwl-eeprom.h" | 34 | #include "iwl-eeprom.h" |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index bd2f7c420563..9ab0e412bf10 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | * Intel Linux Wireless <ilw@linux.intel.com> | 25 | * Intel Linux Wireless <ilw@linux.intel.com> |
| 26 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 | 26 | * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 |
| 27 | *****************************************************************************/ | 27 | *****************************************************************************/ |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 29 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 30 | #include <net/mac80211.h> | 31 | #include <net/mac80211.h> |
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c index 8c12311dbb0a..f0b7e6cfbe4f 100644 --- a/drivers/net/wireless/iwlwifi/iwl-tx.c +++ b/drivers/net/wireless/iwlwifi/iwl-tx.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/sched.h> | 31 | #include <linux/sched.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <net/mac80211.h> | 33 | #include <net/mac80211.h> |
| 33 | #include "iwl-eeprom.h" | 34 | #include "iwl-eeprom.h" |
| 34 | #include "iwl-dev.h" | 35 | #include "iwl-dev.h" |
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c index 54daa38ecba3..1eaa0052c11b 100644 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/pci.h> | 33 | #include <linux/pci.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 36 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
diff --git a/drivers/net/wireless/iwmc3200wifi/cfg80211.c b/drivers/net/wireless/iwmc3200wifi/cfg80211.c index 7c4f44a9c3e6..a1d45cce0ebc 100644 --- a/drivers/net/wireless/iwmc3200wifi/cfg80211.c +++ b/drivers/net/wireless/iwmc3200wifi/cfg80211.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/etherdevice.h> | 27 | #include <linux/etherdevice.h> |
| 28 | #include <linux/wireless.h> | 28 | #include <linux/wireless.h> |
| 29 | #include <linux/ieee80211.h> | 29 | #include <linux/ieee80211.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <net/cfg80211.h> | 31 | #include <net/cfg80211.h> |
| 31 | 32 | ||
| 32 | #include "iwm.h" | 33 | #include "iwm.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/commands.c b/drivers/net/wireless/iwmc3200wifi/commands.c index 1e41ad0fcad5..42df7262f9f7 100644 --- a/drivers/net/wireless/iwmc3200wifi/commands.c +++ b/drivers/net/wireless/iwmc3200wifi/commands.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/etherdevice.h> | 41 | #include <linux/etherdevice.h> |
| 42 | #include <linux/ieee80211.h> | 42 | #include <linux/ieee80211.h> |
| 43 | #include <linux/sched.h> | 43 | #include <linux/sched.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include "iwm.h" | 46 | #include "iwm.h" |
| 46 | #include "bus.h" | 47 | #include "bus.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/debugfs.c b/drivers/net/wireless/iwmc3200wifi/debugfs.c index c29c994de0e2..cbb81befdb55 100644 --- a/drivers/net/wireless/iwmc3200wifi/debugfs.c +++ b/drivers/net/wireless/iwmc3200wifi/debugfs.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/bitops.h> | 26 | #include <linux/bitops.h> |
| 26 | #include <linux/debugfs.h> | 27 | #include <linux/debugfs.h> |
diff --git a/drivers/net/wireless/iwmc3200wifi/eeprom.c b/drivers/net/wireless/iwmc3200wifi/eeprom.c index 8091421ee5e5..e80e776b74f7 100644 --- a/drivers/net/wireless/iwmc3200wifi/eeprom.c +++ b/drivers/net/wireless/iwmc3200wifi/eeprom.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | */ | 37 | */ |
| 38 | 38 | ||
| 39 | #include <linux/kernel.h> | 39 | #include <linux/kernel.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include "iwm.h" | 42 | #include "iwm.h" |
| 42 | #include "umac.h" | 43 | #include "umac.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/hal.c b/drivers/net/wireless/iwmc3200wifi/hal.c index d13c8853ee82..229de990379c 100644 --- a/drivers/net/wireless/iwmc3200wifi/hal.c +++ b/drivers/net/wireless/iwmc3200wifi/hal.c | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | */ | 98 | */ |
| 99 | #include <linux/kernel.h> | 99 | #include <linux/kernel.h> |
| 100 | #include <linux/netdevice.h> | 100 | #include <linux/netdevice.h> |
| 101 | #include <linux/slab.h> | ||
| 101 | 102 | ||
| 102 | #include "iwm.h" | 103 | #include "iwm.h" |
| 103 | #include "bus.h" | 104 | #include "bus.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c index 7f34d6dd3c41..23856d359e12 100644 --- a/drivers/net/wireless/iwmc3200wifi/main.c +++ b/drivers/net/wireless/iwmc3200wifi/main.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/ieee80211.h> | 42 | #include <linux/ieee80211.h> |
| 43 | #include <linux/wireless.h> | 43 | #include <linux/wireless.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include "iwm.h" | 46 | #include "iwm.h" |
| 46 | #include "debug.h" | 47 | #include "debug.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/netdev.c b/drivers/net/wireless/iwmc3200wifi/netdev.c index c4c0d23c63ec..13a69ebf2a94 100644 --- a/drivers/net/wireless/iwmc3200wifi/netdev.c +++ b/drivers/net/wireless/iwmc3200wifi/netdev.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | * -> sdio_disable_func() | 46 | * -> sdio_disable_func() |
| 47 | */ | 47 | */ |
| 48 | #include <linux/netdevice.h> | 48 | #include <linux/netdevice.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | 50 | ||
| 50 | #include "iwm.h" | 51 | #include "iwm.h" |
| 51 | #include "commands.h" | 52 | #include "commands.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/rx.c b/drivers/net/wireless/iwmc3200wifi/rx.c index 8456b4dbd146..3257d4fad835 100644 --- a/drivers/net/wireless/iwmc3200wifi/rx.c +++ b/drivers/net/wireless/iwmc3200wifi/rx.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/ieee80211.h> | 44 | #include <linux/ieee80211.h> |
| 45 | #include <linux/if_arp.h> | 45 | #include <linux/if_arp.h> |
| 46 | #include <linux/list.h> | 46 | #include <linux/list.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <net/iw_handler.h> | 48 | #include <net/iw_handler.h> |
| 48 | 49 | ||
| 49 | #include "iwm.h" | 50 | #include "iwm.h" |
diff --git a/drivers/net/wireless/iwmc3200wifi/sdio.c b/drivers/net/wireless/iwmc3200wifi/sdio.c index a7ec7eac9137..1eafd6dec3fd 100644 --- a/drivers/net/wireless/iwmc3200wifi/sdio.c +++ b/drivers/net/wireless/iwmc3200wifi/sdio.c | |||
| @@ -63,6 +63,7 @@ | |||
| 63 | */ | 63 | */ |
| 64 | 64 | ||
| 65 | #include <linux/kernel.h> | 65 | #include <linux/kernel.h> |
| 66 | #include <linux/slab.h> | ||
| 66 | #include <linux/netdevice.h> | 67 | #include <linux/netdevice.h> |
| 67 | #include <linux/debugfs.h> | 68 | #include <linux/debugfs.h> |
| 68 | #include <linux/mmc/sdio_ids.h> | 69 | #include <linux/mmc/sdio_ids.h> |
diff --git a/drivers/net/wireless/iwmc3200wifi/tx.c b/drivers/net/wireless/iwmc3200wifi/tx.c index 55905f02309c..f6a02f123f31 100644 --- a/drivers/net/wireless/iwmc3200wifi/tx.c +++ b/drivers/net/wireless/iwmc3200wifi/tx.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | * (i.e. half of the max size). [iwm_tx_worker] | 64 | * (i.e. half of the max size). [iwm_tx_worker] |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/slab.h> | ||
| 67 | #include <linux/skbuff.h> | 68 | #include <linux/skbuff.h> |
| 68 | #include <linux/netdevice.h> | 69 | #include <linux/netdevice.h> |
| 69 | #include <linux/ieee80211.h> | 70 | #include <linux/ieee80211.h> |
diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c index f03d5e4e59c3..12a2ef9dacea 100644 --- a/drivers/net/wireless/libertas/assoc.c +++ b/drivers/net/wireless/libertas/assoc.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/etherdevice.h> | 4 | #include <linux/etherdevice.h> |
| 5 | #include <linux/ieee80211.h> | 5 | #include <linux/ieee80211.h> |
| 6 | #include <linux/if_arp.h> | 6 | #include <linux/if_arp.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <net/lib80211.h> | 8 | #include <net/lib80211.h> |
| 8 | 9 | ||
| 9 | #include "assoc.h" | 10 | #include "assoc.h" |
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 4396dccd12ac..e196b84914db 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * | 6 | * |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/slab.h> | ||
| 9 | #include <net/cfg80211.h> | 10 | #include <net/cfg80211.h> |
| 10 | 11 | ||
| 11 | #include "cfg.h" | 12 | #include "cfg.h" |
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c index 82371ef39524..cdb9b9650d73 100644 --- a/drivers/net/wireless/libertas/cmd.c +++ b/drivers/net/wireless/libertas/cmd.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/kfifo.h> | 6 | #include <linux/kfifo.h> |
| 7 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | 9 | ||
| 9 | #include "host.h" | 10 | #include "host.h" |
| 10 | #include "decl.h" | 11 | #include "decl.h" |
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c index e7470442f76b..88f7131d66e9 100644 --- a/drivers/net/wireless/libertas/cmdresp.c +++ b/drivers/net/wireless/libertas/cmdresp.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * This file contains the handling of command | 2 | * This file contains the handling of command |
| 3 | * responses as well as events generated by firmware. | 3 | * responses as well as events generated by firmware. |
| 4 | */ | 4 | */ |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/delay.h> | 6 | #include <linux/delay.h> |
| 6 | #include <linux/sched.h> | 7 | #include <linux/sched.h> |
| 7 | #include <linux/if_arp.h> | 8 | #include <linux/if_arp.h> |
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c index 587b0cb0088d..a48ccaffb288 100644 --- a/drivers/net/wireless/libertas/debugfs.c +++ b/drivers/net/wireless/libertas/debugfs.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | #include <linux/delay.h> | 4 | #include <linux/delay.h> |
| 5 | #include <linux/mm.h> | 5 | #include <linux/mm.h> |
| 6 | #include <linux/string.h> | 6 | #include <linux/string.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <net/iw_handler.h> | 8 | #include <net/iw_handler.h> |
| 8 | #include <net/lib80211.h> | 9 | #include <net/lib80211.h> |
| 9 | 10 | ||
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c index 1f6cb58dd66c..6d55439a7b97 100644 --- a/drivers/net/wireless/libertas/if_cs.c +++ b/drivers/net/wireless/libertas/if_cs.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 26 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 27 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
diff --git a/drivers/net/wireless/libertas/if_sdio.c b/drivers/net/wireless/libertas/if_sdio.c index 7a73f625273b..7d1a3c6b6ce0 100644 --- a/drivers/net/wireless/libertas/if_sdio.c +++ b/drivers/net/wireless/libertas/if_sdio.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/kernel.h> | 29 | #include <linux/kernel.h> |
| 30 | #include <linux/moduleparam.h> | 30 | #include <linux/moduleparam.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/firmware.h> | 32 | #include <linux/firmware.h> |
| 32 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 33 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index 3ea03f259ee7..fe3f08028eb3 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 25 | #include <linux/netdevice.h> | 25 | #include <linux/netdevice.h> |
| 26 | #include <linux/semaphore.h> | 26 | #include <linux/semaphore.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/spi/libertas_spi.h> | 28 | #include <linux/spi/libertas_spi.h> |
| 28 | #include <linux/spi/spi.h> | 29 | #include <linux/spi/spi.h> |
| 29 | 30 | ||
diff --git a/drivers/net/wireless/libertas/if_usb.c b/drivers/net/wireless/libertas/if_usb.c index 65e174595d12..fcea5741ba62 100644 --- a/drivers/net/wireless/libertas/if_usb.c +++ b/drivers/net/wireless/libertas/if_usb.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #include <linux/moduleparam.h> | 5 | #include <linux/moduleparam.h> |
| 6 | #include <linux/firmware.h> | 6 | #include <linux/firmware.h> |
| 7 | #include <linux/netdevice.h> | 7 | #include <linux/netdevice.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | #include <linux/usb.h> | 9 | #include <linux/usb.h> |
| 9 | 10 | ||
| 10 | #ifdef CONFIG_OLPC | 11 | #ifdef CONFIG_OLPC |
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c index 28a1c9d1627a..598080414b17 100644 --- a/drivers/net/wireless/libertas/main.c +++ b/drivers/net/wireless/libertas/main.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/kfifo.h> | 13 | #include <linux/kfifo.h> |
| 14 | #include <linux/stddef.h> | 14 | #include <linux/stddef.h> |
| 15 | #include <linux/ieee80211.h> | 15 | #include <linux/ieee80211.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <net/iw_handler.h> | 17 | #include <net/iw_handler.h> |
| 17 | #include <net/cfg80211.h> | 18 | #include <net/cfg80211.h> |
| 18 | 19 | ||
diff --git a/drivers/net/wireless/libertas/rx.c b/drivers/net/wireless/libertas/rx.c index 2daf8ffdb7e1..784dae714705 100644 --- a/drivers/net/wireless/libertas/rx.c +++ b/drivers/net/wireless/libertas/rx.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * This file contains the handling of RX in wlan driver. | 2 | * This file contains the handling of RX in wlan driver. |
| 3 | */ | 3 | */ |
| 4 | #include <linux/etherdevice.h> | 4 | #include <linux/etherdevice.h> |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 6 | 7 | ||
| 7 | #include "host.h" | 8 | #include "host.h" |
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 220361e69cd3..24cd54b3a806 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | * IOCTL handlers as well as command preperation and response routines | 4 | * IOCTL handlers as well as command preperation and response routines |
| 5 | * for sending scan commands to the firmware. | 5 | * for sending scan commands to the firmware. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 8 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 9 | #include <linux/etherdevice.h> | 10 | #include <linux/etherdevice.h> |
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c index 71f88a08e090..9b555884b08a 100644 --- a/drivers/net/wireless/libertas/wext.c +++ b/drivers/net/wireless/libertas/wext.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * This file contains ioctl functions | 2 | * This file contains ioctl functions |
| 3 | */ | 3 | */ |
| 4 | #include <linux/ctype.h> | 4 | #include <linux/ctype.h> |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/delay.h> | 6 | #include <linux/delay.h> |
| 6 | #include <linux/if.h> | 7 | #include <linux/if.h> |
| 7 | #include <linux/if_arp.h> | 8 | #include <linux/if_arp.h> |
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c index 28790e03dc43..b620daf59ef7 100644 --- a/drivers/net/wireless/libertas_tf/cmd.c +++ b/drivers/net/wireless/libertas_tf/cmd.c | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | * the Free Software Foundation; either version 2 of the License, or (at | 7 | * the Free Software Foundation; either version 2 of the License, or (at |
| 8 | * your option) any later version. | 8 | * your option) any later version. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/slab.h> | ||
| 11 | |||
| 10 | #include "libertas_tf.h" | 12 | #include "libertas_tf.h" |
| 11 | 13 | ||
| 12 | static const struct channel_range channel_ranges[] = { | 14 | static const struct channel_range channel_ranges[] = { |
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c index 3691c307e674..8cc9db60c14b 100644 --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/moduleparam.h> | 11 | #include <linux/moduleparam.h> |
| 12 | #include <linux/firmware.h> | 12 | #include <linux/firmware.h> |
| 13 | #include <linux/netdevice.h> | 13 | #include <linux/netdevice.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 15 | 16 | ||
| 16 | #define DRV_NAME "lbtf_usb" | 17 | #define DRV_NAME "lbtf_usb" |
diff --git a/drivers/net/wireless/libertas_tf/main.c b/drivers/net/wireless/libertas_tf/main.c index 6ab30033c26c..7945ff5aa334 100644 --- a/drivers/net/wireless/libertas_tf/main.c +++ b/drivers/net/wireless/libertas_tf/main.c | |||
| @@ -7,6 +7,8 @@ | |||
| 7 | * the Free Software Foundation; either version 2 of the License, or (at | 7 | * the Free Software Foundation; either version 2 of the License, or (at |
| 8 | * your option) any later version. | 8 | * your option) any later version. |
| 9 | */ | 9 | */ |
| 10 | #include <linux/slab.h> | ||
| 11 | |||
| 10 | #include "libertas_tf.h" | 12 | #include "libertas_tf.h" |
| 11 | #include "linux/etherdevice.h" | 13 | #include "linux/etherdevice.h" |
| 12 | 14 | ||
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index 6ea77e95277b..7cd5f56662fc 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 18 | #include <net/dst.h> | 19 | #include <net/dst.h> |
| 19 | #include <net/xfrm.h> | 20 | #include <net/xfrm.h> |
diff --git a/drivers/net/wireless/mwl8k.c b/drivers/net/wireless/mwl8k.c index ac65e13eb0de..89354c29f088 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/completion.h> | 20 | #include <linux/completion.h> |
| 21 | #include <linux/etherdevice.h> | 21 | #include <linux/etherdevice.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <net/mac80211.h> | 23 | #include <net/mac80211.h> |
| 23 | #include <linux/moduleparam.h> | 24 | #include <linux/moduleparam.h> |
| 24 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
diff --git a/drivers/net/wireless/orinoco/fw.c b/drivers/net/wireless/orinoco/fw.c index cfa72962052b..5ea0f7cf85b1 100644 --- a/drivers/net/wireless/orinoco/fw.c +++ b/drivers/net/wireless/orinoco/fw.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * See copyright notice in main.c | 3 | * See copyright notice in main.c |
| 4 | */ | 4 | */ |
| 5 | #include <linux/kernel.h> | 5 | #include <linux/kernel.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/firmware.h> | 7 | #include <linux/firmware.h> |
| 7 | #include <linux/device.h> | 8 | #include <linux/device.h> |
| 8 | 9 | ||
diff --git a/drivers/net/wireless/orinoco/main.c b/drivers/net/wireless/orinoco/main.c index b42634c614b5..413e9ab6cab3 100644 --- a/drivers/net/wireless/orinoco/main.c +++ b/drivers/net/wireless/orinoco/main.c | |||
| @@ -78,6 +78,7 @@ | |||
| 78 | 78 | ||
| 79 | #include <linux/module.h> | 79 | #include <linux/module.h> |
| 80 | #include <linux/kernel.h> | 80 | #include <linux/kernel.h> |
| 81 | #include <linux/slab.h> | ||
| 81 | #include <linux/init.h> | 82 | #include <linux/init.h> |
| 82 | #include <linux/delay.h> | 83 | #include <linux/delay.h> |
| 83 | #include <linux/device.h> | 84 | #include <linux/device.h> |
diff --git a/drivers/net/wireless/orinoco/scan.c b/drivers/net/wireless/orinoco/scan.c index d2f10e9c2162..330d42d45333 100644 --- a/drivers/net/wireless/orinoco/scan.c +++ b/drivers/net/wireless/orinoco/scan.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | * See copyright notice in main.c | 3 | * See copyright notice in main.c |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/gfp.h> | ||
| 6 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 7 | #include <linux/string.h> | 8 | #include <linux/string.h> |
| 8 | #include <linux/ieee80211.h> | 9 | #include <linux/ieee80211.h> |
diff --git a/drivers/net/wireless/orinoco/wext.c b/drivers/net/wireless/orinoco/wext.c index 31ca241f7753..fbcc6e1a2e1d 100644 --- a/drivers/net/wireless/orinoco/wext.c +++ b/drivers/net/wireless/orinoco/wext.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | * | 2 | * |
| 3 | * See copyright notice in main.c | 3 | * See copyright notice in main.c |
| 4 | */ | 4 | */ |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 6 | #include <linux/if_arp.h> | 7 | #include <linux/if_arp.h> |
| 7 | #include <linux/wireless.h> | 8 | #include <linux/wireless.h> |
diff --git a/drivers/net/wireless/p54/eeprom.c b/drivers/net/wireless/p54/eeprom.c index 8e3818f6832e..187e263b045a 100644 --- a/drivers/net/wireless/p54/eeprom.c +++ b/drivers/net/wireless/p54/eeprom.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/firmware.h> | 20 | #include <linux/firmware.h> |
| 21 | #include <linux/etherdevice.h> | 21 | #include <linux/etherdevice.h> |
| 22 | #include <linux/sort.h> | 22 | #include <linux/sort.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <net/mac80211.h> | 25 | #include <net/mac80211.h> |
| 25 | 26 | ||
diff --git a/drivers/net/wireless/p54/fwio.c b/drivers/net/wireless/p54/fwio.c index e7b9e9cb39f5..c43a5d461ab2 100644 --- a/drivers/net/wireless/p54/fwio.c +++ b/drivers/net/wireless/p54/fwio.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/firmware.h> | 21 | #include <linux/firmware.h> |
| 21 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
| 22 | 23 | ||
diff --git a/drivers/net/wireless/p54/main.c b/drivers/net/wireless/p54/main.c index 4f752a21495f..a7cb9eb759a1 100644 --- a/drivers/net/wireless/p54/main.c +++ b/drivers/net/wireless/p54/main.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/firmware.h> | 21 | #include <linux/firmware.h> |
| 21 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
| 22 | 23 | ||
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c index ed4bdffdd63e..269fda362836 100644 --- a/drivers/net/wireless/p54/p54pci.c +++ b/drivers/net/wireless/p54/p54pci.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/firmware.h> | 19 | #include <linux/firmware.h> |
| 19 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c index afd26bf06649..c8f09da1f84d 100644 --- a/drivers/net/wireless/p54/p54spi.c +++ b/drivers/net/wireless/p54/p54spi.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/spi/spi.h> | 29 | #include <linux/spi/spi.h> |
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include "p54spi.h" | 34 | #include "p54spi.h" |
| 34 | #include "p54spi_eeprom.h" | 35 | #include "p54spi_eeprom.h" |
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c index b3c4fbd80d8d..762952d688e2 100644 --- a/drivers/net/wireless/p54/p54usb.c +++ b/drivers/net/wireless/p54/p54usb.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 17 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/firmware.h> | 19 | #include <linux/firmware.h> |
| 19 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c index f7f5c793514b..a45818ebfdfb 100644 --- a/drivers/net/wireless/prism54/isl_ioctl.c +++ b/drivers/net/wireless/prism54/isl_ioctl.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/if_arp.h> | 25 | #include <linux/if_arp.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 27 | 28 | ||
| 28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index a3ba3539db02..689d59a13d5b 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/netdevice.h> | 24 | #include <linux/netdevice.h> |
| 24 | #include <linux/ethtool.h> | 25 | #include <linux/ethtool.h> |
diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c index 872b64783e78..ac99eaaeabce 100644 --- a/drivers/net/wireless/prism54/islpci_eth.c +++ b/drivers/net/wireless/prism54/islpci_eth.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | 21 | ||
| 21 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 22 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.c b/drivers/net/wireless/prism54/islpci_mgt.c index 69d2f882fd06..adb289723a96 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.c +++ b/drivers/net/wireless/prism54/islpci_mgt.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
| 26 | #include <asm/system.h> | 27 | #include <asm/system.h> |
diff --git a/drivers/net/wireless/prism54/islpci_mgt.h b/drivers/net/wireless/prism54/islpci_mgt.h index 87a1734663da..0b27e50fe0d5 100644 --- a/drivers/net/wireless/prism54/islpci_mgt.h +++ b/drivers/net/wireless/prism54/islpci_mgt.h | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/wireless.h> | 23 | #include <linux/wireless.h> |
| 24 | #include <linux/skbuff.h> | 24 | #include <linux/skbuff.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | /* | 27 | /* |
| 27 | * Function definitions | 28 | * Function definitions |
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index 1187e6112a64..d66933d70fb9 100644 --- a/drivers/net/wireless/prism54/oid_mgt.c +++ b/drivers/net/wireless/prism54/oid_mgt.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | 18 | ||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include "prismcompat.h" | 22 | #include "prismcompat.h" |
| 22 | #include "islpci_dev.h" | 23 | #include "islpci_dev.h" |
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 84c530aa52f9..11865ea21875 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/proc_fs.h> | 35 | #include <linux/proc_fs.h> |
| 36 | #include <linux/ptrace.h> | 36 | #include <linux/ptrace.h> |
| 37 | #include <linux/seq_file.h> | 37 | #include <linux/seq_file.h> |
| 38 | #include <linux/slab.h> | ||
| 39 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 40 | #include <linux/timer.h> | 39 | #include <linux/timer.h> |
| 41 | #include <linux/init.h> | 40 | #include <linux/init.h> |
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index 2887047069f2..1de5b22d3efe 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/if_arp.h> | 41 | #include <linux/if_arp.h> |
| 42 | #include <linux/ctype.h> | 42 | #include <linux/ctype.h> |
| 43 | #include <linux/spinlock.h> | 43 | #include <linux/spinlock.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include <net/iw_handler.h> | 45 | #include <net/iw_handler.h> |
| 45 | #include <net/cfg80211.h> | 46 | #include <net/cfg80211.h> |
| 46 | #include <linux/usb/usbnet.h> | 47 | #include <linux/usb/usbnet.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c index c22b04042d5c..5f5204b82891 100644 --- a/drivers/net/wireless/rt2x00/rt2400pci.c +++ b/drivers/net/wireless/rt2x00/rt2400pci.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 33 | #include <linux/eeprom_93cx6.h> | 33 | #include <linux/eeprom_93cx6.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include "rt2x00.h" | 36 | #include "rt2x00.h" |
| 36 | #include "rt2x00pci.h" | 37 | #include "rt2x00pci.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c index 52bbcf1bd17c..2a73f593aab0 100644 --- a/drivers/net/wireless/rt2x00/rt2500pci.c +++ b/drivers/net/wireless/rt2x00/rt2500pci.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 33 | #include <linux/eeprom_93cx6.h> | 33 | #include <linux/eeprom_93cx6.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include "rt2x00.h" | 36 | #include "rt2x00.h" |
| 36 | #include "rt2x00pci.h" | 37 | #include "rt2x00pci.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c index 9b04964deced..d2cc4458477f 100644 --- a/drivers/net/wireless/rt2x00/rt2500usb.c +++ b/drivers/net/wireless/rt2x00/rt2500usb.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 33 | 34 | ||
| 34 | #include "rt2x00.h" | 35 | #include "rt2x00.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index 18d4d8e4ae6b..58c7f218019d 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include "rt2x00.h" | 40 | #include "rt2x00.h" |
| 40 | #if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE) | 41 | #if defined(CONFIG_RT2X00_LIB_USB) || defined(CONFIG_RT2X00_LIB_USB_MODULE) |
diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c index 28a1c46ec4eb..9569fb4e5bc5 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/poll.h> | 29 | #include <linux/poll.h> |
| 30 | #include <linux/sched.h> | 30 | #include <linux/sched.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 32 | 33 | ||
| 33 | #include "rt2x00.h" | 34 | #include "rt2x00.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c index dd5ab8fe2321..eda73ba735a6 100644 --- a/drivers/net/wireless/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/rt2x00/rt2x00dev.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "rt2x00.h" | 30 | #include "rt2x00.h" |
| 30 | #include "rt2x00lib.h" | 31 | #include "rt2x00lib.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c index 047123b766fc..cf3f1c0c4382 100644 --- a/drivers/net/wireless/rt2x00/rt2x00pci.c +++ b/drivers/net/wireless/rt2x00/rt2x00pci.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include "rt2x00.h" | 32 | #include "rt2x00.h" |
| 32 | #include "rt2x00pci.h" | 33 | #include "rt2x00pci.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c index 5b6b789cad3d..a0bd36fc4d2e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.c +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | Abstract: rt2x00 queue specific routines. | 24 | Abstract: rt2x00 queue specific routines. |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 28 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 29 | #include <linux/dma-mapping.h> | 30 | #include <linux/dma-mapping.h> |
diff --git a/drivers/net/wireless/rt2x00/rt2x00soc.c b/drivers/net/wireless/rt2x00/rt2x00soc.c index 111c0ff5c6c7..fc98063de71d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00soc.c +++ b/drivers/net/wireless/rt2x00/rt2x00soc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #include "rt2x00.h" | 33 | #include "rt2x00.h" |
| 33 | #include "rt2x00soc.h" | 34 | #include "rt2x00soc.h" |
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.c b/drivers/net/wireless/rt2x00/rt2x00usb.c index 0a751e73aa0f..f9a7f8b17411 100644 --- a/drivers/net/wireless/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/rt2x00/rt2x00usb.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 29 | #include <linux/bug.h> | 30 | #include <linux/bug.h> |
| 30 | 31 | ||
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c index 177472742172..432e75f960b7 100644 --- a/drivers/net/wireless/rt2x00/rt61pci.c +++ b/drivers/net/wireless/rt2x00/rt61pci.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 34 | #include <linux/eeprom_93cx6.h> | 35 | #include <linux/eeprom_93cx6.h> |
| 35 | 36 | ||
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c index 290d70bc5d22..bb58d797fb72 100644 --- a/drivers/net/wireless/rt2x00/rt73usb.c +++ b/drivers/net/wireless/rt2x00/rt73usb.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/usb.h> | 34 | #include <linux/usb.h> |
| 34 | 35 | ||
| 35 | #include "rt2x00.h" | 36 | #include "rt2x00.h" |
diff --git a/drivers/net/wireless/rtl818x/rtl8180_dev.c b/drivers/net/wireless/rtl818x/rtl8180_dev.c index 2b928ecf47bd..2131a442831a 100644 --- a/drivers/net/wireless/rtl818x/rtl8180_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8180_dev.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 21 | #include <linux/etherdevice.h> | 22 | #include <linux/etherdevice.h> |
| 22 | #include <linux/eeprom_93cx6.h> | 23 | #include <linux/eeprom_93cx6.h> |
diff --git a/drivers/net/wireless/rtl818x/rtl8187_dev.c b/drivers/net/wireless/rtl818x/rtl8187_dev.c index 0fb850e0c656..1d30792973f5 100644 --- a/drivers/net/wireless/rtl818x/rtl8187_dev.c +++ b/drivers/net/wireless/rtl818x/rtl8187_dev.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 26 | #include <linux/etherdevice.h> | 27 | #include <linux/etherdevice.h> |
| 27 | #include <linux/eeprom_93cx6.h> | 28 | #include <linux/eeprom_93cx6.h> |
diff --git a/drivers/net/wireless/wl12xx/wl1251_acx.c b/drivers/net/wireless/wl12xx/wl1251_acx.c index beff084040b5..91891f928070 100644 --- a/drivers/net/wireless/wl12xx/wl1251_acx.c +++ b/drivers/net/wireless/wl12xx/wl1251_acx.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include "wl1251_acx.h" | 1 | #include "wl1251_acx.h" |
| 2 | 2 | ||
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/crc7.h> | 5 | #include <linux/crc7.h> |
| 5 | 6 | ||
| 6 | #include "wl1251.h" | 7 | #include "wl1251.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_boot.c b/drivers/net/wireless/wl12xx/wl1251_boot.c index 28a808674080..d5ac79aeaa73 100644 --- a/drivers/net/wireless/wl12xx/wl1251_boot.c +++ b/drivers/net/wireless/wl12xx/wl1251_boot.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "wl1251_reg.h" | 27 | #include "wl1251_reg.h" |
| 27 | #include "wl1251_boot.h" | 28 | #include "wl1251_boot.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_cmd.c b/drivers/net/wireless/wl12xx/wl1251_cmd.c index 0320b478bb3f..a37b30cef489 100644 --- a/drivers/net/wireless/wl12xx/wl1251_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1251_cmd.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include "wl1251_cmd.h" | 1 | #include "wl1251_cmd.h" |
| 2 | 2 | ||
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/crc7.h> | 5 | #include <linux/crc7.h> |
| 5 | 6 | ||
| 6 | #include "wl1251.h" | 7 | #include "wl1251.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_debugfs.c b/drivers/net/wireless/wl12xx/wl1251_debugfs.c index 05e4d68eb4cc..5e4465ac08fa 100644 --- a/drivers/net/wireless/wl12xx/wl1251_debugfs.c +++ b/drivers/net/wireless/wl12xx/wl1251_debugfs.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include "wl1251_debugfs.h" | 24 | #include "wl1251_debugfs.h" |
| 25 | 25 | ||
| 26 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "wl1251.h" | 29 | #include "wl1251.h" |
| 29 | #include "wl1251_acx.h" | 30 | #include "wl1251_acx.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_init.c b/drivers/net/wireless/wl12xx/wl1251_init.c index 5aad56ea7153..b538bdd7b320 100644 --- a/drivers/net/wireless/wl12xx/wl1251_init.c +++ b/drivers/net/wireless/wl12xx/wl1251_init.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "wl1251_init.h" | 28 | #include "wl1251_init.h" |
| 28 | #include "wl12xx_80211.h" | 29 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c index 24ae6a360ac8..1c8226eee409 100644 --- a/drivers/net/wireless/wl12xx/wl1251_main.c +++ b/drivers/net/wireless/wl12xx/wl1251_main.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
| 31 | #include <linux/vmalloc.h> | 31 | #include <linux/vmalloc.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include "wl1251.h" | 34 | #include "wl1251.h" |
| 34 | #include "wl12xx_80211.h" | 35 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_rx.c b/drivers/net/wireless/wl12xx/wl1251_rx.c index b56732226cc0..6f229e0990f4 100644 --- a/drivers/net/wireless/wl12xx/wl1251_rx.c +++ b/drivers/net/wireless/wl12xx/wl1251_rx.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
| 26 | #include <linux/gfp.h> | ||
| 26 | #include <net/mac80211.h> | 27 | #include <net/mac80211.h> |
| 27 | 28 | ||
| 28 | #include "wl1251.h" | 29 | #include "wl1251.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1251_spi.c b/drivers/net/wireless/wl12xx/wl1251_spi.c index 9cc8c323830f..3bfb59bd4635 100644 --- a/drivers/net/wireless/wl12xx/wl1251_spi.c +++ b/drivers/net/wireless/wl12xx/wl1251_spi.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/irq.h> | 24 | #include <linux/irq.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/crc7.h> | 27 | #include <linux/crc7.h> |
| 27 | #include <linux/spi/spi.h> | 28 | #include <linux/spi/spi.h> |
| 28 | #include <linux/spi/wl12xx.h> | 29 | #include <linux/spi/wl12xx.h> |
diff --git a/drivers/net/wireless/wl12xx/wl1271_acx.c b/drivers/net/wireless/wl12xx/wl1271_acx.c index 60f10dce4800..308782421fce 100644 --- a/drivers/net/wireless/wl12xx/wl1271_acx.c +++ b/drivers/net/wireless/wl12xx/wl1271_acx.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/crc7.h> | 28 | #include <linux/crc7.h> |
| 29 | #include <linux/spi/spi.h> | 29 | #include <linux/spi/spi.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include "wl1271.h" | 32 | #include "wl1271.h" |
| 32 | #include "wl12xx_80211.h" | 33 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index 2be76ee42bb9..024356263065 100644 --- a/drivers/net/wireless/wl12xx/wl1271_boot.c +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "wl1271_acx.h" | 27 | #include "wl1271_acx.h" |
| 27 | #include "wl1271_reg.h" | 28 | #include "wl1271_reg.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_cmd.c b/drivers/net/wireless/wl12xx/wl1271_cmd.c index 36a64e06f290..e7832f3318eb 100644 --- a/drivers/net/wireless/wl12xx/wl1271_cmd.c +++ b/drivers/net/wireless/wl12xx/wl1271_cmd.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/crc7.h> | 26 | #include <linux/crc7.h> |
| 27 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
| 28 | #include <linux/etherdevice.h> | 28 | #include <linux/etherdevice.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "wl1271.h" | 31 | #include "wl1271.h" |
| 31 | #include "wl1271_reg.h" | 32 | #include "wl1271_reg.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_debugfs.c b/drivers/net/wireless/wl12xx/wl1271_debugfs.c index 8d7588ca68fd..3f7ff8d0cf5a 100644 --- a/drivers/net/wireless/wl12xx/wl1271_debugfs.c +++ b/drivers/net/wireless/wl12xx/wl1271_debugfs.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include "wl1271_debugfs.h" | 24 | #include "wl1271_debugfs.h" |
| 25 | 25 | ||
| 26 | #include <linux/skbuff.h> | 26 | #include <linux/skbuff.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "wl1271.h" | 29 | #include "wl1271.h" |
| 29 | #include "wl1271_acx.h" | 30 | #include "wl1271_acx.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_init.c b/drivers/net/wireless/wl12xx/wl1271_init.c index 86c30a86a456..d189e8fe05a6 100644 --- a/drivers/net/wireless/wl12xx/wl1271_init.c +++ b/drivers/net/wireless/wl12xx/wl1271_init.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "wl1271_init.h" | 28 | #include "wl1271_init.h" |
| 28 | #include "wl12xx_80211.h" | 29 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_main.c b/drivers/net/wireless/wl12xx/wl1271_main.c index 2a864b24291d..65a1aeba2419 100644 --- a/drivers/net/wireless/wl12xx/wl1271_main.c +++ b/drivers/net/wireless/wl12xx/wl1271_main.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/vmalloc.h> | 33 | #include <linux/vmalloc.h> |
| 34 | #include <linux/spi/wl12xx.h> | 34 | #include <linux/spi/wl12xx.h> |
| 35 | #include <linux/inetdevice.h> | 35 | #include <linux/inetdevice.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include "wl1271.h" | 38 | #include "wl1271.h" |
| 38 | #include "wl12xx_80211.h" | 39 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_rx.c b/drivers/net/wireless/wl12xx/wl1271_rx.c index 6730f5b96e76..c723d9c7e131 100644 --- a/drivers/net/wireless/wl12xx/wl1271_rx.c +++ b/drivers/net/wireless/wl12xx/wl1271_rx.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | * | 21 | * |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/gfp.h> | ||
| 25 | |||
| 24 | #include "wl1271.h" | 26 | #include "wl1271.h" |
| 25 | #include "wl1271_acx.h" | 27 | #include "wl1271_acx.h" |
| 26 | #include "wl1271_reg.h" | 28 | #include "wl1271_reg.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_spi.c b/drivers/net/wireless/wl12xx/wl1271_spi.c index 67a82934f36e..053c84aceb49 100644 --- a/drivers/net/wireless/wl12xx/wl1271_spi.c +++ b/drivers/net/wireless/wl12xx/wl1271_spi.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/crc7.h> | 26 | #include <linux/crc7.h> |
| 27 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "wl1271.h" | 30 | #include "wl1271.h" |
| 30 | #include "wl12xx_80211.h" | 31 | #include "wl12xx_80211.h" |
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.c b/drivers/net/wireless/wl12xx/wl1271_testmode.c index 3919102e942e..5c1c4f565fd8 100644 --- a/drivers/net/wireless/wl12xx/wl1271_testmode.c +++ b/drivers/net/wireless/wl12xx/wl1271_testmode.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #include "wl1271_testmode.h" | 23 | #include "wl1271_testmode.h" |
| 24 | 24 | ||
| 25 | #include <linux/slab.h> | ||
| 25 | #include <net/genetlink.h> | 26 | #include <net/genetlink.h> |
| 26 | 27 | ||
| 27 | #include "wl1271.h" | 28 | #include "wl1271.h" |
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 6917286edcae..9d1277874645 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/netdevice.h> | 18 | #include <linux/netdevice.h> |
| 18 | #include <linux/etherdevice.h> | 19 | #include <linux/etherdevice.h> |
| 19 | #include <linux/wireless.h> | 20 | #include <linux/wireless.h> |
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 7ca95c414fa8..b2af3c549bb3 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "zd_def.h" | 30 | #include "zd_def.h" |
| 30 | #include "zd_chip.h" | 31 | #include "zd_chip.h" |
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c index 00e09e26c826..16fa289ad77b 100644 --- a/drivers/net/wireless/zd1211rw/zd_mac.c +++ b/drivers/net/wireless/zd1211rw/zd_mac.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 24 | #include <linux/etherdevice.h> | 24 | #include <linux/etherdevice.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/usb.h> | 26 | #include <linux/usb.h> |
| 26 | #include <linux/jiffies.h> | 27 | #include <linux/jiffies.h> |
| 27 | #include <net/ieee80211_radiotap.h> | 28 | #include <net/ieee80211_radiotap.h> |
diff --git a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c index 439799b84876..9e74eb1b67d5 100644 --- a/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c +++ b/drivers/net/wireless/zd1211rw/zd_rf_uw2453.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include "zd_rf.h" | 24 | #include "zd_rf.h" |
| 24 | #include "zd_usb.h" | 25 | #include "zd_usb.h" |
diff --git a/drivers/net/wireless/zd1211rw/zd_usb.c b/drivers/net/wireless/zd1211rw/zd_usb.c index 442fc1117326..d91ad1a612af 100644 --- a/drivers/net/wireless/zd1211rw/zd_usb.c +++ b/drivers/net/wireless/zd1211rw/zd_usb.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/skbuff.h> | 28 | #include <linux/skbuff.h> |
| 28 | #include <linux/usb.h> | 29 | #include <linux/usb.h> |
| 29 | #include <linux/workqueue.h> | 30 | #include <linux/workqueue.h> |
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index a869b45d3d37..d504e2b60257 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/udp.h> | 40 | #include <linux/udp.h> |
| 41 | #include <linux/moduleparam.h> | 41 | #include <linux/moduleparam.h> |
| 42 | #include <linux/mm.h> | 42 | #include <linux/mm.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include <net/ip.h> | 44 | #include <net/ip.h> |
| 44 | 45 | ||
| 45 | #include <xen/xen.h> | 46 | #include <xen/xen.h> |
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 1a74594224b1..1e783ccc306e 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/etherdevice.h> | 19 | #include <linux/etherdevice.h> |
| 20 | #include <linux/skbuff.h> | 20 | #include <linux/skbuff.h> |
| 21 | #include <linux/io.h> | 21 | #include <linux/io.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/of_device.h> | 24 | #include <linux/of_device.h> |
| 24 | #include <linux/of_platform.h> | 25 | #include <linux/of_platform.h> |
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c index 389ba9df7120..fdba9cb3a599 100644 --- a/drivers/net/xtsonic.c +++ b/drivers/net/xtsonic.c | |||
| @@ -20,11 +20,11 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 22 | #include <linux/fcntl.h> | 22 | #include <linux/fcntl.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 25 | #include <linux/ioport.h> | 26 | #include <linux/ioport.h> |
| 26 | #include <linux/in.h> | 27 | #include <linux/in.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/skbuff.h> | 33 | #include <linux/skbuff.h> |
| 34 | #include <linux/platform_device.h> | 34 | #include <linux/platform_device.h> |
| 35 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
| 38 | #include <asm/pgtable.h> | 39 | #include <asm/pgtable.h> |
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 7d4107f5eeb0..ede5b2436f22 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
| @@ -90,7 +90,6 @@ static int gx_fix; | |||
| 90 | #include <linux/timer.h> | 90 | #include <linux/timer.h> |
| 91 | #include <linux/errno.h> | 91 | #include <linux/errno.h> |
| 92 | #include <linux/ioport.h> | 92 | #include <linux/ioport.h> |
| 93 | #include <linux/slab.h> | ||
| 94 | #include <linux/interrupt.h> | 93 | #include <linux/interrupt.h> |
| 95 | #include <linux/pci.h> | 94 | #include <linux/pci.h> |
| 96 | #include <linux/init.h> | 95 | #include <linux/init.h> |
diff --git a/drivers/net/znet.c b/drivers/net/znet.c index def49d2ec69a..dbfef8d70f2d 100644 --- a/drivers/net/znet.c +++ b/drivers/net/znet.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | #include <linux/module.h> | 88 | #include <linux/module.h> |
| 89 | #include <linux/kernel.h> | 89 | #include <linux/kernel.h> |
| 90 | #include <linux/string.h> | 90 | #include <linux/string.h> |
| 91 | #include <linux/slab.h> | ||
| 91 | #include <linux/errno.h> | 92 | #include <linux/errno.h> |
| 92 | #include <linux/interrupt.h> | 93 | #include <linux/interrupt.h> |
| 93 | #include <linux/ioport.h> | 94 | #include <linux/ioport.h> |
diff --git a/drivers/nubus/nubus.c b/drivers/nubus/nubus.c index f5f75844954c..b764ac22d523 100644 --- a/drivers/nubus/nubus.c +++ b/drivers/nubus/nubus.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/setup.h> | 19 | #include <asm/setup.h> |
| 19 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 20 | #include <asm/page.h> | 21 | #include <asm/page.h> |
diff --git a/drivers/of/base.c b/drivers/of/base.c index cb96888d1427..b5ad9740d8b2 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/of.h> | 21 | #include <linux/of.h> |
| 22 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/proc_fs.h> | 24 | #include <linux/proc_fs.h> |
| 24 | 25 | ||
| 25 | struct device_node *allnodes; | 26 | struct device_node *allnodes; |
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 406757a9d7ea..dee4fb56b094 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c | |||
| @@ -376,8 +376,11 @@ unsigned long __init unflatten_dt_node(unsigned long mem, | |||
| 376 | if (!np->type) | 376 | if (!np->type) |
| 377 | np->type = "<NULL>"; | 377 | np->type = "<NULL>"; |
| 378 | } | 378 | } |
| 379 | while (tag == OF_DT_BEGIN_NODE) { | 379 | while (tag == OF_DT_BEGIN_NODE || tag == OF_DT_NOP) { |
| 380 | mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize); | 380 | if (tag == OF_DT_NOP) |
| 381 | *p += 4; | ||
| 382 | else | ||
| 383 | mem = unflatten_dt_node(mem, p, np, allnextpp, fpsize); | ||
| 381 | tag = be32_to_cpup((__be32 *)(*p)); | 384 | tag = be32_to_cpup((__be32 *)(*p)); |
| 382 | } | 385 | } |
| 383 | if (tag != OF_DT_END_NODE) { | 386 | if (tag != OF_DT_END_NODE) { |
diff --git a/drivers/of/gpio.c b/drivers/of/gpio.c index 24c3606217f8..a1b31a4abae4 100644 --- a/drivers/of/gpio.c +++ b/drivers/of/gpio.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/of.h> | 17 | #include <linux/of.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/of_gpio.h> | 19 | #include <linux/of_gpio.h> |
| 19 | #include <asm/prom.h> | 20 | #include <asm/prom.h> |
| 20 | 21 | ||
diff --git a/drivers/oprofile/buffer_sync.c b/drivers/oprofile/buffer_sync.c index c9e2ae90f195..a9352b2c7ac4 100644 --- a/drivers/oprofile/buffer_sync.c +++ b/drivers/oprofile/buffer_sync.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
| 31 | #include <linux/oprofile.h> | 31 | #include <linux/oprofile.h> |
| 32 | #include <linux/sched.h> | 32 | #include <linux/sched.h> |
| 33 | #include <linux/gfp.h> | ||
| 33 | 34 | ||
| 34 | #include "oprofile_stats.h" | 35 | #include "oprofile_stats.h" |
| 35 | #include "event_buffer.h" | 36 | #include "event_buffer.h" |
diff --git a/drivers/parisc/asp.c b/drivers/parisc/asp.c index 9ca21098b146..6a1ab2512a53 100644 --- a/drivers/parisc/asp.c +++ b/drivers/parisc/asp.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 21 | #include <asm/led.h> | 20 | #include <asm/led.h> |
diff --git a/drivers/parisc/ccio-rm-dma.c b/drivers/parisc/ccio-rm-dma.c index 356b8357bccc..f78f6f1aef47 100644 --- a/drivers/parisc/ccio-rm-dma.c +++ b/drivers/parisc/ccio-rm-dma.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/mm.h> | 38 | #include <linux/mm.h> |
| 39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
| 41 | #include <linux/gfp.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
| 43 | 44 | ||
diff --git a/drivers/parisc/gsc.c b/drivers/parisc/gsc.c index c4e1f3c3c2fa..20a1bce1a031 100644 --- a/drivers/parisc/gsc.c +++ b/drivers/parisc/gsc.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 24 | 23 | ||
| 25 | #include <asm/hardware.h> | 24 | #include <asm/hardware.h> |
diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c index 3c8f06c3a5a0..5bed17f68ef4 100644 --- a/drivers/parport/daisy.c +++ b/drivers/parport/daisy.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/parport.h> | 23 | #include <linux/parport.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 26 | 27 | ||
| 27 | #include <asm/current.h> | 28 | #include <asm/current.h> |
diff --git a/drivers/parport/parport_ax88796.c b/drivers/parport/parport_ax88796.c index 6938d2e9f18f..2c5ac2bf5c56 100644 --- a/drivers/parport/parport_ax88796.c +++ b/drivers/parport/parport_ax88796.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 20 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
diff --git a/drivers/parport/parport_ip32.c b/drivers/parport/parport_ip32.c index 6d58bf895b1a..d3d7809af8bf 100644 --- a/drivers/parport/parport_ip32.c +++ b/drivers/parport/parport_ip32.c | |||
| @@ -103,6 +103,7 @@ | |||
| 103 | #include <linux/module.h> | 103 | #include <linux/module.h> |
| 104 | #include <linux/parport.h> | 104 | #include <linux/parport.h> |
| 105 | #include <linux/sched.h> | 105 | #include <linux/sched.h> |
| 106 | #include <linux/slab.h> | ||
| 106 | #include <linux/spinlock.h> | 107 | #include <linux/spinlock.h> |
| 107 | #include <linux/stddef.h> | 108 | #include <linux/stddef.h> |
| 108 | #include <linux/types.h> | 109 | #include <linux/types.h> |
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c index c3bb84ac931e..40e208d130f5 100644 --- a/drivers/parport/parport_serial.c +++ b/drivers/parport/parport_serial.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | #include <linux/parport.h> | 26 | #include <linux/parport.h> |
diff --git a/drivers/parport/probe.c b/drivers/parport/probe.c index 0f6550719bcf..d763bc9e44c1 100644 --- a/drivers/parport/probe.c +++ b/drivers/parport/probe.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/parport.h> | 9 | #include <linux/parport.h> |
| 10 | #include <linux/ctype.h> | 10 | #include <linux/ctype.h> |
| 11 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <asm/uaccess.h> | 13 | #include <asm/uaccess.h> |
| 13 | 14 | ||
| 14 | static const struct { | 15 | static const struct { |
diff --git a/drivers/pci/access.c b/drivers/pci/access.c index db23200c4874..2f646fe1260f 100644 --- a/drivers/pci/access.c +++ b/drivers/pci/access.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #include <linux/pci.h> | 2 | #include <linux/pci.h> |
| 3 | #include <linux/module.h> | 3 | #include <linux/module.h> |
| 4 | #include <linux/sched.h> | 4 | #include <linux/sched.h> |
| 5 | #include <linux/slab.h> | ||
| 5 | #include <linux/ioport.h> | 6 | #include <linux/ioport.h> |
| 6 | #include <linux/wait.h> | 7 | #include <linux/wait.h> |
| 7 | 8 | ||
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c index 26301cb25e7f..628ea20a8841 100644 --- a/drivers/pci/bus.c +++ b/drivers/pci/bus.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/ioport.h> | 14 | #include <linux/ioport.h> |
| 15 | #include <linux/proc_fs.h> | 15 | #include <linux/proc_fs.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #include "pci.h" | 19 | #include "pci.h" |
| 19 | 20 | ||
diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c index 83aae4747594..33ead97f0c4b 100644 --- a/drivers/pci/dmar.c +++ b/drivers/pci/dmar.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/interrupt.h> | 35 | #include <linux/interrupt.h> |
| 36 | #include <linux/tboot.h> | 36 | #include <linux/tboot.h> |
| 37 | #include <linux/dmi.h> | 37 | #include <linux/dmi.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #define PREFIX "DMAR: " | 40 | #define PREFIX "DMAR: " |
| 40 | 41 | ||
diff --git a/drivers/pci/hotplug/acpi_pcihp.c b/drivers/pci/hotplug/acpi_pcihp.c index 3c76fc67cf0e..45fcc1e96df9 100644 --- a/drivers/pci/hotplug/acpi_pcihp.c +++ b/drivers/pci/hotplug/acpi_pcihp.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/pci_hotplug.h> | 32 | #include <linux/pci_hotplug.h> |
| 33 | #include <linux/acpi.h> | 33 | #include <linux/acpi.h> |
| 34 | #include <linux/pci-acpi.h> | 34 | #include <linux/pci-acpi.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #define MY_NAME "acpi_pcihp" | 37 | #define MY_NAME "acpi_pcihp" |
| 37 | 38 | ||
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c index b5dad9f37453..cb23aa2ebf96 100644 --- a/drivers/pci/hotplug/acpiphp_glue.c +++ b/drivers/pci/hotplug/acpiphp_glue.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/pci_hotplug.h> | 47 | #include <linux/pci_hotplug.h> |
| 48 | #include <linux/pci-acpi.h> | 48 | #include <linux/pci-acpi.h> |
| 49 | #include <linux/mutex.h> | 49 | #include <linux/mutex.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include "../pci.h" | 52 | #include "../pci.h" |
| 52 | #include "acpiphp.h" | 53 | #include "acpiphp.h" |
diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiphp_ibm.c index aa5df485f8cf..6ecbfb27db9d 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 31 | #include <acpi/acpi_bus.h> | 32 | #include <acpi/acpi_bus.h> |
diff --git a/drivers/pci/hotplug/cpqphp_sysfs.c b/drivers/pci/hotplug/cpqphp_sysfs.c index e6089bdb6e5b..56215322930a 100644 --- a/drivers/pci/hotplug/cpqphp_sysfs.c +++ b/drivers/pci/hotplug/cpqphp_sysfs.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 32 | #include <linux/proc_fs.h> | 33 | #include <linux/proc_fs.h> |
| 33 | #include <linux/workqueue.h> | 34 | #include <linux/workqueue.h> |
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 0a894efd4b9b..5317e4d7d96e 100644 --- a/drivers/pci/hotplug/fakephp.c +++ b/drivers/pci/hotplug/fakephp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include "../pci.h" | 23 | #include "../pci.h" |
| 23 | 24 | ||
| 24 | struct legacy_slot { | 25 | struct legacy_slot { |
diff --git a/drivers/pci/hotplug/pci_hotplug_core.c b/drivers/pci/hotplug/pci_hotplug_core.c index 728b119f71ad..6d2eea93298f 100644 --- a/drivers/pci/hotplug/pci_hotplug_core.c +++ b/drivers/pci/hotplug/pci_hotplug_core.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/kobject.h> | 33 | #include <linux/kobject.h> |
| 34 | #include <linux/sysfs.h> | 34 | #include <linux/sysfs.h> |
| 35 | #include <linux/pagemap.h> | 35 | #include <linux/pagemap.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 38 | #include <linux/mount.h> | 37 | #include <linux/mount.h> |
| 39 | #include <linux/namei.h> | 38 | #include <linux/namei.h> |
diff --git a/drivers/pci/hotplug/pciehp_acpi.c b/drivers/pci/hotplug/pciehp_acpi.c index b09b083011d6..1f4000a5a108 100644 --- a/drivers/pci/hotplug/pciehp_acpi.c +++ b/drivers/pci/hotplug/pciehp_acpi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/acpi.h> | 26 | #include <linux/acpi.h> |
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/pci_hotplug.h> | 28 | #include <linux/pci_hotplug.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "pciehp.h" | 30 | #include "pciehp.h" |
| 30 | 31 | ||
| 31 | #define PCIEHP_DETECT_PCIE (0) | 32 | #define PCIEHP_DETECT_PCIE (0) |
diff --git a/drivers/pci/hotplug/pciehp_core.c b/drivers/pci/hotplug/pciehp_core.c index 920f820edf87..3588ea61b0dd 100644 --- a/drivers/pci/hotplug/pciehp_core.c +++ b/drivers/pci/hotplug/pciehp_core.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 34 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 35 | #include "pciehp.h" | 36 | #include "pciehp.h" |
diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c index 9a7f247e8ac1..8f58148be044 100644 --- a/drivers/pci/hotplug/pciehp_ctrl.c +++ b/drivers/pci/hotplug/pciehp_ctrl.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 34 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 35 | #include "../pci.h" | 36 | #include "../pci.h" |
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c index 9665d6b17a2a..0cd42047d89b 100644 --- a/drivers/pci/hotplug/pciehp_hpc.c +++ b/drivers/pci/hotplug/pciehp_hpc.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/pci.h> | 36 | #include <linux/pci.h> |
| 37 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| 38 | #include <linux/time.h> | 38 | #include <linux/time.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include "../pci.h" | 41 | #include "../pci.h" |
| 41 | #include "pciehp.h" | 42 | #include "pciehp.h" |
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index dcaae725fd79..719702240780 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/pci_hotplug.h> | 29 | #include <linux/pci_hotplug.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/smp.h> | 30 | #include <linux/smp.h> |
| 32 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 33 | #include <asm/eeh.h> /* for eeh_add_device() */ | 32 | #include <asm/eeh.h> /* for eeh_add_device() */ |
diff --git a/drivers/pci/hotplug/sgi_hotplug.c b/drivers/pci/hotplug/sgi_hotplug.c index 8aebe1e9d3d6..72d507b6a2aa 100644 --- a/drivers/pci/hotplug/sgi_hotplug.c +++ b/drivers/pci/hotplug/sgi_hotplug.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 16 | #include <linux/pci_hotplug.h> | 16 | #include <linux/pci_hotplug.h> |
| 17 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 19 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 20 | 21 | ||
diff --git a/drivers/pci/hotplug/shpchp_core.c b/drivers/pci/hotplug/shpchp_core.c index a5062297f488..a7bd5048396e 100644 --- a/drivers/pci/hotplug/shpchp_core.c +++ b/drivers/pci/hotplug/shpchp_core.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/moduleparam.h> | 31 | #include <linux/moduleparam.h> |
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 35 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
| 36 | #include "shpchp.h" | 37 | #include "shpchp.h" |
diff --git a/drivers/pci/hotplug/shpchp_ctrl.c b/drivers/pci/hotplug/shpchp_ctrl.c index 3bba0c0888ff..3387fbfb0c54 100644 --- a/drivers/pci/hotplug/shpchp_ctrl.c +++ b/drivers/pci/hotplug/shpchp_ctrl.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 34 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 35 | #include "../pci.h" | 36 | #include "../pci.h" |
diff --git a/drivers/pci/htirq.c b/drivers/pci/htirq.c index 737a1c44b07a..98abf8b91294 100644 --- a/drivers/pci/htirq.c +++ b/drivers/pci/htirq.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 11 | #include <linux/spinlock.h> | 11 | #include <linux/spinlock.h> |
| 12 | #include <linux/slab.h> | 12 | #include <linux/slab.h> |
| 13 | #include <linux/gfp.h> | ||
| 14 | #include <linux/htirq.h> | 13 | #include <linux/htirq.h> |
| 15 | 14 | ||
| 16 | /* Global ht irq lock. | 15 | /* Global ht irq lock. |
diff --git a/drivers/pci/intr_remapping.c b/drivers/pci/intr_remapping.c index 95b849130ad4..6ee98a56946f 100644 --- a/drivers/pci/intr_remapping.c +++ b/drivers/pci/intr_remapping.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #include <linux/interrupt.h> | 1 | #include <linux/interrupt.h> |
| 2 | #include <linux/dmar.h> | 2 | #include <linux/dmar.h> |
| 3 | #include <linux/spinlock.h> | 3 | #include <linux/spinlock.h> |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/jiffies.h> | 5 | #include <linux/jiffies.h> |
| 5 | #include <linux/hpet.h> | 6 | #include <linux/hpet.h> |
| 6 | #include <linux/pci.h> | 7 | #include <linux/pci.h> |
diff --git a/drivers/pci/ioapic.c b/drivers/pci/ioapic.c index fb9fdf4a42bf..203508b227b7 100644 --- a/drivers/pci/ioapic.c +++ b/drivers/pci/ioapic.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/acpi.h> | 20 | #include <linux/acpi.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <acpi/acpi_bus.h> | 22 | #include <acpi/acpi_bus.h> |
| 22 | 23 | ||
| 23 | struct ioapic { | 24 | struct ioapic { |
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c index 3e5ab2bf6a5c..ce6a3666b3d9 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 13 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index f9cf3173b23d..77b68eaf021e 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/smp.h> | 18 | #include <linux/smp.h> |
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include "pci.h" | 23 | #include "pci.h" |
| 23 | #include "msi.h" | 24 | #include "msi.h" |
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 997668558e79..fad93983bfed 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/capability.h> | 24 | #include <linux/capability.h> |
| 25 | #include <linux/pci-aspm.h> | 25 | #include <linux/pci-aspm.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "pci.h" | 27 | #include "pci.h" |
| 27 | 28 | ||
| 28 | static int sysfs_initialized; /* = 0 */ | 29 | static int sysfs_initialized; /* = 0 */ |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 1531f3a49879..5ea587e59e48 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 16 | #include <linux/spinlock.h> | 17 | #include <linux/spinlock.h> |
| 17 | #include <linux/string.h> | 18 | #include <linux/string.h> |
diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c index 223052b73563..f8f425b8731d 100644 --- a/drivers/pci/pcie/aer/aer_inject.c +++ b/drivers/pci/pcie/aer/aer_inject.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/miscdevice.h> | 22 | #include <linux/miscdevice.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 25 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
| 26 | #include <linux/stddef.h> | 27 | #include <linux/stddef.h> |
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index 21f215f4daa3..aa495ad9bbd4 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/pcieport_if.h> | 27 | #include <linux/pcieport_if.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "aerdrv.h" | 30 | #include "aerdrv.h" |
| 30 | #include "../../pci.h" | 31 | #include "../../pci.h" |
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c index c843a799814d..aceb04b67b60 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/pm.h> | 23 | #include <linux/pm.h> |
| 24 | #include <linux/suspend.h> | 24 | #include <linux/suspend.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "aerdrv.h" | 27 | #include "aerdrv.h" |
| 27 | 28 | ||
| 28 | static int forceload; | 29 | static int forceload; |
diff --git a/drivers/pci/pcie/pme/pcie_pme.c b/drivers/pci/pcie/pme/pcie_pme.c index 7b3cbff547ee..aac285a16b62 100644 --- a/drivers/pci/pcie/pme/pcie_pme.c +++ b/drivers/pci/pcie/pme/pcie_pme.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 19 | #include <linux/device.h> | 20 | #include <linux/device.h> |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index 127e8f169d9c..3debed25e46b 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/pm.h> | 13 | #include <linux/pm.h> |
| 14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/pcieport_if.h> | 15 | #include <linux/pcieport_if.h> |
| 17 | #include <linux/aer.h> | 16 | #include <linux/aer.h> |
| 18 | #include <linux/dmi.h> | 17 | #include <linux/dmi.h> |
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 593bb844b8db..449e890267a2 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | 6 | ||
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 10 | #include <linux/proc_fs.h> | 11 | #include <linux/proc_fs.h> |
| 11 | #include <linux/seq_file.h> | 12 | #include <linux/seq_file.h> |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 3ea0b29c0104..27c0e6eb7136 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
| @@ -2123,6 +2123,9 @@ static void __devinit quirk_disable_msi(struct pci_dev *dev) | |||
| 2123 | } | 2123 | } |
| 2124 | } | 2124 | } |
| 2125 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); | 2125 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_8131_BRIDGE, quirk_disable_msi); |
| 2126 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x9602, quirk_disable_msi); | ||
| 2127 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK, 0x9602, quirk_disable_msi); | ||
| 2128 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AI, 0x9602, quirk_disable_msi); | ||
| 2126 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi); | 2129 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, 0xa238, quirk_disable_msi); |
| 2127 | 2130 | ||
| 2128 | /* Go through the list of Hypertransport capabilities and | 2131 | /* Go through the list of Hypertransport capabilities and |
| @@ -2495,39 +2498,6 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4374, | |||
| 2495 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375, | 2498 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x4375, |
| 2496 | quirk_msi_intx_disable_bug); | 2499 | quirk_msi_intx_disable_bug); |
| 2497 | 2500 | ||
| 2498 | /* | ||
| 2499 | * MSI does not work with the AMD RS780/RS880 internal graphics and HDMI audio | ||
| 2500 | * devices unless the BIOS has initialized the nb_cntl.strap_msi_enable bit. | ||
| 2501 | */ | ||
| 2502 | static void __init rs780_int_gfx_disable_msi(struct pci_dev *int_gfx_bridge) | ||
| 2503 | { | ||
| 2504 | u32 nb_cntl; | ||
| 2505 | |||
| 2506 | if (!int_gfx_bridge->subordinate) | ||
| 2507 | return; | ||
| 2508 | |||
| 2509 | pci_bus_write_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0), | ||
| 2510 | 0x60, 0); | ||
| 2511 | pci_bus_read_config_dword(int_gfx_bridge->bus, PCI_DEVFN(0, 0), | ||
| 2512 | 0x64, &nb_cntl); | ||
| 2513 | |||
| 2514 | if (!(nb_cntl & BIT(10))) { | ||
| 2515 | dev_warn(&int_gfx_bridge->dev, | ||
| 2516 | FW_WARN "RS780: MSI for internal graphics disabled\n"); | ||
| 2517 | int_gfx_bridge->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; | ||
| 2518 | } | ||
| 2519 | } | ||
| 2520 | |||
| 2521 | #define PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX 0x9602 | ||
| 2522 | |||
| 2523 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, | ||
| 2524 | PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX, | ||
| 2525 | rs780_int_gfx_disable_msi); | ||
| 2526 | /* wrong vendor ID on M4A785TD motherboard: */ | ||
| 2527 | DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ASUSTEK, | ||
| 2528 | PCI_DEVICE_ID_AMD_RS780_P2P_INT_GFX, | ||
| 2529 | rs780_int_gfx_disable_msi); | ||
| 2530 | |||
| 2531 | #endif /* CONFIG_PCI_MSI */ | 2501 | #endif /* CONFIG_PCI_MSI */ |
| 2532 | 2502 | ||
| 2533 | #ifdef CONFIG_PCI_IOV | 2503 | #ifdef CONFIG_PCI_IOV |
diff --git a/drivers/pci/search.c b/drivers/pci/search.c index 4a471dc4f4b9..20d03f772289 100644 --- a/drivers/pci/search.c +++ b/drivers/pci/search.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| 11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 13 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 14 | #include "pci.h" | 15 | #include "pci.h" |
diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c index f75a44d37fbe..659eaa0fc48f 100644 --- a/drivers/pci/slot.c +++ b/drivers/pci/slot.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | */ | 6 | */ |
| 7 | 7 | ||
| 8 | #include <linux/kobject.h> | 8 | #include <linux/kobject.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 10 | #include <linux/err.h> | 11 | #include <linux/err.h> |
| 11 | #include "pci.h" | 12 | #include "pci.h" |
diff --git a/drivers/pcmcia/at91_cf.c b/drivers/pcmcia/at91_cf.c index fb904f444d90..fb33fa42d249 100644 --- a/drivers/pcmcia/at91_cf.c +++ b/drivers/pcmcia/at91_cf.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include <pcmcia/ss.h> | 20 | #include <pcmcia/ss.h> |
| 20 | 21 | ||
diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index ac4d089430fd..88c4c4098789 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/spinlock.h> | 43 | #include <linux/spinlock.h> |
| 44 | #include <linux/mutex.h> | 44 | #include <linux/mutex.h> |
| 45 | #include <linux/platform_device.h> | 45 | #include <linux/platform_device.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | 47 | ||
| 47 | #include <asm/io.h> | 48 | #include <asm/io.h> |
| 48 | #include <asm/irq.h> | 49 | #include <asm/irq.h> |
diff --git a/drivers/pcmcia/bcm63xx_pcmcia.c b/drivers/pcmcia/bcm63xx_pcmcia.c index bc88a3b19bb3..693577e0fefc 100644 --- a/drivers/pcmcia/bcm63xx_pcmcia.c +++ b/drivers/pcmcia/bcm63xx_pcmcia.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/ioport.h> | 11 | #include <linux/ioport.h> |
| 12 | #include <linux/timer.h> | 12 | #include <linux/timer.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 16 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
diff --git a/drivers/pcmcia/bfin_cf_pcmcia.c b/drivers/pcmcia/bfin_cf_pcmcia.c index 93f9ddeb0c36..9e84d039de41 100644 --- a/drivers/pcmcia/bfin_cf_pcmcia.c +++ b/drivers/pcmcia/bfin_cf_pcmcia.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/init.h> | 33 | #include <linux/init.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 35 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 36 | #include <linux/irq.h> | 37 | #include <linux/irq.h> |
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index a520193b6453..6206408e196c 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/resource.h> | 28 | #include <linux/resource.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 30 | 31 | ||
| 31 | #include <pcmcia/cs_types.h> | 32 | #include <pcmcia/cs_types.h> |
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c index 52d33b2a5bc5..cb6036d89e59 100644 --- a/drivers/pcmcia/ds.c +++ b/drivers/pcmcia/ds.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/firmware.h> | 24 | #include <linux/firmware.h> |
| 25 | #include <linux/kref.h> | 25 | #include <linux/kref.h> |
| 26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <pcmcia/cs_types.h> | 29 | #include <pcmcia/cs_types.h> |
| 29 | #include <pcmcia/cs.h> | 30 | #include <pcmcia/cs.h> |
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c index 89cfddca089a..2e59fe947d28 100644 --- a/drivers/pcmcia/electra_cf.c +++ b/drivers/pcmcia/electra_cf.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
| 33 | #include <linux/of_platform.h> | 33 | #include <linux/of_platform.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <pcmcia/ss.h> | 36 | #include <pcmcia/ss.h> |
| 36 | 37 | ||
diff --git a/drivers/pcmcia/i82365.c b/drivers/pcmcia/i82365.c index d53d9b5659c7..9e2a15628de5 100644 --- a/drivers/pcmcia/i82365.c +++ b/drivers/pcmcia/i82365.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 42 | #include <linux/timer.h> | 42 | #include <linux/timer.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/ioport.h> | 43 | #include <linux/ioport.h> |
| 45 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
| 46 | #include <linux/workqueue.h> | 45 | #include <linux/workqueue.h> |
diff --git a/drivers/pcmcia/m32r_cfc.c b/drivers/pcmcia/m32r_cfc.c index ab21264468d6..7e16ed8eb0a4 100644 --- a/drivers/pcmcia/m32r_cfc.c +++ b/drivers/pcmcia/m32r_cfc.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
diff --git a/drivers/pcmcia/m32r_pcc.c b/drivers/pcmcia/m32r_pcc.c index 0caf3db7c700..6c5c3f910d71 100644 --- a/drivers/pcmcia/m32r_pcc.c +++ b/drivers/pcmcia/m32r_pcc.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/timer.h> | 18 | #include <linux/timer.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/ioport.h> | 19 | #include <linux/ioport.h> |
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/workqueue.h> | 21 | #include <linux/workqueue.h> |
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c index 01ef7de15322..41cc954a5ffe 100644 --- a/drivers/pcmcia/m8xx_pcmcia.c +++ b/drivers/pcmcia/m8xx_pcmcia.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | 42 | ||
| 43 | #include <linux/kernel.h> | 43 | #include <linux/kernel.h> |
| 44 | #include <linux/errno.h> | 44 | #include <linux/errno.h> |
| 45 | #include <linux/slab.h> | ||
| 46 | #include <linux/timer.h> | 45 | #include <linux/timer.h> |
| 47 | #include <linux/ioport.h> | 46 | #include <linux/ioport.h> |
| 48 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
diff --git a/drivers/pcmcia/omap_cf.c b/drivers/pcmcia/omap_cf.c index 9edc396577b9..a7cfc7964c7c 100644 --- a/drivers/pcmcia/omap_cf.c +++ b/drivers/pcmcia/omap_cf.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <pcmcia/ss.h> | 21 | #include <pcmcia/ss.h> |
| 21 | 22 | ||
diff --git a/drivers/pcmcia/pcmcia_ioctl.c b/drivers/pcmcia/pcmcia_ioctl.c index 13a7132cf688..104e73d5d86c 100644 --- a/drivers/pcmcia/pcmcia_ioctl.c +++ b/drivers/pcmcia/pcmcia_ioctl.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
| 28 | #include <linux/poll.h> | 28 | #include <linux/poll.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/seq_file.h> | 31 | #include <linux/seq_file.h> |
| 31 | #include <linux/smp_lock.h> | 32 | #include <linux/smp_lock.h> |
| 32 | #include <linux/workqueue.h> | 33 | #include <linux/workqueue.h> |
diff --git a/drivers/pcmcia/pcmcia_resource.c b/drivers/pcmcia/pcmcia_resource.c index c4612c52e4cb..caec1dee2a4b 100644 --- a/drivers/pcmcia/pcmcia_resource.c +++ b/drivers/pcmcia/pcmcia_resource.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 23 | #include <linux/netdevice.h> | 23 | #include <linux/netdevice.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <pcmcia/cs_types.h> | 26 | #include <pcmcia/cs_types.h> |
| 26 | #include <pcmcia/ss.h> | 27 | #include <pcmcia/ss.h> |
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index 4a34268cc512..b61a13663a0a 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | #include <linux/workqueue.h> | 15 | #include <linux/workqueue.h> |
diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c index 0a876fabfe44..df4532e91b1a 100644 --- a/drivers/pcmcia/pxa2xx_base.c +++ b/drivers/pcmcia/pxa2xx_base.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | ======================================================================*/ | 17 | ======================================================================*/ |
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 21 | #include <linux/cpufreq.h> | 22 | #include <linux/cpufreq.h> |
| 22 | #include <linux/ioport.h> | 23 | #include <linux/ioport.h> |
diff --git a/drivers/pcmcia/rsrc_mgr.c b/drivers/pcmcia/rsrc_mgr.c index 452c83b512c4..ffa5f3cae57b 100644 --- a/drivers/pcmcia/rsrc_mgr.c +++ b/drivers/pcmcia/rsrc_mgr.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * (C) 1999 David A. Hinds | 12 | * (C) 1999 David A. Hinds |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 17 | 18 | ||
diff --git a/drivers/pcmcia/sa1100_generic.c b/drivers/pcmcia/sa1100_generic.c index 518896241429..edbd8c472628 100644 --- a/drivers/pcmcia/sa1100_generic.c +++ b/drivers/pcmcia/sa1100_generic.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
| 36 | 37 | ||
| 37 | #include <pcmcia/cs_types.h> | 38 | #include <pcmcia/cs_types.h> |
diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c index 799e9793e49e..59866905ea37 100644 --- a/drivers/pcmcia/sa1111_generic.c +++ b/drivers/pcmcia/sa1111_generic.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <pcmcia/ss.h> | 17 | #include <pcmcia/ss.h> |
| 17 | 18 | ||
diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c index fc9a6527019b..fa28d8911b00 100644 --- a/drivers/pcmcia/sa11xx_base.c +++ b/drivers/pcmcia/sa11xx_base.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
| 38 | #include <linux/spinlock.h> | 38 | #include <linux/spinlock.h> |
| 39 | #include <linux/io.h> | 39 | #include <linux/io.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
| 42 | #include <asm/irq.h> | 43 | #include <asm/irq.h> |
diff --git a/drivers/pcmcia/socket_sysfs.c b/drivers/pcmcia/socket_sysfs.c index 08278016e58d..80e36bc407da 100644 --- a/drivers/pcmcia/socket_sysfs.c +++ b/drivers/pcmcia/socket_sysfs.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/major.h> | 16 | #include <linux/major.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 20 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 21 | #include <linux/timer.h> | 20 | #include <linux/timer.h> |
diff --git a/drivers/pcmcia/tcic.c b/drivers/pcmcia/tcic.c index bac85f3236bb..56004a1b5bba 100644 --- a/drivers/pcmcia/tcic.c +++ b/drivers/pcmcia/tcic.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 40 | #include <linux/errno.h> | 40 | #include <linux/errno.h> |
| 41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/timer.h> | 42 | #include <linux/timer.h> |
| 44 | #include <linux/ioport.h> | 43 | #include <linux/ioport.h> |
| 45 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index f9009d34254b..201ccfa1e97b 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/pm.h> | 15 | #include <linux/pm.h> |
| 16 | #include <linux/resource.h> | 16 | #include <linux/resource.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/spinlock.h> | 18 | #include <linux/spinlock.h> |
| 18 | 19 | ||
| 19 | #include <pcmcia/cs_types.h> | 20 | #include <pcmcia/cs_types.h> |
diff --git a/drivers/pcmcia/yenta_socket.c b/drivers/pcmcia/yenta_socket.c index f19ad02374d9..83ace277426c 100644 --- a/drivers/pcmcia/yenta_socket.c +++ b/drivers/pcmcia/yenta_socket.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include <pcmcia/cs_types.h> | 22 | #include <pcmcia/cs_types.h> |
| 22 | #include <pcmcia/ss.h> | 23 | #include <pcmcia/ss.h> |
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index e631dbeafd79..7bec4588c268 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig | |||
| @@ -385,6 +385,16 @@ config EEEPC_LAPTOP | |||
| 385 | 385 | ||
| 386 | If you have an Eee PC laptop, say Y or M here. | 386 | If you have an Eee PC laptop, say Y or M here. |
| 387 | 387 | ||
| 388 | config EEEPC_WMI | ||
| 389 | tristate "Eee PC WMI Hotkey Driver (EXPERIMENTAL)" | ||
| 390 | depends on ACPI_WMI | ||
| 391 | depends on INPUT | ||
| 392 | depends on EXPERIMENTAL | ||
| 393 | ---help--- | ||
| 394 | Say Y here if you want to support WMI-based hotkeys on Eee PC laptops. | ||
| 395 | |||
| 396 | To compile this driver as a module, choose M here: the module will | ||
| 397 | be called eeepc-wmi. | ||
| 388 | 398 | ||
| 389 | config ACPI_WMI | 399 | config ACPI_WMI |
| 390 | tristate "WMI" | 400 | tristate "WMI" |
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index 9cd9fa0a27e6..a906490e3530 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | # | 4 | # |
| 5 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o | 5 | obj-$(CONFIG_ASUS_LAPTOP) += asus-laptop.o |
| 6 | obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o | 6 | obj-$(CONFIG_EEEPC_LAPTOP) += eeepc-laptop.o |
| 7 | obj-$(CONFIG_EEEPC_WMI) += eeepc-wmi.o | ||
| 7 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o | 8 | obj-$(CONFIG_MSI_LAPTOP) += msi-laptop.o |
| 8 | obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o | 9 | obj-$(CONFIG_ACPI_CMPC) += classmate-laptop.o |
| 9 | obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o | 10 | obj-$(CONFIG_COMPAL_LAPTOP) += compal-laptop.o |
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index cbca40aa4006..1ea6c434d330 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/rfkill.h> | 36 | #include <linux/rfkill.h> |
| 37 | #include <linux/workqueue.h> | 37 | #include <linux/workqueue.h> |
| 38 | #include <linux/debugfs.h> | 38 | #include <linux/debugfs.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <acpi/acpi_drivers.h> | 41 | #include <acpi/acpi_drivers.h> |
| 41 | 42 | ||
diff --git a/drivers/platform/x86/asus-laptop.c b/drivers/platform/x86/asus-laptop.c index db5f7db2ba33..52262b012abb 100644 --- a/drivers/platform/x86/asus-laptop.c +++ b/drivers/platform/x86/asus-laptop.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
| 50 | #include <linux/input/sparse-keymap.h> | 50 | #include <linux/input/sparse-keymap.h> |
| 51 | #include <linux/rfkill.h> | 51 | #include <linux/rfkill.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <acpi/acpi_drivers.h> | 53 | #include <acpi/acpi_drivers.h> |
| 53 | #include <acpi/acpi_bus.h> | 54 | #include <acpi/acpi_bus.h> |
| 54 | 55 | ||
| @@ -139,7 +140,7 @@ MODULE_PARM_DESC(bluetooth_status, "Set the wireless status on boot " | |||
| 139 | 140 | ||
| 140 | /* Backlight */ | 141 | /* Backlight */ |
| 141 | static acpi_handle lcd_switch_handle; | 142 | static acpi_handle lcd_switch_handle; |
| 142 | static const char *lcd_switch_paths[] = { | 143 | static char *lcd_switch_paths[] = { |
| 143 | "\\_SB.PCI0.SBRG.EC0._Q10", /* All new models */ | 144 | "\\_SB.PCI0.SBRG.EC0._Q10", /* All new models */ |
| 144 | "\\_SB.PCI0.ISA.EC0._Q10", /* A1x */ | 145 | "\\_SB.PCI0.ISA.EC0._Q10", /* A1x */ |
| 145 | "\\_SB.PCI0.PX40.ECD0._Q10", /* L3C */ | 146 | "\\_SB.PCI0.PX40.ECD0._Q10", /* L3C */ |
| @@ -153,7 +154,7 @@ static const char *lcd_switch_paths[] = { | |||
| 153 | #define METHOD_SWITCH_DISPLAY "SDSP" | 154 | #define METHOD_SWITCH_DISPLAY "SDSP" |
| 154 | 155 | ||
| 155 | static acpi_handle display_get_handle; | 156 | static acpi_handle display_get_handle; |
| 156 | static const char *display_get_paths[] = { | 157 | static char *display_get_paths[] = { |
| 157 | /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */ | 158 | /* A6B, A6K A6R A7D F3JM L4R M6R A3G M6A M6V VX-1 V6J V6V W3Z */ |
| 158 | "\\_SB.PCI0.P0P1.VGA.GETD", | 159 | "\\_SB.PCI0.P0P1.VGA.GETD", |
| 159 | /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V G1 */ | 160 | /* A3E A4K, A4D A4L A6J A7J A8J Z71V M9V S5A M5A z33A W1Jc W2V G1 */ |
diff --git a/drivers/platform/x86/asus_acpi.c b/drivers/platform/x86/asus_acpi.c index ee520357abaa..92fd30c9379c 100644 --- a/drivers/platform/x86/asus_acpi.c +++ b/drivers/platform/x86/asus_acpi.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | 32 | ||
| 33 | #include <linux/kernel.h> | 33 | #include <linux/kernel.h> |
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 36 | #include <linux/types.h> | 37 | #include <linux/types.h> |
| 37 | #include <linux/proc_fs.h> | 38 | #include <linux/proc_fs.h> |
diff --git a/drivers/platform/x86/classmate-laptop.c b/drivers/platform/x86/classmate-laptop.c index c696cf1c2616..7f9e5ddc9498 100644 --- a/drivers/platform/x86/classmate-laptop.c +++ b/drivers/platform/x86/classmate-laptop.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 23 | #include <acpi/acpi_drivers.h> | 24 | #include <acpi/acpi_drivers.h> |
| 24 | #include <linux/backlight.h> | 25 | #include <linux/backlight.h> |
diff --git a/drivers/platform/x86/dell-laptop.c b/drivers/platform/x86/dell-laptop.c index 46435ac4684f..661e3ac4d5b1 100644 --- a/drivers/platform/x86/dell-laptop.c +++ b/drivers/platform/x86/dell-laptop.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/acpi.h> | 24 | #include <linux/acpi.h> |
| 25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 26 | #include <linux/i8042.h> | 26 | #include <linux/i8042.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "../../firmware/dcdbas.h" | 28 | #include "../../firmware/dcdbas.h" |
| 28 | 29 | ||
| 29 | #define BRIGHTNESS_TOKEN 0x7d | 30 | #define BRIGHTNESS_TOKEN 0x7d |
diff --git a/drivers/platform/x86/dell-wmi.c b/drivers/platform/x86/dell-wmi.c index bed764e3ea2a..6ba6c30e5bb6 100644 --- a/drivers/platform/x86/dell-wmi.c +++ b/drivers/platform/x86/dell-wmi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 30 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 31 | #include <acpi/acpi_drivers.h> | 32 | #include <acpi/acpi_drivers.h> |
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index 3fdf21e0052e..54a015785ca8 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/fb.h> | 27 | #include <linux/fb.h> |
| 28 | #include <linux/hwmon.h> | 28 | #include <linux/hwmon.h> |
| 29 | #include <linux/hwmon-sysfs.h> | 29 | #include <linux/hwmon-sysfs.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <acpi/acpi_drivers.h> | 31 | #include <acpi/acpi_drivers.h> |
| 31 | #include <acpi/acpi_bus.h> | 32 | #include <acpi/acpi_bus.h> |
| 32 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
diff --git a/drivers/platform/x86/eeepc-wmi.c b/drivers/platform/x86/eeepc-wmi.c new file mode 100644 index 000000000000..9f8822658fd7 --- /dev/null +++ b/drivers/platform/x86/eeepc-wmi.c | |||
| @@ -0,0 +1,158 @@ | |||
| 1 | /* | ||
| 2 | * Eee PC WMI hotkey driver | ||
| 3 | * | ||
| 4 | * Copyright(C) 2010 Intel Corporation. | ||
| 5 | * | ||
| 6 | * Portions based on wistron_btns.c: | ||
| 7 | * Copyright (C) 2005 Miloslav Trmac <mitr@volny.cz> | ||
| 8 | * Copyright (C) 2005 Bernhard Rosenkraenzer <bero@arklinux.org> | ||
| 9 | * Copyright (C) 2005 Dmitry Torokhov <dtor@mail.ru> | ||
| 10 | * | ||
| 11 | * This program is free software; you can redistribute it and/or modify | ||
| 12 | * it under the terms of the GNU General Public License as published by | ||
| 13 | * the Free Software Foundation; either version 2 of the License, or | ||
| 14 | * (at your option) any later version. | ||
| 15 | * | ||
| 16 | * This program is distributed in the hope that it will be useful, | ||
| 17 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 18 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 19 | * GNU General Public License for more details. | ||
| 20 | * | ||
| 21 | * You should have received a copy of the GNU General Public License | ||
| 22 | * along with this program; if not, write to the Free Software | ||
| 23 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 24 | */ | ||
| 25 | |||
| 26 | #include <linux/kernel.h> | ||
| 27 | #include <linux/module.h> | ||
| 28 | #include <linux/init.h> | ||
| 29 | #include <linux/types.h> | ||
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/input.h> | ||
| 32 | #include <linux/input/sparse-keymap.h> | ||
| 33 | #include <acpi/acpi_bus.h> | ||
| 34 | #include <acpi/acpi_drivers.h> | ||
| 35 | |||
| 36 | MODULE_AUTHOR("Yong Wang <yong.y.wang@intel.com>"); | ||
| 37 | MODULE_DESCRIPTION("Eee PC WMI Hotkey Driver"); | ||
| 38 | MODULE_LICENSE("GPL"); | ||
| 39 | |||
| 40 | #define EEEPC_WMI_EVENT_GUID "ABBC0F72-8EA1-11D1-00A0-C90629100000" | ||
| 41 | |||
| 42 | MODULE_ALIAS("wmi:"EEEPC_WMI_EVENT_GUID); | ||
| 43 | |||
| 44 | #define NOTIFY_BRNUP_MIN 0x11 | ||
| 45 | #define NOTIFY_BRNUP_MAX 0x1f | ||
| 46 | #define NOTIFY_BRNDOWN_MIN 0x20 | ||
| 47 | #define NOTIFY_BRNDOWN_MAX 0x2e | ||
| 48 | |||
| 49 | static const struct key_entry eeepc_wmi_keymap[] = { | ||
| 50 | /* Sleep already handled via generic ACPI code */ | ||
| 51 | { KE_KEY, 0x5d, { KEY_WLAN } }, | ||
| 52 | { KE_KEY, 0x32, { KEY_MUTE } }, | ||
| 53 | { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, | ||
| 54 | { KE_KEY, 0x30, { KEY_VOLUMEUP } }, | ||
| 55 | { KE_IGNORE, NOTIFY_BRNDOWN_MIN, { KEY_BRIGHTNESSDOWN } }, | ||
| 56 | { KE_IGNORE, NOTIFY_BRNUP_MIN, { KEY_BRIGHTNESSUP } }, | ||
| 57 | { KE_KEY, 0xcc, { KEY_SWITCHVIDEOMODE } }, | ||
| 58 | { KE_END, 0}, | ||
| 59 | }; | ||
| 60 | |||
| 61 | static struct input_dev *eeepc_wmi_input_dev; | ||
| 62 | |||
| 63 | static void eeepc_wmi_notify(u32 value, void *context) | ||
| 64 | { | ||
| 65 | struct acpi_buffer response = { ACPI_ALLOCATE_BUFFER, NULL }; | ||
| 66 | union acpi_object *obj; | ||
| 67 | acpi_status status; | ||
| 68 | int code; | ||
| 69 | |||
| 70 | status = wmi_get_event_data(value, &response); | ||
| 71 | if (status != AE_OK) { | ||
| 72 | pr_err("EEEPC WMI: bad event status 0x%x\n", status); | ||
| 73 | return; | ||
| 74 | } | ||
| 75 | |||
| 76 | obj = (union acpi_object *)response.pointer; | ||
| 77 | |||
| 78 | if (obj && obj->type == ACPI_TYPE_INTEGER) { | ||
| 79 | code = obj->integer.value; | ||
| 80 | |||
| 81 | if (code >= NOTIFY_BRNUP_MIN && code <= NOTIFY_BRNUP_MAX) | ||
| 82 | code = NOTIFY_BRNUP_MIN; | ||
| 83 | else if (code >= NOTIFY_BRNDOWN_MIN && code <= NOTIFY_BRNDOWN_MAX) | ||
| 84 | code = NOTIFY_BRNDOWN_MIN; | ||
| 85 | |||
| 86 | if (!sparse_keymap_report_event(eeepc_wmi_input_dev, | ||
| 87 | code, 1, true)) | ||
| 88 | pr_info("EEEPC WMI: Unknown key %x pressed\n", code); | ||
| 89 | } | ||
| 90 | |||
| 91 | kfree(obj); | ||
| 92 | } | ||
| 93 | |||
| 94 | static int eeepc_wmi_input_setup(void) | ||
| 95 | { | ||
| 96 | int err; | ||
| 97 | |||
| 98 | eeepc_wmi_input_dev = input_allocate_device(); | ||
| 99 | if (!eeepc_wmi_input_dev) | ||
| 100 | return -ENOMEM; | ||
| 101 | |||
| 102 | eeepc_wmi_input_dev->name = "Eee PC WMI hotkeys"; | ||
| 103 | eeepc_wmi_input_dev->phys = "wmi/input0"; | ||
| 104 | eeepc_wmi_input_dev->id.bustype = BUS_HOST; | ||
| 105 | |||
| 106 | err = sparse_keymap_setup(eeepc_wmi_input_dev, eeepc_wmi_keymap, NULL); | ||
| 107 | if (err) | ||
| 108 | goto err_free_dev; | ||
| 109 | |||
| 110 | err = input_register_device(eeepc_wmi_input_dev); | ||
| 111 | if (err) | ||
| 112 | goto err_free_keymap; | ||
| 113 | |||
| 114 | return 0; | ||
| 115 | |||
| 116 | err_free_keymap: | ||
| 117 | sparse_keymap_free(eeepc_wmi_input_dev); | ||
| 118 | err_free_dev: | ||
| 119 | input_free_device(eeepc_wmi_input_dev); | ||
| 120 | return err; | ||
| 121 | } | ||
| 122 | |||
| 123 | static int __init eeepc_wmi_init(void) | ||
| 124 | { | ||
| 125 | int err; | ||
| 126 | acpi_status status; | ||
| 127 | |||
| 128 | if (!wmi_has_guid(EEEPC_WMI_EVENT_GUID)) { | ||
| 129 | pr_warning("EEEPC WMI: No known WMI GUID found\n"); | ||
| 130 | return -ENODEV; | ||
| 131 | } | ||
| 132 | |||
| 133 | err = eeepc_wmi_input_setup(); | ||
| 134 | if (err) | ||
| 135 | return err; | ||
| 136 | |||
| 137 | status = wmi_install_notify_handler(EEEPC_WMI_EVENT_GUID, | ||
| 138 | eeepc_wmi_notify, NULL); | ||
| 139 | if (ACPI_FAILURE(status)) { | ||
| 140 | sparse_keymap_free(eeepc_wmi_input_dev); | ||
| 141 | input_unregister_device(eeepc_wmi_input_dev); | ||
| 142 | pr_err("EEEPC WMI: Unable to register notify handler - %d\n", | ||
| 143 | status); | ||
| 144 | return -ENODEV; | ||
| 145 | } | ||
| 146 | |||
| 147 | return 0; | ||
| 148 | } | ||
| 149 | |||
| 150 | static void __exit eeepc_wmi_exit(void) | ||
| 151 | { | ||
| 152 | wmi_remove_notify_handler(EEEPC_WMI_EVENT_GUID); | ||
| 153 | sparse_keymap_free(eeepc_wmi_input_dev); | ||
| 154 | input_unregister_device(eeepc_wmi_input_dev); | ||
| 155 | } | ||
| 156 | |||
| 157 | module_init(eeepc_wmi_init); | ||
| 158 | module_exit(eeepc_wmi_exit); | ||
diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c index c1074b32490e..47b4fd75aa34 100644 --- a/drivers/platform/x86/fujitsu-laptop.c +++ b/drivers/platform/x86/fujitsu-laptop.c | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | #include <linux/kfifo.h> | 66 | #include <linux/kfifo.h> |
| 67 | #include <linux/video_output.h> | 67 | #include <linux/video_output.h> |
| 68 | #include <linux/platform_device.h> | 68 | #include <linux/platform_device.h> |
| 69 | #include <linux/slab.h> | ||
| 69 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) | 70 | #if defined(CONFIG_LEDS_CLASS) || defined(CONFIG_LEDS_CLASS_MODULE) |
| 70 | #include <linux/leds.h> | 71 | #include <linux/leds.h> |
| 71 | #endif | 72 | #endif |
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index 56086363becc..51c07a05a7bc 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/types.h> | 30 | #include <linux/types.h> |
| 30 | #include <linux/input.h> | 31 | #include <linux/input.h> |
| 31 | #include <acpi/acpi_drivers.h> | 32 | #include <acpi/acpi_drivers.h> |
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c index f0a90a6bf396..1190bad4297f 100644 --- a/drivers/platform/x86/intel_menlow.c +++ b/drivers/platform/x86/intel_menlow.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 34 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 35 | #include <linux/pm.h> | 36 | #include <linux/pm.h> |
diff --git a/drivers/platform/x86/msi-wmi.c b/drivers/platform/x86/msi-wmi.c index 367caaae2f3c..d1736009636f 100644 --- a/drivers/platform/x86/msi-wmi.c +++ b/drivers/platform/x86/msi-wmi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/input/sparse-keymap.h> | 26 | #include <linux/input/sparse-keymap.h> |
| 27 | #include <linux/acpi.h> | 27 | #include <linux/acpi.h> |
| 28 | #include <linux/backlight.h> | 28 | #include <linux/backlight.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>"); | 31 | MODULE_AUTHOR("Thomas Renninger <trenn@suse.de>"); |
| 31 | MODULE_DESCRIPTION("MSI laptop WMI hotkeys driver"); | 32 | MODULE_DESCRIPTION("MSI laptop WMI hotkeys driver"); |
diff --git a/drivers/platform/x86/panasonic-laptop.c b/drivers/platform/x86/panasonic-laptop.c index 726f02affcb6..2fb9a32926f8 100644 --- a/drivers/platform/x86/panasonic-laptop.c +++ b/drivers/platform/x86/panasonic-laptop.c | |||
| @@ -124,6 +124,7 @@ | |||
| 124 | #include <linux/ctype.h> | 124 | #include <linux/ctype.h> |
| 125 | #include <linux/seq_file.h> | 125 | #include <linux/seq_file.h> |
| 126 | #include <linux/uaccess.h> | 126 | #include <linux/uaccess.h> |
| 127 | #include <linux/slab.h> | ||
| 127 | #include <acpi/acpi_bus.h> | 128 | #include <acpi/acpi_bus.h> |
| 128 | #include <acpi/acpi_drivers.h> | 129 | #include <acpi/acpi_drivers.h> |
| 129 | #include <linux/input.h> | 130 | #include <linux/input.h> |
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 6553b91caaa4..1387c5f9c24d 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/kfifo.h> | 58 | #include <linux/kfifo.h> |
| 59 | #include <linux/workqueue.h> | 59 | #include <linux/workqueue.h> |
| 60 | #include <linux/acpi.h> | 60 | #include <linux/acpi.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <acpi/acpi_drivers.h> | 62 | #include <acpi/acpi_drivers.h> |
| 62 | #include <acpi/acpi_bus.h> | 63 | #include <acpi/acpi_bus.h> |
| 63 | #include <asm/uaccess.h> | 64 | #include <asm/uaccess.h> |
diff --git a/drivers/platform/x86/tc1100-wmi.c b/drivers/platform/x86/tc1100-wmi.c index dd33b51c3486..1fe0f1feff71 100644 --- a/drivers/platform/x86/tc1100-wmi.c +++ b/drivers/platform/x86/tc1100-wmi.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 32 | #include <acpi/acpi.h> | 33 | #include <acpi/acpi.h> |
diff --git a/drivers/platform/x86/thinkpad_acpi.c b/drivers/platform/x86/thinkpad_acpi.c index 770b85327f84..63290b33c879 100644 --- a/drivers/platform/x86/thinkpad_acpi.c +++ b/drivers/platform/x86/thinkpad_acpi.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/kthread.h> | 58 | #include <linux/kthread.h> |
| 59 | #include <linux/freezer.h> | 59 | #include <linux/freezer.h> |
| 60 | #include <linux/delay.h> | 60 | #include <linux/delay.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | 62 | ||
| 62 | #include <linux/nvram.h> | 63 | #include <linux/nvram.h> |
| 63 | #include <linux/proc_fs.h> | 64 | #include <linux/proc_fs.h> |
diff --git a/drivers/platform/x86/topstar-laptop.c b/drivers/platform/x86/topstar-laptop.c index 4d6516fded7e..ff4b476f1950 100644 --- a/drivers/platform/x86/topstar-laptop.c +++ b/drivers/platform/x86/topstar-laptop.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/acpi.h> | 20 | #include <linux/acpi.h> |
| 20 | #include <linux/input.h> | 21 | #include <linux/input.h> |
| 21 | 22 | ||
diff --git a/drivers/platform/x86/toshiba_acpi.c b/drivers/platform/x86/toshiba_acpi.c index def4841183be..37aa14798551 100644 --- a/drivers/platform/x86/toshiba_acpi.c +++ b/drivers/platform/x86/toshiba_acpi.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/platform_device.h> | 47 | #include <linux/platform_device.h> |
| 48 | #include <linux/rfkill.h> | 48 | #include <linux/rfkill.h> |
| 49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include <asm/uaccess.h> | 52 | #include <asm/uaccess.h> |
| 52 | 53 | ||
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 09e9918c69c1..39ec5b6c2e3a 100644 --- a/drivers/platform/x86/wmi.c +++ b/drivers/platform/x86/wmi.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/device.h> | 33 | #include <linux/device.h> |
| 34 | #include <linux/list.h> | 34 | #include <linux/list.h> |
| 35 | #include <linux/acpi.h> | 35 | #include <linux/acpi.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <acpi/acpi_bus.h> | 37 | #include <acpi/acpi_bus.h> |
| 37 | #include <acpi/acpi_drivers.h> | 38 | #include <acpi/acpi_drivers.h> |
| 38 | 39 | ||
diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c index e851160e14f0..918d5f044865 100644 --- a/drivers/pnp/isapnp/core.c +++ b/drivers/pnp/isapnp/core.c | |||
| @@ -37,7 +37,6 @@ | |||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/kernel.h> | 38 | #include <linux/kernel.h> |
| 39 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 40 | #include <linux/slab.h> | ||
| 41 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
| 43 | #include <linux/isapnp.h> | 42 | #include <linux/isapnp.h> |
diff --git a/drivers/pnp/manager.c b/drivers/pnp/manager.c index 00fd3577b985..0a15664eef1c 100644 --- a/drivers/pnp/manager.c +++ b/drivers/pnp/manager.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/pnp.h> | 14 | #include <linux/pnp.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/bitmap.h> | 15 | #include <linux/bitmap.h> |
| 17 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 18 | #include "base.h" | 17 | #include "base.h" |
diff --git a/drivers/pnp/pnpacpi/core.c b/drivers/pnp/pnpacpi/core.c index 5314bf630bc4..f7ff628b7d94 100644 --- a/drivers/pnp/pnpacpi/core.c +++ b/drivers/pnp/pnpacpi/core.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/acpi.h> | 22 | #include <linux/acpi.h> |
| 23 | #include <linux/pnp.h> | 23 | #include <linux/pnp.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/mod_devicetable.h> | 25 | #include <linux/mod_devicetable.h> |
| 25 | #include <acpi/acpi_bus.h> | 26 | #include <acpi/acpi_bus.h> |
| 26 | 27 | ||
diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c index fe5bfa998f59..35bb44af49b3 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/acpi.h> | 24 | #include <linux/acpi.h> |
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/pnp.h> | 26 | #include <linux/pnp.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include "../base.h" | 28 | #include "../base.h" |
| 28 | #include "pnpacpi.h" | 29 | #include "pnpacpi.h" |
| 29 | 30 | ||
diff --git a/drivers/pnp/pnpbios/bioscalls.c b/drivers/pnp/pnpbios/bioscalls.c index fc83783c3a96..8591f6ab1b35 100644 --- a/drivers/pnp/pnpbios/bioscalls.c +++ b/drivers/pnp/pnpbios/bioscalls.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/pnp.h> | 11 | #include <linux/pnp.h> |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/smp.h> | 13 | #include <linux/smp.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/kmod.h> | 14 | #include <linux/kmod.h> |
| 16 | #include <linux/completion.h> | 15 | #include <linux/completion.h> |
| 17 | #include <linux/spinlock.h> | 16 | #include <linux/spinlock.h> |
diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c index a5135ebe5f07..cb1f47bfee96 100644 --- a/drivers/pnp/pnpbios/rsparser.c +++ b/drivers/pnp/pnpbios/rsparser.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #include <linux/ctype.h> | 5 | #include <linux/ctype.h> |
| 6 | #include <linux/pnp.h> | 6 | #include <linux/pnp.h> |
| 7 | #include <linux/string.h> | 7 | #include <linux/string.h> |
| 8 | #include <linux/slab.h> | ||
| 9 | 8 | ||
| 10 | #ifdef CONFIG_PCI | 9 | #ifdef CONFIG_PCI |
| 11 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
diff --git a/drivers/pnp/resource.c b/drivers/pnp/resource.c index 5b277dbaacde..2e54e6a23c72 100644 --- a/drivers/pnp/resource.c +++ b/drivers/pnp/resource.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 12 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
diff --git a/drivers/power/bq27x00_battery.c b/drivers/power/bq27x00_battery.c index bece33ed873c..3ec9c6a8896b 100644 --- a/drivers/power/bq27x00_battery.c +++ b/drivers/power/bq27x00_battery.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/power_supply.h> | 24 | #include <linux/power_supply.h> |
| 25 | #include <linux/idr.h> | 25 | #include <linux/idr.h> |
| 26 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <asm/unaligned.h> | 28 | #include <asm/unaligned.h> |
| 28 | 29 | ||
| 29 | #define DRIVER_VERSION "1.1.0" | 30 | #define DRIVER_VERSION "1.1.0" |
diff --git a/drivers/power/da9030_battery.c b/drivers/power/da9030_battery.c index a2e71f7b27fb..d2c793cf6765 100644 --- a/drivers/power/da9030_battery.c +++ b/drivers/power/da9030_battery.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 14 | #include <linux/types.h> | 15 | #include <linux/types.h> |
| 15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
diff --git a/drivers/power/ds2760_battery.c b/drivers/power/ds2760_battery.c index 6f1dba5a519d..3bf8d1f622e3 100644 --- a/drivers/power/ds2760_battery.c +++ b/drivers/power/ds2760_battery.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/jiffies.h> | 24 | #include <linux/jiffies.h> |
| 25 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> |
| 26 | #include <linux/pm.h> | 26 | #include <linux/pm.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 28 | #include <linux/power_supply.h> | 29 | #include <linux/power_supply.h> |
| 29 | 30 | ||
diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c index da14f374cb60..99c89976a902 100644 --- a/drivers/power/ds2782_battery.c +++ b/drivers/power/ds2782_battery.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/idr.h> | 20 | #include <linux/idr.h> |
| 21 | #include <linux/power_supply.h> | 21 | #include <linux/power_supply.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define DS2782_REG_RARC 0x06 /* Remaining active relative capacity */ | 24 | #define DS2782_REG_RARC 0x06 /* Remaining active relative capacity */ |
| 24 | 25 | ||
diff --git a/drivers/power/max17040_battery.c b/drivers/power/max17040_battery.c index 87b98bf27ae1..f3e22c9fe20a 100644 --- a/drivers/power/max17040_battery.c +++ b/drivers/power/max17040_battery.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/power_supply.h> | 20 | #include <linux/power_supply.h> |
| 21 | #include <linux/max17040_battery.h> | 21 | #include <linux/max17040_battery.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define MAX17040_VCELL_MSB 0x02 | 24 | #define MAX17040_VCELL_MSB 0x02 |
| 24 | #define MAX17040_VCELL_LSB 0x03 | 25 | #define MAX17040_VCELL_LSB 0x03 |
diff --git a/drivers/power/max8925_power.c b/drivers/power/max8925_power.c index a1b4410544d7..8e5aec260866 100644 --- a/drivers/power/max8925_power.c +++ b/drivers/power/max8925_power.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/err.h> | 13 | #include <linux/err.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
| 15 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
diff --git a/drivers/power/pcf50633-charger.c b/drivers/power/pcf50633-charger.c index ea3fdfaca90d..066f994e6fe5 100644 --- a/drivers/power/pcf50633-charger.c +++ b/drivers/power/pcf50633-charger.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 20 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 21 | #include <linux/device.h> | 22 | #include <linux/device.h> |
diff --git a/drivers/power/pmu_battery.c b/drivers/power/pmu_battery.c index 9c87ad564803..023d24993b87 100644 --- a/drivers/power/pmu_battery.c +++ b/drivers/power/pmu_battery.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
| 15 | #include <linux/adb.h> | 15 | #include <linux/adb.h> |
| 16 | #include <linux/pmu.h> | 16 | #include <linux/pmu.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | static struct pmu_battery_dev { | 19 | static struct pmu_battery_dev { |
| 19 | struct power_supply bat; | 20 | struct power_supply bat; |
diff --git a/drivers/power/power_supply_leds.c b/drivers/power/power_supply_leds.c index 2dece40c544f..031a554837f7 100644 --- a/drivers/power/power_supply_leds.c +++ b/drivers/power/power_supply_leds.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include "power_supply.h" | 17 | #include "power_supply.h" |
| 17 | 18 | ||
diff --git a/drivers/power/power_supply_sysfs.c b/drivers/power/power_supply_sysfs.c index ff05e6189768..5b6e352ac7c1 100644 --- a/drivers/power/power_supply_sysfs.c +++ b/drivers/power/power_supply_sysfs.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/ctype.h> | 14 | #include <linux/ctype.h> |
| 15 | #include <linux/power_supply.h> | 15 | #include <linux/power_supply.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include "power_supply.h" | 18 | #include "power_supply.h" |
| 18 | 19 | ||
diff --git a/drivers/power/wm831x_backup.c b/drivers/power/wm831x_backup.c index bf4f387a8009..0fd130d80f5d 100644 --- a/drivers/power/wm831x_backup.c +++ b/drivers/power/wm831x_backup.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <linux/mfd/wm831x/core.h> | 17 | #include <linux/mfd/wm831x/core.h> |
| 17 | #include <linux/mfd/wm831x/auxadc.h> | 18 | #include <linux/mfd/wm831x/auxadc.h> |
diff --git a/drivers/power/wm831x_power.c b/drivers/power/wm831x_power.c index f85e80b1b400..875c4d0f776b 100644 --- a/drivers/power/wm831x_power.c +++ b/drivers/power/wm831x_power.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/err.h> | 12 | #include <linux/err.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/power_supply.h> | 14 | #include <linux/power_supply.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <linux/mfd/wm831x/core.h> | 17 | #include <linux/mfd/wm831x/core.h> |
| 17 | #include <linux/mfd/wm831x/auxadc.h> | 18 | #include <linux/mfd/wm831x/auxadc.h> |
diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c index 23eed356a854..94c70650aafc 100644 --- a/drivers/power/wm97xx_battery.c +++ b/drivers/power/wm97xx_battery.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/gpio.h> | 24 | #include <linux/gpio.h> |
| 25 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | static DEFINE_MUTEX(bat_lock); | 28 | static DEFINE_MUTEX(bat_lock); |
| 28 | static struct work_struct bat_work; | 29 | static struct work_struct bat_work; |
diff --git a/drivers/pps/kapi.c b/drivers/pps/kapi.c index 2d414e23d390..1aa02db3ff4e 100644 --- a/drivers/pps/kapi.c +++ b/drivers/pps/kapi.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/idr.h> | 29 | #include <linux/idr.h> |
| 30 | #include <linux/fs.h> | 30 | #include <linux/fs.h> |
| 31 | #include <linux/pps_kernel.h> | 31 | #include <linux/pps_kernel.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | /* | 34 | /* |
| 34 | * Global variables | 35 | * Global variables |
diff --git a/drivers/ps3/ps3-lpm.c b/drivers/ps3/ps3-lpm.c index fe96793e3f08..8000985d0e8c 100644 --- a/drivers/ps3/ps3-lpm.c +++ b/drivers/ps3/ps3-lpm.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/drivers/ps3/ps3-vuart.c b/drivers/ps3/ps3-vuart.c index e4ad5ba5d0a3..d9fb729535a1 100644 --- a/drivers/ps3/ps3-vuart.c +++ b/drivers/ps3/ps3-vuart.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> |
diff --git a/drivers/ps3/ps3av.c b/drivers/ps3/ps3av.c index 95a689befc84..a409fa050a1a 100644 --- a/drivers/ps3/ps3av.c +++ b/drivers/ps3/ps3av.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
| 25 | #include <linux/ioctl.h> | 25 | #include <linux/ioctl.h> |
| 26 | #include <linux/fb.h> | 26 | #include <linux/fb.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <asm/firmware.h> | 29 | #include <asm/firmware.h> |
| 29 | #include <asm/ps3av.h> | 30 | #include <asm/ps3av.h> |
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 5af16c2bb540..2b4e40d31190 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/device.h> | 18 | #include <linux/device.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/err.h> | 20 | #include <linux/err.h> |
| 20 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 21 | #include <linux/suspend.h> | 22 | #include <linux/suspend.h> |
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index d11f7622430b..2fe9d99c9f23 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/regulator/fixed.h> | 25 | #include <linux/regulator/fixed.h> |
| 26 | #include <linux/gpio.h> | 26 | #include <linux/gpio.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | struct fixed_voltage_data { | 30 | struct fixed_voltage_data { |
| 30 | struct regulator_desc desc; | 31 | struct regulator_desc desc; |
diff --git a/drivers/regulator/lp3971.c b/drivers/regulator/lp3971.c index b20b3e1d821a..671a7d1f1f0e 100644 --- a/drivers/regulator/lp3971.c +++ b/drivers/regulator/lp3971.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/regulator/driver.h> | 19 | #include <linux/regulator/driver.h> |
| 20 | #include <linux/regulator/lp3971.h> | 20 | #include <linux/regulator/lp3971.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | struct lp3971 { | 23 | struct lp3971 { |
| 23 | struct device *dev; | 24 | struct device *dev; |
diff --git a/drivers/regulator/max1586.c b/drivers/regulator/max1586.c index c0b09e15edb6..b3c1afc16889 100644 --- a/drivers/regulator/max1586.c +++ b/drivers/regulator/max1586.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/i2c.h> | 22 | #include <linux/i2c.h> |
| 23 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |
| 24 | #include <linux/regulator/driver.h> | 24 | #include <linux/regulator/driver.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/regulator/max1586.h> | 26 | #include <linux/regulator/max1586.h> |
| 26 | 27 | ||
| 27 | #define MAX1586_V3_MAX_VSEL 31 | 28 | #define MAX1586_V3_MAX_VSEL 31 |
diff --git a/drivers/regulator/max8649.c b/drivers/regulator/max8649.c index 833aaedc7e64..bfc4c5ffdc96 100644 --- a/drivers/regulator/max8649.c +++ b/drivers/regulator/max8649.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/i2c.h> | 14 | #include <linux/i2c.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/regulator/driver.h> | 16 | #include <linux/regulator/driver.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/regulator/max8649.h> | 18 | #include <linux/regulator/max8649.h> |
| 18 | 19 | ||
| 19 | #define MAX8649_DCDC_VMIN 750000 /* uV */ | 20 | #define MAX8649_DCDC_VMIN 750000 /* uV */ |
diff --git a/drivers/regulator/max8660.c b/drivers/regulator/max8660.c index 47f90b2fc290..3790b21879ff 100644 --- a/drivers/regulator/max8660.c +++ b/drivers/regulator/max8660.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/i2c.h> | 42 | #include <linux/i2c.h> |
| 43 | #include <linux/platform_device.h> | 43 | #include <linux/platform_device.h> |
| 44 | #include <linux/regulator/driver.h> | 44 | #include <linux/regulator/driver.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <linux/regulator/max8660.h> | 46 | #include <linux/regulator/max8660.h> |
| 46 | 47 | ||
| 47 | #define MAX8660_DCDC_MIN_UV 725000 | 48 | #define MAX8660_DCDC_MIN_UV 725000 |
diff --git a/drivers/regulator/mc13783-regulator.c b/drivers/regulator/mc13783-regulator.c index f7b81845a196..a681f5e8f786 100644 --- a/drivers/regulator/mc13783-regulator.c +++ b/drivers/regulator/mc13783-regulator.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/regulator/driver.h> | 14 | #include <linux/regulator/driver.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <linux/err.h> | 19 | #include <linux/err.h> |
| 19 | 20 | ||
diff --git a/drivers/regulator/tps65023-regulator.c b/drivers/regulator/tps65023-regulator.c index 1f183543bdbd..8e2f2098b005 100644 --- a/drivers/regulator/tps65023-regulator.c +++ b/drivers/regulator/tps65023-regulator.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/regulator/machine.h> | 24 | #include <linux/regulator/machine.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | /* Register definitions */ | 29 | /* Register definitions */ |
| 29 | #define TPS65023_REG_VERSION 0 | 30 | #define TPS65023_REG_VERSION 0 |
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c index c2a9539acd72..74841abcc9cc 100644 --- a/drivers/regulator/tps6507x-regulator.c +++ b/drivers/regulator/tps6507x-regulator.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/regulator/machine.h> | 24 | #include <linux/regulator/machine.h> |
| 25 | #include <linux/i2c.h> | 25 | #include <linux/i2c.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | /* Register definitions */ | 29 | /* Register definitions */ |
| 29 | #define TPS6507X_REG_PPATH1 0X01 | 30 | #define TPS6507X_REG_PPATH1 0X01 |
diff --git a/drivers/regulator/userspace-consumer.c b/drivers/regulator/userspace-consumer.c index 44917da4ac97..9d5ba9357597 100644 --- a/drivers/regulator/userspace-consumer.c +++ b/drivers/regulator/userspace-consumer.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/regulator/consumer.h> | 22 | #include <linux/regulator/consumer.h> |
| 23 | #include <linux/regulator/userspace-consumer.h> | 23 | #include <linux/regulator/userspace-consumer.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | struct userspace_consumer_data { | 26 | struct userspace_consumer_data { |
| 26 | const char *name; | 27 | const char *name; |
diff --git a/drivers/regulator/virtual.c b/drivers/regulator/virtual.c index d96cecaac73d..69e550f57638 100644 --- a/drivers/regulator/virtual.c +++ b/drivers/regulator/virtual.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/mutex.h> | 15 | #include <linux/mutex.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/regulator/consumer.h> | 17 | #include <linux/regulator/consumer.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | struct virtual_consumer_data { | 20 | struct virtual_consumer_data { |
| 20 | struct mutex lock; | 21 | struct mutex lock; |
diff --git a/drivers/regulator/wm831x-dcdc.c b/drivers/regulator/wm831x-dcdc.c index 6e18e56d850b..dbfaf5945e48 100644 --- a/drivers/regulator/wm831x-dcdc.c +++ b/drivers/regulator/wm831x-dcdc.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/regulator/driver.h> | 21 | #include <linux/regulator/driver.h> |
| 22 | #include <linux/regulator/machine.h> | 22 | #include <linux/regulator/machine.h> |
| 23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/mfd/wm831x/core.h> | 26 | #include <linux/mfd/wm831x/core.h> |
| 26 | #include <linux/mfd/wm831x/regulator.h> | 27 | #include <linux/mfd/wm831x/regulator.h> |
diff --git a/drivers/regulator/wm831x-isink.c b/drivers/regulator/wm831x-isink.c index ca0f6b6c384b..6c446cd6ad54 100644 --- a/drivers/regulator/wm831x-isink.c +++ b/drivers/regulator/wm831x-isink.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/regulator/driver.h> | 21 | #include <linux/regulator/driver.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/mfd/wm831x/core.h> | 24 | #include <linux/mfd/wm831x/core.h> |
| 24 | #include <linux/mfd/wm831x/regulator.h> | 25 | #include <linux/mfd/wm831x/regulator.h> |
diff --git a/drivers/regulator/wm831x-ldo.c b/drivers/regulator/wm831x-ldo.c index d2406c1519a1..e686cdb61b97 100644 --- a/drivers/regulator/wm831x-ldo.c +++ b/drivers/regulator/wm831x-ldo.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/i2c.h> | 19 | #include <linux/i2c.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/regulator/driver.h> | 21 | #include <linux/regulator/driver.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/mfd/wm831x/core.h> | 24 | #include <linux/mfd/wm831x/core.h> |
| 24 | #include <linux/mfd/wm831x/regulator.h> | 25 | #include <linux/mfd/wm831x/regulator.h> |
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 95454a4637b7..5a1dc8a24d35 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
| 20 | #include <linux/regulator/driver.h> | 20 | #include <linux/regulator/driver.h> |
| 21 | #include <linux/gpio.h> | 21 | #include <linux/gpio.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/mfd/wm8994/core.h> | 24 | #include <linux/mfd/wm8994/core.h> |
| 24 | #include <linux/mfd/wm8994/registers.h> | 25 | #include <linux/mfd/wm8994/registers.h> |
diff --git a/drivers/rtc/class.c b/drivers/rtc/class.c index 40845c7e9322..565562ba6ac9 100644 --- a/drivers/rtc/class.c +++ b/drivers/rtc/class.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 16 | #include <linux/kdev_t.h> | 16 | #include <linux/kdev_t.h> |
| 17 | #include <linux/idr.h> | 17 | #include <linux/idr.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include "rtc-core.h" | 20 | #include "rtc-core.h" |
| 20 | 21 | ||
diff --git a/drivers/rtc/rtc-at32ap700x.c b/drivers/rtc/rtc-at32ap700x.c index 8825695777df..b2752b6e7a2f 100644 --- a/drivers/rtc/rtc-at32ap700x.c +++ b/drivers/rtc/rtc-at32ap700x.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 15 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 16 | 17 | ||
diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c index 78a018b5c941..f677e0710ca1 100644 --- a/drivers/rtc/rtc-at91sam9.c +++ b/drivers/rtc/rtc-at91sam9.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/ioctl.h> | 20 | #include <linux/ioctl.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <mach/board.h> | 23 | #include <mach/board.h> |
| 23 | #include <mach/at91_rtt.h> | 24 | #include <mach/at91_rtt.h> |
diff --git a/drivers/rtc/rtc-bfin.c b/drivers/rtc/rtc-bfin.c index b11485b9f21c..72b2bcc2c224 100644 --- a/drivers/rtc/rtc-bfin.c +++ b/drivers/rtc/rtc-bfin.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/platform_device.h> | 51 | #include <linux/platform_device.h> |
| 52 | #include <linux/rtc.h> | 52 | #include <linux/rtc.h> |
| 53 | #include <linux/seq_file.h> | 53 | #include <linux/seq_file.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include <asm/blackfin.h> | 56 | #include <asm/blackfin.h> |
| 56 | 57 | ||
diff --git a/drivers/rtc/rtc-bq4802.c b/drivers/rtc/rtc-bq4802.c index 280fe48ada0b..128270ce355d 100644 --- a/drivers/rtc/rtc-bq4802.c +++ b/drivers/rtc/rtc-bq4802.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/platform_device.h> | 10 | #include <linux/platform_device.h> |
| 11 | #include <linux/rtc.h> | 11 | #include <linux/rtc.h> |
| 12 | #include <linux/bcd.h> | 12 | #include <linux/bcd.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | 14 | ||
| 14 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); | 15 | MODULE_AUTHOR("David S. Miller <davem@davemloft.net>"); |
| 15 | MODULE_DESCRIPTION("TI BQ4802 RTC driver"); | 16 | MODULE_DESCRIPTION("TI BQ4802 RTC driver"); |
diff --git a/drivers/rtc/rtc-coh901331.c b/drivers/rtc/rtc-coh901331.c index 44c4399ee714..316f484999b5 100644 --- a/drivers/rtc/rtc-coh901331.c +++ b/drivers/rtc/rtc-coh901331.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/pm.h> | 14 | #include <linux/pm.h> |
| 15 | #include <linux/platform_device.h> | 15 | #include <linux/platform_device.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | /* | 19 | /* |
| 19 | * Registers in the COH 901 331 | 20 | * Registers in the COH 901 331 |
diff --git a/drivers/rtc/rtc-ds1216.c b/drivers/rtc/rtc-ds1216.c index 4aedc705518c..45cd8c9f5a39 100644 --- a/drivers/rtc/rtc-ds1216.c +++ b/drivers/rtc/rtc-ds1216.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/rtc.h> | 9 | #include <linux/rtc.h> |
| 10 | #include <linux/platform_device.h> | 10 | #include <linux/platform_device.h> |
| 11 | #include <linux/bcd.h> | 11 | #include <linux/bcd.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #define DRV_VERSION "0.2" | 14 | #define DRV_VERSION "0.2" |
| 14 | 15 | ||
diff --git a/drivers/rtc/rtc-ds1286.c b/drivers/rtc/rtc-ds1286.c index 4fcb16bbff4a..bf430f9091ed 100644 --- a/drivers/rtc/rtc-ds1286.c +++ b/drivers/rtc/rtc-ds1286.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/bcd.h> | 18 | #include <linux/bcd.h> |
| 19 | #include <linux/ds1286.h> | 19 | #include <linux/ds1286.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define DRV_VERSION "1.0" | 23 | #define DRV_VERSION "1.0" |
| 23 | 24 | ||
diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c index 9630e7d3314e..7836c9cec557 100644 --- a/drivers/rtc/rtc-ds1305.c +++ b/drivers/rtc/rtc-ds1305.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/bcd.h> | 13 | #include <linux/bcd.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 15 | #include <linux/workqueue.h> | 16 | #include <linux/workqueue.h> |
| 16 | 17 | ||
diff --git a/drivers/rtc/rtc-ds1374.c b/drivers/rtc/rtc-ds1374.c index 5317bbcbc7a0..61945734ad00 100644 --- a/drivers/rtc/rtc-ds1374.c +++ b/drivers/rtc/rtc-ds1374.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/rtc.h> | 24 | #include <linux/rtc.h> |
| 25 | #include <linux/bcd.h> | 25 | #include <linux/bcd.h> |
| 26 | #include <linux/workqueue.h> | 26 | #include <linux/workqueue.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #define DS1374_REG_TOD0 0x00 /* Time of Day */ | 29 | #define DS1374_REG_TOD0 0x00 /* Time of Day */ |
| 29 | #define DS1374_REG_TOD1 0x01 | 30 | #define DS1374_REG_TOD1 0x01 |
diff --git a/drivers/rtc/rtc-ds1390.c b/drivers/rtc/rtc-ds1390.c index cdb705057091..26a86d235051 100644 --- a/drivers/rtc/rtc-ds1390.c +++ b/drivers/rtc/rtc-ds1390.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
| 20 | #include <linux/spi/spi.h> | 20 | #include <linux/spi/spi.h> |
| 21 | #include <linux/bcd.h> | 21 | #include <linux/bcd.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #define DS1390_REG_100THS 0x00 | 24 | #define DS1390_REG_100THS 0x00 |
| 24 | #define DS1390_REG_SECONDS 0x01 | 25 | #define DS1390_REG_SECONDS 0x01 |
diff --git a/drivers/rtc/rtc-ds1511.c b/drivers/rtc/rtc-ds1511.c index 4166b84cb514..06b8566c4532 100644 --- a/drivers/rtc/rtc-ds1511.c +++ b/drivers/rtc/rtc-ds1511.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/bcd.h> | 17 | #include <linux/bcd.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 21 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 22 | #include <linux/rtc.h> | 23 | #include <linux/rtc.h> |
diff --git a/drivers/rtc/rtc-ds1553.c b/drivers/rtc/rtc-ds1553.c index ed1ef7c9cc06..244f9994bcbb 100644 --- a/drivers/rtc/rtc-ds1553.c +++ b/drivers/rtc/rtc-ds1553.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/bcd.h> | 11 | #include <linux/bcd.h> |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include <linux/jiffies.h> | 16 | #include <linux/jiffies.h> |
| 16 | #include <linux/interrupt.h> | 17 | #include <linux/interrupt.h> |
diff --git a/drivers/rtc/rtc-ds1742.c b/drivers/rtc/rtc-ds1742.c index cad9ceb89baf..2b4b0bc42d6f 100644 --- a/drivers/rtc/rtc-ds1742.c +++ b/drivers/rtc/rtc-ds1742.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/bcd.h> | 15 | #include <linux/bcd.h> |
| 16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/gfp.h> | ||
| 18 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 19 | #include <linux/jiffies.h> | 20 | #include <linux/jiffies.h> |
| 20 | #include <linux/rtc.h> | 21 | #include <linux/rtc.h> |
diff --git a/drivers/rtc/rtc-ep93xx.c b/drivers/rtc/rtc-ep93xx.c index 91bde976bc0f..11ae64dcbf3c 100644 --- a/drivers/rtc/rtc-ep93xx.c +++ b/drivers/rtc/rtc-ep93xx.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/rtc.h> | 13 | #include <linux/rtc.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | 17 | ||
| 17 | #define EP93XX_RTC_DATA 0x000 | 18 | #define EP93XX_RTC_DATA 0x000 |
| 18 | #define EP93XX_RTC_MATCH 0x004 | 19 | #define EP93XX_RTC_MATCH 0x004 |
diff --git a/drivers/rtc/rtc-fm3130.c b/drivers/rtc/rtc-fm3130.c index 812c66755083..ff6fce61ea41 100644 --- a/drivers/rtc/rtc-fm3130.c +++ b/drivers/rtc/rtc-fm3130.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/rtc.h> | 14 | #include <linux/rtc.h> |
| 15 | #include <linux/bcd.h> | 15 | #include <linux/bcd.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define FM3130_RTC_CONTROL (0x0) | 18 | #define FM3130_RTC_CONTROL (0x0) |
| 18 | #define FM3130_CAL_CONTROL (0x1) | 19 | #define FM3130_CAL_CONTROL (0x1) |
diff --git a/drivers/rtc/rtc-m48t35.c b/drivers/rtc/rtc-m48t35.c index 8cb5b8959e5b..7410875e5838 100644 --- a/drivers/rtc/rtc-m48t35.c +++ b/drivers/rtc/rtc-m48t35.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 20 | #include <linux/bcd.h> | 21 | #include <linux/bcd.h> |
| 21 | #include <linux/io.h> | 22 | #include <linux/io.h> |
diff --git a/drivers/rtc/rtc-m48t59.c b/drivers/rtc/rtc-m48t59.c index ede43b846859..365ff3ac2348 100644 --- a/drivers/rtc/rtc-m48t59.c +++ b/drivers/rtc/rtc-m48t59.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
| 20 | #include <linux/rtc/m48t59.h> | 20 | #include <linux/rtc/m48t59.h> |
| 21 | #include <linux/bcd.h> | 21 | #include <linux/bcd.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #ifndef NO_IRQ | 24 | #ifndef NO_IRQ |
| 24 | #define NO_IRQ (-1) | 25 | #define NO_IRQ (-1) |
diff --git a/drivers/rtc/rtc-max8925.c b/drivers/rtc/rtc-max8925.c index acdbb1760187..174036dda786 100644 --- a/drivers/rtc/rtc-max8925.c +++ b/drivers/rtc/rtc-max8925.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 15 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 16 | #include <linux/mfd/max8925.h> | 17 | #include <linux/mfd/max8925.h> |
diff --git a/drivers/rtc/rtc-mc13783.c b/drivers/rtc/rtc-mc13783.c index 1379c7faa448..675bfb515367 100644 --- a/drivers/rtc/rtc-mc13783.c +++ b/drivers/rtc/rtc-mc13783.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/rtc.h> | 17 | #include <linux/rtc.h> |
| 17 | 18 | ||
| 18 | #define DRIVER_NAME "mc13783-rtc" | 19 | #define DRIVER_NAME "mc13783-rtc" |
diff --git a/drivers/rtc/rtc-mpc5121.c b/drivers/rtc/rtc-mpc5121.c index 4313ca03a96d..f0dbf9cb8f9c 100644 --- a/drivers/rtc/rtc-mpc5121.c +++ b/drivers/rtc/rtc-mpc5121.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/of_device.h> | 15 | #include <linux/of_device.h> |
| 16 | #include <linux/of_platform.h> | 16 | #include <linux/of_platform.h> |
| 17 | #include <linux/io.h> | 17 | #include <linux/io.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | struct mpc5121_rtc_regs { | 20 | struct mpc5121_rtc_regs { |
| 20 | u8 set_time; /* RTC + 0x00 */ | 21 | u8 set_time; /* RTC + 0x00 */ |
diff --git a/drivers/rtc/rtc-msm6242.c b/drivers/rtc/rtc-msm6242.c index 5f5968a48925..b2fff0ca49f8 100644 --- a/drivers/rtc/rtc-msm6242.c +++ b/drivers/rtc/rtc-msm6242.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/rtc.h> | 15 | #include <linux/rtc.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | 18 | ||
| 18 | enum { | 19 | enum { |
diff --git a/drivers/rtc/rtc-mv.c b/drivers/rtc/rtc-mv.c index dc052ce6e63a..bcca47298554 100644 --- a/drivers/rtc/rtc-mv.c +++ b/drivers/rtc/rtc-mv.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | 17 | ||
| 17 | 18 | ||
| 18 | #define RTC_TIME_REG_OFFS 0 | 19 | #define RTC_TIME_REG_OFFS 0 |
diff --git a/drivers/rtc/rtc-mxc.c b/drivers/rtc/rtc-mxc.c index 8710f9415d98..c77f6f72f950 100644 --- a/drivers/rtc/rtc-mxc.c +++ b/drivers/rtc/rtc-mxc.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/io.h> | 12 | #include <linux/io.h> |
| 13 | #include <linux/rtc.h> | 13 | #include <linux/rtc.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/interrupt.h> | 16 | #include <linux/interrupt.h> |
| 16 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 17 | #include <linux/clk.h> | 18 | #include <linux/clk.h> |
diff --git a/drivers/rtc/rtc-nuc900.c b/drivers/rtc/rtc-nuc900.c index bf59c9c586b2..a351bd5d8176 100644 --- a/drivers/rtc/rtc-nuc900.c +++ b/drivers/rtc/rtc-nuc900.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/rtc.h> | 16 | #include <linux/rtc.h> |
| 16 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 17 | #include <linux/io.h> | 18 | #include <linux/io.h> |
diff --git a/drivers/rtc/rtc-pcap.c b/drivers/rtc/rtc-pcap.c index a99c28992d21..25c0b3fd44f1 100644 --- a/drivers/rtc/rtc-pcap.c +++ b/drivers/rtc/rtc-pcap.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/mfd/ezx-pcap.h> | 18 | #include <linux/mfd/ezx-pcap.h> |
| 19 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 21 | 22 | ||
| 22 | struct pcap_rtc { | 23 | struct pcap_rtc { |
diff --git a/drivers/rtc/rtc-pcf2123.c b/drivers/rtc/rtc-pcf2123.c index 2ceb365533b2..71bab0ef5443 100644 --- a/drivers/rtc/rtc-pcf2123.c +++ b/drivers/rtc/rtc-pcf2123.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/string.h> | 41 | #include <linux/string.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/rtc.h> | 43 | #include <linux/rtc.h> |
| 43 | #include <linux/spi/spi.h> | 44 | #include <linux/spi/spi.h> |
| 44 | 45 | ||
diff --git a/drivers/rtc/rtc-pcf50633.c b/drivers/rtc/rtc-pcf50633.c index 854c3cb365a1..16edf94ab42f 100644 --- a/drivers/rtc/rtc-pcf50633.c +++ b/drivers/rtc/rtc-pcf50633.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 22 | #include <linux/rtc.h> | 23 | #include <linux/rtc.h> |
| 23 | #include <linux/bcd.h> | 24 | #include <linux/bcd.h> |
diff --git a/drivers/rtc/rtc-pcf8563.c b/drivers/rtc/rtc-pcf8563.c index 65f346b2fbae..1af42b4a6f59 100644 --- a/drivers/rtc/rtc-pcf8563.c +++ b/drivers/rtc/rtc-pcf8563.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/bcd.h> | 18 | #include <linux/bcd.h> |
| 19 | #include <linux/rtc.h> | 19 | #include <linux/rtc.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #define DRV_VERSION "0.4.3" | 22 | #define DRV_VERSION "0.4.3" |
| 22 | 23 | ||
diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c index 457231bb1029..bbdb2f02798a 100644 --- a/drivers/rtc/rtc-pl030.c +++ b/drivers/rtc/rtc-pl030.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/amba/bus.h> | 14 | #include <linux/amba/bus.h> |
| 15 | #include <linux/io.h> | 15 | #include <linux/io.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define RTC_DR (0) | 18 | #define RTC_DR (0) |
| 18 | #define RTC_MR (4) | 19 | #define RTC_MR (4) |
diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index c256aacfa954..3587d9922f28 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/bcd.h> | 24 | #include <linux/bcd.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/version.h> | 26 | #include <linux/version.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | /* | 29 | /* |
| 29 | * Register definitions | 30 | * Register definitions |
diff --git a/drivers/rtc/rtc-pxa.c b/drivers/rtc/rtc-pxa.c index e6351b743da6..e9c6fa035989 100644 --- a/drivers/rtc/rtc-pxa.c +++ b/drivers/rtc/rtc-pxa.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/io.h> | 28 | #include <linux/io.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <mach/hardware.h> | 31 | #include <mach/hardware.h> |
| 31 | 32 | ||
diff --git a/drivers/rtc/rtc-rp5c01.c b/drivers/rtc/rtc-rp5c01.c index e1313feb060f..a95f733bb15a 100644 --- a/drivers/rtc/rtc-rp5c01.c +++ b/drivers/rtc/rtc-rp5c01.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/rtc.h> | 14 | #include <linux/rtc.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | 17 | ||
| 17 | enum { | 18 | enum { |
diff --git a/drivers/rtc/rtc-rs5c348.c b/drivers/rtc/rtc-rs5c348.c index 2099037cb3ea..368d0e63cf83 100644 --- a/drivers/rtc/rtc-rs5c348.c +++ b/drivers/rtc/rtc-rs5c348.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/rtc.h> | 23 | #include <linux/rtc.h> |
| 23 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
| 24 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
diff --git a/drivers/rtc/rtc-rs5c372.c b/drivers/rtc/rtc-rs5c372.c index 2f2c68d476da..90cf0a6ff23e 100644 --- a/drivers/rtc/rtc-rs5c372.c +++ b/drivers/rtc/rtc-rs5c372.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/i2c.h> | 13 | #include <linux/i2c.h> |
| 14 | #include <linux/rtc.h> | 14 | #include <linux/rtc.h> |
| 15 | #include <linux/bcd.h> | 15 | #include <linux/bcd.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define DRV_VERSION "0.6" | 18 | #define DRV_VERSION "0.6" |
| 18 | 19 | ||
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c index b1a29bcfdf13..b65c82f792d9 100644 --- a/drivers/rtc/rtc-rx8025.c +++ b/drivers/rtc/rtc-rx8025.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 24 | #include <linux/bcd.h> | 25 | #include <linux/bcd.h> |
| 25 | #include <linux/i2c.h> | 26 | #include <linux/i2c.h> |
diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c index e0d7b9991505..4969b6059c89 100644 --- a/drivers/rtc/rtc-s3c.c +++ b/drivers/rtc/rtc-s3c.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/bcd.h> | 21 | #include <linux/bcd.h> |
| 22 | #include <linux/clk.h> | 22 | #include <linux/clk.h> |
| 23 | #include <linux/log2.h> | 23 | #include <linux/log2.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
| 26 | #include <asm/uaccess.h> | 27 | #include <asm/uaccess.h> |
diff --git a/drivers/rtc/rtc-sh.c b/drivers/rtc/rtc-sh.c index e95cc6f8d61e..5efbd5990ff8 100644 --- a/drivers/rtc/rtc-sh.c +++ b/drivers/rtc/rtc-sh.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/log2.h> | 27 | #include <linux/log2.h> |
| 28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <asm/rtc.h> | 30 | #include <asm/rtc.h> |
| 30 | 31 | ||
| 31 | #define DRV_NAME "sh-rtc" | 32 | #define DRV_NAME "sh-rtc" |
diff --git a/drivers/rtc/rtc-stk17ta8.c b/drivers/rtc/rtc-stk17ta8.c index 67700831b5c9..875ba099e7a5 100644 --- a/drivers/rtc/rtc-stk17ta8.c +++ b/drivers/rtc/rtc-stk17ta8.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/bcd.h> | 14 | #include <linux/bcd.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/gfp.h> | ||
| 17 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 18 | #include <linux/jiffies.h> | 19 | #include <linux/jiffies.h> |
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
diff --git a/drivers/rtc/rtc-stmp3xxx.c b/drivers/rtc/rtc-stmp3xxx.c index d7ce1a5c857d..7e7d0c806f2d 100644 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xxx.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/rtc.h> | 24 | #include <linux/rtc.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <mach/platform.h> | 27 | #include <mach/platform.h> |
| 27 | #include <mach/stmp3xxx.h> | 28 | #include <mach/stmp3xxx.h> |
diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index 9ee81d8aa7c0..20bfc64a15c8 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/gfp.h> | ||
| 15 | #include <asm/txx9/tx4939.h> | 16 | #include <asm/txx9/tx4939.h> |
| 16 | 17 | ||
| 17 | struct tx4939rtc_plat_data { | 18 | struct tx4939rtc_plat_data { |
diff --git a/drivers/rtc/rtc-v3020.c b/drivers/rtc/rtc-v3020.c index bed4cab07043..f71c3ce18036 100644 --- a/drivers/rtc/rtc-v3020.c +++ b/drivers/rtc/rtc-v3020.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/rtc-v3020.h> | 28 | #include <linux/rtc-v3020.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 33 | 34 | ||
diff --git a/drivers/rtc/rtc-wm831x.c b/drivers/rtc/rtc-wm831x.c index 000c7e481e59..b16cfe57a484 100644 --- a/drivers/rtc/rtc-wm831x.c +++ b/drivers/rtc/rtc-wm831x.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/time.h> | 17 | #include <linux/time.h> |
| 18 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/bcd.h> | 20 | #include <linux/bcd.h> |
| 20 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 21 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c index b3736b8aad39..6927e751ce3e 100644 --- a/drivers/s390/block/dasd_3990_erp.c +++ b/drivers/s390/block/dasd_3990_erp.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #define KMSG_COMPONENT "dasd-eckd" | 10 | #define KMSG_COMPONENT "dasd-eckd" |
| 11 | 11 | ||
| 12 | #include <linux/timer.h> | 12 | #include <linux/timer.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <asm/idals.h> | 13 | #include <asm/idals.h> |
| 15 | 14 | ||
| 16 | #define PRINTK_HEADER "dasd_erp(3990): " | 15 | #define PRINTK_HEADER "dasd_erp(3990): " |
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c index 148b1dd24070..8c4814258e93 100644 --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #define KMSG_COMPONENT "dasd-eckd" | 8 | #define KMSG_COMPONENT "dasd-eckd" |
| 9 | 9 | ||
| 10 | #include <linux/list.h> | 10 | #include <linux/list.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <asm/ebcdic.h> | 12 | #include <asm/ebcdic.h> |
| 12 | #include "dasd_int.h" | 13 | #include "dasd_int.h" |
| 13 | #include "dasd_eckd.h" | 14 | #include "dasd_eckd.h" |
diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c index 8e23919c8704..eff9c812c5c2 100644 --- a/drivers/s390/block/dasd_devmap.c +++ b/drivers/s390/block/dasd_devmap.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/ctype.h> | 18 | #include <linux/ctype.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <asm/debug.h> | 23 | #include <asm/debug.h> |
| 23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c index 1f3e967aaba8..dd88803e4899 100644 --- a/drivers/s390/block/dasd_eer.c +++ b/drivers/s390/block/dasd_eer.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/mutex.h> | 19 | #include <linux/mutex.h> |
| 20 | #include <linux/smp_lock.h> | 20 | #include <linux/smp_lock.h> |
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 24 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 3479f8158a1b..1557214944f7 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/blkpg.h> | 18 | #include <linux/blkpg.h> |
| 19 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <asm/compat.h> | 21 | #include <asm/compat.h> |
| 21 | #include <asm/ccwdev.h> | 22 | #include <asm/ccwdev.h> |
| 22 | #include <asm/cmb.h> | 23 | #include <asm/cmb.h> |
diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c index f13a0bdd148c..2eb025592809 100644 --- a/drivers/s390/block/dasd_proc.c +++ b/drivers/s390/block/dasd_proc.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #define KMSG_COMPONENT "dasd" | 14 | #define KMSG_COMPONENT "dasd" |
| 15 | 15 | ||
| 16 | #include <linux/ctype.h> | 16 | #include <linux/ctype.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 18 | #include <linux/seq_file.h> | 19 | #include <linux/seq_file.h> |
| 19 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index 118de392af63..c881a14fa5dd 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/ctype.h> /* isdigit, isxdigit */ | 33 | #include <linux/ctype.h> /* isdigit, isxdigit */ |
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
| 38 | #include <linux/blkpg.h> | 37 | #include <linux/blkpg.h> |
| 39 | #include <linux/hdreg.h> /* HDIO_GETGEO */ | 38 | #include <linux/hdreg.h> /* HDIO_GETGEO */ |
| @@ -41,6 +40,7 @@ | |||
| 41 | #include <linux/bio.h> | 40 | #include <linux/bio.h> |
| 42 | #include <linux/suspend.h> | 41 | #include <linux/suspend.h> |
| 43 | #include <linux/platform_device.h> | 42 | #include <linux/platform_device.h> |
| 43 | #include <linux/gfp.h> | ||
| 44 | #include <asm/uaccess.h> | 44 | #include <asm/uaccess.h> |
| 45 | 45 | ||
| 46 | #define XPRAM_NAME "xpram" | 46 | #define XPRAM_NAME "xpram" |
diff --git a/drivers/s390/char/con3270.c b/drivers/s390/char/con3270.c index 6bca81aea396..bb07577e8fd4 100644 --- a/drivers/s390/char/con3270.c +++ b/drivers/s390/char/con3270.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 16 | #include <linux/reboot.h> | 17 | #include <linux/reboot.h> |
| 17 | 18 | ||
diff --git a/drivers/s390/char/fs3270.c b/drivers/s390/char/fs3270.c index 31c59b0d6df0..0eabcca3c92d 100644 --- a/drivers/s390/char/fs3270.c +++ b/drivers/s390/char/fs3270.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/list.h> | 14 | #include <linux/list.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/types.h> | 16 | #include <linux/types.h> |
| 16 | #include <linux/smp_lock.h> | 17 | #include <linux/smp_lock.h> |
| 17 | 18 | ||
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c index cee4d4e42429..cb6bffe7141a 100644 --- a/drivers/s390/char/keyboard.c +++ b/drivers/s390/char/keyboard.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/sched.h> | 11 | #include <linux/sched.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/sysrq.h> | 13 | #include <linux/sysrq.h> |
| 13 | 14 | ||
| 14 | #include <linux/consolemap.h> | 15 | #include <linux/consolemap.h> |
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 33e96484d54f..2ed3f82e5c30 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/poll.h> | 22 | #include <linux/poll.h> |
| 23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <net/iucv/iucv.h> | 25 | #include <net/iucv/iucv.h> |
| 25 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
| 26 | #include <asm/ebcdic.h> | 27 | #include <asm/ebcdic.h> |
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c index 668a0579b26b..98a49dfda1de 100644 --- a/drivers/s390/char/monwriter.c +++ b/drivers/s390/char/monwriter.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/poll.h> | 20 | #include <linux/poll.h> |
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <asm/uaccess.h> | 24 | #include <asm/uaccess.h> |
| 24 | #include <asm/ebcdic.h> | 25 | #include <asm/ebcdic.h> |
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
diff --git a/drivers/s390/char/sclp_async.c b/drivers/s390/char/sclp_async.c index f449c696e503..2aecf7f21361 100644 --- a/drivers/s390/char/sclp_async.c +++ b/drivers/s390/char/sclp_async.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include <linux/stat.h> | 12 | #include <linux/stat.h> |
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/ctype.h> | 15 | #include <linux/ctype.h> |
| 15 | #include <linux/kmod.h> | 16 | #include <linux/kmod.h> |
| 16 | #include <linux/err.h> | 17 | #include <linux/err.h> |
diff --git a/drivers/s390/char/sclp_con.c b/drivers/s390/char/sclp_con.c index ad698d30cb3b..ecf45c54f8c4 100644 --- a/drivers/s390/char/sclp_con.c +++ b/drivers/s390/char/sclp_con.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/termios.h> | 14 | #include <linux/termios.h> |
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/reboot.h> | 16 | #include <linux/reboot.h> |
| 17 | #include <linux/gfp.h> | ||
| 17 | 18 | ||
| 18 | #include "sclp.h" | 19 | #include "sclp.h" |
| 19 | #include "sclp_rw.h" | 20 | #include "sclp_rw.h" |
diff --git a/drivers/s390/char/sclp_tty.c b/drivers/s390/char/sclp_tty.c index 434ba04b1309..8258d590505f 100644 --- a/drivers/s390/char/sclp_tty.c +++ b/drivers/s390/char/sclp_tty.c | |||
| @@ -13,10 +13,10 @@ | |||
| 13 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
| 14 | #include <linux/tty_driver.h> | 14 | #include <linux/tty_driver.h> |
| 15 | #include <linux/tty_flip.h> | 15 | #include <linux/tty_flip.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 18 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/gfp.h> | ||
| 20 | #include <asm/uaccess.h> | 20 | #include <asm/uaccess.h> |
| 21 | 21 | ||
| 22 | #include "ctrlchar.h" | 22 | #include "ctrlchar.h" |
diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c index 3796ffdb8479..5d706e6c946f 100644 --- a/drivers/s390/char/sclp_vt220.c +++ b/drivers/s390/char/sclp_vt220.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/reboot.h> | 25 | #include <linux/reboot.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 28 | #include "sclp.h" | 29 | #include "sclp.h" |
diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c index cb70fa1cf539..c17f35b6136a 100644 --- a/drivers/s390/char/tape_34xx.c +++ b/drivers/s390/char/tape_34xx.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/bio.h> | 16 | #include <linux/bio.h> |
| 17 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #define TAPE_DBF_AREA tape_34xx_dbf | 20 | #define TAPE_DBF_AREA tape_34xx_dbf |
| 20 | 21 | ||
diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c index 9821c5886613..fc993acf99b6 100644 --- a/drivers/s390/char/tape_3590.c +++ b/drivers/s390/char/tape_3590.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 16 | #include <linux/bio.h> | 17 | #include <linux/bio.h> |
| 17 | #include <asm/ebcdic.h> | 18 | #include <asm/ebcdic.h> |
diff --git a/drivers/s390/char/tape_class.c b/drivers/s390/char/tape_class.c index b2864e3edb6d..55343df61edd 100644 --- a/drivers/s390/char/tape_class.c +++ b/drivers/s390/char/tape_class.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | #define KMSG_COMPONENT "tape" | 11 | #define KMSG_COMPONENT "tape" |
| 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include "tape_class.h" | 16 | #include "tape_class.h" |
| 15 | 17 | ||
| 16 | MODULE_AUTHOR("Stefan Bader <shbader@de.ibm.com>"); | 18 | MODULE_AUTHOR("Stefan Bader <shbader@de.ibm.com>"); |
diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c index 81b094e480e6..29c2d73d719d 100644 --- a/drivers/s390/char/tape_core.c +++ b/drivers/s390/char/tape_core.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/spinlock.h> // for locks | 20 | #include <linux/spinlock.h> // for locks |
| 21 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
| 22 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/types.h> // for variable types | 25 | #include <asm/types.h> // for variable types |
| 25 | 26 | ||
diff --git a/drivers/s390/char/vmcp.c b/drivers/s390/char/vmcp.c index 921dcda77676..5bb59d36a6d4 100644 --- a/drivers/s390/char/vmcp.c +++ b/drivers/s390/char/vmcp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/miscdevice.h> | 20 | #include <linux/miscdevice.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <asm/compat.h> | 23 | #include <asm/compat.h> |
| 23 | #include <asm/cpcmd.h> | 24 | #include <asm/cpcmd.h> |
| 24 | #include <asm/debug.h> | 25 | #include <asm/debug.h> |
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c index 7dfa5412d5a8..e40a1b892866 100644 --- a/drivers/s390/char/vmlogrdr.c +++ b/drivers/s390/char/vmlogrdr.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 20 | #include <linux/types.h> | 21 | #include <linux/types.h> |
| 21 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c index cc56fc708bae..1de672f21037 100644 --- a/drivers/s390/char/vmur.c +++ b/drivers/s390/char/vmur.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 12 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 13 | 13 | ||
| 14 | #include <linux/cdev.h> | 14 | #include <linux/cdev.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/smp_lock.h> | 16 | #include <linux/smp_lock.h> |
| 16 | 17 | ||
| 17 | #include <asm/uaccess.h> | 18 | #include <asm/uaccess.h> |
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index c974058e48d2..e13508c98b1a 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/miscdevice.h> | 17 | #include <linux/miscdevice.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/moduleparam.h> | 19 | #include <linux/moduleparam.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/suspend.h> | 21 | #include <linux/suspend.h> |
| 21 | #include <linux/watchdog.h> | 22 | #include <linux/watchdog.h> |
| 22 | 23 | ||
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c index 3166d85914f2..18daf16aa357 100644 --- a/drivers/s390/char/zcore.c +++ b/drivers/s390/char/zcore.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 13 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 14 | 14 | ||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/miscdevice.h> | 17 | #include <linux/miscdevice.h> |
| 17 | #include <linux/debugfs.h> | 18 | #include <linux/debugfs.h> |
| 18 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c index 7eab9ab9f406..13cb60162e42 100644 --- a/drivers/s390/cio/blacklist.c +++ b/drivers/s390/cio/blacklist.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/proc_fs.h> | 17 | #include <linux/proc_fs.h> |
| 19 | #include <linux/seq_file.h> | 18 | #include <linux/seq_file.h> |
| 20 | #include <linux/ctype.h> | 19 | #include <linux/ctype.h> |
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index c268a2e5b7c3..1d16189f2f2d 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/wait.h> | 15 | #include <linux/wait.h> |
| 16 | #include <linux/mutex.h> | 16 | #include <linux/mutex.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/chpid.h> | 19 | #include <asm/chpid.h> |
| 19 | #include <asm/sclp.h> | 20 | #include <asm/sclp.h> |
| 20 | #include <asm/crw.h> | 21 | #include <asm/crw.h> |
diff --git a/drivers/s390/cio/chsc_sch.c b/drivers/s390/cio/chsc_sch.c index 852612f5dba0..404f630c27ca 100644 --- a/drivers/s390/cio/chsc_sch.c +++ b/drivers/s390/cio/chsc_sch.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * | 7 | * |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 11 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 12 | #include <linux/uaccess.h> | 13 | #include <linux/uaccess.h> |
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c index 4f8f74311778..88be7b9ea6e1 100644 --- a/drivers/s390/cio/qdio_main.c +++ b/drivers/s390/cio/qdio_main.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/timer.h> | 14 | #include <linux/timer.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <asm/atomic.h> | 17 | #include <asm/atomic.h> |
| 17 | #include <asm/debug.h> | 18 | #include <asm/debug.h> |
| 18 | #include <asm/qdio.h> | 19 | #include <asm/qdio.h> |
diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index 9942c1031b25..ce5f8910ff83 100644 --- a/drivers/s390/cio/qdio_thinint.c +++ b/drivers/s390/cio/qdio_thinint.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * Jan Glauber <jang@linux.vnet.ibm.com> | 7 | * Jan Glauber <jang@linux.vnet.ibm.com> |
| 8 | */ | 8 | */ |
| 9 | #include <linux/io.h> | 9 | #include <linux/io.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <asm/atomic.h> | 11 | #include <asm/atomic.h> |
| 11 | #include <asm/debug.h> | 12 | #include <asm/debug.h> |
| 12 | #include <asm/qdio.h> | 13 | #include <asm/qdio.h> |
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index 20836eff88c5..91c6028d7b74 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/err.h> | 33 | #include <linux/err.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/workqueue.h> | 35 | #include <linux/workqueue.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/notifier.h> | 37 | #include <linux/notifier.h> |
| 37 | #include <linux/kthread.h> | 38 | #include <linux/kthread.h> |
| 38 | #include <linux/mutex.h> | 39 | #include <linux/mutex.h> |
diff --git a/drivers/s390/crypto/zcrypt_api.c b/drivers/s390/crypto/zcrypt_api.c index ba50fe02e572..304caf549973 100644 --- a/drivers/s390/crypto/zcrypt_api.c +++ b/drivers/s390/crypto/zcrypt_api.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/seq_file.h> | 36 | #include <linux/seq_file.h> |
| 37 | #include <linux/compat.h> | 37 | #include <linux/compat.h> |
| 38 | #include <linux/smp_lock.h> | 38 | #include <linux/smp_lock.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <asm/atomic.h> | 40 | #include <asm/atomic.h> |
| 40 | #include <asm/uaccess.h> | 41 | #include <asm/uaccess.h> |
| 41 | #include <linux/hw_random.h> | 42 | #include <linux/hw_random.h> |
diff --git a/drivers/s390/crypto/zcrypt_cex2a.c b/drivers/s390/crypto/zcrypt_cex2a.c index c6fb0aa89507..9c409efa1ecf 100644 --- a/drivers/s390/crypto/zcrypt_cex2a.c +++ b/drivers/s390/crypto/zcrypt_cex2a.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 32 | #include <asm/atomic.h> | 33 | #include <asm/atomic.h> |
diff --git a/drivers/s390/crypto/zcrypt_pcica.c b/drivers/s390/crypto/zcrypt_pcica.c index e78df3671caf..09e934b295a0 100644 --- a/drivers/s390/crypto/zcrypt_pcica.c +++ b/drivers/s390/crypto/zcrypt_pcica.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 31 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 32 | #include <asm/atomic.h> | 33 | #include <asm/atomic.h> |
diff --git a/drivers/s390/crypto/zcrypt_pcicc.c b/drivers/s390/crypto/zcrypt_pcicc.c index 142f72a2ca5a..9dec5c77cff4 100644 --- a/drivers/s390/crypto/zcrypt_pcicc.c +++ b/drivers/s390/crypto/zcrypt_pcicc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/gfp.h> | ||
| 31 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 32 | #include <asm/atomic.h> | 33 | #include <asm/atomic.h> |
| 33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c index 68f3e6204db8..510fab4577d4 100644 --- a/drivers/s390/crypto/zcrypt_pcixcc.c +++ b/drivers/s390/crypto/zcrypt_pcixcc.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 31 | #include <linux/err.h> | 31 | #include <linux/err.h> |
| 32 | #include <linux/delay.h> | 32 | #include <linux/delay.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <asm/atomic.h> | 34 | #include <asm/atomic.h> |
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | 36 | ||
diff --git a/drivers/s390/kvm/kvm_virtio.c b/drivers/s390/kvm/kvm_virtio.c index b2fc4fd63f7f..4e298bc8949d 100644 --- a/drivers/s390/kvm/kvm_virtio.c +++ b/drivers/s390/kvm/kvm_virtio.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/err.h> | 15 | #include <linux/err.h> |
| 16 | #include <linux/virtio.h> | 16 | #include <linux/virtio.h> |
| 17 | #include <linux/virtio_config.h> | 17 | #include <linux/virtio_config.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/virtio_console.h> | 19 | #include <linux/virtio_console.h> |
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 20 | #include <linux/virtio_ring.h> | 21 | #include <linux/virtio_ring.h> |
diff --git a/drivers/s390/net/ctcm_dbug.c b/drivers/s390/net/ctcm_dbug.c index 1ca58f153470..d962fd741a23 100644 --- a/drivers/s390/net/ctcm_dbug.c +++ b/drivers/s390/net/ctcm_dbug.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/string.h> | 10 | #include <linux/string.h> |
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/ctype.h> | 13 | #include <linux/ctype.h> |
| 15 | #include <linux/sysctl.h> | 14 | #include <linux/sysctl.h> |
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
diff --git a/drivers/s390/net/ctcm_sysfs.c b/drivers/s390/net/ctcm_sysfs.c index 738ad26c74a7..2b24550e865e 100644 --- a/drivers/s390/net/ctcm_sysfs.c +++ b/drivers/s390/net/ctcm_sysfs.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 14 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 15 | 15 | ||
| 16 | #include <linux/sysfs.h> | 16 | #include <linux/sysfs.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include "ctcm_main.h" | 18 | #include "ctcm_main.h" |
| 18 | 19 | ||
| 19 | /* | 20 | /* |
diff --git a/drivers/s390/net/fsm.c b/drivers/s390/net/fsm.c index cae48cbc5e96..e5dea67f902e 100644 --- a/drivers/s390/net/fsm.c +++ b/drivers/s390/net/fsm.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | 5 | ||
| 6 | #include "fsm.h" | 6 | #include "fsm.h" |
| 7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | #include <linux/timer.h> | 9 | #include <linux/timer.h> |
| 9 | 10 | ||
| 10 | MODULE_AUTHOR("(C) 2000 IBM Corp. by Fritz Elfert (felfert@millenux.com)"); | 11 | MODULE_AUTHOR("(C) 2000 IBM Corp. by Fritz Elfert (felfert@millenux.com)"); |
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index f6cc46dc0501..9b19ea13b4d8 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/igmp.h> | 37 | #include <linux/igmp.h> |
| 38 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 39 | #include <linux/kthread.h> | 39 | #include <linux/kthread.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <net/arp.h> | 41 | #include <net/arp.h> |
| 41 | #include <net/ip.h> | 42 | #include <net/ip.h> |
| 42 | 43 | ||
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c index 3bd4206f3470..3ba738b2e271 100644 --- a/drivers/s390/net/qeth_core_main.c +++ b/drivers/s390/net/qeth_core_main.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/tcp.h> | 20 | #include <linux/tcp.h> |
| 21 | #include <linux/mii.h> | 21 | #include <linux/mii.h> |
| 22 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/ebcdic.h> | 25 | #include <asm/ebcdic.h> |
| 25 | #include <asm/io.h> | 26 | #include <asm/io.h> |
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c index 6f1e3036bafd..6a801dc3bf8e 100644 --- a/drivers/s390/net/qeth_l2_main.c +++ b/drivers/s390/net/qeth_l2_main.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/etherdevice.h> | 20 | #include <linux/etherdevice.h> |
| 20 | #include <linux/mii.h> | 21 | #include <linux/mii.h> |
| 21 | #include <linux/ip.h> | 22 | #include <linux/ip.h> |
diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c index b3b6e872d806..fc6ca1da8b98 100644 --- a/drivers/s390/net/qeth_l3_main.c +++ b/drivers/s390/net/qeth_l3_main.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/ipv6.h> | 22 | #include <linux/ipv6.h> |
| 23 | #include <linux/inetdevice.h> | 23 | #include <linux/inetdevice.h> |
| 24 | #include <linux/igmp.h> | 24 | #include <linux/igmp.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <net/ip.h> | 27 | #include <net/ip.h> |
| 27 | #include <net/arp.h> | 28 | #include <net/arp.h> |
diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c index 3f08b11274ae..25b3e7aae44f 100644 --- a/drivers/s390/net/qeth_l3_sys.c +++ b/drivers/s390/net/qeth_l3_sys.c | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | * Frank Blaschka <frank.blaschka@de.ibm.com> | 8 | * Frank Blaschka <frank.blaschka@de.ibm.com> |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/slab.h> | ||
| 12 | |||
| 11 | #include "qeth_l3.h" | 13 | #include "qeth_l3.h" |
| 12 | 14 | ||
| 13 | #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \ | 15 | #define QETH_DEVICE_ATTR(_id, _name, _mode, _show, _store) \ |
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c index ecef1edee701..70491274da16 100644 --- a/drivers/s390/net/smsgiucv.c +++ b/drivers/s390/net/smsgiucv.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <net/iucv/iucv.h> | 28 | #include <net/iucv/iucv.h> |
| 28 | #include <asm/cpcmd.h> | 29 | #include <asm/cpcmd.h> |
| 29 | #include <asm/ebcdic.h> | 30 | #include <asm/ebcdic.h> |
diff --git a/drivers/s390/net/smsgiucv_app.c b/drivers/s390/net/smsgiucv_app.c index 91579dc6a2b0..137688790207 100644 --- a/drivers/s390/net/smsgiucv_app.c +++ b/drivers/s390/net/smsgiucv_app.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
| 19 | #include <linux/kobject.h> | 19 | #include <linux/kobject.h> |
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/spinlock.h> | 22 | #include <linux/spinlock.h> |
| 22 | #include <linux/workqueue.h> | 23 | #include <linux/workqueue.h> |
| 23 | #include <net/iucv/iucv.h> | 24 | #include <net/iucv/iucv.h> |
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 66d6c01fcf3e..1e6183a86ce5 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | 30 | ||
| 31 | #include <linux/miscdevice.h> | 31 | #include <linux/miscdevice.h> |
| 32 | #include <linux/seq_file.h> | 32 | #include <linux/seq_file.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include "zfcp_ext.h" | 34 | #include "zfcp_ext.h" |
| 34 | #include "zfcp_fc.h" | 35 | #include "zfcp_fc.h" |
| 35 | #include "zfcp_reqlist.h" | 36 | #include "zfcp_reqlist.h" |
diff --git a/drivers/s390/scsi/zfcp_cfdc.c b/drivers/s390/scsi/zfcp_cfdc.c index 0eb6eefd2c1a..25d9e0ae9c57 100644 --- a/drivers/s390/scsi/zfcp_cfdc.c +++ b/drivers/s390/scsi/zfcp_cfdc.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define KMSG_COMPONENT "zfcp" | 10 | #define KMSG_COMPONENT "zfcp" |
| 11 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 11 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 12 | 12 | ||
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 14 | #include <linux/miscdevice.h> | 15 | #include <linux/miscdevice.h> |
| 15 | #include <asm/compat.h> | 16 | #include <asm/compat.h> |
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index 7a149fd85f6d..075852f6968c 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/ctype.h> | 12 | #include <linux/ctype.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <asm/debug.h> | 14 | #include <asm/debug.h> |
| 14 | #include "zfcp_dbf.h" | 15 | #include "zfcp_dbf.h" |
| 15 | #include "zfcp_ext.h" | 16 | #include "zfcp_ext.h" |
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 5219670f0c99..2a1cbb74b99b 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <scsi/fc/fc_els.h> | 14 | #include <scsi/fc/fc_els.h> |
| 14 | #include <scsi/libfc.h> | 15 | #include <scsi/libfc.h> |
| 15 | #include "zfcp_ext.h" | 16 | #include "zfcp_ext.h" |
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 6538742b421a..18564891ea61 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/blktrace_api.h> | 12 | #include <linux/blktrace_api.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <scsi/fc/fc_els.h> | 14 | #include <scsi/fc/fc_els.h> |
| 14 | #include "zfcp_ext.h" | 15 | #include "zfcp_ext.h" |
| 15 | #include "zfcp_fc.h" | 16 | #include "zfcp_fc.h" |
diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c index 6479273a3094..dbfa312a7f50 100644 --- a/drivers/s390/scsi/zfcp_qdio.c +++ b/drivers/s390/scsi/zfcp_qdio.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #define KMSG_COMPONENT "zfcp" | 9 | #define KMSG_COMPONENT "zfcp" |
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/slab.h> | ||
| 12 | #include "zfcp_ext.h" | 13 | #include "zfcp_ext.h" |
| 13 | #include "zfcp_qdio.h" | 14 | #include "zfcp_qdio.h" |
| 14 | 15 | ||
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c index c3c4178888af..174b6d57d576 100644 --- a/drivers/s390/scsi/zfcp_scsi.c +++ b/drivers/s390/scsi/zfcp_scsi.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/types.h> | 12 | #include <linux/types.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <scsi/fc/fc_fcp.h> | 14 | #include <scsi/fc/fc_fcp.h> |
| 14 | #include <asm/atomic.h> | 15 | #include <asm/atomic.h> |
| 15 | #include "zfcp_ext.h" | 16 | #include "zfcp_ext.h" |
diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c index a43035d4bd70..f5f60698dc4c 100644 --- a/drivers/s390/scsi/zfcp_sysfs.c +++ b/drivers/s390/scsi/zfcp_sysfs.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #define KMSG_COMPONENT "zfcp" | 9 | #define KMSG_COMPONENT "zfcp" |
| 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt | 10 | #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt |
| 11 | 11 | ||
| 12 | #include <linux/slab.h> | ||
| 12 | #include "zfcp_ext.h" | 13 | #include "zfcp_ext.h" |
| 13 | 14 | ||
| 14 | #define ZFCP_DEV_ATTR(_feat, _name, _mode, _show, _store) \ | 15 | #define ZFCP_DEV_ATTR(_feat, _name, _mode, _show, _store) \ |
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c index 28d86f9df83c..b4951eb0358e 100644 --- a/drivers/sbus/char/bbc_envctrl.c +++ b/drivers/sbus/char/bbc_envctrl.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/kmod.h> | 8 | #include <linux/kmod.h> |
| 9 | #include <linux/reboot.h> | 9 | #include <linux/reboot.h> |
| 10 | #include <linux/of.h> | 10 | #include <linux/of.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/of_device.h> | 12 | #include <linux/of_device.h> |
| 12 | #include <asm/oplib.h> | 13 | #include <asm/oplib.h> |
| 13 | 14 | ||
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c index 4431578d8c45..3e59189f4137 100644 --- a/drivers/sbus/char/display7seg.c +++ b/drivers/sbus/char/display7seg.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/miscdevice.h> | 13 | #include <linux/miscdevice.h> |
| 14 | #include <linux/ioport.h> /* request_region */ | 14 | #include <linux/ioport.h> /* request_region */ |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/smp_lock.h> | 16 | #include <linux/smp_lock.h> |
| 16 | #include <linux/of.h> | 17 | #include <linux/of.h> |
| 17 | #include <linux/of_device.h> | 18 | #include <linux/of_device.h> |
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index aa2b60a868ba..c6e2eff19409 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/miscdevice.h> | 26 | #include <linux/miscdevice.h> |
| 27 | #include <linux/kmod.h> | 27 | #include <linux/kmod.h> |
| 28 | #include <linux/reboot.h> | 28 | #include <linux/reboot.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/smp_lock.h> | 30 | #include <linux/smp_lock.h> |
| 30 | #include <linux/of.h> | 31 | #include <linux/of.h> |
| 31 | #include <linux/of_device.h> | 32 | #include <linux/of_device.h> |
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c index 41083472ff4f..19f255b97c86 100644 --- a/drivers/sbus/char/flash.c +++ b/drivers/sbus/char/flash.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
| 9 | #include <linux/miscdevice.h> | 9 | #include <linux/miscdevice.h> |
| 10 | #include <linux/slab.h> | ||
| 11 | #include <linux/fcntl.h> | 10 | #include <linux/fcntl.h> |
| 12 | #include <linux/poll.h> | 11 | #include <linux/poll.h> |
| 13 | #include <linux/init.h> | 12 | #include <linux/init.h> |
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 869a30b49edc..4942050dc5b6 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/types.h> | 31 | #include <linux/types.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/miscdevice.h> | 33 | #include <linux/miscdevice.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <linux/fcntl.h> | 34 | #include <linux/fcntl.h> |
| 36 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
| 37 | #include <linux/init.h> | 36 | #include <linux/init.h> |
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index 84d3bbaa95e7..e9788f55ab13 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c | |||
| @@ -91,6 +91,7 @@ | |||
| 91 | #include <linux/time.h> | 91 | #include <linux/time.h> |
| 92 | #include <linux/mutex.h> | 92 | #include <linux/mutex.h> |
| 93 | #include <linux/smp_lock.h> | 93 | #include <linux/smp_lock.h> |
| 94 | #include <linux/slab.h> | ||
| 94 | #include <asm/io.h> | 95 | #include <asm/io.h> |
| 95 | #include <asm/irq.h> | 96 | #include <asm/irq.h> |
| 96 | #include <asm/uaccess.h> | 97 | #include <asm/uaccess.h> |
diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index 4d314d740de4..54c5ffb1eaa1 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #include <linux/time.h> | 65 | #include <linux/time.h> |
| 66 | #include <linux/mutex.h> | 66 | #include <linux/mutex.h> |
| 67 | #include <linux/smp_lock.h> | 67 | #include <linux/smp_lock.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include <asm/io.h> | 69 | #include <asm/io.h> |
| 69 | #include <asm/irq.h> | 70 | #include <asm/irq.h> |
| 70 | #include <asm/uaccess.h> | 71 | #include <asm/uaccess.h> |
diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c index f65a1e92340c..5faf903ca8c8 100644 --- a/drivers/scsi/3w-xxxx.c +++ b/drivers/scsi/3w-xxxx.c | |||
| @@ -205,6 +205,7 @@ | |||
| 205 | #include <linux/errno.h> | 205 | #include <linux/errno.h> |
| 206 | #include <linux/types.h> | 206 | #include <linux/types.h> |
| 207 | #include <linux/delay.h> | 207 | #include <linux/delay.h> |
| 208 | #include <linux/gfp.h> | ||
| 208 | #include <linux/pci.h> | 209 | #include <linux/pci.h> |
| 209 | #include <linux/time.h> | 210 | #include <linux/time.h> |
| 210 | #include <linux/mutex.h> | 211 | #include <linux/mutex.h> |
diff --git a/drivers/scsi/53c700.c b/drivers/scsi/53c700.c index 9f4a911a6d8c..80dc3ac12cde 100644 --- a/drivers/scsi/53c700.c +++ b/drivers/scsi/53c700.c | |||
| @@ -117,6 +117,7 @@ | |||
| 117 | #include <linux/kernel.h> | 117 | #include <linux/kernel.h> |
| 118 | #include <linux/types.h> | 118 | #include <linux/types.h> |
| 119 | #include <linux/string.h> | 119 | #include <linux/string.h> |
| 120 | #include <linux/slab.h> | ||
| 120 | #include <linux/ioport.h> | 121 | #include <linux/ioport.h> |
| 121 | #include <linux/delay.h> | 122 | #include <linux/delay.h> |
| 122 | #include <linux/spinlock.h> | 123 | #include <linux/spinlock.h> |
diff --git a/drivers/scsi/BusLogic.c b/drivers/scsi/BusLogic.c index 1ddcf4031d4c..fc0b4b81d552 100644 --- a/drivers/scsi/BusLogic.c +++ b/drivers/scsi/BusLogic.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/spinlock.h> | 42 | #include <linux/spinlock.h> |
| 43 | #include <linux/jiffies.h> | 43 | #include <linux/jiffies.h> |
| 44 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <scsi/scsicam.h> | 46 | #include <scsi/scsicam.h> |
| 46 | 47 | ||
| 47 | #include <asm/dma.h> | 48 | #include <asm/dma.h> |
diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c index 1cdf09a4779a..8647256ad66d 100644 --- a/drivers/scsi/NCR_D700.c +++ b/drivers/scsi/NCR_D700.c | |||
| @@ -97,6 +97,7 @@ | |||
| 97 | #include <linux/kernel.h> | 97 | #include <linux/kernel.h> |
| 98 | #include <linux/module.h> | 98 | #include <linux/module.h> |
| 99 | #include <linux/mca.h> | 99 | #include <linux/mca.h> |
| 100 | #include <linux/slab.h> | ||
| 100 | #include <asm/io.h> | 101 | #include <asm/io.h> |
| 101 | #include <scsi/scsi_host.h> | 102 | #include <scsi/scsi_host.h> |
| 102 | #include <scsi/scsi_device.h> | 103 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/NCR_Q720.c b/drivers/scsi/NCR_Q720.c index a8bbdc2273b8..afdbb9addf18 100644 --- a/drivers/scsi/NCR_Q720.c +++ b/drivers/scsi/NCR_Q720.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/mca.h> | 12 | #include <linux/mca.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 14 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 15 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c index ff5716d5f044..dbbc601948e5 100644 --- a/drivers/scsi/a100u2w.c +++ b/drivers/scsi/a100u2w.c | |||
| @@ -69,7 +69,6 @@ | |||
| 69 | #include <linux/kernel.h> | 69 | #include <linux/kernel.h> |
| 70 | #include <linux/string.h> | 70 | #include <linux/string.h> |
| 71 | #include <linux/ioport.h> | 71 | #include <linux/ioport.h> |
| 72 | #include <linux/slab.h> | ||
| 73 | #include <linux/dma-mapping.h> | 72 | #include <linux/dma-mapping.h> |
| 74 | 73 | ||
| 75 | #include <asm/io.h> | 74 | #include <asm/io.h> |
diff --git a/drivers/scsi/a2091.c b/drivers/scsi/a2091.c index 4b38c4750f77..d8fe5b76fee0 100644 --- a/drivers/scsi/a2091.c +++ b/drivers/scsi/a2091.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 2 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 4 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/a3000.c b/drivers/scsi/a3000.c index 6970ce82c4ac..c35fc55f1c96 100644 --- a/drivers/scsi/a3000.c +++ b/drivers/scsi/a3000.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 2 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 4 | #include <linux/ioport.h> | 5 | #include <linux/ioport.h> |
| 5 | #include <linux/init.h> | 6 | #include <linux/init.h> |
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c index e3519fa5a3ba..11ae6be8aeaf 100644 --- a/drivers/scsi/a4000t.c +++ b/drivers/scsi/a4000t.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <asm/amigahw.h> | 16 | #include <asm/amigahw.h> |
| 16 | #include <asm/amigaints.h> | 17 | #include <asm/amigaints.h> |
| 17 | #include <scsi/scsi_host.h> | 18 | #include <scsi/scsi_host.h> |
diff --git a/drivers/scsi/aacraid/rx.c b/drivers/scsi/aacraid/rx.c index f70d9f8e79e5..04057ab72a8b 100644 --- a/drivers/scsi/aacraid/rx.c +++ b/drivers/scsi/aacraid/rx.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/completion.h> | 38 | #include <linux/completion.h> |
diff --git a/drivers/scsi/aacraid/sa.c b/drivers/scsi/aacraid/sa.c index b6a3c5c187b6..622c21c68e65 100644 --- a/drivers/scsi/aacraid/sa.c +++ b/drivers/scsi/aacraid/sa.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/types.h> | 33 | #include <linux/types.h> |
| 34 | #include <linux/pci.h> | 34 | #include <linux/pci.h> |
| 35 | #include <linux/spinlock.h> | 35 | #include <linux/spinlock.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
| 38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 39 | #include <linux/completion.h> | 38 | #include <linux/completion.h> |
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c index 22626abdb630..9201afe65609 100644 --- a/drivers/scsi/advansys.c +++ b/drivers/scsi/advansys.c | |||
| @@ -4781,12 +4781,14 @@ static ushort AscInitAsc1000Driver(ASC_DVC_VAR *asc_dvc) | |||
| 4781 | if (err) { | 4781 | if (err) { |
| 4782 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | 4782 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", |
| 4783 | fwname, err); | 4783 | fwname, err); |
| 4784 | asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM; | ||
| 4784 | return err; | 4785 | return err; |
| 4785 | } | 4786 | } |
| 4786 | if (fw->size < 4) { | 4787 | if (fw->size < 4) { |
| 4787 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | 4788 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", |
| 4788 | fw->size, fwname); | 4789 | fw->size, fwname); |
| 4789 | release_firmware(fw); | 4790 | release_firmware(fw); |
| 4791 | asc_dvc->err_code |= ASC_IERR_MCODE_CHKSUM; | ||
| 4790 | return -EINVAL; | 4792 | return -EINVAL; |
| 4791 | } | 4793 | } |
| 4792 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | | 4794 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | |
| @@ -5110,12 +5112,14 @@ static int AdvInitAsc3550Driver(ADV_DVC_VAR *asc_dvc) | |||
| 5110 | if (err) { | 5112 | if (err) { |
| 5111 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | 5113 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", |
| 5112 | fwname, err); | 5114 | fwname, err); |
| 5115 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 5113 | return err; | 5116 | return err; |
| 5114 | } | 5117 | } |
| 5115 | if (fw->size < 4) { | 5118 | if (fw->size < 4) { |
| 5116 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | 5119 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", |
| 5117 | fw->size, fwname); | 5120 | fw->size, fwname); |
| 5118 | release_firmware(fw); | 5121 | release_firmware(fw); |
| 5122 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 5119 | return -EINVAL; | 5123 | return -EINVAL; |
| 5120 | } | 5124 | } |
| 5121 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | | 5125 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | |
| @@ -5624,12 +5628,14 @@ static int AdvInitAsc38C0800Driver(ADV_DVC_VAR *asc_dvc) | |||
| 5624 | if (err) { | 5628 | if (err) { |
| 5625 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | 5629 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", |
| 5626 | fwname, err); | 5630 | fwname, err); |
| 5631 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 5627 | return err; | 5632 | return err; |
| 5628 | } | 5633 | } |
| 5629 | if (fw->size < 4) { | 5634 | if (fw->size < 4) { |
| 5630 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | 5635 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", |
| 5631 | fw->size, fwname); | 5636 | fw->size, fwname); |
| 5632 | release_firmware(fw); | 5637 | release_firmware(fw); |
| 5638 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 5633 | return -EINVAL; | 5639 | return -EINVAL; |
| 5634 | } | 5640 | } |
| 5635 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | | 5641 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | |
| @@ -6124,12 +6130,14 @@ static int AdvInitAsc38C1600Driver(ADV_DVC_VAR *asc_dvc) | |||
| 6124 | if (err) { | 6130 | if (err) { |
| 6125 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | 6131 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", |
| 6126 | fwname, err); | 6132 | fwname, err); |
| 6133 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 6127 | return err; | 6134 | return err; |
| 6128 | } | 6135 | } |
| 6129 | if (fw->size < 4) { | 6136 | if (fw->size < 4) { |
| 6130 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | 6137 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", |
| 6131 | fw->size, fwname); | 6138 | fw->size, fwname); |
| 6132 | release_firmware(fw); | 6139 | release_firmware(fw); |
| 6140 | asc_dvc->err_code = ASC_IERR_MCODE_CHKSUM; | ||
| 6133 | return -EINVAL; | 6141 | return -EINVAL; |
| 6134 | } | 6142 | } |
| 6135 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | | 6143 | chksum = (fw->data[3] << 24) | (fw->data[2] << 16) | |
diff --git a/drivers/scsi/aha152x.c b/drivers/scsi/aha152x.c index 1e5478abd90e..8eab8587ff21 100644 --- a/drivers/scsi/aha152x.c +++ b/drivers/scsi/aha152x.c | |||
| @@ -254,6 +254,7 @@ | |||
| 254 | #include <linux/spinlock.h> | 254 | #include <linux/spinlock.h> |
| 255 | #include <linux/workqueue.h> | 255 | #include <linux/workqueue.h> |
| 256 | #include <linux/list.h> | 256 | #include <linux/list.h> |
| 257 | #include <linux/slab.h> | ||
| 257 | #include <scsi/scsicam.h> | 258 | #include <scsi/scsicam.h> |
| 258 | 259 | ||
| 259 | #include "scsi.h" | 260 | #include "scsi.h" |
diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c index 80594947c6f6..2a8cf137f609 100644 --- a/drivers/scsi/aha1542.c +++ b/drivers/scsi/aha1542.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/blkdev.h> | 39 | #include <linux/blkdev.h> |
| 40 | #include <linux/mca.h> | 40 | #include <linux/mca.h> |
| 41 | #include <linux/mca-legacy.h> | 41 | #include <linux/mca-legacy.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <asm/dma.h> | 44 | #include <asm/dma.h> |
| 44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
diff --git a/drivers/scsi/aha1740.c b/drivers/scsi/aha1740.c index 538135783aab..0107a4cc3331 100644 --- a/drivers/scsi/aha1740.c +++ b/drivers/scsi/aha1740.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/device.h> | 50 | #include <linux/device.h> |
| 51 | #include <linux/eisa.h> | 51 | #include <linux/eisa.h> |
| 52 | #include <linux/dma-mapping.h> | 52 | #include <linux/dma-mapping.h> |
| 53 | #include <linux/gfp.h> | ||
| 53 | 54 | ||
| 54 | #include <asm/dma.h> | 55 | #include <asm/dma.h> |
| 55 | #include <asm/system.h> | 56 | #include <asm/system.h> |
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.c b/drivers/scsi/aic7xxx/aic79xx_osm.c index 1222a7ac698a..4c41332a354b 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.c +++ b/drivers/scsi/aic7xxx/aic79xx_osm.c | |||
| @@ -53,6 +53,7 @@ static struct scsi_transport_template *ahd_linux_transport_template = NULL; | |||
| 53 | #include <linux/blkdev.h> /* For block_size() */ | 53 | #include <linux/blkdev.h> /* For block_size() */ |
| 54 | #include <linux/delay.h> /* For ssleep/msleep */ | 54 | #include <linux/delay.h> /* For ssleep/msleep */ |
| 55 | #include <linux/device.h> | 55 | #include <linux/device.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | 57 | ||
| 57 | /* | 58 | /* |
| 58 | * Bucket size for counting good commands in between bad ones. | 59 | * Bucket size for counting good commands in between bad ones. |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.c b/drivers/scsi/aic7xxx/aic7xxx_osm.c index 8cb05dc8e6a1..5e42dac23505 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.c +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.c | |||
| @@ -129,6 +129,7 @@ static struct scsi_transport_template *ahc_linux_transport_template = NULL; | |||
| 129 | #include <linux/mm.h> /* For fetching system memory size */ | 129 | #include <linux/mm.h> /* For fetching system memory size */ |
| 130 | #include <linux/blkdev.h> /* For block_size() */ | 130 | #include <linux/blkdev.h> /* For block_size() */ |
| 131 | #include <linux/delay.h> /* For ssleep/msleep */ | 131 | #include <linux/delay.h> /* For ssleep/msleep */ |
| 132 | #include <linux/slab.h> | ||
| 132 | 133 | ||
| 133 | 134 | ||
| 134 | /* | 135 | /* |
diff --git a/drivers/scsi/aic94xx/aic94xx_hwi.c b/drivers/scsi/aic94xx/aic94xx_hwi.c index eb9dc3195fdf..81b736c76fff 100644 --- a/drivers/scsi/aic94xx/aic94xx_hwi.c +++ b/drivers/scsi/aic94xx/aic94xx_hwi.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 29 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 30 | #include <linux/firmware.h> | 31 | #include <linux/firmware.h> |
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 996f7224f90e..24ac2315c5c7 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/pci.h> | 30 | #include <linux/pci.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/firmware.h> | 32 | #include <linux/firmware.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <scsi/scsi_host.h> | 35 | #include <scsi/scsi_host.h> |
| 35 | 36 | ||
diff --git a/drivers/scsi/aic94xx/aic94xx_scb.c b/drivers/scsi/aic94xx/aic94xx_scb.c index ca55013b6ae5..c43698b1cb64 100644 --- a/drivers/scsi/aic94xx/aic94xx_scb.c +++ b/drivers/scsi/aic94xx/aic94xx_scb.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * | 24 | * |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/gfp.h> | ||
| 27 | #include <scsi/scsi_host.h> | 28 | #include <scsi/scsi_host.h> |
| 28 | 29 | ||
| 29 | #include "aic94xx.h" | 30 | #include "aic94xx.h" |
diff --git a/drivers/scsi/aic94xx/aic94xx_sds.c b/drivers/scsi/aic94xx/aic94xx_sds.c index 8630a75b2872..edb43fda9f36 100644 --- a/drivers/scsi/aic94xx/aic94xx_sds.c +++ b/drivers/scsi/aic94xx/aic94xx_sds.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | 27 | ||
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 30 | 31 | ||
| 31 | #include "aic94xx.h" | 32 | #include "aic94xx.h" |
diff --git a/drivers/scsi/aic94xx/aic94xx_seq.c b/drivers/scsi/aic94xx/aic94xx_seq.c index 8f98e33155e9..d01dcc62b39a 100644 --- a/drivers/scsi/aic94xx/aic94xx_seq.c +++ b/drivers/scsi/aic94xx/aic94xx_seq.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 31 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 32 | #include <linux/firmware.h> | 33 | #include <linux/firmware.h> |
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c index 78eb86fc6276..0add73bdf2a4 100644 --- a/drivers/scsi/aic94xx/aic94xx_tmf.c +++ b/drivers/scsi/aic94xx/aic94xx_tmf.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | #include <linux/gfp.h> | ||
| 28 | #include "aic94xx.h" | 29 | #include "aic94xx.h" |
| 29 | #include "aic94xx_sas.h" | 30 | #include "aic94xx_sas.h" |
| 30 | #include "aic94xx_hwi.h" | 31 | #include "aic94xx_hwi.h" |
diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c index 47d5d19f8c92..ffbe2192da3c 100644 --- a/drivers/scsi/arcmsr/arcmsr_hba.c +++ b/drivers/scsi/arcmsr/arcmsr_hba.c | |||
| @@ -58,6 +58,7 @@ | |||
| 58 | #include <linux/timer.h> | 58 | #include <linux/timer.h> |
| 59 | #include <linux/pci.h> | 59 | #include <linux/pci.h> |
| 60 | #include <linux/aer.h> | 60 | #include <linux/aer.h> |
| 61 | #include <linux/slab.h> | ||
| 61 | #include <asm/dma.h> | 62 | #include <asm/dma.h> |
| 62 | #include <asm/io.h> | 63 | #include <asm/io.h> |
| 63 | #include <asm/system.h> | 64 | #include <asm/system.h> |
diff --git a/drivers/scsi/atari_NCR5380.c b/drivers/scsi/atari_NCR5380.c index 4240b05aef6d..158ebc3644d8 100644 --- a/drivers/scsi/atari_NCR5380.c +++ b/drivers/scsi/atari_NCR5380.c | |||
| @@ -651,6 +651,7 @@ static inline void NCR5380_print_phase(struct Scsi_Host *instance) | |||
| 651 | * interrupt or bottom half. | 651 | * interrupt or bottom half. |
| 652 | */ | 652 | */ |
| 653 | 653 | ||
| 654 | #include <linux/gfp.h> | ||
| 654 | #include <linux/workqueue.h> | 655 | #include <linux/workqueue.h> |
| 655 | #include <linux/interrupt.h> | 656 | #include <linux/interrupt.h> |
| 656 | 657 | ||
diff --git a/drivers/scsi/atp870u.c b/drivers/scsi/atp870u.c index b137e561f5bc..ab5bdda6903e 100644 --- a/drivers/scsi/atp870u.c +++ b/drivers/scsi/atp870u.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/blkdev.h> | 30 | #include <linux/blkdev.h> |
| 31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | 35 | ||
diff --git a/drivers/scsi/be2iscsi/be_main.c b/drivers/scsi/be2iscsi/be_main.c index fcfb29e02d8a..dd5b105f8f47 100644 --- a/drivers/scsi/be2iscsi/be_main.c +++ b/drivers/scsi/be2iscsi/be_main.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | #include <linux/reboot.h> | 20 | #include <linux/reboot.h> |
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 23 | #include <linux/blkdev.h> | 24 | #include <linux/blkdev.h> |
| 24 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
diff --git a/drivers/scsi/bfa/bfad.c b/drivers/scsi/bfa/bfad.c index 6bff08ea4029..13f5feb308c2 100644 --- a/drivers/scsi/bfa/bfad.c +++ b/drivers/scsi/bfa/bfad.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * bfad.c Linux driver PCI interface module. | 19 | * bfad.c Linux driver PCI interface module. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 23 | #include <linux/kthread.h> | 24 | #include <linux/kthread.h> |
| 24 | #include "bfad_drv.h" | 25 | #include "bfad_drv.h" |
diff --git a/drivers/scsi/bfa/bfad_attr.c b/drivers/scsi/bfa/bfad_attr.c index d97f69191838..6a2efdd5ef24 100644 --- a/drivers/scsi/bfa/bfad_attr.c +++ b/drivers/scsi/bfa/bfad_attr.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * bfa_attr.c Linux driver configuration interface module. | 19 | * bfa_attr.c Linux driver configuration interface module. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include "bfad_drv.h" | 23 | #include "bfad_drv.h" |
| 23 | #include "bfad_im.h" | 24 | #include "bfad_im.h" |
| 24 | #include "bfad_trcmod.h" | 25 | #include "bfad_trcmod.h" |
diff --git a/drivers/scsi/bfa/bfad_im.c b/drivers/scsi/bfa/bfad_im.c index f9fc67a25bf2..78f42aa57369 100644 --- a/drivers/scsi/bfa/bfad_im.c +++ b/drivers/scsi/bfa/bfad_im.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * bfad_im.c Linux driver IM module. | 19 | * bfad_im.c Linux driver IM module. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include "bfad_drv.h" | 23 | #include "bfad_drv.h" |
| 23 | #include "bfad_im.h" | 24 | #include "bfad_im.h" |
| 24 | #include "bfad_trcmod.h" | 25 | #include "bfad_trcmod.h" |
diff --git a/drivers/scsi/bfa/rport.c b/drivers/scsi/bfa/rport.c index 8e73dd9a625a..7b096f2e3836 100644 --- a/drivers/scsi/bfa/rport.c +++ b/drivers/scsi/bfa/rport.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * rport.c Remote port implementation. | 19 | * rport.c Remote port implementation. |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <bfa.h> | 23 | #include <bfa.h> |
| 23 | #include <bfa_svc.h> | 24 | #include <bfa_svc.h> |
| 24 | #include "fcbuild.h" | 25 | #include "fcbuild.h" |
diff --git a/drivers/scsi/bnx2i/bnx2i_hwi.c b/drivers/scsi/bnx2i/bnx2i_hwi.c index 1af578dec276..18352ff82101 100644 --- a/drivers/scsi/bnx2i/bnx2i_hwi.c +++ b/drivers/scsi/bnx2i/bnx2i_hwi.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) | 11 | * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <scsi/scsi_tcq.h> | 15 | #include <scsi/scsi_tcq.h> |
| 15 | #include <scsi/libiscsi.h> | 16 | #include <scsi/libiscsi.h> |
| 16 | #include "bnx2i.h" | 17 | #include "bnx2i.h" |
diff --git a/drivers/scsi/bnx2i/bnx2i_iscsi.c b/drivers/scsi/bnx2i/bnx2i_iscsi.c index cb71dc984797..f2e9b18fe76c 100644 --- a/drivers/scsi/bnx2i/bnx2i_iscsi.c +++ b/drivers/scsi/bnx2i/bnx2i_iscsi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) | 12 | * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | ||
| 15 | #include <scsi/scsi_tcq.h> | 16 | #include <scsi/scsi_tcq.h> |
| 16 | #include <scsi/libiscsi.h> | 17 | #include <scsi/libiscsi.h> |
| 17 | #include "bnx2i.h" | 18 | #include "bnx2i.h" |
diff --git a/drivers/scsi/bvme6000_scsi.c b/drivers/scsi/bvme6000_scsi.c index 5799cb5cba6b..d40ea2f5be10 100644 --- a/drivers/scsi/bvme6000_scsi.c +++ b/drivers/scsi/bvme6000_scsi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <asm/bvme6000hw.h> | 16 | #include <asm/bvme6000hw.h> |
| 16 | #include <scsi/scsi_host.h> | 17 | #include <scsi/scsi_host.h> |
| 17 | #include <scsi/scsi_device.h> | 18 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/ch.c b/drivers/scsi/ch.c index fe11c1d4b31d..4799d4391203 100644 --- a/drivers/scsi/ch.c +++ b/drivers/scsi/ch.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/mutex.h> | 23 | #include <linux/mutex.h> |
| 24 | #include <linux/idr.h> | 24 | #include <linux/idr.h> |
| 25 | #include <linux/smp_lock.h> | 25 | #include <linux/smp_lock.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <scsi/scsi.h> | 28 | #include <scsi/scsi.h> |
| 28 | #include <scsi/scsi_cmnd.h> | 29 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_ddp.c b/drivers/scsi/cxgb3i/cxgb3i_ddp.c index 344fd53b9954..b58d9134ac1b 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_ddp.c +++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * Written by: Karen Xie (kxie@chelsio.com) | 10 | * Written by: Karen Xie (kxie@chelsio.com) |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/skbuff.h> | 14 | #include <linux/skbuff.h> |
| 14 | #include <linux/scatterlist.h> | 15 | #include <linux/scatterlist.h> |
| 15 | 16 | ||
diff --git a/drivers/scsi/cxgb3i/cxgb3i_ddp.h b/drivers/scsi/cxgb3i/cxgb3i_ddp.h index 87dd56b422bf..6761b329124d 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_ddp.h +++ b/drivers/scsi/cxgb3i/cxgb3i_ddp.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #ifndef __CXGB3I_ULP2_DDP_H__ | 13 | #ifndef __CXGB3I_ULP2_DDP_H__ |
| 14 | #define __CXGB3I_ULP2_DDP_H__ | 14 | #define __CXGB3I_ULP2_DDP_H__ |
| 15 | 15 | ||
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/vmalloc.h> | 17 | #include <linux/vmalloc.h> |
| 17 | 18 | ||
| 18 | /** | 19 | /** |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c index b7c30585dadd..7b686abaae64 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_iscsi.c +++ b/drivers/scsi/cxgb3i/cxgb3i_iscsi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/inet.h> | 14 | #include <linux/inet.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/crypto.h> | 16 | #include <linux/crypto.h> |
| 16 | #include <linux/if_vlan.h> | 17 | #include <linux/if_vlan.h> |
| 17 | #include <net/dst.h> | 18 | #include <net/dst.h> |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_offload.c b/drivers/scsi/cxgb3i/cxgb3i_offload.c index 3e08c430ff29..a175be9c496f 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_offload.c +++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/if_vlan.h> | 15 | #include <linux/if_vlan.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/version.h> | 17 | #include <linux/version.h> |
| 17 | 18 | ||
| 18 | #include "cxgb3_defs.h" | 19 | #include "cxgb3_defs.h" |
diff --git a/drivers/scsi/cxgb3i/cxgb3i_pdu.c b/drivers/scsi/cxgb3i/cxgb3i_pdu.c index 9c38539557fc..dc5e3e77a351 100644 --- a/drivers/scsi/cxgb3i/cxgb3i_pdu.c +++ b/drivers/scsi/cxgb3i/cxgb3i_pdu.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * Written by: Karen Xie (kxie@chelsio.com) | 12 | * Written by: Karen Xie (kxie@chelsio.com) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/skbuff.h> | 16 | #include <linux/skbuff.h> |
| 16 | #include <linux/crypto.h> | 17 | #include <linux/crypto.h> |
| 17 | #include <scsi/scsi_cmnd.h> | 18 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/dc395x.c b/drivers/scsi/dc395x.c index 6c59c02c1ed9..bd977be7544e 100644 --- a/drivers/scsi/dc395x.c +++ b/drivers/scsi/dc395x.c | |||
| @@ -57,6 +57,7 @@ | |||
| 57 | #include <linux/pci.h> | 57 | #include <linux/pci.h> |
| 58 | #include <linux/list.h> | 58 | #include <linux/list.h> |
| 59 | #include <linux/vmalloc.h> | 59 | #include <linux/vmalloc.h> |
| 60 | #include <linux/slab.h> | ||
| 60 | #include <asm/io.h> | 61 | #include <asm/io.h> |
| 61 | 62 | ||
| 62 | #include <scsi/scsi.h> | 63 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/device_handler/scsi_dh.c b/drivers/scsi/device_handler/scsi_dh.c index e19a1a55270c..6fae3d285ae7 100644 --- a/drivers/scsi/device_handler/scsi_dh.c +++ b/drivers/scsi/device_handler/scsi_dh.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * Mike Anderson <andmike@linux.vnet.ibm.com> | 21 | * Mike Anderson <andmike@linux.vnet.ibm.com> |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <scsi/scsi_dh.h> | 25 | #include <scsi/scsi_dh.h> |
| 25 | #include "../scsi_priv.h" | 26 | #include "../scsi_priv.h" |
| 26 | 27 | ||
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index bc9e94f5915e..1a970a76b1b9 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 19 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
| 20 | * | 20 | * |
| 21 | */ | 21 | */ |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <scsi/scsi.h> | 23 | #include <scsi/scsi.h> |
| 23 | #include <scsi/scsi_eh.h> | 24 | #include <scsi/scsi_eh.h> |
| 24 | #include <scsi/scsi_dh.h> | 25 | #include <scsi/scsi_dh.h> |
diff --git a/drivers/scsi/device_handler/scsi_dh_emc.c b/drivers/scsi/device_handler/scsi_dh_emc.c index 63032ec3db92..e8a0bc3efd49 100644 --- a/drivers/scsi/device_handler/scsi_dh_emc.c +++ b/drivers/scsi/device_handler/scsi_dh_emc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * along with this program; see the file COPYING. If not, write to | 20 | * along with this program; see the file COPYING. If not, write to |
| 21 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <scsi/scsi.h> | 24 | #include <scsi/scsi.h> |
| 24 | #include <scsi/scsi_eh.h> | 25 | #include <scsi/scsi_eh.h> |
| 25 | #include <scsi/scsi_dh.h> | 26 | #include <scsi/scsi_dh.h> |
diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c index 857fdd6032b2..e3916641e627 100644 --- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c +++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <scsi/scsi.h> | 25 | #include <scsi/scsi.h> |
| 25 | #include <scsi/scsi_dbg.h> | 26 | #include <scsi/scsi_dbg.h> |
| 26 | #include <scsi/scsi_eh.h> | 27 | #include <scsi/scsi_eh.h> |
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 1a660191a905..5b683e429542 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <scsi/scsi_eh.h> | 23 | #include <scsi/scsi_eh.h> |
| 24 | #include <scsi/scsi_dh.h> | 24 | #include <scsi/scsi_dh.h> |
| 25 | #include <linux/workqueue.h> | 25 | #include <linux/workqueue.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #define RDAC_NAME "rdac" | 28 | #define RDAC_NAME "rdac" |
| 28 | #define RDAC_RETRY_COUNT 5 | 29 | #define RDAC_RETRY_COUNT 5 |
diff --git a/drivers/scsi/eata.c b/drivers/scsi/eata.c index 3c5abf7cd762..d1c31378f6da 100644 --- a/drivers/scsi/eata.c +++ b/drivers/scsi/eata.c | |||
| @@ -490,6 +490,7 @@ | |||
| 490 | #include <linux/ctype.h> | 490 | #include <linux/ctype.h> |
| 491 | #include <linux/spinlock.h> | 491 | #include <linux/spinlock.h> |
| 492 | #include <linux/dma-mapping.h> | 492 | #include <linux/dma-mapping.h> |
| 493 | #include <linux/slab.h> | ||
| 493 | #include <asm/byteorder.h> | 494 | #include <asm/byteorder.h> |
| 494 | #include <asm/dma.h> | 495 | #include <asm/dma.h> |
| 495 | #include <asm/io.h> | 496 | #include <asm/io.h> |
diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c index 152dd15db276..60886c19065e 100644 --- a/drivers/scsi/eata_pio.c +++ b/drivers/scsi/eata_pio.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <linux/kernel.h> | 50 | #include <linux/kernel.h> |
| 51 | #include <linux/string.h> | 51 | #include <linux/string.h> |
| 52 | #include <linux/ioport.h> | 52 | #include <linux/ioport.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/in.h> | 53 | #include <linux/in.h> |
| 55 | #include <linux/pci.h> | 54 | #include <linux/pci.h> |
| 56 | #include <linux/proc_fs.h> | 55 | #include <linux/proc_fs.h> |
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 2f47ae7cce91..f01b9b44e8aa 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/if_ether.h> | 26 | #include <linux/if_ether.h> |
| 27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
| 28 | #include <linux/crc32.h> | 28 | #include <linux/crc32.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/cpu.h> | 30 | #include <linux/cpu.h> |
| 30 | #include <linux/fs.h> | 31 | #include <linux/fs.h> |
| 31 | #include <linux/sysfs.h> | 32 | #include <linux/sysfs.h> |
diff --git a/drivers/scsi/fcoe/libfcoe.c b/drivers/scsi/fcoe/libfcoe.c index 511cb6b371ee..3440da48d169 100644 --- a/drivers/scsi/fcoe/libfcoe.c +++ b/drivers/scsi/fcoe/libfcoe.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/if_vlan.h> | 31 | #include <linux/if_vlan.h> |
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/bitops.h> | 33 | #include <linux/bitops.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <net/rtnetlink.h> | 35 | #include <net/rtnetlink.h> |
| 35 | 36 | ||
| 36 | #include <scsi/fc/fc_els.h> | 37 | #include <scsi/fc/fc_els.h> |
diff --git a/drivers/scsi/fd_mcs.c b/drivers/scsi/fd_mcs.c index 85bd54c77b50..2ad95aa8f585 100644 --- a/drivers/scsi/fd_mcs.c +++ b/drivers/scsi/fd_mcs.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | #include <linux/delay.h> | 88 | #include <linux/delay.h> |
| 89 | #include <linux/mca.h> | 89 | #include <linux/mca.h> |
| 90 | #include <linux/spinlock.h> | 90 | #include <linux/spinlock.h> |
| 91 | #include <linux/slab.h> | ||
| 91 | #include <scsi/scsicam.h> | 92 | #include <scsi/scsicam.h> |
| 92 | #include <linux/mca-legacy.h> | 93 | #include <linux/mca-legacy.h> |
| 93 | 94 | ||
diff --git a/drivers/scsi/fdomain.c b/drivers/scsi/fdomain.c index 32eef66114c7..e296bcc57d5c 100644 --- a/drivers/scsi/fdomain.c +++ b/drivers/scsi/fdomain.c | |||
| @@ -279,6 +279,7 @@ | |||
| 279 | #include <linux/stat.h> | 279 | #include <linux/stat.h> |
| 280 | #include <linux/delay.h> | 280 | #include <linux/delay.h> |
| 281 | #include <linux/io.h> | 281 | #include <linux/io.h> |
| 282 | #include <linux/slab.h> | ||
| 282 | #include <scsi/scsicam.h> | 283 | #include <scsi/scsicam.h> |
| 283 | 284 | ||
| 284 | #include <asm/system.h> | 285 | #include <asm/system.h> |
diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 54f8d0e5407f..5259888fbfb1 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/skbuff.h> | 21 | #include <linux/skbuff.h> |
| 21 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 22 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
diff --git a/drivers/scsi/fnic/fnic_main.c b/drivers/scsi/fnic/fnic_main.c index 507e26c1c29f..97b212570bcc 100644 --- a/drivers/scsi/fnic/fnic_main.c +++ b/drivers/scsi/fnic/fnic_main.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/mempool.h> | 19 | #include <linux/mempool.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 22 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 23 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
diff --git a/drivers/scsi/fnic/fnic_scsi.c b/drivers/scsi/fnic/fnic_scsi.c index 65a39b0f6dc2..3cc47c6e1ada 100644 --- a/drivers/scsi/fnic/fnic_scsi.c +++ b/drivers/scsi/fnic/fnic_scsi.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/if_ether.h> | 26 | #include <linux/if_ether.h> |
| 27 | #include <linux/if_vlan.h> | 27 | #include <linux/if_vlan.h> |
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/gfp.h> | ||
| 29 | #include <scsi/scsi.h> | 30 | #include <scsi/scsi.h> |
| 30 | #include <scsi/scsi_host.h> | 31 | #include <scsi/scsi_host.h> |
| 31 | #include <scsi/scsi_device.h> | 32 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/fnic/vnic_dev.c b/drivers/scsi/fnic/vnic_dev.c index 566770645086..db710148d156 100644 --- a/drivers/scsi/fnic/vnic_dev.c +++ b/drivers/scsi/fnic/vnic_dev.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/if_ether.h> | 24 | #include <linux/if_ether.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "vnic_resource.h" | 26 | #include "vnic_resource.h" |
| 26 | #include "vnic_devcmd.h" | 27 | #include "vnic_devcmd.h" |
| 27 | #include "vnic_dev.h" | 28 | #include "vnic_dev.h" |
diff --git a/drivers/scsi/fnic/vnic_rq.c b/drivers/scsi/fnic/vnic_rq.c index bedd0d285630..fd2068f5ae16 100644 --- a/drivers/scsi/fnic/vnic_rq.c +++ b/drivers/scsi/fnic/vnic_rq.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "vnic_dev.h" | 24 | #include "vnic_dev.h" |
| 24 | #include "vnic_rq.h" | 25 | #include "vnic_rq.h" |
| 25 | 26 | ||
diff --git a/drivers/scsi/fnic/vnic_wq.c b/drivers/scsi/fnic/vnic_wq.c index 1f9ea790d130..a414135460db 100644 --- a/drivers/scsi/fnic/vnic_wq.c +++ b/drivers/scsi/fnic/vnic_wq.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/types.h> | 20 | #include <linux/types.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "vnic_dev.h" | 24 | #include "vnic_dev.h" |
| 24 | #include "vnic_wq.h" | 25 | #include "vnic_wq.h" |
| 25 | 26 | ||
diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index ba3c94c9c25f..35a4b3073ec3 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c | |||
| @@ -121,6 +121,7 @@ | |||
| 121 | #include <linux/dma-mapping.h> | 121 | #include <linux/dma-mapping.h> |
| 122 | #include <linux/list.h> | 122 | #include <linux/list.h> |
| 123 | #include <linux/smp_lock.h> | 123 | #include <linux/smp_lock.h> |
| 124 | #include <linux/slab.h> | ||
| 124 | 125 | ||
| 125 | #ifdef GDTH_RTC | 126 | #ifdef GDTH_RTC |
| 126 | #include <linux/mc146818rtc.h> | 127 | #include <linux/mc146818rtc.h> |
diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c index ffb2b21992ba..0572b9bf4bd6 100644 --- a/drivers/scsi/gdth_proc.c +++ b/drivers/scsi/gdth_proc.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/completion.h> | 5 | #include <linux/completion.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | 7 | ||
| 7 | int gdth_proc_info(struct Scsi_Host *host, char *buffer,char **start,off_t offset,int length, | 8 | int gdth_proc_info(struct Scsi_Host *host, char *buffer,char **start,off_t offset,int length, |
| 8 | int inout) | 9 | int inout) |
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c index 5d1bf7e3d245..48f406850c65 100644 --- a/drivers/scsi/gvp11.c +++ b/drivers/scsi/gvp11.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include <linux/types.h> | 1 | #include <linux/types.h> |
| 2 | #include <linux/mm.h> | 2 | #include <linux/mm.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include <linux/blkdev.h> | 4 | #include <linux/blkdev.h> |
| 4 | #include <linux/init.h> | 5 | #include <linux/init.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 09dbcb847b73..6660fa92ffa1 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/kthread.h> | 28 | #include <linux/kthread.h> |
| 28 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 29 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
diff --git a/drivers/scsi/hptiop.c b/drivers/scsi/hptiop.c index 4f0556571f80..645f7cdf21ab 100644 --- a/drivers/scsi/hptiop.c +++ b/drivers/scsi/hptiop.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
| 27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 28 | #include <linux/gfp.h> | ||
| 28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 30 | #include <asm/div64.h> | 31 | #include <asm/div64.h> |
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 4e577e2fee38..c2eea711a5ce 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 29 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
| 30 | #include <linux/kthread.h> | 30 | #include <linux/kthread.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/of.h> | 32 | #include <linux/of.h> |
| 32 | #include <linux/pm.h> | 33 | #include <linux/pm.h> |
| 33 | #include <linux/stringify.h> | 34 | #include <linux/stringify.h> |
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c index dc1bcbe3b176..ff5ec5ac1fb5 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.c +++ b/drivers/scsi/ibmvscsi/ibmvscsi.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | #include <linux/moduleparam.h> | 70 | #include <linux/moduleparam.h> |
| 71 | #include <linux/dma-mapping.h> | 71 | #include <linux/dma-mapping.h> |
| 72 | #include <linux/delay.h> | 72 | #include <linux/delay.h> |
| 73 | #include <linux/slab.h> | ||
| 73 | #include <linux/of.h> | 74 | #include <linux/of.h> |
| 74 | #include <linux/pm.h> | 75 | #include <linux/pm.h> |
| 75 | #include <asm/firmware.h> | 76 | #include <asm/firmware.h> |
diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c index d5eaf9727109..e2056d517e99 100644 --- a/drivers/scsi/ibmvscsi/ibmvstgt.c +++ b/drivers/scsi/ibmvscsi/ibmvstgt.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
| 27 | #include <scsi/scsi_host.h> | 28 | #include <scsi/scsi_host.h> |
| 28 | #include <scsi/scsi_transport_srp.h> | 29 | #include <scsi/scsi_transport_srp.h> |
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c index 63a30cbbf9de..a864ccc0a342 100644 --- a/drivers/scsi/ibmvscsi/rpa_vscsi.c +++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <asm/iommu.h> | 32 | #include <asm/iommu.h> |
| 33 | #include <asm/hvcall.h> | 33 | #include <asm/hvcall.h> |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/gfp.h> | ||
| 35 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
| 36 | #include "ibmvscsi.h" | 37 | #include "ibmvscsi.h" |
| 37 | 38 | ||
diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c index c2a9a13d788f..4734ab0b3ff6 100644 --- a/drivers/scsi/imm.c +++ b/drivers/scsi/imm.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/parport.h> | 15 | #include <linux/parport.h> |
| 16 | #include <linux/workqueue.h> | 16 | #include <linux/workqueue.h> |
| 17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | 20 | ||
| 20 | #include <scsi/scsi.h> | 21 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index c79cd98eb6bf..520461b9bc09 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c | |||
| @@ -59,6 +59,7 @@ | |||
| 59 | #include <linux/types.h> | 59 | #include <linux/types.h> |
| 60 | #include <linux/errno.h> | 60 | #include <linux/errno.h> |
| 61 | #include <linux/kernel.h> | 61 | #include <linux/kernel.h> |
| 62 | #include <linux/slab.h> | ||
| 62 | #include <linux/ioport.h> | 63 | #include <linux/ioport.h> |
| 63 | #include <linux/delay.h> | 64 | #include <linux/delay.h> |
| 64 | #include <linux/pci.h> | 65 | #include <linux/pci.h> |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 249053a9d4fa..0ee725ced511 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | 28 | ||
| 29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 30 | #include <linux/inet.h> | 30 | #include <linux/inet.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/file.h> | 32 | #include <linux/file.h> |
| 32 | #include <linux/blkdev.h> | 33 | #include <linux/blkdev.h> |
| 33 | #include <linux/crypto.h> | 34 | #include <linux/crypto.h> |
diff --git a/drivers/scsi/jazz_esp.c b/drivers/scsi/jazz_esp.c index b2d481dd3750..08e26d4e3731 100644 --- a/drivers/scsi/jazz_esp.c +++ b/drivers/scsi/jazz_esp.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/gfp.h> | ||
| 7 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 8 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 9 | #include <linux/init.h> | 10 | #include <linux/init.h> |
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c index b3d31315ac32..23880f8fe7e4 100644 --- a/drivers/scsi/lasi700.c +++ b/drivers/scsi/lasi700.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/blkdev.h> | 40 | #include <linux/blkdev.h> |
| 41 | #include <linux/ioport.h> | 41 | #include <linux/ioport.h> |
| 42 | #include <linux/dma-mapping.h> | 42 | #include <linux/dma-mapping.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include <asm/page.h> | 45 | #include <asm/page.h> |
| 45 | #include <asm/pgtable.h> | 46 | #include <asm/pgtable.h> |
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c index 9b0a5192a965..1087a7f18e84 100644 --- a/drivers/scsi/libfc/fc_disc.c +++ b/drivers/scsi/libfc/fc_disc.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | */ | 33 | */ |
| 34 | 34 | ||
| 35 | #include <linux/timer.h> | 35 | #include <linux/timer.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/err.h> | 37 | #include <linux/err.h> |
| 37 | #include <asm/unaligned.h> | 38 | #include <asm/unaligned.h> |
| 38 | 39 | ||
diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c index 7f4364770e4a..e5df0d4db67e 100644 --- a/drivers/scsi/libfc/fc_exch.c +++ b/drivers/scsi/libfc/fc_exch.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
| 27 | #include <linux/gfp.h> | 27 | #include <linux/slab.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | 29 | ||
| 30 | #include <scsi/fc/fc_fc2.h> | 30 | #include <scsi/fc/fc_fc2.h> |
diff --git a/drivers/scsi/libfc/fc_fcp.c b/drivers/scsi/libfc/fc_fcp.c index 774e7ac837a5..17396c708b08 100644 --- a/drivers/scsi/libfc/fc_fcp.c +++ b/drivers/scsi/libfc/fc_fcp.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/scatterlist.h> | 27 | #include <linux/scatterlist.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/crc32.h> | 29 | #include <linux/crc32.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <scsi/scsi_tcq.h> | 32 | #include <scsi/scsi_tcq.h> |
| 32 | #include <scsi/scsi.h> | 33 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/libfc/fc_frame.c b/drivers/scsi/libfc/fc_frame.c index 6da01c616964..981329a17c48 100644 --- a/drivers/scsi/libfc/fc_frame.c +++ b/drivers/scsi/libfc/fc_frame.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/skbuff.h> | 25 | #include <linux/skbuff.h> |
| 26 | #include <linux/crc32.h> | 26 | #include <linux/crc32.h> |
| 27 | #include <linux/gfp.h> | ||
| 27 | 28 | ||
| 28 | #include <scsi/fc_frame.h> | 29 | #include <scsi/fc_frame.h> |
| 29 | 30 | ||
diff --git a/drivers/scsi/libfc/fc_lport.c b/drivers/scsi/libfc/fc_lport.c index 7ec8ce75007c..d126ecfff704 100644 --- a/drivers/scsi/libfc/fc_lport.c +++ b/drivers/scsi/libfc/fc_lport.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | */ | 88 | */ |
| 89 | 89 | ||
| 90 | #include <linux/timer.h> | 90 | #include <linux/timer.h> |
| 91 | #include <linux/slab.h> | ||
| 91 | #include <asm/unaligned.h> | 92 | #include <asm/unaligned.h> |
| 92 | 93 | ||
| 93 | #include <scsi/fc/fc_gs.h> | 94 | #include <scsi/fc/fc_gs.h> |
diff --git a/drivers/scsi/libfc/fc_rport.c b/drivers/scsi/libfc/fc_rport.c index 97923bb07765..b37d0ff28b35 100644 --- a/drivers/scsi/libfc/fc_rport.c +++ b/drivers/scsi/libfc/fc_rport.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/kernel.h> | 47 | #include <linux/kernel.h> |
| 48 | #include <linux/spinlock.h> | 48 | #include <linux/spinlock.h> |
| 49 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | #include <linux/rcupdate.h> | 51 | #include <linux/rcupdate.h> |
| 51 | #include <linux/timer.h> | 52 | #include <linux/timer.h> |
| 52 | #include <linux/workqueue.h> | 53 | #include <linux/workqueue.h> |
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c index 685eaec53218..6d5ae4474bb3 100644 --- a/drivers/scsi/libiscsi.c +++ b/drivers/scsi/libiscsi.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/kfifo.h> | 25 | #include <linux/kfifo.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/log2.h> | 27 | #include <linux/log2.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <asm/unaligned.h> | 29 | #include <asm/unaligned.h> |
| 29 | #include <net/tcp.h> | 30 | #include <net/tcp.h> |
| 30 | #include <scsi/scsi_cmnd.h> | 31 | #include <scsi/scsi_cmnd.h> |
| @@ -3087,14 +3088,15 @@ static void iscsi_start_session_recovery(struct iscsi_session *session, | |||
| 3087 | session->state = ISCSI_STATE_TERMINATE; | 3088 | session->state = ISCSI_STATE_TERMINATE; |
| 3088 | else if (conn->stop_stage != STOP_CONN_RECOVER) | 3089 | else if (conn->stop_stage != STOP_CONN_RECOVER) |
| 3089 | session->state = ISCSI_STATE_IN_RECOVERY; | 3090 | session->state = ISCSI_STATE_IN_RECOVERY; |
| 3091 | |||
| 3092 | old_stop_stage = conn->stop_stage; | ||
| 3093 | conn->stop_stage = flag; | ||
| 3090 | spin_unlock_bh(&session->lock); | 3094 | spin_unlock_bh(&session->lock); |
| 3091 | 3095 | ||
| 3092 | del_timer_sync(&conn->transport_timer); | 3096 | del_timer_sync(&conn->transport_timer); |
| 3093 | iscsi_suspend_tx(conn); | 3097 | iscsi_suspend_tx(conn); |
| 3094 | 3098 | ||
| 3095 | spin_lock_bh(&session->lock); | 3099 | spin_lock_bh(&session->lock); |
| 3096 | old_stop_stage = conn->stop_stage; | ||
| 3097 | conn->stop_stage = flag; | ||
| 3098 | conn->c_stage = ISCSI_CONN_STOPPED; | 3100 | conn->c_stage = ISCSI_CONN_STOPPED; |
| 3099 | spin_unlock_bh(&session->lock); | 3101 | spin_unlock_bh(&session->lock); |
| 3100 | 3102 | ||
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 4ad87fd74ddd..5c92620292fb 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/types.h> | 29 | #include <linux/types.h> |
| 30 | #include <linux/list.h> | 30 | #include <linux/list.h> |
| 31 | #include <linux/inet.h> | 31 | #include <linux/inet.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/file.h> | 33 | #include <linux/file.h> |
| 33 | #include <linux/blkdev.h> | 34 | #include <linux/blkdev.h> |
| 34 | #include <linux/crypto.h> | 35 | #include <linux/crypto.h> |
diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c index e15501170698..b00efd19aadb 100644 --- a/drivers/scsi/libsas/sas_ata.c +++ b/drivers/scsi/libsas/sas_ata.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <scsi/sas_ata.h> | 27 | #include <scsi/sas_ata.h> |
| 27 | #include "sas_internal.h" | 28 | #include "sas_internal.h" |
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c index facc5bfcf7db..f5831930df9b 100644 --- a/drivers/scsi/libsas/sas_discover.c +++ b/drivers/scsi/libsas/sas_discover.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/scatterlist.h> | 25 | #include <linux/scatterlist.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <scsi/scsi_host.h> | 27 | #include <scsi/scsi_host.h> |
| 27 | #include <scsi/scsi_eh.h> | 28 | #include <scsi/scsi_eh.h> |
| 28 | #include "sas_internal.h" | 29 | #include "sas_internal.h" |
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 33cf988c8c8a..c65af02dcfe8 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/scatterlist.h> | 25 | #include <linux/scatterlist.h> |
| 26 | #include <linux/blkdev.h> | 26 | #include <linux/blkdev.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "sas_internal.h" | 29 | #include "sas_internal.h" |
| 29 | 30 | ||
diff --git a/drivers/scsi/libsas/sas_host_smp.c b/drivers/scsi/libsas/sas_host_smp.c index 1bc3b7567994..04ad8dd1a74c 100644 --- a/drivers/scsi/libsas/sas_host_smp.c +++ b/drivers/scsi/libsas/sas_host_smp.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | #include <linux/scatterlist.h> | 11 | #include <linux/scatterlist.h> |
| 12 | #include <linux/blkdev.h> | 12 | #include <linux/blkdev.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | 14 | ||
| 14 | #include "sas_internal.h" | 15 | #include "sas_internal.h" |
| 15 | 16 | ||
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c index 9cd5abe9e714..2dc55343f671 100644 --- a/drivers/scsi/libsas/sas_init.c +++ b/drivers/scsi/libsas/sas_init.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 28 | #include <linux/device.h> | 29 | #include <linux/device.h> |
| 29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
diff --git a/drivers/scsi/libsas/sas_scsi_host.c b/drivers/scsi/libsas/sas_scsi_host.c index 14b13196b22d..2660e1b4569a 100644 --- a/drivers/scsi/libsas/sas_scsi_host.c +++ b/drivers/scsi/libsas/sas_scsi_host.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/err.h> | 44 | #include <linux/err.h> |
| 45 | #include <linux/blkdev.h> | 45 | #include <linux/blkdev.h> |
| 46 | #include <linux/freezer.h> | 46 | #include <linux/freezer.h> |
| 47 | #include <linux/gfp.h> | ||
| 47 | #include <linux/scatterlist.h> | 48 | #include <linux/scatterlist.h> |
| 48 | #include <linux/libata.h> | 49 | #include <linux/libata.h> |
| 49 | 50 | ||
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c index 22775165bf6a..ff6a28ce9b69 100644 --- a/drivers/scsi/libsrp.c +++ b/drivers/scsi/libsrp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * 02110-1301 USA | 19 | * 02110-1301 USA |
| 20 | */ | 20 | */ |
| 21 | #include <linux/err.h> | 21 | #include <linux/err.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/kfifo.h> | 23 | #include <linux/kfifo.h> |
| 23 | #include <linux/scatterlist.h> | 24 | #include <linux/scatterlist.h> |
| 24 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 64cd17eedb64..1849e33e68f9 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/aer.h> | 26 | #include <linux/aer.h> |
| 27 | #include <linux/gfp.h> | ||
| 27 | 28 | ||
| 28 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 29 | #include <scsi/scsi_device.h> | 30 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c index 692c29f6048e..ec3723831e89 100644 --- a/drivers/scsi/lpfc/lpfc_bsg.c +++ b/drivers/scsi/lpfc/lpfc_bsg.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/mempool.h> | 22 | #include <linux/mempool.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | 26 | ||
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c index c7e921973f66..463b74902ac4 100644 --- a/drivers/scsi/lpfc/lpfc_ct.c +++ b/drivers/scsi/lpfc/lpfc_ct.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/interrupt.h> | 27 | #include <linux/interrupt.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/utsname.h> | 29 | #include <linux/utsname.h> |
| 29 | 30 | ||
| 30 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 391584183d81..a80d938fafc9 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/idr.h> | 24 | #include <linux/idr.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/kthread.h> | 26 | #include <linux/kthread.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 28 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 29 | #include <linux/ctype.h> | 30 | #include <linux/ctype.h> |
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c index ee980bd66869..5fbdb22c1899 100644 --- a/drivers/scsi/lpfc/lpfc_els.c +++ b/drivers/scsi/lpfc/lpfc_els.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | /* See Fibre Channel protocol T11 FC-LS for details */ | 21 | /* See Fibre Channel protocol T11 FC-LS for details */ |
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | 26 | ||
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index c555e3b7f202..e1466eec56b7 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | *******************************************************************/ | 20 | *******************************************************************/ |
| 21 | 21 | ||
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 24 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
| 25 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index ea44239eeb33..774663e8e1fe 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
| 30 | #include <linux/ctype.h> | 30 | #include <linux/ctype.h> |
| 31 | #include <linux/aer.h> | 31 | #include <linux/aer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <scsi/scsi.h> | 34 | #include <scsi/scsi.h> |
| 34 | #include <scsi/scsi_device.h> | 35 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c index 1e61ae3bc4eb..72e6adb0643e 100644 --- a/drivers/scsi/lpfc/lpfc_mbox.c +++ b/drivers/scsi/lpfc/lpfc_mbox.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | 26 | ||
| 26 | #include <scsi/scsi_device.h> | 27 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/lpfc/lpfc_mem.c b/drivers/scsi/lpfc/lpfc_mem.c index a1b6db6016da..8f879e477e9d 100644 --- a/drivers/scsi/lpfc/lpfc_mem.c +++ b/drivers/scsi/lpfc/lpfc_mem.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | *******************************************************************/ | 20 | *******************************************************************/ |
| 21 | 21 | ||
| 22 | #include <linux/mempool.h> | 22 | #include <linux/mempool.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | 26 | ||
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c index d20ae6b3b3cf..e331204a4d56 100644 --- a/drivers/scsi/lpfc/lpfc_nportdisc.c +++ b/drivers/scsi/lpfc/lpfc_nportdisc.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 25 | 26 | ||
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index b16bb2c9978b..dccdb822328c 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * included with this package. * | 19 | * included with this package. * |
| 20 | *******************************************************************/ | 20 | *******************************************************************/ |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 24 | #include <asm/unaligned.h> | 25 | #include <asm/unaligned.h> |
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index fe6660ca6452..049fb9a17b3f 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <scsi/scsi.h> | 28 | #include <scsi/scsi.h> |
| 28 | #include <scsi/scsi_cmnd.h> | 29 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/lpfc/lpfc_vport.c b/drivers/scsi/lpfc/lpfc_vport.c index 869f76cbc58a..ffd575c379f3 100644 --- a/drivers/scsi/lpfc/lpfc_vport.c +++ b/drivers/scsi/lpfc/lpfc_vport.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/kthread.h> | 27 | #include <linux/kthread.h> |
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 30 | 31 | ||
| 31 | #include <scsi/scsi.h> | 32 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/mac_esp.c b/drivers/scsi/mac_esp.c index 4a90eaf7cb63..3893337e3dd3 100644 --- a/drivers/scsi/mac_esp.c +++ b/drivers/scsi/mac_esp.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/nubus.h> | 21 | #include <linux/nubus.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <asm/irq.h> | 24 | #include <asm/irq.h> |
| 24 | #include <asm/dma.h> | 25 | #include <asm/dma.h> |
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 49eb0612d5af..4bf7edca9e69 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/dma-mapping.h> | 48 | #include <linux/dma-mapping.h> |
| 49 | #include <linux/smp_lock.h> | 49 | #include <linux/smp_lock.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | #include <scsi/scsicam.h> | 51 | #include <scsi/scsicam.h> |
| 51 | 52 | ||
| 52 | #include "scsi.h" | 53 | #include "scsi.h" |
diff --git a/drivers/scsi/megaraid/megaraid_mbox.c b/drivers/scsi/megaraid/megaraid_mbox.c index 7f977967b884..a7810a106b37 100644 --- a/drivers/scsi/megaraid/megaraid_mbox.c +++ b/drivers/scsi/megaraid/megaraid_mbox.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | * For history of changes, see Documentation/ChangeLog.megaraid | 70 | * For history of changes, see Documentation/ChangeLog.megaraid |
| 71 | */ | 71 | */ |
| 72 | 72 | ||
| 73 | #include <linux/slab.h> | ||
| 73 | #include "megaraid_mbox.h" | 74 | #include "megaraid_mbox.h" |
| 74 | 75 | ||
| 75 | static int megaraid_init(void); | 76 | static int megaraid_init(void); |
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c index f680561d2c6f..36e0b7d05c1d 100644 --- a/drivers/scsi/megaraid/megaraid_mm.c +++ b/drivers/scsi/megaraid/megaraid_mm.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * Common management module | 15 | * Common management module |
| 16 | */ | 16 | */ |
| 17 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
| 19 | #include "megaraid_mm.h" | 20 | #include "megaraid_mm.h" |
| 20 | 21 | ||
diff --git a/drivers/scsi/megaraid/megaraid_sas.c b/drivers/scsi/megaraid/megaraid_sas.c index 409648f5845f..99e4478c3f3e 100644 --- a/drivers/scsi/megaraid/megaraid_sas.c +++ b/drivers/scsi/megaraid/megaraid_sas.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/smp_lock.h> | 36 | #include <linux/smp_lock.h> |
| 37 | #include <linux/uio.h> | 37 | #include <linux/uio.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include <asm/uaccess.h> | 39 | #include <asm/uaccess.h> |
| 39 | #include <linux/fs.h> | 40 | #include <linux/fs.h> |
| 40 | #include <linux/compat.h> | 41 | #include <linux/compat.h> |
diff --git a/drivers/scsi/mesh.c b/drivers/scsi/mesh.c index 11aa917629ac..a1c97e88068a 100644 --- a/drivers/scsi/mesh.c +++ b/drivers/scsi/mesh.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/types.h> | 24 | #include <linux/types.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/blkdev.h> | 26 | #include <linux/blkdev.h> |
| 28 | #include <linux/proc_fs.h> | 27 | #include <linux/proc_fs.h> |
| 29 | #include <linux/stat.h> | 28 | #include <linux/stat.h> |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_config.c b/drivers/scsi/mpt2sas/mpt2sas_config.c index 411c27d7f787..cf44b355bc97 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_config.c +++ b/drivers/scsi/mpt2sas/mpt2sas_config.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/workqueue.h> | 51 | #include <linux/workqueue.h> |
| 52 | #include <linux/delay.h> | 52 | #include <linux/delay.h> |
| 53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include "mpt2sas_base.h" | 56 | #include "mpt2sas_base.h" |
| 56 | 57 | ||
diff --git a/drivers/scsi/mpt2sas/mpt2sas_scsih.c b/drivers/scsi/mpt2sas/mpt2sas_scsih.c index c7ec3f174782..be171ed682e0 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_scsih.c +++ b/drivers/scsi/mpt2sas/mpt2sas_scsih.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | #include <linux/pci.h> | 53 | #include <linux/pci.h> |
| 54 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 55 | #include <linux/raid_class.h> | 55 | #include <linux/raid_class.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | 57 | ||
| 57 | #include "mpt2sas_base.h" | 58 | #include "mpt2sas_base.h" |
| 58 | 59 | ||
diff --git a/drivers/scsi/mpt2sas/mpt2sas_transport.c b/drivers/scsi/mpt2sas/mpt2sas_transport.c index 789f9ee7f001..bd7ca2b49f81 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_transport.c +++ b/drivers/scsi/mpt2sas/mpt2sas_transport.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/workqueue.h> | 49 | #include <linux/workqueue.h> |
| 50 | #include <linux/delay.h> | 50 | #include <linux/delay.h> |
| 51 | #include <linux/pci.h> | 51 | #include <linux/pci.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | 53 | ||
| 53 | #include <scsi/scsi.h> | 54 | #include <scsi/scsi.h> |
| 54 | #include <scsi/scsi_cmnd.h> | 55 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/mvme16x_scsi.c b/drivers/scsi/mvme16x_scsi.c index b5fbfd6ce870..39f554f5f261 100644 --- a/drivers/scsi/mvme16x_scsi.c +++ b/drivers/scsi/mvme16x_scsi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <asm/mvme16xhw.h> | 16 | #include <asm/mvme16xhw.h> |
| 16 | #include <scsi/scsi_host.h> | 17 | #include <scsi/scsi_host.h> |
| 17 | #include <scsi/scsi_device.h> | 18 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/mvsas/mv_sas.h b/drivers/scsi/mvsas/mv_sas.h index aa2270af1bac..885858bcc403 100644 --- a/drivers/scsi/mvsas/mv_sas.h +++ b/drivers/scsi/mvsas/mv_sas.h | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/platform_device.h> | 36 | #include <linux/platform_device.h> |
| 37 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
| 38 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | #include <linux/vmalloc.h> | 40 | #include <linux/vmalloc.h> |
| 40 | #include <scsi/libsas.h> | 41 | #include <scsi/libsas.h> |
| 41 | #include <scsi/scsi_tcq.h> | 42 | #include <scsi/scsi_tcq.h> |
diff --git a/drivers/scsi/ncr53c8xx.c b/drivers/scsi/ncr53c8xx.c index a2d569828308..d013a2aa2fd5 100644 --- a/drivers/scsi/ncr53c8xx.c +++ b/drivers/scsi/ncr53c8xx.c | |||
| @@ -98,6 +98,7 @@ | |||
| 98 | #include <linux/delay.h> | 98 | #include <linux/delay.h> |
| 99 | #include <linux/dma-mapping.h> | 99 | #include <linux/dma-mapping.h> |
| 100 | #include <linux/errno.h> | 100 | #include <linux/errno.h> |
| 101 | #include <linux/gfp.h> | ||
| 101 | #include <linux/init.h> | 102 | #include <linux/init.h> |
| 102 | #include <linux/interrupt.h> | 103 | #include <linux/interrupt.h> |
| 103 | #include <linux/ioport.h> | 104 | #include <linux/ioport.h> |
diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c index 2c98a6ee973b..4c1e54545200 100644 --- a/drivers/scsi/nsp32.c +++ b/drivers/scsi/nsp32.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 31 | #include <linux/timer.h> | 30 | #include <linux/timer.h> |
| 32 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
diff --git a/drivers/scsi/osd/osd_initiator.c b/drivers/scsi/osd/osd_initiator.c index 60de85091502..ee4b6914667f 100644 --- a/drivers/scsi/osd/osd_initiator.c +++ b/drivers/scsi/osd/osd_initiator.c | |||
| @@ -39,6 +39,8 @@ | |||
| 39 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 39 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/slab.h> | ||
| 43 | |||
| 42 | #include <scsi/osd_initiator.h> | 44 | #include <scsi/osd_initiator.h> |
| 43 | #include <scsi/osd_sec.h> | 45 | #include <scsi/osd_sec.h> |
| 44 | #include <scsi/osd_attributes.h> | 46 | #include <scsi/osd_attributes.h> |
diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c index 0a90702b3d71..ffdd9fdb9995 100644 --- a/drivers/scsi/osd/osd_uld.c +++ b/drivers/scsi/osd/osd_uld.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/idr.h> | 50 | #include <linux/idr.h> |
| 51 | #include <linux/major.h> | 51 | #include <linux/major.h> |
| 52 | #include <linux/file.h> | 52 | #include <linux/file.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #include <scsi/scsi.h> | 55 | #include <scsi/scsi.h> |
| 55 | #include <scsi/scsi_driver.h> | 56 | #include <scsi/scsi_driver.h> |
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c index acb835837eec..b219118f8bd6 100644 --- a/drivers/scsi/osst.c +++ b/drivers/scsi/osst.c | |||
| @@ -38,6 +38,7 @@ static const char * osst_version = "0.99.4"; | |||
| 38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 39 | #include <linux/proc_fs.h> | 39 | #include <linux/proc_fs.h> |
| 40 | #include <linux/mm.h> | 40 | #include <linux/mm.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/init.h> | 42 | #include <linux/init.h> |
| 42 | #include <linux/string.h> | 43 | #include <linux/string.h> |
| 43 | #include <linux/errno.h> | 44 | #include <linux/errno.h> |
diff --git a/drivers/scsi/pm8001/pm8001_ctl.c b/drivers/scsi/pm8001/pm8001_ctl.c index 14b13acae6dd..45bc197bc22f 100644 --- a/drivers/scsi/pm8001/pm8001_ctl.c +++ b/drivers/scsi/pm8001/pm8001_ctl.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | #include <linux/firmware.h> | 40 | #include <linux/firmware.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include "pm8001_sas.h" | 42 | #include "pm8001_sas.h" |
| 42 | #include "pm8001_ctl.h" | 43 | #include "pm8001_ctl.h" |
| 43 | 44 | ||
diff --git a/drivers/scsi/pm8001/pm8001_hwi.c b/drivers/scsi/pm8001/pm8001_hwi.c index 7985ae45d688..909c00ec044f 100644 --- a/drivers/scsi/pm8001/pm8001_hwi.c +++ b/drivers/scsi/pm8001/pm8001_hwi.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | * POSSIBILITY OF SUCH DAMAGES. | 37 | * POSSIBILITY OF SUCH DAMAGES. |
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | #include <linux/slab.h> | ||
| 40 | #include "pm8001_sas.h" | 41 | #include "pm8001_sas.h" |
| 41 | #include "pm8001_hwi.h" | 42 | #include "pm8001_hwi.h" |
| 42 | #include "pm8001_chips.h" | 43 | #include "pm8001_chips.h" |
diff --git a/drivers/scsi/pm8001/pm8001_init.c b/drivers/scsi/pm8001/pm8001_init.c index f80c1da8f6ca..f8c86b28f03f 100644 --- a/drivers/scsi/pm8001/pm8001_init.c +++ b/drivers/scsi/pm8001/pm8001_init.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/slab.h> | ||
| 41 | #include "pm8001_sas.h" | 42 | #include "pm8001_sas.h" |
| 42 | #include "pm8001_chips.h" | 43 | #include "pm8001_chips.h" |
| 43 | 44 | ||
diff --git a/drivers/scsi/pm8001/pm8001_sas.c b/drivers/scsi/pm8001/pm8001_sas.c index 3b2c98fba834..bff4f5139b9c 100644 --- a/drivers/scsi/pm8001/pm8001_sas.c +++ b/drivers/scsi/pm8001/pm8001_sas.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | * | 38 | * |
| 39 | */ | 39 | */ |
| 40 | 40 | ||
| 41 | #include <linux/slab.h> | ||
| 41 | #include "pm8001_sas.h" | 42 | #include "pm8001_sas.h" |
| 42 | 43 | ||
| 43 | /** | 44 | /** |
diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c index 9b1c1433c26b..53aefffbaead 100644 --- a/drivers/scsi/pmcraid.c +++ b/drivers/scsi/pmcraid.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/hdreg.h> | 41 | #include <linux/hdreg.h> |
| 42 | #include <linux/version.h> | 42 | #include <linux/version.h> |
| 43 | #include <linux/io.h> | 43 | #include <linux/io.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include <asm/irq.h> | 45 | #include <asm/irq.h> |
| 45 | #include <asm/processor.h> | 46 | #include <asm/processor.h> |
| 46 | #include <linux/libata.h> | 47 | #include <linux/libata.h> |
diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c index 8aa0bd987e29..7bc2d796e403 100644 --- a/drivers/scsi/ppa.c +++ b/drivers/scsi/ppa.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 14 | #include <linux/blkdev.h> | 15 | #include <linux/blkdev.h> |
| 15 | #include <linux/parport.h> | 16 | #include <linux/parport.h> |
diff --git a/drivers/scsi/ps3rom.c b/drivers/scsi/ps3rom.c index db90caf43f42..92ffbb510498 100644 --- a/drivers/scsi/ps3rom.c +++ b/drivers/scsi/ps3rom.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/cdrom.h> | 21 | #include <linux/cdrom.h> |
| 22 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <scsi/scsi.h> | 25 | #include <scsi/scsi.h> |
| 25 | #include <scsi/scsi_cmnd.h> | 26 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/qla1280.c b/drivers/scsi/qla1280.c index 49ac4148493b..b8166ecfd0e3 100644 --- a/drivers/scsi/qla1280.c +++ b/drivers/scsi/qla1280.c | |||
| @@ -17,9 +17,11 @@ | |||
| 17 | * General Public License for more details. | 17 | * General Public License for more details. |
| 18 | * | 18 | * |
| 19 | ******************************************************************************/ | 19 | ******************************************************************************/ |
| 20 | #define QLA1280_VERSION "3.27" | 20 | #define QLA1280_VERSION "3.27.1" |
| 21 | /***************************************************************************** | 21 | /***************************************************************************** |
| 22 | Revision History: | 22 | Revision History: |
| 23 | Rev 3.27.1, February 8, 2010, Michael Reed | ||
| 24 | - Retain firmware image for error recovery. | ||
| 23 | Rev 3.27, February 10, 2009, Michael Reed | 25 | Rev 3.27, February 10, 2009, Michael Reed |
| 24 | - General code cleanup. | 26 | - General code cleanup. |
| 25 | - Improve error recovery. | 27 | - Improve error recovery. |
| @@ -346,7 +348,6 @@ | |||
| 346 | #include <linux/pci.h> | 348 | #include <linux/pci.h> |
| 347 | #include <linux/proc_fs.h> | 349 | #include <linux/proc_fs.h> |
| 348 | #include <linux/stat.h> | 350 | #include <linux/stat.h> |
| 349 | #include <linux/slab.h> | ||
| 350 | #include <linux/pci_ids.h> | 351 | #include <linux/pci_ids.h> |
| 351 | #include <linux/interrupt.h> | 352 | #include <linux/interrupt.h> |
| 352 | #include <linux/init.h> | 353 | #include <linux/init.h> |
| @@ -538,9 +539,9 @@ __setup("qla1280=", qla1280_setup); | |||
| 538 | /*****************************************/ | 539 | /*****************************************/ |
| 539 | 540 | ||
| 540 | struct qla_boards { | 541 | struct qla_boards { |
| 541 | unsigned char name[9]; /* Board ID String */ | 542 | char *name; /* Board ID String */ |
| 542 | int numPorts; /* Number of SCSI ports */ | 543 | int numPorts; /* Number of SCSI ports */ |
| 543 | char *fwname; /* firmware name */ | 544 | int fw_index; /* index into qla1280_fw_tbl for firmware */ |
| 544 | }; | 545 | }; |
| 545 | 546 | ||
| 546 | /* NOTE: the last argument in each entry is used to index ql1280_board_tbl */ | 547 | /* NOTE: the last argument in each entry is used to index ql1280_board_tbl */ |
| @@ -561,15 +562,30 @@ static struct pci_device_id qla1280_pci_tbl[] = { | |||
| 561 | }; | 562 | }; |
| 562 | MODULE_DEVICE_TABLE(pci, qla1280_pci_tbl); | 563 | MODULE_DEVICE_TABLE(pci, qla1280_pci_tbl); |
| 563 | 564 | ||
| 565 | DEFINE_MUTEX(qla1280_firmware_mutex); | ||
| 566 | |||
| 567 | struct qla_fw { | ||
| 568 | char *fwname; | ||
| 569 | const struct firmware *fw; | ||
| 570 | }; | ||
| 571 | |||
| 572 | #define QL_NUM_FW_IMAGES 3 | ||
| 573 | |||
| 574 | struct qla_fw qla1280_fw_tbl[QL_NUM_FW_IMAGES] = { | ||
| 575 | {"qlogic/1040.bin", NULL}, /* image 0 */ | ||
| 576 | {"qlogic/1280.bin", NULL}, /* image 1 */ | ||
| 577 | {"qlogic/12160.bin", NULL}, /* image 2 */ | ||
| 578 | }; | ||
| 579 | |||
| 580 | /* NOTE: Order of boards in this table must match order in qla1280_pci_tbl */ | ||
| 564 | static struct qla_boards ql1280_board_tbl[] = { | 581 | static struct qla_boards ql1280_board_tbl[] = { |
| 565 | /* Name , Number of ports, FW details */ | 582 | {.name = "QLA12160", .numPorts = 2, .fw_index = 2}, |
| 566 | {"QLA12160", 2, "qlogic/12160.bin"}, | 583 | {.name = "QLA1040" , .numPorts = 1, .fw_index = 0}, |
| 567 | {"QLA1040", 1, "qlogic/1040.bin"}, | 584 | {.name = "QLA1080" , .numPorts = 1, .fw_index = 1}, |
| 568 | {"QLA1080", 1, "qlogic/1280.bin"}, | 585 | {.name = "QLA1240" , .numPorts = 2, .fw_index = 1}, |
| 569 | {"QLA1240", 2, "qlogic/1280.bin"}, | 586 | {.name = "QLA1280" , .numPorts = 2, .fw_index = 1}, |
| 570 | {"QLA1280", 2, "qlogic/1280.bin"}, | 587 | {.name = "QLA10160", .numPorts = 1, .fw_index = 2}, |
| 571 | {"QLA10160", 1, "qlogic/12160.bin"}, | 588 | {.name = " ", .numPorts = 0, .fw_index = -1}, |
| 572 | {" ", 0, " "}, | ||
| 573 | }; | 589 | }; |
| 574 | 590 | ||
| 575 | static int qla1280_verbose = 1; | 591 | static int qla1280_verbose = 1; |
| @@ -1512,6 +1528,63 @@ qla1280_initialize_adapter(struct scsi_qla_host *ha) | |||
| 1512 | } | 1528 | } |
| 1513 | 1529 | ||
| 1514 | /* | 1530 | /* |
| 1531 | * qla1280_request_firmware | ||
| 1532 | * Acquire firmware for chip. Retain in memory | ||
| 1533 | * for error recovery. | ||
| 1534 | * | ||
| 1535 | * Input: | ||
| 1536 | * ha = adapter block pointer. | ||
| 1537 | * | ||
| 1538 | * Returns: | ||
| 1539 | * Pointer to firmware image or an error code | ||
| 1540 | * cast to pointer via ERR_PTR(). | ||
| 1541 | */ | ||
| 1542 | static const struct firmware * | ||
| 1543 | qla1280_request_firmware(struct scsi_qla_host *ha) | ||
| 1544 | { | ||
| 1545 | const struct firmware *fw; | ||
| 1546 | int err; | ||
| 1547 | int index; | ||
| 1548 | char *fwname; | ||
| 1549 | |||
| 1550 | spin_unlock_irq(ha->host->host_lock); | ||
| 1551 | mutex_lock(&qla1280_firmware_mutex); | ||
| 1552 | |||
| 1553 | index = ql1280_board_tbl[ha->devnum].fw_index; | ||
| 1554 | fw = qla1280_fw_tbl[index].fw; | ||
| 1555 | if (fw) | ||
| 1556 | goto out; | ||
| 1557 | |||
| 1558 | fwname = qla1280_fw_tbl[index].fwname; | ||
| 1559 | err = request_firmware(&fw, fwname, &ha->pdev->dev); | ||
| 1560 | |||
| 1561 | if (err) { | ||
| 1562 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | ||
| 1563 | fwname, err); | ||
| 1564 | fw = ERR_PTR(err); | ||
| 1565 | goto unlock; | ||
| 1566 | } | ||
| 1567 | if ((fw->size % 2) || (fw->size < 6)) { | ||
| 1568 | printk(KERN_ERR "Invalid firmware length %zu in image \"%s\"\n", | ||
| 1569 | fw->size, fwname); | ||
| 1570 | release_firmware(fw); | ||
| 1571 | fw = ERR_PTR(-EINVAL); | ||
| 1572 | goto unlock; | ||
| 1573 | } | ||
| 1574 | |||
| 1575 | qla1280_fw_tbl[index].fw = fw; | ||
| 1576 | |||
| 1577 | out: | ||
| 1578 | ha->fwver1 = fw->data[0]; | ||
| 1579 | ha->fwver2 = fw->data[1]; | ||
| 1580 | ha->fwver3 = fw->data[2]; | ||
| 1581 | unlock: | ||
| 1582 | mutex_unlock(&qla1280_firmware_mutex); | ||
| 1583 | spin_lock_irq(ha->host->host_lock); | ||
| 1584 | return fw; | ||
| 1585 | } | ||
| 1586 | |||
| 1587 | /* | ||
| 1515 | * Chip diagnostics | 1588 | * Chip diagnostics |
| 1516 | * Test chip for proper operation. | 1589 | * Test chip for proper operation. |
| 1517 | * | 1590 | * |
| @@ -1634,30 +1707,18 @@ qla1280_chip_diag(struct scsi_qla_host *ha) | |||
| 1634 | static int | 1707 | static int |
| 1635 | qla1280_load_firmware_pio(struct scsi_qla_host *ha) | 1708 | qla1280_load_firmware_pio(struct scsi_qla_host *ha) |
| 1636 | { | 1709 | { |
| 1710 | /* enter with host_lock acquired */ | ||
| 1711 | |||
| 1637 | const struct firmware *fw; | 1712 | const struct firmware *fw; |
| 1638 | const __le16 *fw_data; | 1713 | const __le16 *fw_data; |
| 1639 | uint16_t risc_address, risc_code_size; | 1714 | uint16_t risc_address, risc_code_size; |
| 1640 | uint16_t mb[MAILBOX_REGISTER_COUNT], i; | 1715 | uint16_t mb[MAILBOX_REGISTER_COUNT], i; |
| 1641 | int err; | 1716 | int err = 0; |
| 1717 | |||
| 1718 | fw = qla1280_request_firmware(ha); | ||
| 1719 | if (IS_ERR(fw)) | ||
| 1720 | return PTR_ERR(fw); | ||
| 1642 | 1721 | ||
| 1643 | spin_unlock_irq(ha->host->host_lock); | ||
| 1644 | err = request_firmware(&fw, ql1280_board_tbl[ha->devnum].fwname, | ||
| 1645 | &ha->pdev->dev); | ||
| 1646 | spin_lock_irq(ha->host->host_lock); | ||
| 1647 | if (err) { | ||
| 1648 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | ||
| 1649 | ql1280_board_tbl[ha->devnum].fwname, err); | ||
| 1650 | return err; | ||
| 1651 | } | ||
| 1652 | if ((fw->size % 2) || (fw->size < 6)) { | ||
| 1653 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | ||
| 1654 | fw->size, ql1280_board_tbl[ha->devnum].fwname); | ||
| 1655 | err = -EINVAL; | ||
| 1656 | goto out; | ||
| 1657 | } | ||
| 1658 | ha->fwver1 = fw->data[0]; | ||
| 1659 | ha->fwver2 = fw->data[1]; | ||
| 1660 | ha->fwver3 = fw->data[2]; | ||
| 1661 | fw_data = (const __le16 *)&fw->data[0]; | 1722 | fw_data = (const __le16 *)&fw->data[0]; |
| 1662 | ha->fwstart = __le16_to_cpu(fw_data[2]); | 1723 | ha->fwstart = __le16_to_cpu(fw_data[2]); |
| 1663 | 1724 | ||
| @@ -1675,11 +1736,10 @@ qla1280_load_firmware_pio(struct scsi_qla_host *ha) | |||
| 1675 | if (err) { | 1736 | if (err) { |
| 1676 | printk(KERN_ERR "scsi(%li): Failed to load firmware\n", | 1737 | printk(KERN_ERR "scsi(%li): Failed to load firmware\n", |
| 1677 | ha->host_no); | 1738 | ha->host_no); |
| 1678 | goto out; | 1739 | break; |
| 1679 | } | 1740 | } |
| 1680 | } | 1741 | } |
| 1681 | out: | 1742 | |
| 1682 | release_firmware(fw); | ||
| 1683 | return err; | 1743 | return err; |
| 1684 | } | 1744 | } |
| 1685 | 1745 | ||
| @@ -1687,6 +1747,7 @@ out: | |||
| 1687 | static int | 1747 | static int |
| 1688 | qla1280_load_firmware_dma(struct scsi_qla_host *ha) | 1748 | qla1280_load_firmware_dma(struct scsi_qla_host *ha) |
| 1689 | { | 1749 | { |
| 1750 | /* enter with host_lock acquired */ | ||
| 1690 | const struct firmware *fw; | 1751 | const struct firmware *fw; |
| 1691 | const __le16 *fw_data; | 1752 | const __le16 *fw_data; |
| 1692 | uint16_t risc_address, risc_code_size; | 1753 | uint16_t risc_address, risc_code_size; |
| @@ -1701,24 +1762,10 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) | |||
| 1701 | return -ENOMEM; | 1762 | return -ENOMEM; |
| 1702 | #endif | 1763 | #endif |
| 1703 | 1764 | ||
| 1704 | spin_unlock_irq(ha->host->host_lock); | 1765 | fw = qla1280_request_firmware(ha); |
| 1705 | err = request_firmware(&fw, ql1280_board_tbl[ha->devnum].fwname, | 1766 | if (IS_ERR(fw)) |
| 1706 | &ha->pdev->dev); | 1767 | return PTR_ERR(fw); |
| 1707 | spin_lock_irq(ha->host->host_lock); | 1768 | |
| 1708 | if (err) { | ||
| 1709 | printk(KERN_ERR "Failed to load image \"%s\" err %d\n", | ||
| 1710 | ql1280_board_tbl[ha->devnum].fwname, err); | ||
| 1711 | return err; | ||
| 1712 | } | ||
| 1713 | if ((fw->size % 2) || (fw->size < 6)) { | ||
| 1714 | printk(KERN_ERR "Bogus length %zu in image \"%s\"\n", | ||
| 1715 | fw->size, ql1280_board_tbl[ha->devnum].fwname); | ||
| 1716 | err = -EINVAL; | ||
| 1717 | goto out; | ||
| 1718 | } | ||
| 1719 | ha->fwver1 = fw->data[0]; | ||
| 1720 | ha->fwver2 = fw->data[1]; | ||
| 1721 | ha->fwver3 = fw->data[2]; | ||
| 1722 | fw_data = (const __le16 *)&fw->data[0]; | 1769 | fw_data = (const __le16 *)&fw->data[0]; |
| 1723 | ha->fwstart = __le16_to_cpu(fw_data[2]); | 1770 | ha->fwstart = __le16_to_cpu(fw_data[2]); |
| 1724 | 1771 | ||
| @@ -1803,7 +1850,6 @@ qla1280_load_firmware_dma(struct scsi_qla_host *ha) | |||
| 1803 | #if DUMP_IT_BACK | 1850 | #if DUMP_IT_BACK |
| 1804 | pci_free_consistent(ha->pdev, 8000, tbuf, p_tbuf); | 1851 | pci_free_consistent(ha->pdev, 8000, tbuf, p_tbuf); |
| 1805 | #endif | 1852 | #endif |
| 1806 | release_firmware(fw); | ||
| 1807 | return err; | 1853 | return err; |
| 1808 | } | 1854 | } |
| 1809 | 1855 | ||
| @@ -1842,6 +1888,7 @@ qla1280_start_firmware(struct scsi_qla_host *ha) | |||
| 1842 | static int | 1888 | static int |
| 1843 | qla1280_load_firmware(struct scsi_qla_host *ha) | 1889 | qla1280_load_firmware(struct scsi_qla_host *ha) |
| 1844 | { | 1890 | { |
| 1891 | /* enter with host_lock taken */ | ||
| 1845 | int err; | 1892 | int err; |
| 1846 | 1893 | ||
| 1847 | err = qla1280_chip_diag(ha); | 1894 | err = qla1280_chip_diag(ha); |
| @@ -4420,7 +4467,16 @@ qla1280_init(void) | |||
| 4420 | static void __exit | 4467 | static void __exit |
| 4421 | qla1280_exit(void) | 4468 | qla1280_exit(void) |
| 4422 | { | 4469 | { |
| 4470 | int i; | ||
| 4471 | |||
| 4423 | pci_unregister_driver(&qla1280_pci_driver); | 4472 | pci_unregister_driver(&qla1280_pci_driver); |
| 4473 | /* release any allocated firmware images */ | ||
| 4474 | for (i = 0; i < QL_NUM_FW_IMAGES; i++) { | ||
| 4475 | if (qla1280_fw_tbl[i].fw) { | ||
| 4476 | release_firmware(qla1280_fw_tbl[i].fw); | ||
| 4477 | qla1280_fw_tbl[i].fw = NULL; | ||
| 4478 | } | ||
| 4479 | } | ||
| 4424 | } | 4480 | } |
| 4425 | 4481 | ||
| 4426 | module_init(qla1280_init); | 4482 | module_init(qla1280_init); |
diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_attr.c index 90d1e062ec4f..359e9a71a021 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | 8 | ||
| 9 | #include <linux/kthread.h> | 9 | #include <linux/kthread.h> |
| 10 | #include <linux/vmalloc.h> | 10 | #include <linux/vmalloc.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 12 | 13 | ||
| 13 | static int qla24xx_vport_disable(struct fc_vport *, bool); | 14 | static int qla24xx_vport_disable(struct fc_vport *, bool); |
| @@ -1274,7 +1275,11 @@ qla2x00_fw_state_show(struct device *dev, struct device_attribute *attr, | |||
| 1274 | int rval = QLA_FUNCTION_FAILED; | 1275 | int rval = QLA_FUNCTION_FAILED; |
| 1275 | uint16_t state[5]; | 1276 | uint16_t state[5]; |
| 1276 | 1277 | ||
| 1277 | if (!vha->hw->flags.eeh_busy) | 1278 | if (test_bit(ABORT_ISP_ACTIVE, &vha->dpc_flags) || |
| 1279 | test_bit(ISP_ABORT_NEEDED, &vha->dpc_flags)) | ||
| 1280 | DEBUG2_3_11(printk("%s(%ld): isp reset in progress.\n", | ||
| 1281 | __func__, vha->host_no)); | ||
| 1282 | else if (!vha->hw->flags.eeh_busy) | ||
| 1278 | rval = qla2x00_get_firmware_state(vha, state); | 1283 | rval = qla2x00_get_firmware_state(vha, state); |
| 1279 | if (rval != QLA_SUCCESS) | 1284 | if (rval != QLA_SUCCESS) |
| 1280 | memset(state, -1, sizeof(state)); | 1285 | memset(state, -1, sizeof(state)); |
diff --git a/drivers/scsi/qla2xxx/qla_fw.h b/drivers/scsi/qla2xxx/qla_fw.h index cebf4f1bb7d9..42c5587cc50c 100644 --- a/drivers/scsi/qla2xxx/qla_fw.h +++ b/drivers/scsi/qla2xxx/qla_fw.h | |||
| @@ -1592,10 +1592,22 @@ struct nvram_81xx { | |||
| 1592 | 1592 | ||
| 1593 | /* Offset 384. */ | 1593 | /* Offset 384. */ |
| 1594 | uint8_t reserved_21[16]; | 1594 | uint8_t reserved_21[16]; |
| 1595 | uint16_t reserved_22[8]; | 1595 | uint16_t reserved_22[3]; |
| 1596 | |||
| 1597 | /* | ||
| 1598 | * BIT 0 = Extended BB credits for LR | ||
| 1599 | * BIT 1 = Virtual Fabric Enable | ||
| 1600 | * BIT 2 = Enhanced Features Unused | ||
| 1601 | * BIT 3-7 = Enhanced Features Reserved | ||
| 1602 | */ | ||
| 1603 | /* Enhanced Features */ | ||
| 1604 | uint8_t enhanced_features; | ||
| 1605 | |||
| 1606 | uint8_t reserved_23; | ||
| 1607 | uint16_t reserved_24[4]; | ||
| 1596 | 1608 | ||
| 1597 | /* Offset 416. */ | 1609 | /* Offset 416. */ |
| 1598 | uint16_t reserved_23[32]; | 1610 | uint16_t reserved_25[32]; |
| 1599 | 1611 | ||
| 1600 | /* Offset 480. */ | 1612 | /* Offset 480. */ |
| 1601 | uint8_t model_name[16]; | 1613 | uint8_t model_name[16]; |
| @@ -1603,7 +1615,7 @@ struct nvram_81xx { | |||
| 1603 | /* Offset 496. */ | 1615 | /* Offset 496. */ |
| 1604 | uint16_t feature_mask_l; | 1616 | uint16_t feature_mask_l; |
| 1605 | uint16_t feature_mask_h; | 1617 | uint16_t feature_mask_h; |
| 1606 | uint16_t reserved_24[2]; | 1618 | uint16_t reserved_26[2]; |
| 1607 | 1619 | ||
| 1608 | uint16_t subsystem_vendor_id; | 1620 | uint16_t subsystem_vendor_id; |
| 1609 | uint16_t subsystem_device_id; | 1621 | uint16_t subsystem_device_id; |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index a67b2bafb882..4229bb483c5e 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include "qla_gbl.h" | 8 | #include "qla_gbl.h" |
| 9 | 9 | ||
| 10 | #include <linux/delay.h> | 10 | #include <linux/delay.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/vmalloc.h> | 12 | #include <linux/vmalloc.h> |
| 12 | 13 | ||
| 13 | #include "qla_devtbl.h" | 14 | #include "qla_devtbl.h" |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index ab90329ff2e4..db539b0c3dae 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
| 8 | 8 | ||
| 9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <scsi/scsi_tcq.h> | 11 | #include <scsi/scsi_tcq.h> |
| 11 | #include <scsi/scsi_bsg_fc.h> | 12 | #include <scsi/scsi_bsg_fc.h> |
| 12 | 13 | ||
| @@ -620,11 +621,10 @@ skip_rio: | |||
| 620 | * vp_idx does not match | 621 | * vp_idx does not match |
| 621 | * Event is not global, vp_idx does not match | 622 | * Event is not global, vp_idx does not match |
| 622 | */ | 623 | */ |
| 623 | if ((mb[1] == 0xffff && (mb[3] & 0xff) != 0xff) | 624 | if (IS_QLA2XXX_MIDTYPE(ha) && |
| 624 | || (mb[1] != 0xffff)) { | 625 | ((mb[1] == 0xffff && (mb[3] & 0xff) != 0xff) || |
| 625 | if (vha->vp_idx != (mb[3] & 0xff)) | 626 | (mb[1] != 0xffff)) && vha->vp_idx != (mb[3] & 0xff)) |
| 626 | break; | 627 | break; |
| 627 | } | ||
| 628 | 628 | ||
| 629 | /* Global event -- port logout or port unavailable. */ | 629 | /* Global event -- port logout or port unavailable. */ |
| 630 | if (mb[1] == 0xffff && mb[2] == 0x7) { | 630 | if (mb[1] == 0xffff && mb[2] == 0x7) { |
| @@ -2272,30 +2272,28 @@ qla2x00_request_irqs(struct qla_hw_data *ha, struct rsp_que *rsp) | |||
| 2272 | 2272 | ||
| 2273 | /* If possible, enable MSI-X. */ | 2273 | /* If possible, enable MSI-X. */ |
| 2274 | if (!IS_QLA2432(ha) && !IS_QLA2532(ha) && | 2274 | if (!IS_QLA2432(ha) && !IS_QLA2532(ha) && |
| 2275 | !IS_QLA8432(ha) && !IS_QLA8001(ha)) | 2275 | !IS_QLA8432(ha) && !IS_QLA8001(ha)) |
| 2276 | goto skip_msix; | 2276 | goto skip_msi; |
| 2277 | |||
| 2278 | if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_HP && | ||
| 2279 | (ha->pdev->subsystem_device == 0x7040 || | ||
| 2280 | ha->pdev->subsystem_device == 0x7041 || | ||
| 2281 | ha->pdev->subsystem_device == 0x1705)) { | ||
| 2282 | DEBUG2(qla_printk(KERN_WARNING, ha, | ||
| 2283 | "MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X,0x%X).\n", | ||
| 2284 | ha->pdev->subsystem_vendor, | ||
| 2285 | ha->pdev->subsystem_device)); | ||
| 2286 | goto skip_msi; | ||
| 2287 | } | ||
| 2277 | 2288 | ||
| 2278 | if (IS_QLA2432(ha) && (ha->pdev->revision < QLA_MSIX_CHIP_REV_24XX || | 2289 | if (IS_QLA2432(ha) && (ha->pdev->revision < QLA_MSIX_CHIP_REV_24XX || |
| 2279 | !QLA_MSIX_FW_MODE_1(ha->fw_attributes))) { | 2290 | !QLA_MSIX_FW_MODE_1(ha->fw_attributes))) { |
| 2280 | DEBUG2(qla_printk(KERN_WARNING, ha, | 2291 | DEBUG2(qla_printk(KERN_WARNING, ha, |
| 2281 | "MSI-X: Unsupported ISP2432 (0x%X, 0x%X).\n", | 2292 | "MSI-X: Unsupported ISP2432 (0x%X, 0x%X).\n", |
| 2282 | ha->pdev->revision, ha->fw_attributes)); | 2293 | ha->pdev->revision, ha->fw_attributes)); |
| 2283 | |||
| 2284 | goto skip_msix; | 2294 | goto skip_msix; |
| 2285 | } | 2295 | } |
| 2286 | 2296 | ||
| 2287 | if (ha->pdev->subsystem_vendor == PCI_VENDOR_ID_HP && | ||
| 2288 | (ha->pdev->subsystem_device == 0x7040 || | ||
| 2289 | ha->pdev->subsystem_device == 0x7041 || | ||
| 2290 | ha->pdev->subsystem_device == 0x1705)) { | ||
| 2291 | DEBUG2(qla_printk(KERN_WARNING, ha, | ||
| 2292 | "MSI-X: Unsupported ISP2432 SSVID/SSDID (0x%X, 0x%X).\n", | ||
| 2293 | ha->pdev->subsystem_vendor, | ||
| 2294 | ha->pdev->subsystem_device)); | ||
| 2295 | |||
| 2296 | goto skip_msi; | ||
| 2297 | } | ||
| 2298 | |||
| 2299 | ret = qla24xx_enable_msix(ha, rsp); | 2297 | ret = qla24xx_enable_msix(ha, rsp); |
| 2300 | if (!ret) { | 2298 | if (!ret) { |
| 2301 | DEBUG2(qla_printk(KERN_INFO, ha, | 2299 | DEBUG2(qla_printk(KERN_INFO, ha, |
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 6e53bdbb1da8..42eb7ffd5942 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
| 8 | 8 | ||
| 9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 10 | #include <linux/gfp.h> | ||
| 10 | 11 | ||
| 11 | 12 | ||
| 12 | /* | 13 | /* |
| @@ -339,6 +340,7 @@ qla2x00_load_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t risc_addr, | |||
| 339 | return rval; | 340 | return rval; |
| 340 | } | 341 | } |
| 341 | 342 | ||
| 343 | #define EXTENDED_BB_CREDITS BIT_0 | ||
| 342 | /* | 344 | /* |
| 343 | * qla2x00_execute_fw | 345 | * qla2x00_execute_fw |
| 344 | * Start adapter firmware. | 346 | * Start adapter firmware. |
| @@ -371,7 +373,12 @@ qla2x00_execute_fw(scsi_qla_host_t *vha, uint32_t risc_addr) | |||
| 371 | mcp->mb[1] = MSW(risc_addr); | 373 | mcp->mb[1] = MSW(risc_addr); |
| 372 | mcp->mb[2] = LSW(risc_addr); | 374 | mcp->mb[2] = LSW(risc_addr); |
| 373 | mcp->mb[3] = 0; | 375 | mcp->mb[3] = 0; |
| 374 | mcp->mb[4] = 0; | 376 | if (IS_QLA81XX(ha)) { |
| 377 | struct nvram_81xx *nv = ha->nvram; | ||
| 378 | mcp->mb[4] = (nv->enhanced_features & | ||
| 379 | EXTENDED_BB_CREDITS); | ||
| 380 | } else | ||
| 381 | mcp->mb[4] = 0; | ||
| 375 | mcp->out_mb |= MBX_4|MBX_3|MBX_2|MBX_1; | 382 | mcp->out_mb |= MBX_4|MBX_3|MBX_2|MBX_1; |
| 376 | mcp->in_mb |= MBX_1; | 383 | mcp->in_mb |= MBX_1; |
| 377 | } else { | 384 | } else { |
diff --git a/drivers/scsi/qla2xxx/qla_mid.c b/drivers/scsi/qla2xxx/qla_mid.c index ff17dee28613..8220e7b9799b 100644 --- a/drivers/scsi/qla2xxx/qla_mid.c +++ b/drivers/scsi/qla2xxx/qla_mid.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | 9 | ||
| 10 | #include <linux/moduleparam.h> | 10 | #include <linux/moduleparam.h> |
| 11 | #include <linux/vmalloc.h> | 11 | #include <linux/vmalloc.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 13 | 14 | ||
| 14 | #include <scsi/scsi_tcq.h> | 15 | #include <scsi/scsi_tcq.h> |
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 46720b23028f..48c37e38ed01 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/kthread.h> | 12 | #include <linux/kthread.h> |
| 13 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 14 | #include <linux/kobject.h> | 14 | #include <linux/kobject.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <scsi/scsi_tcq.h> | 17 | #include <scsi/scsi_tcq.h> |
| 17 | #include <scsi/scsicam.h> | 18 | #include <scsi/scsicam.h> |
| @@ -1676,9 +1677,11 @@ skip_pio: | |||
| 1676 | 1677 | ||
| 1677 | /* Determine queue resources */ | 1678 | /* Determine queue resources */ |
| 1678 | ha->max_req_queues = ha->max_rsp_queues = 1; | 1679 | ha->max_req_queues = ha->max_rsp_queues = 1; |
| 1679 | if ((ql2xmaxqueues <= 1 || ql2xmultique_tag < 1) && | 1680 | if ((ql2xmaxqueues <= 1 && !ql2xmultique_tag) || |
| 1681 | (ql2xmaxqueues > 1 && ql2xmultique_tag) || | ||
| 1680 | (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) | 1682 | (!IS_QLA25XX(ha) && !IS_QLA81XX(ha))) |
| 1681 | goto mqiobase_exit; | 1683 | goto mqiobase_exit; |
| 1684 | |||
| 1682 | ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3), | 1685 | ha->mqiobase = ioremap(pci_resource_start(ha->pdev, 3), |
| 1683 | pci_resource_len(ha->pdev, 3)); | 1686 | pci_resource_len(ha->pdev, 3)); |
| 1684 | if (ha->mqiobase) { | 1687 | if (ha->mqiobase) { |
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c index 371dc895972a..8b3de4e54c28 100644 --- a/drivers/scsi/qla2xxx/qla_sup.c +++ b/drivers/scsi/qla2xxx/qla_sup.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include "qla_def.h" | 7 | #include "qla_def.h" |
| 8 | 8 | ||
| 9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/vmalloc.h> | 11 | #include <linux/vmalloc.h> |
| 11 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 12 | 13 | ||
diff --git a/drivers/scsi/qla2xxx/qla_version.h b/drivers/scsi/qla2xxx/qla_version.h index 8d2fc2fa7a6b..109068df933f 100644 --- a/drivers/scsi/qla2xxx/qla_version.h +++ b/drivers/scsi/qla2xxx/qla_version.h | |||
| @@ -7,9 +7,9 @@ | |||
| 7 | /* | 7 | /* |
| 8 | * Driver version | 8 | * Driver version |
| 9 | */ | 9 | */ |
| 10 | #define QLA2XXX_VERSION "8.03.02-k1" | 10 | #define QLA2XXX_VERSION "8.03.02-k2" |
| 11 | 11 | ||
| 12 | #define QLA_DRIVER_MAJOR_VER 8 | 12 | #define QLA_DRIVER_MAJOR_VER 8 |
| 13 | #define QLA_DRIVER_MINOR_VER 3 | 13 | #define QLA_DRIVER_MINOR_VER 3 |
| 14 | #define QLA_DRIVER_PATCH_VER 2 | 14 | #define QLA_DRIVER_PATCH_VER 2 |
| 15 | #define QLA_DRIVER_BETA_VER 1 | 15 | #define QLA_DRIVER_BETA_VER 2 |
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c index 83c8b5e4fc8b..2ccad36bee9f 100644 --- a/drivers/scsi/qla4xxx/ql4_os.c +++ b/drivers/scsi/qla4xxx/ql4_os.c | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | * See LICENSE.qla4xxx for copyright and licensing details. | 5 | * See LICENSE.qla4xxx for copyright and licensing details. |
| 6 | */ | 6 | */ |
| 7 | #include <linux/moduleparam.h> | 7 | #include <linux/moduleparam.h> |
| 8 | #include <linux/slab.h> | ||
| 8 | 9 | ||
| 9 | #include <scsi/scsi_tcq.h> | 10 | #include <scsi/scsi_tcq.h> |
| 10 | #include <scsi/scsicam.h> | 11 | #include <scsi/scsicam.h> |
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c index 1b8217076b0e..aa406497eebc 100644 --- a/drivers/scsi/qlogicpti.c +++ b/drivers/scsi/qlogicpti.c | |||
| @@ -16,7 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/types.h> | 17 | #include <linux/types.h> |
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/gfp.h> |
| 20 | #include <linux/blkdev.h> | 20 | #include <linux/blkdev.h> |
| 21 | #include <linux/proc_fs.h> | 21 | #include <linux/proc_fs.h> |
| 22 | #include <linux/stat.h> | 22 | #include <linux/stat.h> |
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 0b575c871007..3e10c306de94 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 32 | #include <linux/timer.h> | 32 | #include <linux/timer.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 34 | #include <linux/string.h> | 35 | #include <linux/string.h> |
| 35 | #include <linux/genhd.h> | 36 | #include <linux/genhd.h> |
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index 37af178b2d17..43fad4c09beb 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | #include <linux/moduleparam.h> | 6 | #include <linux/moduleparam.h> |
| 7 | #include <linux/proc_fs.h> | 7 | #include <linux/proc_fs.h> |
| 8 | #include <linux/seq_file.h> | 8 | #include <linux/seq_file.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | 10 | ||
| 10 | #include <scsi/scsi_device.h> | 11 | #include <scsi/scsi_device.h> |
| 11 | #include <scsi/scsi_devinfo.h> | 12 | #include <scsi/scsi_devinfo.h> |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 08ed506e6059..d45c69ca5737 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | 16 | ||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/sched.h> | 18 | #include <linux/sched.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | #include <linux/timer.h> | 20 | #include <linux/timer.h> |
| 20 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 21 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index 0fd6ae6911ad..d53e6503c6d5 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/jiffies.h> | 22 | #include <linux/jiffies.h> |
| 23 | #include <linux/security.h> | 23 | #include <linux/security.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <net/sock.h> | 26 | #include <net/sock.h> |
| 26 | #include <net/netlink.h> | 27 | #include <net/netlink.h> |
| 27 | 28 | ||
diff --git a/drivers/scsi/scsi_proc.c b/drivers/scsi/scsi_proc.c index 77fbddb507fd..c99da926fdac 100644 --- a/drivers/scsi/scsi_proc.c +++ b/drivers/scsi/scsi_proc.c | |||
| @@ -20,12 +20,12 @@ | |||
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #include <linux/proc_fs.h> | 23 | #include <linux/proc_fs.h> |
| 25 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 26 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
| 27 | #include <linux/seq_file.h> | 26 | #include <linux/seq_file.h> |
| 28 | #include <linux/mutex.h> | 27 | #include <linux/mutex.h> |
| 28 | #include <linux/gfp.h> | ||
| 29 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 30 | 30 | ||
| 31 | #include <scsi/scsi.h> | 31 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 4bc8b77a2ef3..38518b088073 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/kthread.h> | 33 | #include <linux/kthread.h> |
| 34 | #include <linux/spinlock.h> | 34 | #include <linux/spinlock.h> |
| 35 | #include <linux/async.h> | 35 | #include <linux/async.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <scsi/scsi.h> | 38 | #include <scsi/scsi.h> |
| 38 | #include <scsi/scsi_cmnd.h> | 39 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 19ec9e2d3f39..429c9b73e3e4 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/module.h> | 9 | #include <linux/module.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 11 | #include <linux/blkdev.h> | 12 | #include <linux/blkdev.h> |
| 12 | #include <linux/device.h> | 13 | #include <linux/device.h> |
diff --git a/drivers/scsi/scsi_tgt_if.c b/drivers/scsi/scsi_tgt_if.c index 0e9533f7aabc..a87e21c35ef2 100644 --- a/drivers/scsi/scsi_tgt_if.c +++ b/drivers/scsi/scsi_tgt_if.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * 02110-1301 USA | 20 | * 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | #include <linux/miscdevice.h> | 22 | #include <linux/miscdevice.h> |
| 23 | #include <linux/gfp.h> | ||
| 23 | #include <linux/file.h> | 24 | #include <linux/file.h> |
| 24 | #include <linux/smp_lock.h> | 25 | #include <linux/smp_lock.h> |
| 25 | #include <net/tcp.h> | 26 | #include <net/tcp.h> |
diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c index 10303272ba45..66241dd525ae 100644 --- a/drivers/scsi/scsi_tgt_lib.c +++ b/drivers/scsi/scsi_tgt_lib.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/hash.h> | 23 | #include <linux/hash.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/pagemap.h> | 25 | #include <linux/pagemap.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
| 27 | #include <scsi/scsi_cmnd.h> | 28 | #include <scsi/scsi_cmnd.h> |
| 28 | #include <scsi/scsi_device.h> | 29 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 1d5b72173dd8..6cfffc88022a 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 29 | #include <linux/init.h> | 29 | #include <linux/init.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 31 | #include <scsi/scsi_device.h> | 32 | #include <scsi/scsi_device.h> |
| 32 | #include <scsi/scsi_host.h> | 33 | #include <scsi/scsi_host.h> |
| @@ -3852,7 +3853,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost, | |||
| 3852 | if (rport && (rport->port_state != FC_PORTSTATE_ONLINE)) { | 3853 | if (rport && (rport->port_state != FC_PORTSTATE_ONLINE)) { |
| 3853 | req->errors = -ENXIO; | 3854 | req->errors = -ENXIO; |
| 3854 | spin_unlock_irq(q->queue_lock); | 3855 | spin_unlock_irq(q->queue_lock); |
| 3855 | blk_end_request(req, -ENXIO, blk_rq_bytes(req)); | 3856 | blk_end_request_all(req, -ENXIO); |
| 3856 | spin_lock_irq(q->queue_lock); | 3857 | spin_lock_irq(q->queue_lock); |
| 3857 | continue; | 3858 | continue; |
| 3858 | } | 3859 | } |
| @@ -3862,7 +3863,7 @@ fc_bsg_request_handler(struct request_queue *q, struct Scsi_Host *shost, | |||
| 3862 | ret = fc_req_to_bsgjob(shost, rport, req); | 3863 | ret = fc_req_to_bsgjob(shost, rport, req); |
| 3863 | if (ret) { | 3864 | if (ret) { |
| 3864 | req->errors = ret; | 3865 | req->errors = ret; |
| 3865 | blk_end_request(req, ret, blk_rq_bytes(req)); | 3866 | blk_end_request_all(req, ret); |
| 3866 | spin_lock_irq(q->queue_lock); | 3867 | spin_lock_irq(q->queue_lock); |
| 3867 | continue; | 3868 | continue; |
| 3868 | } | 3869 | } |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index ea3892e7e0f7..1e6d4793542c 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/mutex.h> | 24 | #include <linux/mutex.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <net/tcp.h> | 26 | #include <net/tcp.h> |
| 26 | #include <scsi/scsi.h> | 27 | #include <scsi/scsi.h> |
| 27 | #include <scsi/scsi_host.h> | 28 | #include <scsi/scsi_host.h> |
diff --git a/drivers/scsi/scsi_transport_spi.c b/drivers/scsi/scsi_transport_spi.c index c25bd9a34e02..8a172d4f4564 100644 --- a/drivers/scsi/scsi_transport_spi.c +++ b/drivers/scsi/scsi_transport_spi.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
| 26 | #include <linux/mutex.h> | 26 | #include <linux/mutex.h> |
| 27 | #include <linux/sysfs.h> | 27 | #include <linux/sysfs.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 29 | #include "scsi_priv.h" | 30 | #include "scsi_priv.h" |
| 30 | #include <scsi/scsi_device.h> | 31 | #include <scsi/scsi_device.h> |
diff --git a/drivers/scsi/scsicam.c b/drivers/scsi/scsicam.c index 3f21bc65e8c6..6803b1e26ecc 100644 --- a/drivers/scsi/scsicam.c +++ b/drivers/scsi/scsicam.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 15 | #include <linux/genhd.h> | 16 | #include <linux/genhd.h> |
| 16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 7b75c8a2a49d..58c62ff42ab3 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/mutex.h> | 49 | #include <linux/mutex.h> |
| 50 | #include <linux/string_helpers.h> | 50 | #include <linux/string_helpers.h> |
| 51 | #include <linux/async.h> | 51 | #include <linux/async.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <asm/uaccess.h> | 53 | #include <asm/uaccess.h> |
| 53 | #include <asm/unaligned.h> | 54 | #include <asm/unaligned.h> |
| 54 | 55 | ||
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 0d9d6f7567f5..7f5a6a86f820 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | **----------------------------------------------------------------------------- | 21 | **----------------------------------------------------------------------------- |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 25 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 26 | #include <linux/enclosure.h> | 27 | #include <linux/enclosure.h> |
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index c996d98636f3..dee1c96288d4 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c | |||
| @@ -38,6 +38,7 @@ static int sg_version_num = 30534; /* 2 digits for each component */ | |||
| 38 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 39 | #include <linux/mtio.h> | 39 | #include <linux/mtio.h> |
| 40 | #include <linux/ioctl.h> | 40 | #include <linux/ioctl.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/fcntl.h> | 42 | #include <linux/fcntl.h> |
| 42 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 43 | #include <linux/poll.h> | 44 | #include <linux/poll.h> |
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c index 6dc8b846c112..8ac6ce792b69 100644 --- a/drivers/scsi/sim710.c +++ b/drivers/scsi/sim710.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | */ | 27 | */ |
| 28 | 28 | ||
| 29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <linux/blkdev.h> | 32 | #include <linux/blkdev.h> |
| 32 | #include <linux/device.h> | 33 | #include <linux/device.h> |
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c index 56cf0bb4ed1f..9acc2b2a3601 100644 --- a/drivers/scsi/sni_53c710.c +++ b/drivers/scsi/sni_53c710.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/init.h> | 31 | #include <linux/init.h> |
| 32 | #include <linux/types.h> | 32 | #include <linux/types.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/stat.h> | 34 | #include <linux/stat.h> |
| 34 | #include <linux/mm.h> | 35 | #include <linux/mm.h> |
| 35 | #include <linux/blkdev.h> | 36 | #include <linux/blkdev.h> |
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d6f340f48a3b..0a90abc7f140 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/init.h> | 44 | #include <linux/init.h> |
| 45 | #include <linux/blkdev.h> | 45 | #include <linux/blkdev.h> |
| 46 | #include <linux/mutex.h> | 46 | #include <linux/mutex.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | #include <asm/uaccess.h> | 48 | #include <asm/uaccess.h> |
| 48 | 49 | ||
| 49 | #include <scsi/scsi.h> | 50 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/sr_ioctl.c b/drivers/scsi/sr_ioctl.c index 291236e6e435..cbb38c5197fa 100644 --- a/drivers/scsi/sr_ioctl.c +++ b/drivers/scsi/sr_ioctl.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/blkpg.h> | 7 | #include <linux/blkpg.h> |
| 8 | #include <linux/cdrom.h> | 8 | #include <linux/cdrom.h> |
| 9 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <asm/io.h> | 11 | #include <asm/io.h> |
| 11 | #include <asm/uaccess.h> | 12 | #include <asm/uaccess.h> |
| 12 | 13 | ||
diff --git a/drivers/scsi/sr_vendor.c b/drivers/scsi/sr_vendor.c index 4ad3e017213f..92cc2efb25d7 100644 --- a/drivers/scsi/sr_vendor.c +++ b/drivers/scsi/sr_vendor.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/string.h> | 39 | #include <linux/string.h> |
| 40 | #include <linux/bcd.h> | 40 | #include <linux/bcd.h> |
| 41 | #include <linux/blkdev.h> | 41 | #include <linux/blkdev.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <scsi/scsi.h> | 44 | #include <scsi/scsi.h> |
| 44 | #include <scsi/scsi_cmnd.h> | 45 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index f67d1a159aad..3ea1a713ef25 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
| @@ -27,6 +27,7 @@ static const char *verstr = "20081215"; | |||
| 27 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 31 | #include <linux/mtio.h> | 32 | #include <linux/mtio.h> |
| 32 | #include <linux/cdrom.h> | 33 | #include <linux/cdrom.h> |
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index fd7b15be7640..9c73dbda3bbb 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/time.h> | 21 | #include <linux/time.h> |
| 21 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 22 | #include <linux/blkdev.h> | 23 | #include <linux/blkdev.h> |
diff --git a/drivers/scsi/sun3_NCR5380.c b/drivers/scsi/sun3_NCR5380.c index 75da6e58ce55..b5838d547c68 100644 --- a/drivers/scsi/sun3_NCR5380.c +++ b/drivers/scsi/sun3_NCR5380.c | |||
| @@ -645,6 +645,7 @@ __inline__ void NCR5380_print_phase(struct Scsi_Host *instance) { }; | |||
| 645 | * interrupt or bottom half. | 645 | * interrupt or bottom half. |
| 646 | */ | 646 | */ |
| 647 | 647 | ||
| 648 | #include <linux/gfp.h> | ||
| 648 | #include <linux/workqueue.h> | 649 | #include <linux/workqueue.h> |
| 649 | #include <linux/interrupt.h> | 650 | #include <linux/interrupt.h> |
| 650 | 651 | ||
diff --git a/drivers/scsi/sun3x_esp.c b/drivers/scsi/sun3x_esp.c index 34a99620e5bd..0621037f0271 100644 --- a/drivers/scsi/sun3x_esp.c +++ b/drivers/scsi/sun3x_esp.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
| 7 | #include <linux/gfp.h> | ||
| 7 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 8 | #include <linux/delay.h> | 9 | #include <linux/delay.h> |
| 9 | #include <linux/module.h> | 10 | #include <linux/module.h> |
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c index 3d73aad4bc82..fc23d273fb1a 100644 --- a/drivers/scsi/sun_esp.c +++ b/drivers/scsi/sun_esp.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/dma-mapping.h> | 12 | #include <linux/dma-mapping.h> |
| 13 | #include <linux/of.h> | 13 | #include <linux/of.h> |
| 14 | #include <linux/of_device.h> | 14 | #include <linux/of_device.h> |
| 15 | #include <linux/gfp.h> | ||
| 15 | 16 | ||
| 16 | #include <asm/irq.h> | 17 | #include <asm/irq.h> |
| 17 | #include <asm/io.h> | 18 | #include <asm/io.h> |
diff --git a/drivers/scsi/tmscsim.c b/drivers/scsi/tmscsim.c index 9a4273445c0d..27866b0adfeb 100644 --- a/drivers/scsi/tmscsim.c +++ b/drivers/scsi/tmscsim.c | |||
| @@ -233,6 +233,7 @@ | |||
| 233 | #include <linux/interrupt.h> | 233 | #include <linux/interrupt.h> |
| 234 | #include <linux/init.h> | 234 | #include <linux/init.h> |
| 235 | #include <linux/spinlock.h> | 235 | #include <linux/spinlock.h> |
| 236 | #include <linux/slab.h> | ||
| 236 | #include <asm/io.h> | 237 | #include <asm/io.h> |
| 237 | 238 | ||
| 238 | #include <scsi/scsi.h> | 239 | #include <scsi/scsi.h> |
diff --git a/drivers/scsi/u14-34f.c b/drivers/scsi/u14-34f.c index 26e8e0e6b8dd..5d9fdeeb2315 100644 --- a/drivers/scsi/u14-34f.c +++ b/drivers/scsi/u14-34f.c | |||
| @@ -420,6 +420,7 @@ | |||
| 420 | #include <linux/init.h> | 420 | #include <linux/init.h> |
| 421 | #include <linux/ctype.h> | 421 | #include <linux/ctype.h> |
| 422 | #include <linux/spinlock.h> | 422 | #include <linux/spinlock.h> |
| 423 | #include <linux/slab.h> | ||
| 423 | #include <asm/dma.h> | 424 | #include <asm/dma.h> |
| 424 | #include <asm/irq.h> | 425 | #include <asm/irq.h> |
| 425 | 426 | ||
diff --git a/drivers/scsi/vmw_pvscsi.c b/drivers/scsi/vmw_pvscsi.c index e4ac5829b637..26894459c37f 100644 --- a/drivers/scsi/vmw_pvscsi.c +++ b/drivers/scsi/vmw_pvscsi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/workqueue.h> | 28 | #include <linux/workqueue.h> |
| 28 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 29 | 30 | ||
diff --git a/drivers/scsi/wd7000.c b/drivers/scsi/wd7000.c index 2f6e9d8eaf71..d0b7d2ff9ac5 100644 --- a/drivers/scsi/wd7000.c +++ b/drivers/scsi/wd7000.c | |||
| @@ -171,7 +171,6 @@ | |||
| 171 | #include <linux/kernel.h> | 171 | #include <linux/kernel.h> |
| 172 | #include <linux/types.h> | 172 | #include <linux/types.h> |
| 173 | #include <linux/string.h> | 173 | #include <linux/string.h> |
| 174 | #include <linux/slab.h> | ||
| 175 | #include <linux/spinlock.h> | 174 | #include <linux/spinlock.h> |
| 176 | #include <linux/ioport.h> | 175 | #include <linux/ioport.h> |
| 177 | #include <linux/proc_fs.h> | 176 | #include <linux/proc_fs.h> |
diff --git a/drivers/scsi/zorro7xx.c b/drivers/scsi/zorro7xx.c index 64d40a2d4d4d..105449c15fa9 100644 --- a/drivers/scsi/zorro7xx.c +++ b/drivers/scsi/zorro7xx.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/zorro.h> | 15 | #include <linux/zorro.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <asm/amigahw.h> | 18 | #include <asm/amigahw.h> |
| 18 | #include <asm/amigaints.h> | 19 | #include <asm/amigaints.h> |
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index ae0251ef6f4e..78ed24bb6a35 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/pm.h> | 35 | #include <linux/pm.h> |
| 36 | #include <linux/bitops.h> | 36 | #include <linux/bitops.h> |
| 37 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 38 | #include <linux/gfp.h> | ||
| 38 | 39 | ||
| 39 | #include <asm/io.h> | 40 | #include <asm/io.h> |
| 40 | #include <asm/irq.h> | 41 | #include <asm/irq.h> |
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c index c3db16b7afa1..2b1ea3d4c4f4 100644 --- a/drivers/serial/8250.c +++ b/drivers/serial/8250.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/serial_8250.h> | 38 | #include <linux/serial_8250.h> |
| 39 | #include <linux/nmi.h> | 39 | #include <linux/nmi.h> |
| 40 | #include <linux/mutex.h> | 40 | #include <linux/mutex.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | 42 | ||
| 42 | #include <asm/io.h> | 43 | #include <asm/io.h> |
| 43 | #include <asm/irq.h> | 44 | #include <asm/irq.h> |
diff --git a/drivers/serial/8250_gsc.c b/drivers/serial/8250_gsc.c index 33149d982e82..d8c0ffbfa6e3 100644 --- a/drivers/serial/8250_gsc.c +++ b/drivers/serial/8250_gsc.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/serial_core.h> | 17 | #include <linux/serial_core.h> |
| 18 | #include <linux/signal.h> | 18 | #include <linux/signal.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 21 | 20 | ||
| 22 | #include <asm/hardware.h> | 21 | #include <asm/hardware.h> |
diff --git a/drivers/serial/8250_hp300.c b/drivers/serial/8250_hp300.c index 0e1410f2c033..c13438c93012 100644 --- a/drivers/serial/8250_hp300.c +++ b/drivers/serial/8250_hp300.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/dio.h> | 16 | #include <linux/dio.h> |
| 17 | #include <linux/console.h> | 17 | #include <linux/console.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 19 | 20 | ||
| 20 | #include "8250.h" | 21 | #include "8250.h" |
diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index e4b3c2c88bb6..b09a638d051f 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/amba/bus.h> | 47 | #include <linux/amba/bus.h> |
| 48 | #include <linux/amba/serial.h> | 48 | #include <linux/amba/serial.h> |
| 49 | #include <linux/clk.h> | 49 | #include <linux/clk.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 52 | 53 | ||
diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index ce6c35333ff7..743ebf5f16da 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | #include <linux/amba/bus.h> | 47 | #include <linux/amba/bus.h> |
| 48 | #include <linux/amba/serial.h> | 48 | #include <linux/amba/serial.h> |
| 49 | #include <linux/clk.h> | 49 | #include <linux/clk.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | 51 | ||
| 51 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 52 | #include <asm/sizes.h> | 53 | #include <asm/sizes.h> |
diff --git a/drivers/serial/bfin_5xx.c b/drivers/serial/bfin_5xx.c index fcf273e3f48c..96f7e7484fee 100644 --- a/drivers/serial/bfin_5xx.c +++ b/drivers/serial/bfin_5xx.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/ioport.h> | 16 | #include <linux/ioport.h> |
| 17 | #include <linux/gfp.h> | ||
| 17 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 18 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 19 | #include <linux/console.h> | 20 | #include <linux/console.h> |
diff --git a/drivers/serial/bfin_sport_uart.c b/drivers/serial/bfin_sport_uart.c index 7c72888fbf94..c88f8ad3ff82 100644 --- a/drivers/serial/bfin_sport_uart.c +++ b/drivers/serial/bfin_sport_uart.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/console.h> | 29 | #include <linux/console.h> |
| 30 | #include <linux/sysrq.h> | 30 | #include <linux/sysrq.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 32 | #include <linux/tty.h> | 33 | #include <linux/tty.h> |
| 33 | #include <linux/tty_flip.h> | 34 | #include <linux/tty_flip.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm1.c b/drivers/serial/cpm_uart/cpm_uart_cpm1.c index 1b94c56ec239..3fc1d66e32c6 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm1.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm1.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | #include <linux/ioport.h> | 33 | #include <linux/ioport.h> |
| 33 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 34 | #include <linux/serial.h> | 35 | #include <linux/serial.h> |
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index 722eac18f382..814ac006393f 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/tty.h> | 31 | #include <linux/tty.h> |
| 32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/init.h> | 34 | #include <linux/init.h> |
| 34 | #include <linux/serial.h> | 35 | #include <linux/serial.h> |
| 35 | #include <linux/console.h> | 36 | #include <linux/console.h> |
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index e579d7a1807a..4315b23590bd 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -46,6 +46,7 @@ | |||
| 46 | #include <linux/clk.h> | 46 | #include <linux/clk.h> |
| 47 | #include <linux/delay.h> | 47 | #include <linux/delay.h> |
| 48 | #include <linux/rational.h> | 48 | #include <linux/rational.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | 50 | ||
| 50 | #include <asm/io.h> | 51 | #include <asm/io.h> |
| 51 | #include <asm/irq.h> | 52 | #include <asm/irq.h> |
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c index 23ba6b40b3ac..f164ba4eba02 100644 --- a/drivers/serial/ioc3_serial.c +++ b/drivers/serial/ioc3_serial.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/pci.h> | 20 | #include <linux/pci.h> |
| 21 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
| 22 | #include <linux/ioc3.h> | 22 | #include <linux/ioc3.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | /* | 25 | /* |
| 25 | * Interesting things about the ioc3 | 26 | * Interesting things about the ioc3 |
diff --git a/drivers/serial/ioc4_serial.c b/drivers/serial/ioc4_serial.c index 836d9ab4f729..8ad28fc64926 100644 --- a/drivers/serial/ioc4_serial.c +++ b/drivers/serial/ioc4_serial.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/pci.h> | 22 | #include <linux/pci.h> |
| 23 | #include <linux/ioc4.h> | 23 | #include <linux/ioc4.h> |
| 24 | #include <linux/serial_core.h> | 24 | #include <linux/serial_core.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | /* | 27 | /* |
| 27 | * interesting things about the ioc4 | 28 | * interesting things about the ioc4 |
diff --git a/drivers/serial/jsm/jsm_driver.c b/drivers/serial/jsm/jsm_driver.c index 12cb5e446a4f..eaf545014119 100644 --- a/drivers/serial/jsm/jsm_driver.c +++ b/drivers/serial/jsm/jsm_driver.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | ***********************************************************************/ | 26 | ***********************************************************************/ |
| 27 | #include <linux/moduleparam.h> | 27 | #include <linux/moduleparam.h> |
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "jsm.h" | 31 | #include "jsm.h" |
| 31 | 32 | ||
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 5673ca9dfdc8..7a4a914ecff0 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/serial_reg.h> | 30 | #include <linux/serial_reg.h> |
| 31 | #include <linux/delay.h> /* For udelay */ | 31 | #include <linux/delay.h> /* For udelay */ |
| 32 | #include <linux/pci.h> | 32 | #include <linux/pci.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include "jsm.h" | 35 | #include "jsm.h" |
| 35 | 36 | ||
diff --git a/drivers/serial/max3100.c b/drivers/serial/max3100.c index 3c30c56aa2e1..3351c3bd59e4 100644 --- a/drivers/serial/max3100.c +++ b/drivers/serial/max3100.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #define MAX_MAX3100 4 | 41 | #define MAX_MAX3100 4 |
| 42 | 42 | ||
| 43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include <linux/device.h> | 45 | #include <linux/device.h> |
| 45 | #include <linux/serial_core.h> | 46 | #include <linux/serial_core.h> |
| 46 | #include <linux/serial.h> | 47 | #include <linux/serial.h> |
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index b5496c28e60b..55e113a0be03 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
| @@ -70,6 +70,7 @@ | |||
| 70 | #include <linux/dma-mapping.h> | 70 | #include <linux/dma-mapping.h> |
| 71 | #include <linux/mv643xx.h> | 71 | #include <linux/mv643xx.h> |
| 72 | #include <linux/platform_device.h> | 72 | #include <linux/platform_device.h> |
| 73 | #include <linux/gfp.h> | ||
| 73 | 74 | ||
| 74 | #include <asm/io.h> | 75 | #include <asm/io.h> |
| 75 | #include <asm/irq.h> | 76 | #include <asm/irq.h> |
diff --git a/drivers/serial/mux.c b/drivers/serial/mux.c index 7571aaa138b0..9711e06a8374 100644 --- a/drivers/serial/mux.c +++ b/drivers/serial/mux.c | |||
| @@ -22,7 +22,6 @@ | |||
| 22 | #include <linux/init.h> | 22 | #include <linux/init.h> |
| 23 | #include <linux/serial.h> | 23 | #include <linux/serial.h> |
| 24 | #include <linux/console.h> | 24 | #include <linux/console.h> |
| 25 | #include <linux/slab.h> | ||
| 26 | #include <linux/delay.h> /* for udelay */ | 25 | #include <linux/delay.h> /* for udelay */ |
| 27 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 28 | #include <asm/io.h> | 27 | #include <asm/io.h> |
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c index cdf172eda2e3..4abfebdb0fcc 100644 --- a/drivers/serial/of_serial.c +++ b/drivers/serial/of_serial.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/serial_core.h> | 15 | #include <linux/serial_core.h> |
| 15 | #include <linux/serial_8250.h> | 16 | #include <linux/serial_8250.h> |
| 16 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c index f020de1cdd50..4eaa043ca2a8 100644 --- a/drivers/serial/pmac_zilog.c +++ b/drivers/serial/pmac_zilog.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #include <linux/delay.h> | 54 | #include <linux/delay.h> |
| 55 | #include <linux/init.h> | 55 | #include <linux/init.h> |
| 56 | #include <linux/console.h> | 56 | #include <linux/console.h> |
| 57 | #include <linux/slab.h> | ||
| 58 | #include <linux/adb.h> | 57 | #include <linux/adb.h> |
| 59 | #include <linux/pmu.h> | 58 | #include <linux/pmu.h> |
| 60 | #include <linux/bitops.h> | 59 | #include <linux/bitops.h> |
diff --git a/drivers/serial/pxa.c b/drivers/serial/pxa.c index 56ee082157aa..1102a39b44f5 100644 --- a/drivers/serial/pxa.c +++ b/drivers/serial/pxa.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/serial_core.h> | 44 | #include <linux/serial_core.h> |
| 45 | #include <linux/clk.h> | 45 | #include <linux/clk.h> |
| 46 | #include <linux/io.h> | 46 | #include <linux/io.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | struct uart_pxa_port { | 49 | struct uart_pxa_port { |
| 49 | struct uart_port port; | 50 | struct uart_port port; |
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 309de6be8204..8eb094c1f61b 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <linux/list.h> | 50 | #include <linux/list.h> |
| 51 | #include <linux/dmaengine.h> | 51 | #include <linux/dmaengine.h> |
| 52 | #include <linux/scatterlist.h> | 52 | #include <linux/scatterlist.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | 54 | ||
| 54 | #ifdef CONFIG_SUPERH | 55 | #ifdef CONFIG_SUPERH |
| 55 | #include <asm/sh_bios.h> | 56 | #include <asm/sh_bios.h> |
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index 170d3d68c8f0..01f7731e59b8 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/serial.h> | 29 | #include <linux/serial.h> |
| 30 | #include <linux/sysrq.h> | 30 | #include <linux/sysrq.h> |
| 31 | #include <linux/console.h> | 31 | #include <linux/console.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #ifdef CONFIG_SERIO | 33 | #ifdef CONFIG_SERIO |
| 33 | #include <linux/serio.h> | 34 | #include <linux/serio.h> |
| 34 | #endif | 35 | #endif |
| @@ -1453,8 +1454,10 @@ static int __devinit su_probe(struct of_device *op, const struct of_device_id *m | |||
| 1453 | if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) { | 1454 | if (up->su_type == SU_PORT_KBD || up->su_type == SU_PORT_MS) { |
| 1454 | err = sunsu_kbd_ms_init(up); | 1455 | err = sunsu_kbd_ms_init(up); |
| 1455 | if (err) { | 1456 | if (err) { |
| 1457 | of_iounmap(&op->resource[0], | ||
| 1458 | up->port.membase, up->reg_size); | ||
| 1456 | kfree(up); | 1459 | kfree(up); |
| 1457 | goto out_unmap; | 1460 | return err; |
| 1458 | } | 1461 | } |
| 1459 | dev_set_drvdata(&op->dev, up); | 1462 | dev_set_drvdata(&op->dev, up); |
| 1460 | 1463 | ||
diff --git a/drivers/serial/timbuart.c b/drivers/serial/timbuart.c index 7bf10264a6ac..786ba85c170b 100644 --- a/drivers/serial/timbuart.c +++ b/drivers/serial/timbuart.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/ioport.h> | 28 | #include <linux/ioport.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include "timbuart.h" | 31 | #include "timbuart.h" |
| 31 | 32 | ||
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c index 465f2fae1025..074904912f64 100644 --- a/drivers/serial/ucc_uart.c +++ b/drivers/serial/ucc_uart.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/serial.h> | 22 | #include <linux/serial.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/serial_core.h> | 24 | #include <linux/serial_core.h> |
| 24 | #include <linux/io.h> | 25 | #include <linux/io.h> |
| 25 | #include <linux/of_platform.h> | 26 | #include <linux/of_platform.h> |
diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c index a3d8677af6a5..94ad6bd86a00 100644 --- a/drivers/sh/intc.c +++ b/drivers/sh/intc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/irq.h> | 20 | #include <linux/irq.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | #include <linux/sh_intc.h> | 25 | #include <linux/sh_intc.h> |
| 25 | #include <linux/sysdev.h> | 26 | #include <linux/sysdev.h> |
diff --git a/drivers/sn/ioc3.c b/drivers/sn/ioc3.c index 66802a4390cc..b3b33fa26acd 100644 --- a/drivers/sn/ioc3.c +++ b/drivers/sn/ioc3.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/ioc3.h> | 17 | #include <linux/ioc3.h> |
| 18 | #include <linux/rwsem.h> | 18 | #include <linux/rwsem.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define IOC3_PCI_SIZE 0x100000 | 21 | #define IOC3_PCI_SIZE 0x100000 |
| 21 | 22 | ||
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 9aeb68113100..e9aeee16d922 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c | |||
| @@ -44,6 +44,7 @@ | |||
| 44 | #include <linux/amba/bus.h> | 44 | #include <linux/amba/bus.h> |
| 45 | #include <linux/amba/pl022.h> | 45 | #include <linux/amba/pl022.h> |
| 46 | #include <linux/io.h> | 46 | #include <linux/io.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | /* | 49 | /* |
| 49 | * This macro is used to define some register default values. | 50 | * This macro is used to define some register default values. |
diff --git a/drivers/spi/atmel_spi.c b/drivers/spi/atmel_spi.c index d21c24eaf0a9..c4e04428992d 100644 --- a/drivers/spi/atmel_spi.c +++ b/drivers/spi/atmel_spi.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/err.h> | 18 | #include <linux/err.h> |
| 19 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
| 20 | #include <linux/spi/spi.h> | 20 | #include <linux/spi/spi.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <asm/io.h> | 23 | #include <asm/io.h> |
| 23 | #include <mach/board.h> | 24 | #include <mach/board.h> |
diff --git a/drivers/spi/au1550_spi.c b/drivers/spi/au1550_spi.c index ba8ac4f599d3..3c9ade69643f 100644 --- a/drivers/spi/au1550_spi.c +++ b/drivers/spi/au1550_spi.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 27 | #include <linux/device.h> | 28 | #include <linux/device.h> |
| 28 | #include <linux/platform_device.h> | 29 | #include <linux/platform_device.h> |
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c index 225ab60b02c4..95afb6b77395 100644 --- a/drivers/spi/davinci_spi.c +++ b/drivers/spi/davinci_spi.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
| 28 | #include <linux/spi/spi.h> | 28 | #include <linux/spi/spi.h> |
| 29 | #include <linux/spi/spi_bitbang.h> | 29 | #include <linux/spi/spi_bitbang.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <mach/spi.h> | 32 | #include <mach/spi.h> |
| 32 | #include <mach/edma.h> | 33 | #include <mach/edma.h> |
diff --git a/drivers/spi/dw_spi.c b/drivers/spi/dw_spi.c index 8ed38f1d6c18..d256cb00604c 100644 --- a/drivers/spi/dw_spi.c +++ b/drivers/spi/dw_spi.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/spi/dw_spi.h> | 26 | #include <linux/spi/dw_spi.h> |
| 26 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
diff --git a/drivers/spi/dw_spi_mmio.c b/drivers/spi/dw_spi_mmio.c index e35b45ac5174..db35bd9c1b24 100644 --- a/drivers/spi/dw_spi_mmio.c +++ b/drivers/spi/dw_spi_mmio.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/clk.h> | 11 | #include <linux/clk.h> |
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/spi/dw_spi.h> | 15 | #include <linux/spi/dw_spi.h> |
| 15 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 16 | 17 | ||
diff --git a/drivers/spi/dw_spi_pci.c b/drivers/spi/dw_spi_pci.c index 1f0735f9cc76..1f52755dc878 100644 --- a/drivers/spi/dw_spi_pci.c +++ b/drivers/spi/dw_spi_pci.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/spi/dw_spi.h> | 23 | #include <linux/spi/dw_spi.h> |
| 23 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
| 24 | 25 | ||
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c index 04747868d6c4..77d4cc88edea 100644 --- a/drivers/spi/mpc52xx_psc_spi.c +++ b/drivers/spi/mpc52xx_psc_spi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
| 26 | #include <linux/fsl_devices.h> | 26 | #include <linux/fsl_devices.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <asm/mpc52xx.h> | 29 | #include <asm/mpc52xx.h> |
| 29 | #include <asm/mpc52xx_psc.h> | 30 | #include <asm/mpc52xx_psc.h> |
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c index 6eab46537a0a..cd68f1ce5cc3 100644 --- a/drivers/spi/mpc52xx_spi.c +++ b/drivers/spi/mpc52xx_spi.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/of_spi.h> | 21 | #include <linux/of_spi.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/of_gpio.h> | 23 | #include <linux/of_gpio.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <asm/time.h> | 25 | #include <asm/time.h> |
| 25 | #include <asm/mpc52xx.h> | 26 | #include <asm/mpc52xx.h> |
| 26 | 27 | ||
diff --git a/drivers/spi/omap2_mcspi.c b/drivers/spi/omap2_mcspi.c index 4dd786b99b8b..d8356af118a8 100644 --- a/drivers/spi/omap2_mcspi.c +++ b/drivers/spi/omap2_mcspi.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 33 | #include <linux/clk.h> | 33 | #include <linux/clk.h> |
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <linux/spi/spi.h> | 37 | #include <linux/spi/spi.h> |
| 37 | 38 | ||
diff --git a/drivers/spi/omap_spi_100k.c b/drivers/spi/omap_spi_100k.c index 5355d90d1bee..24668b30a52d 100644 --- a/drivers/spi/omap_spi_100k.c +++ b/drivers/spi/omap_spi_100k.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/clk.h> | 33 | #include <linux/clk.h> |
| 34 | #include <linux/io.h> | 34 | #include <linux/io.h> |
| 35 | #include <linux/gpio.h> | 35 | #include <linux/gpio.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include <linux/spi/spi.h> | 38 | #include <linux/spi/spi.h> |
| 38 | 39 | ||
diff --git a/drivers/spi/omap_uwire.c b/drivers/spi/omap_uwire.c index 6c3a8557db27..160d3266205f 100644 --- a/drivers/spi/omap_uwire.c +++ b/drivers/spi/omap_uwire.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
| 42 | #include <linux/err.h> | 42 | #include <linux/err.h> |
| 43 | #include <linux/clk.h> | 43 | #include <linux/clk.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include <linux/spi/spi.h> | 46 | #include <linux/spi/spi.h> |
| 46 | #include <linux/spi/spi_bitbang.h> | 47 | #include <linux/spi/spi_bitbang.h> |
diff --git a/drivers/spi/pxa2xx_spi.c b/drivers/spi/pxa2xx_spi.c index c2f707e5ce74..36828358a4d8 100644 --- a/drivers/spi/pxa2xx_spi.c +++ b/drivers/spi/pxa2xx_spi.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
| 31 | #include <linux/gpio.h> | 31 | #include <linux/gpio.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 34 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index b76f2468a84a..9ffb0fdbd6fe 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/init.h> | 23 | #include <linux/init.h> |
| 24 | #include <linux/cache.h> | 24 | #include <linux/cache.h> |
| 25 | #include <linux/mutex.h> | 25 | #include <linux/mutex.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/mod_devicetable.h> | 27 | #include <linux/mod_devicetable.h> |
| 27 | #include <linux/spi/spi.h> | 28 | #include <linux/spi/spi.h> |
| 28 | 29 | ||
diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index 1d41058bbab2..10a6dc3d37ac 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 16 | #include <linux/ioport.h> | 17 | #include <linux/ioport.h> |
| 17 | #include <linux/irq.h> | 18 | #include <linux/irq.h> |
diff --git a/drivers/spi/spi_bitbang.c b/drivers/spi/spi_bitbang.c index f1db395dd889..5265330a528f 100644 --- a/drivers/spi/spi_bitbang.c +++ b/drivers/spi/spi_bitbang.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <linux/spi/spi.h> | 28 | #include <linux/spi/spi.h> |
| 28 | #include <linux/spi/spi_bitbang.h> | 29 | #include <linux/spi/spi_bitbang.h> |
diff --git a/drivers/spi/spi_imx.c b/drivers/spi/spi_imx.c index 0ddbbe45e834..7972e9077473 100644 --- a/drivers/spi/spi_imx.c +++ b/drivers/spi/spi_imx.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/spi/spi.h> | 34 | #include <linux/spi/spi.h> |
| 34 | #include <linux/spi/spi_bitbang.h> | 35 | #include <linux/spi/spi_bitbang.h> |
| 35 | #include <linux/types.h> | 36 | #include <linux/types.h> |
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c index 4f0cc9d457e0..14d052316502 100644 --- a/drivers/spi/spi_mpc8xxx.c +++ b/drivers/spi/spi_mpc8xxx.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | #include <linux/gpio.h> | 39 | #include <linux/gpio.h> |
| 40 | #include <linux/of_gpio.h> | 40 | #include <linux/of_gpio.h> |
| 41 | #include <linux/of_spi.h> | 41 | #include <linux/of_spi.h> |
| 42 | #include <linux/slab.h> | ||
| 42 | 43 | ||
| 43 | #include <sysdev/fsl_soc.h> | 44 | #include <sysdev/fsl_soc.h> |
| 44 | #include <asm/cpm.h> | 45 | #include <asm/cpm.h> |
diff --git a/drivers/spi/spi_nuc900.c b/drivers/spi/spi_nuc900.c index b319f9bf9b9b..dff63be0d0a8 100644 --- a/drivers/spi/spi_nuc900.c +++ b/drivers/spi/spi_nuc900.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
| 26 | #include <linux/spi/spi_bitbang.h> | 27 | #include <linux/spi/spi_bitbang.h> |
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c index 6d8d4026a07a..7cb5ff37f6e2 100644 --- a/drivers/spi/spi_ppc4xx.c +++ b/drivers/spi/spi_ppc4xx.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/sched.h> | 28 | #include <linux/sched.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/errno.h> | 30 | #include <linux/errno.h> |
| 30 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
| 31 | #include <linux/of_platform.h> | 32 | #include <linux/of_platform.h> |
diff --git a/drivers/spi/spi_s3c24xx.c b/drivers/spi/spi_s3c24xx.c index 1fabede9e061..151a95e40653 100644 --- a/drivers/spi/spi_s3c24xx.c +++ b/drivers/spi/spi_s3c24xx.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <linux/spi/spi.h> | 26 | #include <linux/spi/spi.h> |
| 26 | #include <linux/spi/spi_bitbang.h> | 27 | #include <linux/spi/spi_bitbang.h> |
diff --git a/drivers/spi/tle62x0.c b/drivers/spi/tle62x0.c index bf9540f5fb98..a3938958147c 100644 --- a/drivers/spi/tle62x0.c +++ b/drivers/spi/tle62x0.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 16 | #include <linux/spi/tle62x0.h> | 17 | #include <linux/spi/tle62x0.h> |
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c index ed34a8d419c7..748d33a76d29 100644 --- a/drivers/spi/xilinx_spi_of.c +++ b/drivers/spi/xilinx_spi_of.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 28 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <linux/of_platform.h> | 32 | #include <linux/of_platform.h> |
| 32 | #include <linux/of_device.h> | 33 | #include <linux/of_device.h> |
diff --git a/drivers/ssb/driver_gige.c b/drivers/ssb/driver_gige.c index 172f90407b93..5ba92a2719a4 100644 --- a/drivers/ssb/driver_gige.c +++ b/drivers/ssb/driver_gige.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/ssb/ssb_driver_gige.h> | 12 | #include <linux/ssb/ssb_driver_gige.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/pci_regs.h> | 14 | #include <linux/pci_regs.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | 17 | ||
| 17 | /* | 18 | /* |
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 03dfd27c4bfb..80ff7d9e60de 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/mmc/sdio_func.h> | 20 | #include <linux/mmc/sdio_func.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <pcmcia/cs_types.h> | 23 | #include <pcmcia/cs_types.h> |
| 23 | #include <pcmcia/cs.h> | 24 | #include <pcmcia/cs.h> |
diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c index 9e50896233aa..a8dbb06623c9 100644 --- a/drivers/ssb/pci.c +++ b/drivers/ssb/pci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/ssb/ssb.h> | 18 | #include <linux/ssb/ssb.h> |
| 19 | #include <linux/ssb/ssb_regs.h> | 19 | #include <linux/ssb/ssb_regs.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 22 | 23 | ||
diff --git a/drivers/ssb/pcihost_wrapper.c b/drivers/ssb/pcihost_wrapper.c index 26737a010c6d..6536a041d90d 100644 --- a/drivers/ssb/pcihost_wrapper.c +++ b/drivers/ssb/pcihost_wrapper.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/pci.h> | 14 | #include <linux/pci.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/ssb/ssb.h> | 16 | #include <linux/ssb/ssb.h> |
| 16 | 17 | ||
| 17 | 18 | ||
diff --git a/drivers/ssb/sprom.c b/drivers/ssb/sprom.c index d0e6762fec50..f2f920fef10d 100644 --- a/drivers/ssb/sprom.c +++ b/drivers/ssb/sprom.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include "ssb_private.h" | 14 | #include "ssb_private.h" |
| 15 | 15 | ||
| 16 | #include <linux/ctype.h> | 16 | #include <linux/ctype.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | 19 | ||
| 19 | static const struct ssb_sprom *fallback_sprom; | 20 | static const struct ssb_sprom *fallback_sprom; |
diff --git a/drivers/staging/batman-adv/device.c b/drivers/staging/batman-adv/device.c index e7f44215b5f3..2f61500186f2 100644 --- a/drivers/staging/batman-adv/device.c +++ b/drivers/staging/batman-adv/device.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "main.h" | 24 | #include "main.h" |
| 24 | #include "device.h" | 25 | #include "device.h" |
| 25 | #include "send.h" | 26 | #include "send.h" |
diff --git a/drivers/staging/batman-adv/main.h b/drivers/staging/batman-adv/main.h index deb41f5beda6..2e9bb891a5de 100644 --- a/drivers/staging/batman-adv/main.h +++ b/drivers/staging/batman-adv/main.h | |||
| @@ -109,6 +109,7 @@ extern int bat_debug_type(int type); | |||
| 109 | #include <linux/kthread.h> /* kernel threads */ | 109 | #include <linux/kthread.h> /* kernel threads */ |
| 110 | #include <linux/pkt_sched.h> /* schedule types */ | 110 | #include <linux/pkt_sched.h> /* schedule types */ |
| 111 | #include <linux/workqueue.h> /* workqueue */ | 111 | #include <linux/workqueue.h> /* workqueue */ |
| 112 | #include <linux/slab.h> | ||
| 112 | #include <net/sock.h> /* struct sock */ | 113 | #include <net/sock.h> /* struct sock */ |
| 113 | #include <linux/jiffies.h> | 114 | #include <linux/jiffies.h> |
| 114 | #include "types.h" | 115 | #include "types.h" |
diff --git a/drivers/staging/batman-adv/soft-interface.c b/drivers/staging/batman-adv/soft-interface.c index c9b35d9f7991..0e2307f3cb96 100644 --- a/drivers/staging/batman-adv/soft-interface.c +++ b/drivers/staging/batman-adv/soft-interface.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include "translation-table.h" | 26 | #include "translation-table.h" |
| 27 | #include "types.h" | 27 | #include "types.h" |
| 28 | #include "hash.h" | 28 | #include "hash.h" |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/ethtool.h> | 30 | #include <linux/ethtool.h> |
| 30 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 31 | 32 | ||
diff --git a/drivers/staging/comedi/drivers/8255.c b/drivers/staging/comedi/drivers/8255.c index 10f488f0e5ee..2d54993ffb12 100644 --- a/drivers/staging/comedi/drivers/8255.c +++ b/drivers/staging/comedi/drivers/8255.c | |||
| @@ -81,6 +81,7 @@ I/O port base address can be found in the output of 'lspci -v'. | |||
| 81 | #include "../comedidev.h" | 81 | #include "../comedidev.h" |
| 82 | 82 | ||
| 83 | #include <linux/ioport.h> | 83 | #include <linux/ioport.h> |
| 84 | #include <linux/slab.h> | ||
| 84 | 85 | ||
| 85 | #define _8255_SIZE 4 | 86 | #define _8255_SIZE 4 |
| 86 | 87 | ||
diff --git a/drivers/staging/comedi/drivers/addi-data/addi_common.c b/drivers/staging/comedi/drivers/addi-data/addi_common.c index 8db5ab63e363..6625fdc8e903 100644 --- a/drivers/staging/comedi/drivers/addi-data/addi_common.c +++ b/drivers/staging/comedi/drivers/addi-data/addi_common.c | |||
| @@ -50,7 +50,6 @@ You should also find the complete GPL in the COPYING file accompanying this sour | |||
| 50 | #include <linux/module.h> | 50 | #include <linux/module.h> |
| 51 | #include <linux/sched.h> | 51 | #include <linux/sched.h> |
| 52 | #include <linux/mm.h> | 52 | #include <linux/mm.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/errno.h> | 53 | #include <linux/errno.h> |
| 55 | #include <linux/ioport.h> | 54 | #include <linux/ioport.h> |
| 56 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
| @@ -58,6 +57,7 @@ You should also find the complete GPL in the COPYING file accompanying this sour | |||
| 58 | #include <linux/timex.h> | 57 | #include <linux/timex.h> |
| 59 | #include <linux/timer.h> | 58 | #include <linux/timer.h> |
| 60 | #include <linux/pci.h> | 59 | #include <linux/pci.h> |
| 60 | #include <linux/gfp.h> | ||
| 61 | #include "../../comedidev.h" | 61 | #include "../../comedidev.h" |
| 62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
| 63 | #if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300) | 63 | #if defined(CONFIG_APCI_1710) || defined(CONFIG_APCI_3200) || defined(CONFIG_APCI_3300) |
diff --git a/drivers/staging/comedi/drivers/adl_pci9118.c b/drivers/staging/comedi/drivers/adl_pci9118.c index 9934a3cf2548..944f20ae5a6a 100644 --- a/drivers/staging/comedi/drivers/adl_pci9118.c +++ b/drivers/staging/comedi/drivers/adl_pci9118.c | |||
| @@ -66,6 +66,7 @@ Configuration options: | |||
| 66 | #include "../pci_ids.h" | 66 | #include "../pci_ids.h" |
| 67 | 67 | ||
| 68 | #include <linux/delay.h> | 68 | #include <linux/delay.h> |
| 69 | #include <linux/gfp.h> | ||
| 69 | #include <linux/interrupt.h> | 70 | #include <linux/interrupt.h> |
| 70 | 71 | ||
| 71 | #include "amcc_s5933.h" | 72 | #include "amcc_s5933.h" |
diff --git a/drivers/staging/comedi/drivers/amplc_dio200.c b/drivers/staging/comedi/drivers/amplc_dio200.c index 204f30ef6e96..92bcc205dd4b 100644 --- a/drivers/staging/comedi/drivers/amplc_dio200.c +++ b/drivers/staging/comedi/drivers/amplc_dio200.c | |||
| @@ -206,6 +206,7 @@ order they appear in the channel list. | |||
| 206 | */ | 206 | */ |
| 207 | 207 | ||
| 208 | #include <linux/interrupt.h> | 208 | #include <linux/interrupt.h> |
| 209 | #include <linux/slab.h> | ||
| 209 | 210 | ||
| 210 | #include "../comedidev.h" | 211 | #include "../comedidev.h" |
| 211 | 212 | ||
diff --git a/drivers/staging/comedi/drivers/amplc_pci224.c b/drivers/staging/comedi/drivers/amplc_pci224.c index b41e5e5963aa..c54cca8b2565 100644 --- a/drivers/staging/comedi/drivers/amplc_pci224.c +++ b/drivers/staging/comedi/drivers/amplc_pci224.c | |||
| @@ -104,6 +104,7 @@ Caveats: | |||
| 104 | */ | 104 | */ |
| 105 | 105 | ||
| 106 | #include <linux/interrupt.h> | 106 | #include <linux/interrupt.h> |
| 107 | #include <linux/slab.h> | ||
| 107 | 108 | ||
| 108 | #include "../comedidev.h" | 109 | #include "../comedidev.h" |
| 109 | 110 | ||
diff --git a/drivers/staging/comedi/drivers/cb_das16_cs.c b/drivers/staging/comedi/drivers/cb_das16_cs.c index bc375e73abc1..5632991760af 100644 --- a/drivers/staging/comedi/drivers/cb_das16_cs.c +++ b/drivers/staging/comedi/drivers/cb_das16_cs.c | |||
| @@ -32,6 +32,7 @@ Status: experimental | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include "../comedidev.h" | 36 | #include "../comedidev.h" |
| 36 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 37 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
diff --git a/drivers/staging/comedi/drivers/comedi_bond.c b/drivers/staging/comedi/drivers/comedi_bond.c index d7260cc86985..41311d99473b 100644 --- a/drivers/staging/comedi/drivers/comedi_bond.c +++ b/drivers/staging/comedi/drivers/comedi_bond.c | |||
| @@ -90,6 +90,7 @@ Configuration Options: | |||
| 90 | #include "../comedilib.h" | 90 | #include "../comedilib.h" |
| 91 | #include "../comedidev.h" | 91 | #include "../comedidev.h" |
| 92 | #include <linux/string.h> | 92 | #include <linux/string.h> |
| 93 | #include <linux/slab.h> | ||
| 93 | 94 | ||
| 94 | /* The maxiumum number of channels per subdevice. */ | 95 | /* The maxiumum number of channels per subdevice. */ |
| 95 | #define MAX_CHANS 256 | 96 | #define MAX_CHANS 256 |
diff --git a/drivers/staging/comedi/drivers/das08_cs.c b/drivers/staging/comedi/drivers/das08_cs.c index f12ef1cd6f53..9164ce158dcd 100644 --- a/drivers/staging/comedi/drivers/das08_cs.c +++ b/drivers/staging/comedi/drivers/das08_cs.c | |||
| @@ -43,6 +43,7 @@ Command support does not exist, but could be added for this board. | |||
| 43 | 43 | ||
| 44 | #include <linux/delay.h> | 44 | #include <linux/delay.h> |
| 45 | #include <linux/pci.h> | 45 | #include <linux/pci.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | 47 | ||
| 47 | #include "das08.h" | 48 | #include "das08.h" |
| 48 | 49 | ||
diff --git a/drivers/staging/comedi/drivers/das16.c b/drivers/staging/comedi/drivers/das16.c index 10a87e6a8095..f2aadda9b241 100644 --- a/drivers/staging/comedi/drivers/das16.c +++ b/drivers/staging/comedi/drivers/das16.c | |||
| @@ -79,6 +79,7 @@ Computer boards manuals also available from their website www.measurementcomputi | |||
| 79 | */ | 79 | */ |
| 80 | 80 | ||
| 81 | #include <linux/pci.h> | 81 | #include <linux/pci.h> |
| 82 | #include <linux/slab.h> | ||
| 82 | #include <linux/interrupt.h> | 83 | #include <linux/interrupt.h> |
| 83 | #include <asm/dma.h> | 84 | #include <asm/dma.h> |
| 84 | #include "../comedidev.h" | 85 | #include "../comedidev.h" |
diff --git a/drivers/staging/comedi/drivers/das1800.c b/drivers/staging/comedi/drivers/das1800.c index 6ea59cc6b2bb..3c3e0455c7c4 100644 --- a/drivers/staging/comedi/drivers/das1800.c +++ b/drivers/staging/comedi/drivers/das1800.c | |||
| @@ -101,6 +101,7 @@ TODO: | |||
| 101 | */ | 101 | */ |
| 102 | 102 | ||
| 103 | #include <linux/interrupt.h> | 103 | #include <linux/interrupt.h> |
| 104 | #include <linux/slab.h> | ||
| 104 | #include "../comedidev.h" | 105 | #include "../comedidev.h" |
| 105 | 106 | ||
| 106 | #include <linux/ioport.h> | 107 | #include <linux/ioport.h> |
diff --git a/drivers/staging/comedi/drivers/dt282x.c b/drivers/staging/comedi/drivers/dt282x.c index 99ca294b1ec5..e548763cf2f3 100644 --- a/drivers/staging/comedi/drivers/dt282x.c +++ b/drivers/staging/comedi/drivers/dt282x.c | |||
| @@ -58,6 +58,7 @@ Notes: | |||
| 58 | 58 | ||
| 59 | #include "../comedidev.h" | 59 | #include "../comedidev.h" |
| 60 | 60 | ||
| 61 | #include <linux/gfp.h> | ||
| 61 | #include <linux/ioport.h> | 62 | #include <linux/ioport.h> |
| 62 | #include <linux/interrupt.h> | 63 | #include <linux/interrupt.h> |
| 63 | #include <asm/dma.h> | 64 | #include <asm/dma.h> |
diff --git a/drivers/staging/comedi/drivers/jr3_pci.c b/drivers/staging/comedi/drivers/jr3_pci.c index fe5b4953f7ec..d330b1886846 100644 --- a/drivers/staging/comedi/drivers/jr3_pci.c +++ b/drivers/staging/comedi/drivers/jr3_pci.c | |||
| @@ -46,6 +46,7 @@ Devices: [JR3] PCI force sensor board (jr3_pci) | |||
| 46 | #include <linux/ctype.h> | 46 | #include <linux/ctype.h> |
| 47 | #include <linux/firmware.h> | 47 | #include <linux/firmware.h> |
| 48 | #include <linux/jiffies.h> | 48 | #include <linux/jiffies.h> |
| 49 | #include <linux/slab.h> | ||
| 49 | #include <linux/timer.h> | 50 | #include <linux/timer.h> |
| 50 | #include "comedi_pci.h" | 51 | #include "comedi_pci.h" |
| 51 | #include "jr3_pci.h" | 52 | #include "jr3_pci.h" |
diff --git a/drivers/staging/comedi/drivers/ni_65xx.c b/drivers/staging/comedi/drivers/ni_65xx.c index c223f76031f6..9a4fffe5655f 100644 --- a/drivers/staging/comedi/drivers/ni_65xx.c +++ b/drivers/staging/comedi/drivers/ni_65xx.c | |||
| @@ -52,6 +52,7 @@ except maybe the 6514. | |||
| 52 | #define DEBUG 1 | 52 | #define DEBUG 1 |
| 53 | #define DEBUG_FLAGS | 53 | #define DEBUG_FLAGS |
| 54 | #include <linux/interrupt.h> | 54 | #include <linux/interrupt.h> |
| 55 | #include <linux/slab.h> | ||
| 55 | #include "../comedidev.h" | 56 | #include "../comedidev.h" |
| 56 | 57 | ||
| 57 | #include "mite.h" | 58 | #include "mite.h" |
diff --git a/drivers/staging/comedi/drivers/ni_670x.c b/drivers/staging/comedi/drivers/ni_670x.c index 1e792d592f73..68221bfba5dd 100644 --- a/drivers/staging/comedi/drivers/ni_670x.c +++ b/drivers/staging/comedi/drivers/ni_670x.c | |||
| @@ -42,6 +42,7 @@ Commands are not supported. | |||
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include "../comedidev.h" | 46 | #include "../comedidev.h" |
| 46 | 47 | ||
| 47 | #include "mite.h" | 48 | #include "mite.h" |
diff --git a/drivers/staging/comedi/drivers/ni_at_a2150.c b/drivers/staging/comedi/drivers/ni_at_a2150.c index dd75dfb34309..9bff34cf06d1 100644 --- a/drivers/staging/comedi/drivers/ni_at_a2150.c +++ b/drivers/staging/comedi/drivers/ni_at_a2150.c | |||
| @@ -65,6 +65,7 @@ TRIG_WAKE_EOS | |||
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/interrupt.h> | 67 | #include <linux/interrupt.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include "../comedidev.h" | 69 | #include "../comedidev.h" |
| 69 | 70 | ||
| 70 | #include <linux/ioport.h> | 71 | #include <linux/ioport.h> |
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index c9b0395a6103..7ea64538e055 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c | |||
| @@ -42,6 +42,7 @@ IRQ is assigned but not used. | |||
| 42 | */ | 42 | */ |
| 43 | 43 | ||
| 44 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include "../comedidev.h" | 46 | #include "../comedidev.h" |
| 46 | 47 | ||
| 47 | #include <linux/ioport.h> | 48 | #include <linux/ioport.h> |
diff --git a/drivers/staging/comedi/drivers/ni_daq_dio24.c b/drivers/staging/comedi/drivers/ni_daq_dio24.c index 9017be3a92f1..ddc312b5d20d 100644 --- a/drivers/staging/comedi/drivers/ni_daq_dio24.c +++ b/drivers/staging/comedi/drivers/ni_daq_dio24.c | |||
| @@ -41,6 +41,7 @@ the PCMCIA interface. | |||
| 41 | #undef LABPC_DEBUG | 41 | #undef LABPC_DEBUG |
| 42 | 42 | ||
| 43 | #include <linux/interrupt.h> | 43 | #include <linux/interrupt.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | #include "../comedidev.h" | 45 | #include "../comedidev.h" |
| 45 | 46 | ||
| 46 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
diff --git a/drivers/staging/comedi/drivers/ni_labpc.c b/drivers/staging/comedi/drivers/ni_labpc.c index 3c88caaa9dab..558e525fed37 100644 --- a/drivers/staging/comedi/drivers/ni_labpc.c +++ b/drivers/staging/comedi/drivers/ni_labpc.c | |||
| @@ -77,6 +77,7 @@ NI manuals: | |||
| 77 | /* #define LABPC_DEBUG enable debugging messages */ | 77 | /* #define LABPC_DEBUG enable debugging messages */ |
| 78 | 78 | ||
| 79 | #include <linux/interrupt.h> | 79 | #include <linux/interrupt.h> |
| 80 | #include <linux/slab.h> | ||
| 80 | #include "../comedidev.h" | 81 | #include "../comedidev.h" |
| 81 | 82 | ||
| 82 | #include <linux/delay.h> | 83 | #include <linux/delay.h> |
diff --git a/drivers/staging/comedi/drivers/ni_labpc_cs.c b/drivers/staging/comedi/drivers/ni_labpc_cs.c index 0b963bb3328b..8ad1055a5cc1 100644 --- a/drivers/staging/comedi/drivers/ni_labpc_cs.c +++ b/drivers/staging/comedi/drivers/ni_labpc_cs.c | |||
| @@ -64,6 +64,7 @@ NI manuals: | |||
| 64 | #include "../comedidev.h" | 64 | #include "../comedidev.h" |
| 65 | 65 | ||
| 66 | #include <linux/delay.h> | 66 | #include <linux/delay.h> |
| 67 | #include <linux/slab.h> | ||
| 67 | 68 | ||
| 68 | #include "8253.h" | 69 | #include "8253.h" |
| 69 | #include "8255.h" | 70 | #include "8255.h" |
diff --git a/drivers/staging/comedi/drivers/pcl812.c b/drivers/staging/comedi/drivers/pcl812.c index d4634c4f02dc..1ddc19c705a6 100644 --- a/drivers/staging/comedi/drivers/pcl812.c +++ b/drivers/staging/comedi/drivers/pcl812.c | |||
| @@ -108,6 +108,7 @@ Options for ACL-8113, ISO-813: | |||
| 108 | */ | 108 | */ |
| 109 | 109 | ||
| 110 | #include <linux/interrupt.h> | 110 | #include <linux/interrupt.h> |
| 111 | #include <linux/gfp.h> | ||
| 111 | #include "../comedidev.h" | 112 | #include "../comedidev.h" |
| 112 | 113 | ||
| 113 | #include <linux/delay.h> | 114 | #include <linux/delay.h> |
diff --git a/drivers/staging/comedi/drivers/pcl816.c b/drivers/staging/comedi/drivers/pcl816.c index 9820759ec54f..71c2a3aa379e 100644 --- a/drivers/staging/comedi/drivers/pcl816.c +++ b/drivers/staging/comedi/drivers/pcl816.c | |||
| @@ -36,6 +36,7 @@ Configuration Options: | |||
| 36 | 36 | ||
| 37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 38 | #include <linux/mc146818rtc.h> | 38 | #include <linux/mc146818rtc.h> |
| 39 | #include <linux/gfp.h> | ||
| 39 | #include <linux/delay.h> | 40 | #include <linux/delay.h> |
| 40 | #include <asm/dma.h> | 41 | #include <asm/dma.h> |
| 41 | 42 | ||
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index c9d75385755d..9d6aa393ef13 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c | |||
| @@ -102,6 +102,7 @@ A word or two about DMA. Driver support DMA operations at two ways: | |||
| 102 | 102 | ||
| 103 | #include <linux/ioport.h> | 103 | #include <linux/ioport.h> |
| 104 | #include <linux/mc146818rtc.h> | 104 | #include <linux/mc146818rtc.h> |
| 105 | #include <linux/gfp.h> | ||
| 105 | #include <linux/delay.h> | 106 | #include <linux/delay.h> |
| 106 | #include <asm/dma.h> | 107 | #include <asm/dma.h> |
| 107 | 108 | ||
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 6ca4105610c1..025a52e8981d 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c | |||
| @@ -77,6 +77,7 @@ Configuration Options: | |||
| 77 | */ | 77 | */ |
| 78 | 78 | ||
| 79 | #include <linux/interrupt.h> | 79 | #include <linux/interrupt.h> |
| 80 | #include <linux/slab.h> | ||
| 80 | #include "../comedidev.h" | 81 | #include "../comedidev.h" |
| 81 | #include "pcm_common.h" | 82 | #include "pcm_common.h" |
| 82 | #include <linux/pci.h> /* for PCI devices */ | 83 | #include <linux/pci.h> /* for PCI devices */ |
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index c1ae20ffb379..5af4c8448a3a 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c | |||
| @@ -76,6 +76,7 @@ Configuration Options: | |||
| 76 | */ | 76 | */ |
| 77 | 77 | ||
| 78 | #include <linux/interrupt.h> | 78 | #include <linux/interrupt.h> |
| 79 | #include <linux/slab.h> | ||
| 79 | #include "../comedidev.h" | 80 | #include "../comedidev.h" |
| 80 | #include "pcm_common.h" | 81 | #include "pcm_common.h" |
| 81 | 82 | ||
diff --git a/drivers/staging/comedi/drivers/serial2002.c b/drivers/staging/comedi/drivers/serial2002.c index dd2b90372794..0792617ebc35 100644 --- a/drivers/staging/comedi/drivers/serial2002.c +++ b/drivers/staging/comedi/drivers/serial2002.c | |||
| @@ -36,6 +36,7 @@ Status: in development | |||
| 36 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 37 | #include <linux/ioport.h> | 37 | #include <linux/ioport.h> |
| 38 | #include <linux/sched.h> | 38 | #include <linux/sched.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | #include <asm/termios.h> | 41 | #include <asm/termios.h> |
| 41 | #include <asm/ioctls.h> | 42 | #include <asm/ioctls.h> |
diff --git a/drivers/staging/comedi/drivers/unioxx5.c b/drivers/staging/comedi/drivers/unioxx5.c index 75a9a62e1a70..be1d83df0de5 100644 --- a/drivers/staging/comedi/drivers/unioxx5.c +++ b/drivers/staging/comedi/drivers/unioxx5.c | |||
| @@ -44,6 +44,7 @@ Devices: [Fastwel] UNIOxx-5 (unioxx5), | |||
| 44 | 44 | ||
| 45 | #include "../comedidev.h" | 45 | #include "../comedidev.h" |
| 46 | #include <linux/ioport.h> | 46 | #include <linux/ioport.h> |
| 47 | #include <linux/slab.h> | ||
| 47 | 48 | ||
| 48 | #define DRIVER_NAME "unioxx5" | 49 | #define DRIVER_NAME "unioxx5" |
| 49 | #define UNIOXX5_SIZE 0x10 | 50 | #define UNIOXX5_SIZE 0x10 |
diff --git a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c index 6552ef6d8297..288fef4fcbcc 100644 --- a/drivers/staging/comedi/kcomedilib/kcomedilib_main.c +++ b/drivers/staging/comedi/kcomedilib/kcomedilib_main.c | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
| 33 | #include <linux/mm.h> | 33 | #include <linux/mm.h> |
| 34 | #include <linux/slab.h> | ||
| 35 | #include <asm/io.h> | 34 | #include <asm/io.h> |
| 36 | 35 | ||
| 37 | #include "../comedi.h" | 36 | #include "../comedi.h" |
diff --git a/drivers/staging/comedi/kcomedilib/ksyms.c b/drivers/staging/comedi/kcomedilib/ksyms.c index 19293d1f998d..8bf4471ce6c1 100644 --- a/drivers/staging/comedi/kcomedilib/ksyms.c +++ b/drivers/staging/comedi/kcomedilib/ksyms.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/ioport.h> | 35 | #include <linux/ioport.h> |
| 36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | 37 | ||
| 39 | /* functions specific to kcomedilib */ | 38 | /* functions specific to kcomedilib */ |
| 40 | 39 | ||
diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c index 01819d34201a..c438c489aa92 100644 --- a/drivers/staging/crystalhd/crystalhd_hw.c +++ b/drivers/staging/crystalhd/crystalhd_hw.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | **********************************************************************/ | 23 | **********************************************************************/ |
| 24 | 24 | ||
| 25 | #include <linux/pci.h> | 25 | #include <linux/pci.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 27 | #include "crystalhd_hw.h" | 28 | #include "crystalhd_hw.h" |
| 28 | 29 | ||
diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 3eac70aa213c..54bad652c0c5 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | ***************************************************************************/ | 16 | ***************************************************************************/ |
| 17 | 17 | ||
| 18 | #include <linux/version.h> | 18 | #include <linux/version.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include "crystalhd_lnx.h" | 21 | #include "crystalhd_lnx.h" |
| 21 | 22 | ||
diff --git a/drivers/staging/crystalhd/crystalhd_misc.c b/drivers/staging/crystalhd/crystalhd_misc.c index 587dcc477865..73593b078b33 100644 --- a/drivers/staging/crystalhd/crystalhd_misc.c +++ b/drivers/staging/crystalhd/crystalhd_misc.c | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | * along with this driver. If not, see <http://www.gnu.org/licenses/>. | 24 | * along with this driver. If not, see <http://www.gnu.org/licenses/>. |
| 25 | **********************************************************************/ | 25 | **********************************************************************/ |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 28 | |||
| 27 | #include "crystalhd_misc.h" | 29 | #include "crystalhd_misc.h" |
| 28 | #include "crystalhd_lnx.h" | 30 | #include "crystalhd_lnx.h" |
| 29 | 31 | ||
diff --git a/drivers/staging/cx25821/cx25821-alsa.c b/drivers/staging/cx25821/cx25821-alsa.c index e0eef12759e4..061add30ba8a 100644 --- a/drivers/staging/cx25821/cx25821-alsa.c +++ b/drivers/staging/cx25821/cx25821-alsa.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/delay.h> | 32 | #include <asm/delay.h> |
| 32 | #include <sound/core.h> | 33 | #include <sound/core.h> |
diff --git a/drivers/staging/cx25821/cx25821-audio-upstream.c b/drivers/staging/cx25821/cx25821-audio-upstream.c index ddddf651266b..11c56bdb0ceb 100644 --- a/drivers/staging/cx25821/cx25821-audio-upstream.c +++ b/drivers/staging/cx25821/cx25821-audio-upstream.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/file.h> | 32 | #include <linux/file.h> |
| 33 | #include <linux/fcntl.h> | 33 | #include <linux/fcntl.h> |
| 34 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <asm/uaccess.h> | 36 | #include <asm/uaccess.h> |
| 36 | 37 | ||
| 37 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); | 38 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); |
diff --git a/drivers/staging/cx25821/cx25821-audups11.c b/drivers/staging/cx25821/cx25821-audups11.c index 46c7f78bb972..e76451c309f1 100644 --- a/drivers/staging/cx25821/cx25821-audups11.c +++ b/drivers/staging/cx25821/cx25821-audups11.c | |||
| @@ -21,6 +21,8 @@ | |||
| 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 25 | |||
| 24 | #include "cx25821-video.h" | 26 | #include "cx25821-video.h" |
| 25 | 27 | ||
| 26 | static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) | 28 | static void buffer_queue(struct videobuf_queue *vq, struct videobuf_buffer *vb) |
diff --git a/drivers/staging/cx25821/cx25821-core.c b/drivers/staging/cx25821/cx25821-core.c index 67f689de4daa..9e9b8c3c9311 100644 --- a/drivers/staging/cx25821/cx25821-core.c +++ b/drivers/staging/cx25821/cx25821-core.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/i2c.h> | 24 | #include <linux/i2c.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "cx25821.h" | 26 | #include "cx25821.h" |
| 26 | #include "cx25821-sram.h" | 27 | #include "cx25821-sram.h" |
| 27 | #include "cx25821-video.h" | 28 | #include "cx25821-video.h" |
diff --git a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c index c8905e0ac509..cc51618cffa9 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream-ch2.c +++ b/drivers/staging/cx25821/cx25821-video-upstream-ch2.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/syscalls.h> | 31 | #include <linux/syscalls.h> |
| 32 | #include <linux/file.h> | 32 | #include <linux/file.h> |
| 33 | #include <linux/fcntl.h> | 33 | #include <linux/fcntl.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | 36 | ||
| 36 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); | 37 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); |
diff --git a/drivers/staging/cx25821/cx25821-video-upstream.c b/drivers/staging/cx25821/cx25821-video-upstream.c index 3d7dd3f66541..6d48a1e26d1b 100644 --- a/drivers/staging/cx25821/cx25821-video-upstream.c +++ b/drivers/staging/cx25821/cx25821-video-upstream.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/syscalls.h> | 31 | #include <linux/syscalls.h> |
| 32 | #include <linux/file.h> | 32 | #include <linux/file.h> |
| 33 | #include <linux/fcntl.h> | 33 | #include <linux/fcntl.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/uaccess.h> | 35 | #include <asm/uaccess.h> |
| 35 | 36 | ||
| 36 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); | 37 | MODULE_DESCRIPTION("v4l2 driver module for cx25821 based TV cards"); |
diff --git a/drivers/staging/dream/camera/msm_camera.c b/drivers/staging/dream/camera/msm_camera.c index dc7c603625c7..81bd71fd816e 100644 --- a/drivers/staging/dream/camera/msm_camera.c +++ b/drivers/staging/dream/camera/msm_camera.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 16 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
| 17 | #include <mach/board.h> | 18 | #include <mach/board.h> |
diff --git a/drivers/staging/dream/camera/msm_v4l2.c b/drivers/staging/dream/camera/msm_v4l2.c index 6a7d46cf11eb..c276f2f7583a 100644 --- a/drivers/staging/dream/camera/msm_v4l2.c +++ b/drivers/staging/dream/camera/msm_v4l2.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/spinlock.h> | 12 | #include <linux/spinlock.h> |
| 13 | #include <linux/videodev2.h> | 13 | #include <linux/videodev2.h> |
| 14 | #include <linux/proc_fs.h> | 14 | #include <linux/proc_fs.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <media/v4l2-dev.h> | 16 | #include <media/v4l2-dev.h> |
| 16 | #include <media/msm_camera.h> | 17 | #include <media/msm_camera.h> |
| 17 | #include <mach/camera.h> | 18 | #include <mach/camera.h> |
diff --git a/drivers/staging/dream/camera/msm_vfe7x.c b/drivers/staging/dream/camera/msm_vfe7x.c index 62fd24d632d5..198656ac3de5 100644 --- a/drivers/staging/dream/camera/msm_vfe7x.c +++ b/drivers/staging/dream/camera/msm_vfe7x.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/fs.h> | 7 | #include <linux/fs.h> |
| 8 | #include <linux/sched.h> | 8 | #include <linux/sched.h> |
| 9 | #include <linux/android_pmem.h> | 9 | #include <linux/android_pmem.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <mach/msm_adsp.h> | 11 | #include <mach/msm_adsp.h> |
| 11 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
| 12 | #include <linux/wait.h> | 13 | #include <linux/wait.h> |
diff --git a/drivers/staging/dream/camera/msm_vfe8x.c b/drivers/staging/dream/camera/msm_vfe8x.c index 03de6ec2eb44..e61fdba62838 100644 --- a/drivers/staging/dream/camera/msm_vfe8x.c +++ b/drivers/staging/dream/camera/msm_vfe8x.c | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (C) 2008-2009 QUALCOMM Incorporated. | 2 | * Copyright (C) 2008-2009 QUALCOMM Incorporated. |
| 3 | */ | 3 | */ |
| 4 | #include <linux/slab.h> | ||
| 4 | #include <linux/uaccess.h> | 5 | #include <linux/uaccess.h> |
| 5 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 6 | #include <mach/irqs.h> | 7 | #include <mach/irqs.h> |
diff --git a/drivers/staging/dream/camera/mt9d112.c b/drivers/staging/dream/camera/mt9d112.c index 4f938f9dfc47..e6f2d5124611 100644 --- a/drivers/staging/dream/camera/mt9d112.c +++ b/drivers/staging/dream/camera/mt9d112.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 7 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 8 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
diff --git a/drivers/staging/dream/camera/mt9p012_fox.c b/drivers/staging/dream/camera/mt9p012_fox.c index 70119d5e0ab3..791bd6c40615 100644 --- a/drivers/staging/dream/camera/mt9p012_fox.c +++ b/drivers/staging/dream/camera/mt9p012_fox.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 8 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
| 9 | #include <linux/miscdevice.h> | 10 | #include <linux/miscdevice.h> |
diff --git a/drivers/staging/dream/camera/mt9t013.c b/drivers/staging/dream/camera/mt9t013.c index 88229f2663b5..8fd7727ba234 100644 --- a/drivers/staging/dream/camera/mt9t013.c +++ b/drivers/staging/dream/camera/mt9t013.c | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/types.h> | 6 | #include <linux/types.h> |
| 7 | #include <linux/slab.h> | ||
| 7 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 8 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
| 9 | #include <linux/miscdevice.h> | 10 | #include <linux/miscdevice.h> |
diff --git a/drivers/staging/dream/camera/s5k3e2fx.c b/drivers/staging/dream/camera/s5k3e2fx.c index 841792e2624b..1459903a339d 100644 --- a/drivers/staging/dream/camera/s5k3e2fx.c +++ b/drivers/staging/dream/camera/s5k3e2fx.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/types.h> | 7 | #include <linux/types.h> |
| 7 | #include <linux/i2c.h> | 8 | #include <linux/i2c.h> |
| 8 | #include <linux/uaccess.h> | 9 | #include <linux/uaccess.h> |
diff --git a/drivers/staging/dream/gpio_axis.c b/drivers/staging/dream/gpio_axis.c index c801172aa9ee..eb54724b1d3a 100644 --- a/drivers/staging/dream/gpio_axis.c +++ b/drivers/staging/dream/gpio_axis.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/gpio_event.h> | 19 | #include <linux/gpio_event.h> |
| 19 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
diff --git a/drivers/staging/dream/gpio_event.c b/drivers/staging/dream/gpio_event.c index e60e2c0db9c0..97a511d11f49 100644 --- a/drivers/staging/dream/gpio_event.c +++ b/drivers/staging/dream/gpio_event.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | 16 | ||
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 18 | #include <linux/input.h> | 19 | #include <linux/input.h> |
| 19 | #include <linux/gpio_event.h> | 20 | #include <linux/gpio_event.h> |
diff --git a/drivers/staging/dream/gpio_input.c b/drivers/staging/dream/gpio_input.c index 0638ec43601a..ca29e5eb070a 100644 --- a/drivers/staging/dream/gpio_input.c +++ b/drivers/staging/dream/gpio_input.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/hrtimer.h> | 19 | #include <linux/hrtimer.h> |
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | enum { | 24 | enum { |
| 24 | DEBOUNCE_UNSTABLE = BIT(0), /* Got irq, while debouncing */ | 25 | DEBOUNCE_UNSTABLE = BIT(0), /* Got irq, while debouncing */ |
diff --git a/drivers/staging/dream/gpio_matrix.c b/drivers/staging/dream/gpio_matrix.c index 796de4faf859..b377ee1f5a5f 100644 --- a/drivers/staging/dream/gpio_matrix.c +++ b/drivers/staging/dream/gpio_matrix.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 18 | #include <linux/gpio_event.h> | 19 | #include <linux/gpio_event.h> |
| 19 | #include <linux/hrtimer.h> | 20 | #include <linux/hrtimer.h> |
diff --git a/drivers/staging/dream/pmem.c b/drivers/staging/dream/pmem.c index 503ba212dc96..6edfdd4ef804 100644 --- a/drivers/staging/dream/pmem.c +++ b/drivers/staging/dream/pmem.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/android_pmem.h> | 23 | #include <linux/android_pmem.h> |
| 24 | #include <linux/mempolicy.h> | 24 | #include <linux/mempolicy.h> |
| 25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <asm/io.h> | 27 | #include <asm/io.h> |
| 27 | #include <asm/uaccess.h> | 28 | #include <asm/uaccess.h> |
| 28 | #include <asm/cacheflush.h> | 29 | #include <asm/cacheflush.h> |
diff --git a/drivers/staging/dream/qdsp5/adsp.c b/drivers/staging/dream/qdsp5/adsp.c index 9069535fcaf1..f1e9d81674e8 100644 --- a/drivers/staging/dream/qdsp5/adsp.c +++ b/drivers/staging/dream/qdsp5/adsp.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/kthread.h> | 31 | #include <linux/kthread.h> |
| 32 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/uaccess.h> | 34 | #include <linux/uaccess.h> |
| 34 | #include <linux/wait.h> | 35 | #include <linux/wait.h> |
| 35 | 36 | ||
diff --git a/drivers/staging/dream/qdsp5/adsp_driver.c b/drivers/staging/dream/qdsp5/adsp_driver.c index e55a0db53a93..8197765aae1e 100644 --- a/drivers/staging/dream/qdsp5/adsp_driver.c +++ b/drivers/staging/dream/qdsp5/adsp_driver.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/list.h> | 19 | #include <linux/list.h> |
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/uaccess.h> | 23 | #include <linux/uaccess.h> |
| 23 | 24 | ||
| 24 | #include "adsp.h" | 25 | #include "adsp.h" |
diff --git a/drivers/staging/dream/qdsp5/audio_aac.c b/drivers/staging/dream/qdsp5/audio_aac.c index ad2390f32a4f..a373f3522384 100644 --- a/drivers/staging/dream/qdsp5/audio_aac.c +++ b/drivers/staging/dream/qdsp5/audio_aac.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kthread.h> | 24 | #include <linux/kthread.h> |
| 25 | #include <linux/wait.h> | 25 | #include <linux/wait.h> |
| 26 | #include <linux/dma-mapping.h> | 26 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/gfp.h> | ||
| 27 | 28 | ||
| 28 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 29 | 30 | ||
diff --git a/drivers/staging/dream/qdsp5/audio_amrnb.c b/drivers/staging/dream/qdsp5/audio_amrnb.c index cd818a526f83..07b79d5836e5 100644 --- a/drivers/staging/dream/qdsp5/audio_amrnb.c +++ b/drivers/staging/dream/qdsp5/audio_amrnb.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/kthread.h> | 32 | #include <linux/kthread.h> |
| 33 | #include <linux/wait.h> | 33 | #include <linux/wait.h> |
| 34 | #include <linux/dma-mapping.h> | 34 | #include <linux/dma-mapping.h> |
| 35 | #include <linux/gfp.h> | ||
| 35 | 36 | ||
| 36 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
| 37 | 38 | ||
diff --git a/drivers/staging/dream/qdsp5/audio_evrc.c b/drivers/staging/dream/qdsp5/audio_evrc.c index 4b43e183f9e8..ad989ee87690 100644 --- a/drivers/staging/dream/qdsp5/audio_evrc.c +++ b/drivers/staging/dream/qdsp5/audio_evrc.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/wait.h> | 27 | #include <linux/wait.h> |
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/gfp.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/atomic.h> | 32 | #include <asm/atomic.h> |
| 32 | #include <asm/ioctls.h> | 33 | #include <asm/ioctls.h> |
diff --git a/drivers/staging/dream/qdsp5/audio_in.c b/drivers/staging/dream/qdsp5/audio_in.c index 3d950a245895..6ae48e72d145 100644 --- a/drivers/staging/dream/qdsp5/audio_in.c +++ b/drivers/staging/dream/qdsp5/audio_in.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kthread.h> | 23 | #include <linux/kthread.h> |
| 24 | #include <linux/wait.h> | 24 | #include <linux/wait.h> |
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/gfp.h> | ||
| 26 | 27 | ||
| 27 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 28 | 29 | ||
diff --git a/drivers/staging/dream/qdsp5/audio_mp3.c b/drivers/staging/dream/qdsp5/audio_mp3.c index 7ed6e261d6c9..530e1f35eed3 100644 --- a/drivers/staging/dream/qdsp5/audio_mp3.c +++ b/drivers/staging/dream/qdsp5/audio_mp3.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kthread.h> | 23 | #include <linux/kthread.h> |
| 24 | #include <linux/wait.h> | 24 | #include <linux/wait.h> |
| 25 | #include <linux/dma-mapping.h> | 25 | #include <linux/dma-mapping.h> |
| 26 | #include <linux/gfp.h> | ||
| 26 | 27 | ||
| 27 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 28 | 29 | ||
diff --git a/drivers/staging/dream/qdsp5/audio_out.c b/drivers/staging/dream/qdsp5/audio_out.c index df87ca337b94..fe7809dd4401 100644 --- a/drivers/staging/dream/qdsp5/audio_out.c +++ b/drivers/staging/dream/qdsp5/audio_out.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/debugfs.h> | 26 | #include <linux/debugfs.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/wakelock.h> | 28 | #include <linux/wakelock.h> |
| 29 | #include <linux/gfp.h> | ||
| 29 | 30 | ||
| 30 | #include <linux/msm_audio.h> | 31 | #include <linux/msm_audio.h> |
| 31 | 32 | ||
diff --git a/drivers/staging/dream/qdsp5/audio_qcelp.c b/drivers/staging/dream/qdsp5/audio_qcelp.c index f0f50e36805a..effa96f34fdc 100644 --- a/drivers/staging/dream/qdsp5/audio_qcelp.c +++ b/drivers/staging/dream/qdsp5/audio_qcelp.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 30 | #include <linux/wait.h> | 30 | #include <linux/wait.h> |
| 31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/gfp.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/ioctls.h> | 34 | #include <asm/ioctls.h> |
| 34 | #include <mach/msm_adsp.h> | 35 | #include <mach/msm_adsp.h> |
diff --git a/drivers/staging/dream/qdsp5/audmgr.c b/drivers/staging/dream/qdsp5/audmgr.c index 1ad8b82c2570..427ae6c0bea8 100644 --- a/drivers/staging/dream/qdsp5/audmgr.c +++ b/drivers/staging/dream/qdsp5/audmgr.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/fs.h> | 19 | #include <linux/fs.h> |
| 20 | #include <linux/uaccess.h> | 20 | #include <linux/uaccess.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/kthread.h> | 22 | #include <linux/kthread.h> |
| 22 | #include <linux/wait.h> | 23 | #include <linux/wait.h> |
| 23 | 24 | ||
diff --git a/drivers/staging/dream/smd/smd_rpcrouter.c b/drivers/staging/dream/smd/smd_rpcrouter.c index 69911a7bc87a..8744a6e499cb 100644 --- a/drivers/staging/dream/smd/smd_rpcrouter.c +++ b/drivers/staging/dream/smd/smd_rpcrouter.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/err.h> | 33 | #include <linux/err.h> |
| 34 | #include <linux/sched.h> | 34 | #include <linux/sched.h> |
| 35 | #include <linux/poll.h> | 35 | #include <linux/poll.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
| 37 | #include <asm/byteorder.h> | 38 | #include <asm/byteorder.h> |
| 38 | #include <linux/platform_device.h> | 39 | #include <linux/platform_device.h> |
diff --git a/drivers/staging/dream/smd/smd_rpcrouter_device.c b/drivers/staging/dream/smd/smd_rpcrouter_device.c index cd3910bcc4ed..e9c28eddce31 100644 --- a/drivers/staging/dream/smd/smd_rpcrouter_device.c +++ b/drivers/staging/dream/smd/smd_rpcrouter_device.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/poll.h> | 29 | #include <linux/poll.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/msm_rpcrouter.h> | 31 | #include <linux/msm_rpcrouter.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <asm/uaccess.h> | 34 | #include <asm/uaccess.h> |
| 34 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
diff --git a/drivers/staging/dream/smd/smd_rpcrouter_servers.c b/drivers/staging/dream/smd/smd_rpcrouter_servers.c index 2597bbbc6f5e..1b152abb2783 100644 --- a/drivers/staging/dream/smd/smd_rpcrouter_servers.c +++ b/drivers/staging/dream/smd/smd_rpcrouter_servers.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/wakelock.h> | 29 | #include <linux/wakelock.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <linux/msm_rpcrouter.h> | 32 | #include <linux/msm_rpcrouter.h> |
| 32 | #include <linux/uaccess.h> | 33 | #include <linux/uaccess.h> |
diff --git a/drivers/staging/dream/synaptics_i2c_rmi.c b/drivers/staging/dream/synaptics_i2c_rmi.c index 4de6bc917595..d2ca116a1c25 100644 --- a/drivers/staging/dream/synaptics_i2c_rmi.c +++ b/drivers/staging/dream/synaptics_i2c_rmi.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #ifdef CONFIG_HAS_EARLYSUSPEND | 22 | #ifdef CONFIG_HAS_EARLYSUSPEND |
| 22 | #include <linux/earlysuspend.h> | 23 | #include <linux/earlysuspend.h> |
| 23 | #endif | 24 | #endif |
diff --git a/drivers/staging/dt3155/allocator.c b/drivers/staging/dt3155/allocator.c index c74234c66895..db382ef90217 100644 --- a/drivers/staging/dt3155/allocator.c +++ b/drivers/staging/dt3155/allocator.c | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | #include <linux/types.h> | 55 | #include <linux/types.h> |
| 56 | #include <linux/mm.h> /* PAGE_ALIGN() */ | 56 | #include <linux/mm.h> /* PAGE_ALIGN() */ |
| 57 | #include <linux/io.h> | 57 | #include <linux/io.h> |
| 58 | #include <linux/slab.h> | ||
| 58 | 59 | ||
| 59 | #include <asm/page.h> | 60 | #include <asm/page.h> |
| 60 | 61 | ||
diff --git a/drivers/staging/dt3155/dt3155_isr.c b/drivers/staging/dt3155/dt3155_isr.c index fd7f93d6c33d..09d7d9b8272d 100644 --- a/drivers/staging/dt3155/dt3155_isr.c +++ b/drivers/staging/dt3155/dt3155_isr.c | |||
| @@ -45,7 +45,7 @@ Purpose: Buffer management routines, and other routines for the ISR | |||
| 45 | */ | 45 | */ |
| 46 | 46 | ||
| 47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
| 48 | #include <linux/slab.h> | 48 | #include <linux/gfp.h> |
| 49 | #include <linux/sched.h> | 49 | #include <linux/sched.h> |
| 50 | #include <linux/types.h> | 50 | #include <linux/types.h> |
| 51 | 51 | ||
diff --git a/drivers/staging/et131x/et1310_eeprom.c b/drivers/staging/et131x/et1310_eeprom.c index 3ca253672ba1..e4d095b0b52a 100644 --- a/drivers/staging/et131x/et1310_eeprom.c +++ b/drivers/staging/et131x/et1310_eeprom.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | 66 | ||
| 67 | #include <linux/sched.h> | 67 | #include <linux/sched.h> |
| 68 | #include <linux/ptrace.h> | 68 | #include <linux/ptrace.h> |
| 69 | #include <linux/slab.h> | ||
| 70 | #include <linux/ctype.h> | 69 | #include <linux/ctype.h> |
| 71 | #include <linux/string.h> | 70 | #include <linux/string.h> |
| 72 | #include <linux/timer.h> | 71 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et1310_mac.c b/drivers/staging/et131x/et1310_mac.c index 737a9f5401d1..16fa13d4821f 100644 --- a/drivers/staging/et131x/et1310_mac.c +++ b/drivers/staging/et131x/et1310_mac.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | 65 | ||
| 66 | #include <linux/sched.h> | 66 | #include <linux/sched.h> |
| 67 | #include <linux/ptrace.h> | 67 | #include <linux/ptrace.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/ctype.h> | 68 | #include <linux/ctype.h> |
| 70 | #include <linux/string.h> | 69 | #include <linux/string.h> |
| 71 | #include <linux/timer.h> | 70 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et1310_phy.c b/drivers/staging/et131x/et1310_phy.c index 4a55fbfbd59d..34cd5d1b586a 100644 --- a/drivers/staging/et131x/et1310_phy.c +++ b/drivers/staging/et131x/et1310_phy.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | 66 | ||
| 67 | #include <linux/sched.h> | 67 | #include <linux/sched.h> |
| 68 | #include <linux/ptrace.h> | 68 | #include <linux/ptrace.h> |
| 69 | #include <linux/slab.h> | ||
| 70 | #include <linux/ctype.h> | 69 | #include <linux/ctype.h> |
| 71 | #include <linux/string.h> | 70 | #include <linux/string.h> |
| 72 | #include <linux/timer.h> | 71 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et1310_pm.c b/drivers/staging/et131x/et1310_pm.c index 41019e390af5..c64bb2c6d0d6 100644 --- a/drivers/staging/et131x/et1310_pm.c +++ b/drivers/staging/et131x/et1310_pm.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | 65 | ||
| 66 | #include <linux/sched.h> | 66 | #include <linux/sched.h> |
| 67 | #include <linux/ptrace.h> | 67 | #include <linux/ptrace.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/ctype.h> | 68 | #include <linux/ctype.h> |
| 70 | #include <linux/string.h> | 69 | #include <linux/string.h> |
| 71 | #include <linux/timer.h> | 70 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c index 5ad7e5a6f631..1dd5fa5b888b 100644 --- a/drivers/staging/et131x/et131x_initpci.c +++ b/drivers/staging/et131x/et131x_initpci.c | |||
| @@ -68,7 +68,6 @@ | |||
| 68 | 68 | ||
| 69 | #include <linux/sched.h> | 69 | #include <linux/sched.h> |
| 70 | #include <linux/ptrace.h> | 70 | #include <linux/ptrace.h> |
| 71 | #include <linux/slab.h> | ||
| 72 | #include <linux/ctype.h> | 71 | #include <linux/ctype.h> |
| 73 | #include <linux/string.h> | 72 | #include <linux/string.h> |
| 74 | #include <linux/timer.h> | 73 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et131x_isr.c b/drivers/staging/et131x/et131x_isr.c index 8b6e0b7ec568..cb7f6775ce0a 100644 --- a/drivers/staging/et131x/et131x_isr.c +++ b/drivers/staging/et131x/et131x_isr.c | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | 66 | ||
| 67 | #include <linux/sched.h> | 67 | #include <linux/sched.h> |
| 68 | #include <linux/ptrace.h> | 68 | #include <linux/ptrace.h> |
| 69 | #include <linux/slab.h> | ||
| 70 | #include <linux/ctype.h> | 69 | #include <linux/ctype.h> |
| 71 | #include <linux/string.h> | 70 | #include <linux/string.h> |
| 72 | #include <linux/timer.h> | 71 | #include <linux/timer.h> |
diff --git a/drivers/staging/et131x/et131x_netdev.c b/drivers/staging/et131x/et131x_netdev.c index 40f8954dde47..ab047f2ff72c 100644 --- a/drivers/staging/et131x/et131x_netdev.c +++ b/drivers/staging/et131x/et131x_netdev.c | |||
| @@ -65,7 +65,6 @@ | |||
| 65 | 65 | ||
| 66 | #include <linux/sched.h> | 66 | #include <linux/sched.h> |
| 67 | #include <linux/ptrace.h> | 67 | #include <linux/ptrace.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/ctype.h> | 68 | #include <linux/ctype.h> |
| 70 | #include <linux/string.h> | 69 | #include <linux/string.h> |
| 71 | #include <linux/timer.h> | 70 | #include <linux/timer.h> |
diff --git a/drivers/staging/go7007/go7007-driver.c b/drivers/staging/go7007/go7007-driver.c index d42ba1696999..372a7c6791ca 100644 --- a/drivers/staging/go7007/go7007-driver.c +++ b/drivers/staging/go7007/go7007-driver.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/firmware.h> | 29 | #include <linux/firmware.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <asm/system.h> | 33 | #include <asm/system.h> |
| 33 | #include <linux/videodev2.h> | 34 | #include <linux/videodev2.h> |
| 34 | #include <media/tuner.h> | 35 | #include <media/tuner.h> |
diff --git a/drivers/staging/go7007/go7007-fw.c b/drivers/staging/go7007/go7007-fw.c index a8bb264e0074..ee622ff1707e 100644 --- a/drivers/staging/go7007/go7007-fw.c +++ b/drivers/staging/go7007/go7007-fw.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/device.h> | 31 | #include <linux/device.h> |
| 32 | #include <linux/i2c.h> | 32 | #include <linux/i2c.h> |
| 33 | #include <linux/firmware.h> | 33 | #include <linux/firmware.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <asm/byteorder.h> | 35 | #include <asm/byteorder.h> |
| 35 | 36 | ||
| 36 | #include "go7007-priv.h" | 37 | #include "go7007-priv.h" |
diff --git a/drivers/staging/go7007/go7007-v4l2.c b/drivers/staging/go7007/go7007-v4l2.c index 3af79242313e..723c1a64d87f 100644 --- a/drivers/staging/go7007/go7007-v4l2.c +++ b/drivers/staging/go7007/go7007-v4l2.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/spinlock.h> | 23 | #include <linux/spinlock.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 25 | #include <linux/unistd.h> | 26 | #include <linux/unistd.h> |
| 26 | #include <linux/time.h> | 27 | #include <linux/time.h> |
diff --git a/drivers/staging/go7007/s2250-board.c b/drivers/staging/go7007/s2250-board.c index dc89502ea1b7..93f26048e3b4 100644 --- a/drivers/staging/go7007/s2250-board.c +++ b/drivers/staging/go7007/s2250-board.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/usb.h> | 20 | #include <linux/usb.h> |
| 21 | #include <linux/i2c.h> | 21 | #include <linux/i2c.h> |
| 22 | #include <linux/videodev2.h> | 22 | #include <linux/videodev2.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <media/v4l2-device.h> | 24 | #include <media/v4l2-device.h> |
| 24 | #include <media/v4l2-common.h> | 25 | #include <media/v4l2-common.h> |
| 25 | #include <media/v4l2-i2c-drv.h> | 26 | #include <media/v4l2-i2c-drv.h> |
diff --git a/drivers/staging/go7007/s2250-loader.c b/drivers/staging/go7007/s2250-loader.c index 1de2dfb16d3f..7547a8f77345 100644 --- a/drivers/staging/go7007/s2250-loader.c +++ b/drivers/staging/go7007/s2250-loader.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | 17 | ||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/smp_lock.h> | 21 | #include <linux/smp_lock.h> |
| 21 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
| 22 | #include <dvb-usb.h> | 23 | #include <dvb-usb.h> |
diff --git a/drivers/staging/go7007/snd-go7007.c b/drivers/staging/go7007/snd-go7007.c index 03c4dfc138a1..deac938d8505 100644 --- a/drivers/staging/go7007/snd-go7007.c +++ b/drivers/staging/go7007/snd-go7007.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/i2c.h> | 28 | #include <linux/i2c.h> |
| 29 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 30 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <asm/system.h> | 32 | #include <asm/system.h> |
| 32 | #include <sound/core.h> | 33 | #include <sound/core.h> |
| 33 | #include <sound/pcm.h> | 34 | #include <sound/pcm.h> |
diff --git a/drivers/staging/go7007/wis-saa7113.c b/drivers/staging/go7007/wis-saa7113.c index d196e16fe72b..5c12b4d38459 100644 --- a/drivers/staging/go7007/wis-saa7113.c +++ b/drivers/staging/go7007/wis-saa7113.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/videodev2.h> | 21 | #include <linux/videodev2.h> |
| 22 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "wis-i2c.h" | 25 | #include "wis-i2c.h" |
| 25 | 26 | ||
diff --git a/drivers/staging/go7007/wis-saa7115.c b/drivers/staging/go7007/wis-saa7115.c index 0f2b4a0ceccf..73f2283a8803 100644 --- a/drivers/staging/go7007/wis-saa7115.c +++ b/drivers/staging/go7007/wis-saa7115.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/videodev2.h> | 21 | #include <linux/videodev2.h> |
| 22 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "wis-i2c.h" | 25 | #include "wis-i2c.h" |
| 25 | 26 | ||
diff --git a/drivers/staging/go7007/wis-sony-tuner.c b/drivers/staging/go7007/wis-sony-tuner.c index c723e4aa7147..b1013291190f 100644 --- a/drivers/staging/go7007/wis-sony-tuner.c +++ b/drivers/staging/go7007/wis-sony-tuner.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/videodev2.h> | 21 | #include <linux/videodev2.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <media/tuner.h> | 23 | #include <media/tuner.h> |
| 23 | #include <media/v4l2-common.h> | 24 | #include <media/v4l2-common.h> |
| 24 | #include <media/v4l2-ioctl.h> | 25 | #include <media/v4l2-ioctl.h> |
diff --git a/drivers/staging/go7007/wis-tw2804.c b/drivers/staging/go7007/wis-tw2804.c index 1983839f554d..315268d130dd 100644 --- a/drivers/staging/go7007/wis-tw2804.c +++ b/drivers/staging/go7007/wis-tw2804.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/videodev2.h> | 21 | #include <linux/videodev2.h> |
| 22 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "wis-i2c.h" | 25 | #include "wis-i2c.h" |
| 25 | 26 | ||
diff --git a/drivers/staging/go7007/wis-tw9903.c b/drivers/staging/go7007/wis-tw9903.c index f97e2be3c0b5..3ac6f785c4ad 100644 --- a/drivers/staging/go7007/wis-tw9903.c +++ b/drivers/staging/go7007/wis-tw9903.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/i2c.h> | 20 | #include <linux/i2c.h> |
| 21 | #include <linux/videodev2.h> | 21 | #include <linux/videodev2.h> |
| 22 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "wis-i2c.h" | 25 | #include "wis-i2c.h" |
| 25 | 26 | ||
diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index d46eb145484f..e69e9ee704ac 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include "osd.h" | 24 | #include "osd.h" |
| 24 | #include "logging.h" | 25 | #include "logging.h" |
| 25 | #include "VmbusPrivate.h" | 26 | #include "VmbusPrivate.h" |
diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index ef38467ed4e2..5f92c2102ab4 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 24 | #include "osd.h" | 25 | #include "osd.h" |
| 25 | #include "logging.h" | 26 | #include "logging.h" |
diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c index 43c2e6855015..e0ea9cf90f03 100644 --- a/drivers/staging/hv/Connection.c +++ b/drivers/staging/hv/Connection.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 26 | #include "osd.h" | 27 | #include "osd.h" |
| 27 | #include "logging.h" | 28 | #include "logging.h" |
diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index 51149e69f3e8..5d53889fb4a4 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/vmalloc.h> | 25 | #include <linux/vmalloc.h> |
| 25 | #include "osd.h" | 26 | #include "osd.h" |
| 26 | #include "logging.h" | 27 | #include "logging.h" |
diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 1c717f9a554e..e4bf82297504 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "osd.h" | 26 | #include "osd.h" |
| 26 | #include "logging.h" | 27 | #include "logging.h" |
| 27 | #include "NetVsc.h" | 28 | #include "NetVsc.h" |
diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 1ab7fa97d373..cd2930de2176 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/highmem.h> | 22 | #include <linux/highmem.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 24 | #include "osd.h" | 25 | #include "osd.h" |
| 25 | #include "logging.h" | 26 | #include "logging.h" |
diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index 38ea1407f222..e426a23ca537 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | #include "osd.h" | 26 | #include "osd.h" |
diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 3d0a240ed664..2f84bf7c0a9f 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include "osd.h" | 25 | #include "osd.h" |
| 25 | #include "logging.h" | 26 | #include "logging.h" |
| 26 | #include "VersionInfo.h" | 27 | #include "VersionInfo.h" |
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index abeac12c093d..8f1fda3256ad 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/major.h> | 25 | #include <linux/major.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/hdreg.h> | 27 | #include <linux/hdreg.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <scsi/scsi.h> | 29 | #include <scsi/scsi.h> |
| 29 | #include <scsi/scsi_cmnd.h> | 30 | #include <scsi/scsi_cmnd.h> |
| 30 | #include <scsi/scsi_eh.h> | 31 | #include <scsi/scsi_eh.h> |
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 1af3dcbafd65..2ccb6b93fe47 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/etherdevice.h> | 29 | #include <linux/etherdevice.h> |
| 30 | #include <linux/skbuff.h> | 30 | #include <linux/skbuff.h> |
| 31 | #include <linux/in.h> | 31 | #include <linux/in.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <net/arp.h> | 33 | #include <net/arp.h> |
| 33 | #include <net/route.h> | 34 | #include <net/route.h> |
| 34 | #include <net/sock.h> | 35 | #include <net/sock.h> |
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index 3a4793a0fd05..9aea31067295 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | #include <linux/time.h> | 40 | #include <linux/time.h> |
| 41 | #include <linux/io.h> | 41 | #include <linux/io.h> |
| 42 | #include <linux/bitops.h> | 42 | #include <linux/bitops.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | #include "osd.h" | 44 | #include "osd.h" |
| 44 | 45 | ||
| 45 | struct osd_callback_struct { | 46 | struct osd_callback_struct { |
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index 3988f4bec1ce..8a58272b8039 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * Hank Janssen <hjanssen@microsoft.com> | 19 | * Hank Janssen <hjanssen@microsoft.com> |
| 20 | */ | 20 | */ |
| 21 | #include <linux/init.h> | 21 | #include <linux/init.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 23 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 24 | #include <linux/blkdev.h> | 25 | #include <linux/blkdev.h> |
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 2c906195b9c8..3397ef08e0aa 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/sysctl.h> | 26 | #include <linux/sysctl.h> |
| 27 | #include <linux/pci.h> | 27 | #include <linux/pci.h> |
| 28 | #include <linux/dmi.h> | 28 | #include <linux/dmi.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include "VersionInfo.h" | 30 | #include "VersionInfo.h" |
| 30 | #include "osd.h" | 31 | #include "osd.h" |
| 31 | #include "logging.h" | 32 | #include "logging.h" |
diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c index 33d16b6f7b50..db2dd537ffb0 100644 --- a/drivers/staging/iio/accel/kxsd9.c +++ b/drivers/staging/iio/accel/kxsd9.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/sysfs.h> | 25 | #include <linux/sysfs.h> |
| 26 | #include <linux/rtc.h> | 26 | #include <linux/rtc.h> |
| 27 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include "../iio.h" | 30 | #include "../iio.h" |
| 30 | #include "../sysfs.h" | 31 | #include "../sysfs.h" |
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c index f008837e5a14..ea76902797bb 100644 --- a/drivers/staging/iio/accel/lis3l02dq_core.c +++ b/drivers/staging/iio/accel/lis3l02dq_core.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/device.h> | 20 | #include <linux/device.h> |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <linux/sysfs.h> | 25 | #include <linux/sysfs.h> |
| 25 | #include <linux/list.h> | 26 | #include <linux/list.h> |
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c index a6b7c72a86f4..93712430e579 100644 --- a/drivers/staging/iio/accel/lis3l02dq_ring.c +++ b/drivers/staging/iio/accel/lis3l02dq_ring.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/spi/spi.h> | 8 | #include <linux/spi/spi.h> |
| 9 | #include <linux/sysfs.h> | 9 | #include <linux/sysfs.h> |
| 10 | #include <linux/list.h> | 10 | #include <linux/list.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | 12 | ||
| 12 | #include "../iio.h" | 13 | #include "../iio.h" |
| 13 | #include "../sysfs.h" | 14 | #include "../sysfs.h" |
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c index cedcaa2b3d1f..1c229869a22d 100644 --- a/drivers/staging/iio/accel/sca3000_core.c +++ b/drivers/staging/iio/accel/sca3000_core.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
| 15 | #include <linux/fs.h> | 15 | #include <linux/fs.h> |
| 16 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 18 | #include <linux/spi/spi.h> | 19 | #include <linux/spi/spi.h> |
| 19 | #include <linux/sysfs.h> | 20 | #include <linux/sysfs.h> |
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c index d5ea237793a6..40cbab2a6592 100644 --- a/drivers/staging/iio/accel/sca3000_ring.c +++ b/drivers/staging/iio/accel/sca3000_ring.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
| 14 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 17 | #include <linux/spi/spi.h> | 18 | #include <linux/spi/spi.h> |
| 18 | #include <linux/sysfs.h> | 19 | #include <linux/sysfs.h> |
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c index 9703881cb3f8..790d1cc9cdc3 100644 --- a/drivers/staging/iio/adc/max1363_core.c +++ b/drivers/staging/iio/adc/max1363_core.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/i2c.h> | 33 | #include <linux/i2c.h> |
| 34 | #include <linux/rtc.h> | 34 | #include <linux/rtc.h> |
| 35 | #include <linux/regulator/consumer.h> | 35 | #include <linux/regulator/consumer.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | 37 | ||
| 37 | #include "../iio.h" | 38 | #include "../iio.h" |
| 38 | #include "../sysfs.h" | 39 | #include "../sysfs.h" |
diff --git a/drivers/staging/iio/adc/max1363_ring.c b/drivers/staging/iio/adc/max1363_ring.c index a953eac6fd62..f94fe2d38a97 100644 --- a/drivers/staging/iio/adc/max1363_ring.c +++ b/drivers/staging/iio/adc/max1363_ring.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/gpio.h> | 12 | #include <linux/gpio.h> |
| 13 | #include <linux/workqueue.h> | 13 | #include <linux/workqueue.h> |
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 16 | #include <linux/sysfs.h> | 17 | #include <linux/sysfs.h> |
| 17 | #include <linux/list.h> | 18 | #include <linux/list.h> |
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c index b456dfc8fe27..37f58f66e491 100644 --- a/drivers/staging/iio/industrialio-core.c +++ b/drivers/staging/iio/industrialio-core.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/sched.h> | 21 | #include <linux/sched.h> |
| 22 | #include <linux/wait.h> | 22 | #include <linux/wait.h> |
| 23 | #include <linux/cdev.h> | 23 | #include <linux/cdev.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include "iio.h" | 25 | #include "iio.h" |
| 25 | #include "trigger_consumer.h" | 26 | #include "trigger_consumer.h" |
| 26 | 27 | ||
diff --git a/drivers/staging/iio/industrialio-ring.c b/drivers/staging/iio/industrialio-ring.c index ebe5cccb4034..e53e214bfeb0 100644 --- a/drivers/staging/iio/industrialio-ring.c +++ b/drivers/staging/iio/industrialio-ring.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/cdev.h> | 22 | #include <linux/cdev.h> |
| 23 | #include <linux/idr.h> | 23 | #include <linux/idr.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "iio.h" | 26 | #include "iio.h" |
| 26 | #include "ring_generic.h" | 27 | #include "ring_generic.h" |
diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c index 693ebc48597c..35ec80ba444f 100644 --- a/drivers/staging/iio/industrialio-trigger.c +++ b/drivers/staging/iio/industrialio-trigger.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 16 | #include <linux/list.h> | 16 | #include <linux/list.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | 18 | ||
| 18 | #include "iio.h" | 19 | #include "iio.h" |
| 19 | #include "trigger.h" | 20 | #include "trigger.h" |
diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c index 78b9432c8105..1ba4aa392f6e 100644 --- a/drivers/staging/iio/light/tsl2563.c +++ b/drivers/staging/iio/light/tsl2563.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/pm.h> | 34 | #include <linux/pm.h> |
| 35 | #include <linux/hwmon.h> | 35 | #include <linux/hwmon.h> |
| 36 | #include <linux/err.h> | 36 | #include <linux/err.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | 38 | ||
| 38 | #include "../iio.h" | 39 | #include "../iio.h" |
| 39 | #include "tsl2563.h" | 40 | #include "tsl2563.h" |
diff --git a/drivers/staging/iio/ring_sw.c b/drivers/staging/iio/ring_sw.c index 6f7f4d5a93f3..b104c3d9c35e 100644 --- a/drivers/staging/iio/ring_sw.c +++ b/drivers/staging/iio/ring_sw.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * the Free Software Foundation. | 7 | * the Free Software Foundation. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 12 | #include <linux/device.h> | 13 | #include <linux/device.h> |
diff --git a/drivers/staging/iio/trigger/iio-trig-gpio.c b/drivers/staging/iio/trigger/iio-trig-gpio.c index 539e4169a02e..0c3bad3187f5 100644 --- a/drivers/staging/iio/trigger/iio-trig-gpio.c +++ b/drivers/staging/iio/trigger/iio-trig-gpio.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
| 22 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
| 23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "../iio.h" | 26 | #include "../iio.h" |
| 26 | #include "../trigger.h" | 27 | #include "../trigger.h" |
diff --git a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c index e310dc009855..4295bbc7b50d 100644 --- a/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c +++ b/drivers/staging/iio/trigger/iio-trig-periodic-rtc.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/rtc.h> | 18 | #include <linux/rtc.h> |
| 18 | #include "../iio.h" | 19 | #include "../iio.h" |
| 19 | #include "../trigger.h" | 20 | #include "../trigger.h" |
diff --git a/drivers/staging/line6/capture.c b/drivers/staging/line6/capture.c index fd4890de8dbc..ca092247f363 100644 --- a/drivers/staging/line6/capture.c +++ b/drivers/staging/line6/capture.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include <sound/core.h> | 16 | #include <sound/core.h> |
| 15 | #include <sound/pcm.h> | 17 | #include <sound/pcm.h> |
| 16 | #include <sound/pcm_params.h> | 18 | #include <sound/pcm_params.h> |
diff --git a/drivers/staging/line6/driver.c b/drivers/staging/line6/driver.c index 0392a4bc8cc8..258555417bc7 100644 --- a/drivers/staging/line6/driver.c +++ b/drivers/staging/line6/driver.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | 13 | ||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/usb.h> | 17 | #include <linux/usb.h> |
| 17 | 18 | ||
| 18 | #include "audio.h" | 19 | #include "audio.h" |
diff --git a/drivers/staging/line6/dumprequest.c b/drivers/staging/line6/dumprequest.c index decbaa971b68..bb8c9da5803f 100644 --- a/drivers/staging/line6/dumprequest.c +++ b/drivers/staging/line6/dumprequest.c | |||
| @@ -10,6 +10,9 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | |||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 13 | #include "dumprequest.h" | 16 | #include "dumprequest.h" |
| 14 | 17 | ||
| 15 | 18 | ||
diff --git a/drivers/staging/line6/midi.c b/drivers/staging/line6/midi.c index 6ef4455d87d8..32b6ca75cadb 100644 --- a/drivers/staging/line6/midi.c +++ b/drivers/staging/line6/midi.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/usb.h> | 14 | #include <linux/usb.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include <sound/core.h> | 17 | #include <sound/core.h> |
| 17 | #include <sound/rawmidi.h> | 18 | #include <sound/rawmidi.h> |
diff --git a/drivers/staging/line6/pcm.c b/drivers/staging/line6/pcm.c index dd98121eb80b..fbe4b083eac5 100644 --- a/drivers/staging/line6/pcm.c +++ b/drivers/staging/line6/pcm.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include <sound/core.h> | 16 | #include <sound/core.h> |
| 15 | #include <sound/control.h> | 17 | #include <sound/control.h> |
| 16 | #include <sound/pcm.h> | 18 | #include <sound/pcm.h> |
diff --git a/drivers/staging/line6/playback.c b/drivers/staging/line6/playback.c index 3431f5cd2852..fbcd6e150aaf 100644 --- a/drivers/staging/line6/playback.c +++ b/drivers/staging/line6/playback.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include <sound/core.h> | 16 | #include <sound/core.h> |
| 15 | #include <sound/pcm.h> | 17 | #include <sound/pcm.h> |
| 16 | #include <sound/pcm_params.h> | 18 | #include <sound/pcm_params.h> |
diff --git a/drivers/staging/line6/pod.c b/drivers/staging/line6/pod.c index 685c529950eb..4983f2b51cf2 100644 --- a/drivers/staging/line6/pod.c +++ b/drivers/staging/line6/pod.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include "audio.h" | 16 | #include "audio.h" |
| 15 | #include "capture.h" | 17 | #include "capture.h" |
| 16 | #include "control.h" | 18 | #include "control.h" |
diff --git a/drivers/staging/line6/variax.c b/drivers/staging/line6/variax.c index 58fef82c247d..28eb89983f36 100644 --- a/drivers/staging/line6/variax.c +++ b/drivers/staging/line6/variax.c | |||
| @@ -11,6 +11,8 @@ | |||
| 11 | 11 | ||
| 12 | #include "driver.h" | 12 | #include "driver.h" |
| 13 | 13 | ||
| 14 | #include <linux/slab.h> | ||
| 15 | |||
| 14 | #include "audio.h" | 16 | #include "audio.h" |
| 15 | #include "control.h" | 17 | #include "control.h" |
| 16 | #include "variax.h" | 18 | #include "variax.h" |
diff --git a/drivers/staging/netwave/netwave_cs.c b/drivers/staging/netwave/netwave_cs.c index e936717d1f4b..3875a722d12b 100644 --- a/drivers/staging/netwave/netwave_cs.c +++ b/drivers/staging/netwave/netwave_cs.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/ptrace.h> | 46 | #include <linux/ptrace.h> |
| 47 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 48 | #include <linux/in.h> | 48 | #include <linux/in.h> |
| 49 | #include <linux/slab.h> | ||
| 50 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 51 | #include <linux/timer.h> | 50 | #include <linux/timer.h> |
| 52 | #include <linux/errno.h> | 51 | #include <linux/errno.h> |
diff --git a/drivers/staging/octeon/ethernet-mem.c b/drivers/staging/octeon/ethernet-mem.c index 00cc91df6b46..635bb86cdcff 100644 --- a/drivers/staging/octeon/ethernet-mem.c +++ b/drivers/staging/octeon/ethernet-mem.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | **********************************************************************/ | 26 | **********************************************************************/ |
| 27 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 28 | #include <linux/netdevice.h> | 28 | #include <linux/netdevice.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/octeon/octeon.h> | 31 | #include <asm/octeon/octeon.h> |
| 31 | 32 | ||
diff --git a/drivers/staging/octeon/ethernet.c b/drivers/staging/octeon/ethernet.c index 4a2161f70c7f..e50a17d80707 100644 --- a/drivers/staging/octeon/ethernet.c +++ b/drivers/staging/octeon/ethernet.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/netdevice.h> | 30 | #include <linux/netdevice.h> |
| 31 | #include <linux/etherdevice.h> | 31 | #include <linux/etherdevice.h> |
| 32 | #include <linux/phy.h> | 32 | #include <linux/phy.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <net/dst.h> | 35 | #include <net/dst.h> |
| 35 | 36 | ||
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c index 8c47b1a68627..84be4b2cd692 100644 --- a/drivers/staging/otus/ioctl.c +++ b/drivers/staging/otus/ioctl.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | /* Platform dependent. */ | 23 | /* Platform dependent. */ |
| 24 | /* */ | 24 | /* */ |
| 25 | /************************************************************************/ | 25 | /************************************************************************/ |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 27 | #include <linux/if_arp.h> | 28 | #include <linux/if_arp.h> |
| 28 | #include <linux/uaccess.h> | 29 | #include <linux/uaccess.h> |
diff --git a/drivers/staging/otus/usbdrv.c b/drivers/staging/otus/usbdrv.c index 5e6a12037b12..0ce65b5b9456 100644 --- a/drivers/staging/otus/usbdrv.c +++ b/drivers/staging/otus/usbdrv.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | #include "linux/netlink.h" | 39 | #include "linux/netlink.h" |
| 40 | #include "linux/rtnetlink.h" | 40 | #include "linux/rtnetlink.h" |
| 41 | #include "linux/slab.h" | ||
| 41 | 42 | ||
| 42 | #include <net/iw_handler.h> | 43 | #include <net/iw_handler.h> |
| 43 | 44 | ||
diff --git a/drivers/staging/otus/usbdrv.h b/drivers/staging/otus/usbdrv.h index 330d1b95cb88..7e66c2d72a69 100644 --- a/drivers/staging/otus/usbdrv.h +++ b/drivers/staging/otus/usbdrv.h | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/uaccess.h> | 38 | #include <linux/uaccess.h> |
| 39 | #include <linux/wireless.h> | 39 | #include <linux/wireless.h> |
| 40 | #include <linux/if_arp.h> | 40 | #include <linux/if_arp.h> |
| 41 | #include <linux/slab.h> | ||
| 41 | #include <linux/io.h> | 42 | #include <linux/io.h> |
| 42 | 43 | ||
| 43 | #include "zdcompat.h" | 44 | #include "zdcompat.h" |
diff --git a/drivers/staging/otus/wrap_mem.c b/drivers/staging/otus/wrap_mem.c index 47cbce1346a9..b0037568e870 100644 --- a/drivers/staging/otus/wrap_mem.c +++ b/drivers/staging/otus/wrap_mem.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include "usbdrv.h" | 27 | #include "usbdrv.h" |
| 28 | 28 | ||
| 29 | #include <linux/netlink.h> | 29 | #include <linux/netlink.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <net/iw_handler.h> | 31 | #include <net/iw_handler.h> |
| 31 | 32 | ||
| 32 | /* Memory management */ | 33 | /* Memory management */ |
diff --git a/drivers/staging/otus/wrap_pkt.c b/drivers/staging/otus/wrap_pkt.c index a2f5cb1f5298..5ecf38e355a8 100644 --- a/drivers/staging/otus/wrap_pkt.c +++ b/drivers/staging/otus/wrap_pkt.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include "usbdrv.h" | 28 | #include "usbdrv.h" |
| 29 | 29 | ||
| 30 | #include <linux/netlink.h> | 30 | #include <linux/netlink.h> |
| 31 | #include <linux/gfp.h> | ||
| 31 | #include <net/iw_handler.h> | 32 | #include <net/iw_handler.h> |
| 32 | 33 | ||
| 33 | 34 | ||
diff --git a/drivers/staging/otus/wrap_usb.c b/drivers/staging/otus/wrap_usb.c index 6b336ede8867..93459cadc472 100644 --- a/drivers/staging/otus/wrap_usb.c +++ b/drivers/staging/otus/wrap_usb.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include "usbdrv.h" | 28 | #include "usbdrv.h" |
| 29 | 29 | ||
| 30 | #include <linux/netlink.h> | 30 | #include <linux/netlink.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <net/iw_handler.h> | 32 | #include <net/iw_handler.h> |
| 32 | 33 | ||
| 33 | extern void zfLnxInitUsbTxQ(zdev_t *dev); | 34 | extern void zfLnxInitUsbTxQ(zdev_t *dev); |
diff --git a/drivers/staging/otus/wwrap.c b/drivers/staging/otus/wwrap.c index 53d2a45d55f9..a74f7eea56e4 100644 --- a/drivers/staging/otus/wwrap.c +++ b/drivers/staging/otus/wwrap.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include "usbdrv.h" | 26 | #include "usbdrv.h" |
| 27 | 27 | ||
| 28 | #include <linux/netlink.h> | 28 | #include <linux/netlink.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <net/iw_handler.h> | 30 | #include <net/iw_handler.h> |
| 30 | 31 | ||
| 31 | extern void zfiRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo); | 32 | extern void zfiRecv80211(zdev_t* dev, zbuf_t* buf, struct zsAdditionInfo* addInfo); |
diff --git a/drivers/staging/otus/zdusb.c b/drivers/staging/otus/zdusb.c index 4cd9b7f5a887..bb89d85a4c7c 100644 --- a/drivers/staging/otus/zdusb.c +++ b/drivers/staging/otus/zdusb.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <linux/usb.h> | 33 | #include <linux/usb.h> |
| 33 | 34 | ||
| 34 | #include "usbdrv.h" | 35 | #include "usbdrv.h" |
diff --git a/drivers/staging/poch/poch.c b/drivers/staging/poch/poch.c index 9095158fb1b3..f940a34c1a0c 100644 --- a/drivers/staging/poch/poch.c +++ b/drivers/staging/poch/poch.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/ioctl.h> | 21 | #include <linux/ioctl.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "poch.h" | 26 | #include "poch.h" |
| 26 | 27 | ||
diff --git a/drivers/staging/pohmelfs/config.c b/drivers/staging/pohmelfs/config.c index 5d04bf5b021a..eed0e5545a55 100644 --- a/drivers/staging/pohmelfs/config.c +++ b/drivers/staging/pohmelfs/config.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/in.h> | 22 | #include <linux/in.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include "netfs.h" | 25 | #include "netfs.h" |
| 25 | 26 | ||
diff --git a/drivers/staging/pohmelfs/dir.c b/drivers/staging/pohmelfs/dir.c index aacd25bfb0cb..79819f07bfb9 100644 --- a/drivers/staging/pohmelfs/dir.c +++ b/drivers/staging/pohmelfs/dir.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 18 | #include <linux/jhash.h> | 18 | #include <linux/jhash.h> |
| 19 | #include <linux/namei.h> | 19 | #include <linux/namei.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/pagemap.h> | 21 | #include <linux/pagemap.h> |
| 21 | 22 | ||
| 22 | #include "netfs.h" | 23 | #include "netfs.h" |
diff --git a/drivers/staging/pohmelfs/lock.c b/drivers/staging/pohmelfs/lock.c index 22fef18cae90..6710114cd425 100644 --- a/drivers/staging/pohmelfs/lock.c +++ b/drivers/staging/pohmelfs/lock.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/backing-dev.h> | 17 | #include <linux/backing-dev.h> |
| 18 | #include <linux/fs.h> | 18 | #include <linux/fs.h> |
| 19 | #include <linux/fsnotify.h> | 19 | #include <linux/fsnotify.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/mempool.h> | 20 | #include <linux/mempool.h> |
| 22 | 21 | ||
| 23 | #include "netfs.h" | 22 | #include "netfs.h" |
diff --git a/drivers/staging/pohmelfs/net.c b/drivers/staging/pohmelfs/net.c index af7f262e68c2..4a86f0b1ea88 100644 --- a/drivers/staging/pohmelfs/net.c +++ b/drivers/staging/pohmelfs/net.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/kthread.h> | 20 | #include <linux/kthread.h> |
| 21 | #include <linux/pagemap.h> | 21 | #include <linux/pagemap.h> |
| 22 | #include <linux/poll.h> | 22 | #include <linux/poll.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/swap.h> | 24 | #include <linux/swap.h> |
| 24 | #include <linux/syscalls.h> | 25 | #include <linux/syscalls.h> |
| 25 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
diff --git a/drivers/staging/pohmelfs/path_entry.c b/drivers/staging/pohmelfs/path_entry.c index 3bad888ced13..cdc4dd50d638 100644 --- a/drivers/staging/pohmelfs/path_entry.c +++ b/drivers/staging/pohmelfs/path_entry.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | 15 | ||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/fs.h> | 17 | #include <linux/fs.h> |
| 19 | #include <linux/ktime.h> | 18 | #include <linux/ktime.h> |
| 20 | #include <linux/fs_struct.h> | 19 | #include <linux/fs_struct.h> |
diff --git a/drivers/staging/ramzswap/ramzswap_drv.c b/drivers/staging/ramzswap/ramzswap_drv.c index 5e422e254ee8..ee5eb12b9285 100644 --- a/drivers/staging/ramzswap/ramzswap_drv.c +++ b/drivers/staging/ramzswap/ramzswap_drv.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/device.h> | 23 | #include <linux/device.h> |
| 24 | #include <linux/genhd.h> | 24 | #include <linux/genhd.h> |
| 25 | #include <linux/highmem.h> | 25 | #include <linux/highmem.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/lzo.h> | 27 | #include <linux/lzo.h> |
| 27 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 28 | #include <linux/swap.h> | 29 | #include <linux/swap.h> |
diff --git a/drivers/staging/rt2860/pci_main_dev.c b/drivers/staging/rt2860/pci_main_dev.c index 6af430419070..e665d862281c 100644 --- a/drivers/staging/rt2860/pci_main_dev.c +++ b/drivers/staging/rt2860/pci_main_dev.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | 37 | ||
| 38 | #include "rt_config.h" | 38 | #include "rt_config.h" |
| 39 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | /* Following information will be show when you run 'modinfo' */ | 42 | /* Following information will be show when you run 'modinfo' */ |
| 42 | /* *** If you have a solution for the bug in current version of driver, please mail to me. */ | 43 | /* *** If you have a solution for the bug in current version of driver, please mail to me. */ |
diff --git a/drivers/staging/rt2860/rt_linux.c b/drivers/staging/rt2860/rt_linux.c index b5c78aecf5e3..fd9a2072139b 100644 --- a/drivers/staging/rt2860/rt_linux.c +++ b/drivers/staging/rt2860/rt_linux.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | 27 | ||
| 28 | #include <linux/firmware.h> | 28 | #include <linux/firmware.h> |
| 29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include "rt_config.h" | 31 | #include "rt_config.h" |
| 31 | 32 | ||
| 32 | unsigned long RTDebugLevel = RT_DEBUG_ERROR; | 33 | unsigned long RTDebugLevel = RT_DEBUG_ERROR; |
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c index c2f472ee6eb6..be2d17f60c35 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/version.h> | 22 | #include <linux/version.h> |
| 22 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 23 | 24 | ||
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c index bd5e77bf7162..c5b80f9c32c0 100644 --- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | ******************************************************************************/ | 31 | ******************************************************************************/ |
| 32 | #include <linux/wireless.h> | 32 | #include <linux/wireless.h> |
| 33 | #include <linux/kmod.h> | 33 | #include <linux/kmod.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 35 | 36 | ||
| 36 | #include "ieee80211.h" | 37 | #include "ieee80211.h" |
diff --git a/drivers/staging/rtl8187se/r8180_core.c b/drivers/staging/rtl8187se/r8180_core.c index b1757acabedc..55d12e3271de 100644 --- a/drivers/staging/rtl8187se/r8180_core.c +++ b/drivers/staging/rtl8187se/r8180_core.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #undef RX_DONT_PASS_UL | 30 | #undef RX_DONT_PASS_UL |
| 31 | #undef DUMMY_RX | 31 | #undef DUMMY_RX |
| 32 | 32 | ||
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/syscalls.h> | 34 | #include <linux/syscalls.h> |
| 34 | #include <linux/eeprom_93cx6.h> | 35 | #include <linux/eeprom_93cx6.h> |
| 35 | 36 | ||
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index ea96c4956930..d1d7b0866755 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/version.h> | 22 | #include <linux/version.h> |
| 22 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 23 | #ifdef ENABLE_DOT11D | 24 | #ifdef ENABLE_DOT11D |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index a3302d5e01ab..de57967b9681 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/wireless.h> | 32 | #include <linux/wireless.h> |
| 33 | #include <linux/version.h> | 33 | #include <linux/version.h> |
| 34 | #include <linux/kmod.h> | 34 | #include <linux/kmod.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 36 | 37 | ||
| 37 | #include "ieee80211.h" | 38 | #include "ieee80211.h" |
diff --git a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c index e2cbfd3aa00f..e8699616fad4 100644 --- a/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/ieee80211/rtl819x_TSProc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include "ieee80211.h" | 1 | #include "ieee80211.h" |
| 2 | #include <linux/etherdevice.h> | 2 | #include <linux/etherdevice.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include "rtl819x_TS.h" | 4 | #include "rtl819x_TS.h" |
| 4 | 5 | ||
| 5 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) | 6 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) |
diff --git a/drivers/staging/rtl8192e/r8192E_core.c b/drivers/staging/rtl8192e/r8192E_core.c index 886105db8b7c..bb7e1ef28d3b 100644 --- a/drivers/staging/rtl8192e/r8192E_core.c +++ b/drivers/staging/rtl8192e/r8192E_core.c | |||
| @@ -47,6 +47,7 @@ | |||
| 47 | 47 | ||
| 48 | //#define CONFIG_RTL8192_IO_MAP | 48 | //#define CONFIG_RTL8192_IO_MAP |
| 49 | #include <linux/vmalloc.h> | 49 | #include <linux/vmalloc.h> |
| 50 | #include <linux/slab.h> | ||
| 50 | #include <asm/uaccess.h> | 51 | #include <asm/uaccess.h> |
| 51 | #include "r8192E_hw.h" | 52 | #include "r8192E_hw.h" |
| 52 | #include "r8192E.h" | 53 | #include "r8192E.h" |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c index 9d8cb0e575d3..84a4e23b60b3 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_softmac.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/version.h> | 22 | #include <linux/version.h> |
| 22 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 23 | #include "dot11d.h" | 24 | #include "dot11d.h" |
diff --git a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c index 122f8004904b..727cc552c5ee 100644 --- a/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192su/ieee80211/ieee80211_wx.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | ******************************************************************************/ | 31 | ******************************************************************************/ |
| 32 | #include <linux/wireless.h> | 32 | #include <linux/wireless.h> |
| 33 | #include <linux/kmod.h> | 33 | #include <linux/kmod.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 35 | 36 | ||
| 36 | #include "ieee80211.h" | 37 | #include "ieee80211.h" |
diff --git a/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c index 60cf1f8781ce..38468c539675 100644 --- a/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192su/ieee80211/rtl819x_TSProc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include "ieee80211.h" | 1 | #include "ieee80211.h" |
| 2 | #include <linux/etherdevice.h> | 2 | #include <linux/etherdevice.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include "rtl819x_TS.h" | 4 | #include "rtl819x_TS.h" |
| 4 | 5 | ||
| 5 | void TsSetupTimeOut(unsigned long data) | 6 | void TsSetupTimeOut(unsigned long data) |
diff --git a/drivers/staging/rtl8192su/r8192U_core.c b/drivers/staging/rtl8192su/r8192U_core.c index 7d0305cc2106..e16256fe595a 100644 --- a/drivers/staging/rtl8192su/r8192U_core.c +++ b/drivers/staging/rtl8192su/r8192U_core.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #undef LOOP_TEST | 30 | #undef LOOP_TEST |
| 30 | #undef DUMP_RX | 31 | #undef DUMP_RX |
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c index 27d925712cdd..d54e3a77423f 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_softmac.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | 18 | ||
| 19 | #include <linux/random.h> | 19 | #include <linux/random.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/version.h> | 22 | #include <linux/version.h> |
| 22 | #include <asm/uaccess.h> | 23 | #include <asm/uaccess.h> |
| 23 | #ifdef ENABLE_DOT11D | 24 | #ifdef ENABLE_DOT11D |
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c index c0b2c02b0ac4..750e94e17114 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/wireless.h> | 32 | #include <linux/wireless.h> |
| 33 | #include <linux/version.h> | 33 | #include <linux/version.h> |
| 34 | #include <linux/kmod.h> | 34 | #include <linux/kmod.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/module.h> | 36 | #include <linux/module.h> |
| 36 | 37 | ||
| 37 | #include "ieee80211.h" | 38 | #include "ieee80211.h" |
diff --git a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c index d1275e887f0c..451120ff2130 100644 --- a/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192u/ieee80211/rtl819x_TSProc.c | |||
| @@ -1,5 +1,6 @@ | |||
| 1 | #include "ieee80211.h" | 1 | #include "ieee80211.h" |
| 2 | #include <linux/etherdevice.h> | 2 | #include <linux/etherdevice.h> |
| 3 | #include <linux/slab.h> | ||
| 3 | #include "rtl819x_TS.h" | 4 | #include "rtl819x_TS.h" |
| 4 | 5 | ||
| 5 | void TsSetupTimeOut(unsigned long data) | 6 | void TsSetupTimeOut(unsigned long data) |
diff --git a/drivers/staging/rtl8192u/r8192U_core.c b/drivers/staging/rtl8192u/r8192U_core.c index f1e085ba1cf1..68ebb0256771 100644 --- a/drivers/staging/rtl8192u/r8192U_core.c +++ b/drivers/staging/rtl8192u/r8192U_core.c | |||
| @@ -70,6 +70,7 @@ double __extendsfdf2(float a) {return a;} | |||
| 70 | #include "r8192U_dm.h" | 70 | #include "r8192U_dm.h" |
| 71 | //#include "r8192xU_phyreg.h" | 71 | //#include "r8192xU_phyreg.h" |
| 72 | #include <linux/usb.h> | 72 | #include <linux/usb.h> |
| 73 | #include <linux/slab.h> | ||
| 73 | // FIXME: check if 2.6.7 is ok | 74 | // FIXME: check if 2.6.7 is ok |
| 74 | 75 | ||
| 75 | #ifdef CONFIG_RTL8192_PM | 76 | #ifdef CONFIG_RTL8192_PM |
diff --git a/drivers/staging/sep/sep_driver.c b/drivers/staging/sep/sep_driver.c index 265de7949a78..88880734921a 100644 --- a/drivers/staging/sep/sep_driver.c +++ b/drivers/staging/sep/sep_driver.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/sched.h> | 42 | #include <linux/sched.h> |
| 43 | #include <linux/pci.h> | 43 | #include <linux/pci.h> |
| 44 | #include <linux/firmware.h> | 44 | #include <linux/firmware.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <asm/ioctl.h> | 46 | #include <asm/ioctl.h> |
| 46 | #include <linux/ioport.h> | 47 | #include <linux/ioport.h> |
| 47 | #include <asm/io.h> | 48 | #include <asm/io.h> |
diff --git a/drivers/staging/sm7xx/smtcfb.c b/drivers/staging/sm7xx/smtcfb.c index 9c82a1a81ccc..8d7261c052eb 100644 --- a/drivers/staging/sm7xx/smtcfb.c +++ b/drivers/staging/sm7xx/smtcfb.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/fb.h> | 34 | #include <linux/fb.h> |
| 35 | #include <linux/pci.h> | 35 | #include <linux/pci.h> |
| 36 | #include <linux/init.h> | 36 | #include <linux/init.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/uaccess.h> | 38 | #include <linux/uaccess.h> |
| 38 | #include <linux/console.h> | 39 | #include <linux/console.h> |
| 39 | #include <linux/screen_info.h> | 40 | #include <linux/screen_info.h> |
diff --git a/drivers/staging/strip/strip.c b/drivers/staging/strip/strip.c index 698aade79d40..c976c6b4d28a 100644 --- a/drivers/staging/strip/strip.c +++ b/drivers/staging/strip/strip.c | |||
| @@ -107,6 +107,7 @@ static const char StripVersion[] = "1.3A-STUART.CHESHIRE"; | |||
| 107 | #include <linux/serialP.h> | 107 | #include <linux/serialP.h> |
| 108 | #include <linux/rcupdate.h> | 108 | #include <linux/rcupdate.h> |
| 109 | #include <linux/compat.h> | 109 | #include <linux/compat.h> |
| 110 | #include <linux/slab.h> | ||
| 110 | #include <net/arp.h> | 111 | #include <net/arp.h> |
| 111 | #include <net/net_namespace.h> | 112 | #include <net/net_namespace.h> |
| 112 | 113 | ||
diff --git a/drivers/staging/udlfb/udlfb.c b/drivers/staging/udlfb/udlfb.c index 8f6223c8303a..a78ade0dc687 100644 --- a/drivers/staging/udlfb/udlfb.c +++ b/drivers/staging/udlfb/udlfb.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
| 26 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "udlfb.h" | 29 | #include "udlfb.h" |
| 29 | 30 | ||
diff --git a/drivers/staging/usbip/stub_dev.c b/drivers/staging/usbip/stub_dev.c index 173b018c56d8..3f95605427a7 100644 --- a/drivers/staging/usbip/stub_dev.c +++ b/drivers/staging/usbip/stub_dev.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 21 | |||
| 20 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 21 | #include "stub.h" | 23 | #include "stub.h" |
| 22 | 24 | ||
diff --git a/drivers/staging/usbip/stub_main.c b/drivers/staging/usbip/stub_main.c index ba1678fa6311..6665cefe573b 100644 --- a/drivers/staging/usbip/stub_main.c +++ b/drivers/staging/usbip/stub_main.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 22 | #include "stub.h" | 23 | #include "stub.h" |
diff --git a/drivers/staging/usbip/stub_rx.c b/drivers/staging/usbip/stub_rx.c index 815fb7cc3b23..bc2674086673 100644 --- a/drivers/staging/usbip/stub_rx.c +++ b/drivers/staging/usbip/stub_rx.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 21 | |||
| 20 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 21 | #include "stub.h" | 23 | #include "stub.h" |
| 22 | #include "../../usb/core/hcd.h" | 24 | #include "../../usb/core/hcd.h" |
diff --git a/drivers/staging/usbip/stub_tx.c b/drivers/staging/usbip/stub_tx.c index e2ab4f3fdac2..d7136e2c86fa 100644 --- a/drivers/staging/usbip/stub_tx.c +++ b/drivers/staging/usbip/stub_tx.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 21 | |||
| 20 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 21 | #include "stub.h" | 23 | #include "stub.h" |
| 22 | 24 | ||
diff --git a/drivers/staging/usbip/usbip_common.c b/drivers/staging/usbip/usbip_common.c index 7a45da8f9565..e3fa4216c1cd 100644 --- a/drivers/staging/usbip/usbip_common.c +++ b/drivers/staging/usbip/usbip_common.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/tcp.h> | 23 | #include <linux/tcp.h> |
| 24 | #include <linux/in.h> | 24 | #include <linux/in.h> |
| 25 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include "usbip_common.h" | 27 | #include "usbip_common.h" |
| 27 | 28 | ||
| 28 | /* version information */ | 29 | /* version information */ |
diff --git a/drivers/staging/usbip/vhci_hcd.c b/drivers/staging/usbip/vhci_hcd.c index ef4371358dbe..0b1766122d38 100644 --- a/drivers/staging/usbip/vhci_hcd.c +++ b/drivers/staging/usbip/vhci_hcd.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 22 | #include "vhci.h" | 23 | #include "vhci.h" |
diff --git a/drivers/staging/usbip/vhci_rx.c b/drivers/staging/usbip/vhci_rx.c index 7636d86c2388..8147d7202b2d 100644 --- a/drivers/staging/usbip/vhci_rx.c +++ b/drivers/staging/usbip/vhci_rx.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 21 | |||
| 20 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 21 | #include "vhci.h" | 23 | #include "vhci.h" |
| 22 | 24 | ||
diff --git a/drivers/staging/usbip/vhci_tx.c b/drivers/staging/usbip/vhci_tx.c index 7a00eb44b795..b71b4c2fbd86 100644 --- a/drivers/staging/usbip/vhci_tx.c +++ b/drivers/staging/usbip/vhci_tx.c | |||
| @@ -17,6 +17,8 @@ | |||
| 17 | * USA. | 17 | * USA. |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/slab.h> | ||
| 21 | |||
| 20 | #include "usbip_common.h" | 22 | #include "usbip_common.h" |
| 21 | #include "vhci.h" | 23 | #include "vhci.h" |
| 22 | 24 | ||
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c index 2795ff2411e0..b159ea58adf7 100644 --- a/drivers/staging/vme/bridges/vme_ca91cx42.c +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <asm/time.h> | 29 | #include <asm/time.h> |
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
diff --git a/drivers/staging/vme/bridges/vme_tsi148.c b/drivers/staging/vme/bridges/vme_tsi148.c index faf652edb70f..68f24425977f 100644 --- a/drivers/staging/vme/bridges/vme_tsi148.c +++ b/drivers/staging/vme/bridges/vme_tsi148.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| 26 | #include <linux/spinlock.h> | 26 | #include <linux/spinlock.h> |
| 27 | #include <linux/sched.h> | 27 | #include <linux/sched.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <asm/time.h> | 29 | #include <asm/time.h> |
| 29 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 30 | #include <asm/uaccess.h> | 31 | #include <asm/uaccess.h> |
diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c index c60c80fb241d..1ab9a985dfb9 100644 --- a/drivers/staging/vme/devices/vme_user.c +++ b/drivers/staging/vme/devices/vme_user.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/pagemap.h> | 28 | #include <linux/pagemap.h> |
| 29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
| 30 | #include <linux/semaphore.h> | 30 | #include <linux/semaphore.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/spinlock.h> | 32 | #include <linux/spinlock.h> |
| 32 | #include <linux/syscalls.h> | 33 | #include <linux/syscalls.h> |
| 33 | #include <linux/types.h> | 34 | #include <linux/types.h> |
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c index d6d84ebeeec0..934283a19ca5 100644 --- a/drivers/staging/vme/vme.c +++ b/drivers/staging/vme/vme.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/syscalls.h> | 29 | #include <linux/syscalls.h> |
| 30 | #include <linux/mutex.h> | 30 | #include <linux/mutex.h> |
| 31 | #include <linux/spinlock.h> | 31 | #include <linux/spinlock.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include "vme.h" | 34 | #include "vme.h" |
| 34 | #include "vme_bridge.h" | 35 | #include "vme_bridge.h" |
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 1d643653a7ed..e40a2e990f4f 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c | |||
| @@ -84,6 +84,7 @@ | |||
| 84 | #include "iowpa.h" | 84 | #include "iowpa.h" |
| 85 | #include <linux/delay.h> | 85 | #include <linux/delay.h> |
| 86 | #include <linux/kthread.h> | 86 | #include <linux/kthread.h> |
| 87 | #include <linux/slab.h> | ||
| 87 | 88 | ||
| 88 | //#define DEBUG | 89 | //#define DEBUG |
| 89 | /*--------------------- Static Definitions -------------------------*/ | 90 | /*--------------------- Static Definitions -------------------------*/ |
diff --git a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c index f5608ad9ed00..1b93547ff5bc 100644 --- a/drivers/staging/winbond/wb35reg.c +++ b/drivers/staging/winbond/wb35reg.c | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | #include "wb35reg_f.h" | 2 | #include "wb35reg_f.h" |
| 3 | 3 | ||
| 4 | #include <linux/usb.h> | 4 | #include <linux/usb.h> |
| 5 | #include <linux/slab.h> | ||
| 5 | 6 | ||
| 6 | extern void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency); | 7 | extern void phy_calibration_winbond(struct hw_data *phw_data, u32 frequency); |
| 7 | 8 | ||
diff --git a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c index 4d41f6c3563c..d7b57e62db08 100644 --- a/drivers/staging/winbond/wb35rx.c +++ b/drivers/staging/winbond/wb35rx.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | // | 9 | // |
| 10 | //============================================================================ | 10 | //============================================================================ |
| 11 | #include <linux/usb.h> | 11 | #include <linux/usb.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | 13 | ||
| 13 | #include "core.h" | 14 | #include "core.h" |
| 14 | #include "sysdef.h" | 15 | #include "sysdef.h" |
diff --git a/drivers/staging/winbond/wb35tx.c b/drivers/staging/winbond/wb35tx.c index 5869ef473fcd..bda7a913edf8 100644 --- a/drivers/staging/winbond/wb35tx.c +++ b/drivers/staging/winbond/wb35tx.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | // | 9 | // |
| 10 | //============================================================================ | 10 | //============================================================================ |
| 11 | #include <linux/usb.h> | 11 | #include <linux/usb.h> |
| 12 | #include <linux/gfp.h> | ||
| 12 | 13 | ||
| 13 | #include "wb35tx_f.h" | 14 | #include "wb35tx_f.h" |
| 14 | #include "mds_f.h" | 15 | #include "mds_f.h" |
diff --git a/drivers/staging/wlags49_h2/wl_cs.c b/drivers/staging/wlags49_h2/wl_cs.c index 811a8daa660e..9da42e66085e 100644 --- a/drivers/staging/wlags49_h2/wl_cs.c +++ b/drivers/staging/wlags49_h2/wl_cs.c | |||
| @@ -67,7 +67,6 @@ | |||
| 67 | #include <linux/kernel.h> | 67 | #include <linux/kernel.h> |
| 68 | #include <linux/sched.h> | 68 | #include <linux/sched.h> |
| 69 | #include <linux/ptrace.h> | 69 | #include <linux/ptrace.h> |
| 70 | #include <linux/slab.h> | ||
| 71 | #include <linux/ctype.h> | 70 | #include <linux/ctype.h> |
| 72 | #include <linux/string.h> | 71 | #include <linux/string.h> |
| 73 | #include <linux/timer.h> | 72 | #include <linux/timer.h> |
diff --git a/drivers/staging/wlags49_h2/wl_netdev.c b/drivers/staging/wlags49_h2/wl_netdev.c index fa082d90fcad..1db73ebcae28 100644 --- a/drivers/staging/wlags49_h2/wl_netdev.c +++ b/drivers/staging/wlags49_h2/wl_netdev.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | #include <wl_version.h> | 65 | #include <wl_version.h> |
| 66 | 66 | ||
| 67 | #include <linux/module.h> | 67 | #include <linux/module.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include <linux/types.h> | 69 | #include <linux/types.h> |
| 69 | #include <linux/kernel.h> | 70 | #include <linux/kernel.h> |
| 70 | // #include <linux/sched.h> | 71 | // #include <linux/sched.h> |
diff --git a/drivers/staging/wlags49_h2/wl_pci.c b/drivers/staging/wlags49_h2/wl_pci.c index 01e4bec9fd5b..6751b4bad2e4 100644 --- a/drivers/staging/wlags49_h2/wl_pci.c +++ b/drivers/staging/wlags49_h2/wl_pci.c | |||
| @@ -71,7 +71,6 @@ | |||
| 71 | #include <linux/init.h> | 71 | #include <linux/init.h> |
| 72 | #include <linux/sched.h> | 72 | #include <linux/sched.h> |
| 73 | #include <linux/ptrace.h> | 73 | #include <linux/ptrace.h> |
| 74 | #include <linux/slab.h> | ||
| 75 | #include <linux/ctype.h> | 74 | #include <linux/ctype.h> |
| 76 | #include <linux/string.h> | 75 | #include <linux/string.h> |
| 77 | //#include <linux/timer.h> | 76 | //#include <linux/timer.h> |
diff --git a/drivers/staging/wlags49_h2/wl_priv.c b/drivers/staging/wlags49_h2/wl_priv.c index ee610c76457e..727ea8a483af 100644 --- a/drivers/staging/wlags49_h2/wl_priv.c +++ b/drivers/staging/wlags49_h2/wl_priv.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | #include <linux/if_arp.h> | 66 | #include <linux/if_arp.h> |
| 67 | #include <linux/ioport.h> | 67 | #include <linux/ioport.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include <linux/delay.h> | 69 | #include <linux/delay.h> |
| 69 | #include <asm/uaccess.h> | 70 | #include <asm/uaccess.h> |
| 70 | 71 | ||
diff --git a/drivers/staging/wlan-ng/p80211req.c b/drivers/staging/wlan-ng/p80211req.c index c2e95f166828..e1e7bf1bf27c 100644 --- a/drivers/staging/wlan-ng/p80211req.c +++ b/drivers/staging/wlan-ng/p80211req.c | |||
| @@ -55,7 +55,6 @@ | |||
| 55 | #include <linux/sched.h> | 55 | #include <linux/sched.h> |
| 56 | #include <linux/types.h> | 56 | #include <linux/types.h> |
| 57 | #include <linux/skbuff.h> | 57 | #include <linux/skbuff.h> |
| 58 | #include <linux/slab.h> | ||
| 59 | #include <linux/wireless.h> | 58 | #include <linux/wireless.h> |
| 60 | #include <linux/netdevice.h> | 59 | #include <linux/netdevice.h> |
| 61 | #include <linux/etherdevice.h> | 60 | #include <linux/etherdevice.h> |
diff --git a/drivers/staging/wlan-ng/p80211wep.c b/drivers/staging/wlan-ng/p80211wep.c index ecbb15b297ae..80c2d3b672bb 100644 --- a/drivers/staging/wlan-ng/p80211wep.c +++ b/drivers/staging/wlan-ng/p80211wep.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | 50 | ||
| 51 | #include <linux/netdevice.h> | 51 | #include <linux/netdevice.h> |
| 52 | #include <linux/wireless.h> | 52 | #include <linux/wireless.h> |
| 53 | #include <linux/slab.h> | ||
| 54 | #include <linux/random.h> | 53 | #include <linux/random.h> |
| 55 | #include <linux/kernel.h> | 54 | #include <linux/kernel.h> |
| 56 | 55 | ||
diff --git a/drivers/staging/wlan-ng/p80211wext.c b/drivers/staging/wlan-ng/p80211wext.c index 2fa1dfa23783..83f1d6cd7991 100644 --- a/drivers/staging/wlan-ng/p80211wext.c +++ b/drivers/staging/wlan-ng/p80211wext.c | |||
| @@ -40,7 +40,6 @@ | |||
| 40 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |
| 41 | #include <linux/sched.h> | 41 | #include <linux/sched.h> |
| 42 | #include <linux/types.h> | 42 | #include <linux/types.h> |
| 43 | #include <linux/slab.h> | ||
| 44 | #include <linux/netdevice.h> | 43 | #include <linux/netdevice.h> |
| 45 | #include <linux/etherdevice.h> | 44 | #include <linux/etherdevice.h> |
| 46 | #include <linux/wireless.h> | 45 | #include <linux/wireless.h> |
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c index 4be54cea6ad7..d383ea85c9bc 100644 --- a/drivers/staging/wlan-ng/prism2fw.c +++ b/drivers/staging/wlan-ng/prism2fw.c | |||
| @@ -48,6 +48,7 @@ | |||
| 48 | /*================================================================*/ | 48 | /*================================================================*/ |
| 49 | /* System Includes */ | 49 | /* System Includes */ |
| 50 | #include <linux/ihex.h> | 50 | #include <linux/ihex.h> |
| 51 | #include <linux/slab.h> | ||
| 51 | 52 | ||
| 52 | /*================================================================*/ | 53 | /*================================================================*/ |
| 53 | /* Local Constants */ | 54 | /* Local Constants */ |
diff --git a/drivers/staging/wlan-ng/prism2mgmt.c b/drivers/staging/wlan-ng/prism2mgmt.c index ad163da72ae4..4d1cdfc35420 100644 --- a/drivers/staging/wlan-ng/prism2mgmt.c +++ b/drivers/staging/wlan-ng/prism2mgmt.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | #include <linux/wait.h> | 63 | #include <linux/wait.h> |
| 64 | #include <linux/sched.h> | 64 | #include <linux/sched.h> |
| 65 | #include <linux/types.h> | 65 | #include <linux/types.h> |
| 66 | #include <linux/slab.h> | ||
| 67 | #include <linux/wireless.h> | 66 | #include <linux/wireless.h> |
| 68 | #include <linux/netdevice.h> | 67 | #include <linux/netdevice.h> |
| 69 | #include <linux/delay.h> | 68 | #include <linux/delay.h> |
diff --git a/drivers/staging/wlan-ng/prism2mib.c b/drivers/staging/wlan-ng/prism2mib.c index 98a5d58c3f55..0b0ec9c59a5d 100644 --- a/drivers/staging/wlan-ng/prism2mib.c +++ b/drivers/staging/wlan-ng/prism2mib.c | |||
| @@ -54,7 +54,6 @@ | |||
| 54 | #include <linux/kernel.h> | 54 | #include <linux/kernel.h> |
| 55 | #include <linux/sched.h> | 55 | #include <linux/sched.h> |
| 56 | #include <linux/types.h> | 56 | #include <linux/types.h> |
| 57 | #include <linux/slab.h> | ||
| 58 | #include <linux/wireless.h> | 57 | #include <linux/wireless.h> |
| 59 | #include <linux/netdevice.h> | 58 | #include <linux/netdevice.h> |
| 60 | #include <linux/io.h> | 59 | #include <linux/io.h> |
diff --git a/drivers/tc/tc.c b/drivers/tc/tc.c index e5bd4470a570..a8aaf6ac2ae2 100644 --- a/drivers/tc/tc.c +++ b/drivers/tc/tc.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/list.h> | 17 | #include <linux/list.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 20 | #include <linux/tc.h> | 21 | #include <linux/tc.h> |
| 21 | #include <linux/types.h> | 22 | #include <linux/types.h> |
diff --git a/drivers/thermal/thermal_sys.c b/drivers/thermal/thermal_sys.c index 5066de5cfc0c..9b6297f07b83 100644 --- a/drivers/thermal/thermal_sys.c +++ b/drivers/thermal/thermal_sys.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/kdev_t.h> | 30 | #include <linux/kdev_t.h> |
| 30 | #include <linux/idr.h> | 31 | #include <linux/idr.h> |
| 31 | #include <linux/thermal.h> | 32 | #include <linux/thermal.h> |
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index 4de382acd8f2..bff1afbde5a4 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/poll.h> | 18 | #include <linux/poll.h> |
| 19 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 21 | #include <linux/idr.h> | 22 | #include <linux/idr.h> |
| 22 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
diff --git a/drivers/uio/uio_aec.c b/drivers/uio/uio_aec.c index b7830e9a3baa..72b22d44e8b9 100644 --- a/drivers/uio/uio_aec.c +++ b/drivers/uio/uio_aec.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/io.h> | 27 | #include <linux/io.h> |
| 28 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
| 29 | #include <linux/uio_driver.h> | 29 | #include <linux/uio_driver.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #define PCI_VENDOR_ID_AEC 0xaecb | 32 | #define PCI_VENDOR_ID_AEC 0xaecb |
| 32 | #define PCI_DEVICE_ID_AEC_VITCLTC 0x6250 | 33 | #define PCI_DEVICE_ID_AEC_VITCLTC 0x6250 |
diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c index 28034c812914..371f87f8bc22 100644 --- a/drivers/uio/uio_cif.c +++ b/drivers/uio/uio_cif.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/uio_driver.h> | 15 | #include <linux/uio_driver.h> |
| 15 | 16 | ||
| 16 | #include <asm/io.h> | 17 | #include <asm/io.h> |
diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c index afbf0bd55cc9..5a18e9f7b836 100644 --- a/drivers/uio/uio_netx.c +++ b/drivers/uio/uio_netx.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/io.h> | 13 | #include <linux/io.h> |
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/uio_driver.h> | 17 | #include <linux/uio_driver.h> |
| 17 | 18 | ||
| 18 | #define PCI_VENDOR_ID_HILSCHER 0x15CF | 19 | #define PCI_VENDOR_ID_HILSCHER 0x15CF |
diff --git a/drivers/uio/uio_pci_generic.c b/drivers/uio/uio_pci_generic.c index 313da35984af..85c9884a67fd 100644 --- a/drivers/uio/uio_pci_generic.c +++ b/drivers/uio/uio_pci_generic.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/uio_driver.h> | 26 | #include <linux/uio_driver.h> |
| 26 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
| 27 | 28 | ||
diff --git a/drivers/uio/uio_pdrv.c b/drivers/uio/uio_pdrv.c index d494ce9288c3..7d3e469b9904 100644 --- a/drivers/uio/uio_pdrv.c +++ b/drivers/uio/uio_pdrv.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/platform_device.h> | 11 | #include <linux/platform_device.h> |
| 12 | #include <linux/uio_driver.h> | 12 | #include <linux/uio_driver.h> |
| 13 | #include <linux/stringify.h> | 13 | #include <linux/stringify.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #define DRIVER_NAME "uio_pdrv" | 16 | #define DRIVER_NAME "uio_pdrv" |
| 16 | 17 | ||
diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 1ef3b8fc50b3..61e569df2bba 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/stringify.h> | 22 | #include <linux/stringify.h> |
| 23 | #include <linux/pm_runtime.h> | 23 | #include <linux/pm_runtime.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #define DRIVER_NAME "uio_pdrv_genirq" | 26 | #define DRIVER_NAME "uio_pdrv_genirq" |
| 26 | 27 | ||
diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c index a6d1b2bc47f3..3d461cd73e6b 100644 --- a/drivers/uio/uio_sercos3.c +++ b/drivers/uio/uio_sercos3.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/pci.h> | 28 | #include <linux/pci.h> |
| 29 | #include <linux/uio_driver.h> | 29 | #include <linux/uio_driver.h> |
| 30 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | /* ID's for SERCOS III PCI card (PLX 9030) */ | 33 | /* ID's for SERCOS III PCI card (PLX 9030) */ |
| 33 | #define SERCOS_SUB_VENDOR_ID 0x1971 | 34 | #define SERCOS_SUB_VENDOR_ID 0x1971 |
diff --git a/drivers/usb/atm/speedtch.c b/drivers/usb/atm/speedtch.c index 3e862401a638..1e9ba4bdffef 100644 --- a/drivers/usb/atm/speedtch.c +++ b/drivers/usb/atm/speedtch.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 29 | #include <linux/firmware.h> | 29 | #include <linux/firmware.h> |
| 30 | #include <linux/gfp.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
diff --git a/drivers/usb/atm/ueagle-atm.c b/drivers/usb/atm/ueagle-atm.c index c5395246886d..25f01b536f67 100644 --- a/drivers/usb/atm/ueagle-atm.c +++ b/drivers/usb/atm/ueagle-atm.c | |||
| @@ -66,6 +66,7 @@ | |||
| 66 | #include <linux/kthread.h> | 66 | #include <linux/kthread.h> |
| 67 | #include <linux/mutex.h> | 67 | #include <linux/mutex.h> |
| 68 | #include <linux/freezer.h> | 68 | #include <linux/freezer.h> |
| 69 | #include <linux/slab.h> | ||
| 69 | 70 | ||
| 70 | #include <asm/unaligned.h> | 71 | #include <asm/unaligned.h> |
| 71 | 72 | ||
diff --git a/drivers/usb/c67x00/c67x00-drv.c b/drivers/usb/c67x00/c67x00-drv.c index 029ee4a8a1f3..b6d49234e521 100644 --- a/drivers/usb/c67x00/c67x00-drv.c +++ b/drivers/usb/c67x00/c67x00-drv.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/device.h> | 37 | #include <linux/device.h> |
| 38 | #include <linux/io.h> | 38 | #include <linux/io.h> |
| 39 | #include <linux/list.h> | 39 | #include <linux/list.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/usb.h> | 41 | #include <linux/usb.h> |
| 41 | #include <linux/usb/c67x00.h> | 42 | #include <linux/usb/c67x00.h> |
| 42 | 43 | ||
diff --git a/drivers/usb/c67x00/c67x00-sched.c b/drivers/usb/c67x00/c67x00-sched.c index 85dfe2965661..f6b3c253f3fa 100644 --- a/drivers/usb/c67x00/c67x00-sched.c +++ b/drivers/usb/c67x00/c67x00-sched.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/kthread.h> | 24 | #include <linux/kthread.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "c67x00.h" | 27 | #include "c67x00.h" |
| 27 | #include "c67x00-hcd.h" | 28 | #include "c67x00-hcd.h" |
diff --git a/drivers/usb/class/usbtmc.c b/drivers/usb/class/usbtmc.c index 8588c0937a89..3e7c1b800ebb 100644 --- a/drivers/usb/class/usbtmc.c +++ b/drivers/usb/class/usbtmc.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 26 | #include <linux/uaccess.h> | 26 | #include <linux/uaccess.h> |
| 27 | #include <linux/kref.h> | 27 | #include <linux/kref.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/mutex.h> | 29 | #include <linux/mutex.h> |
| 29 | #include <linux/usb.h> | 30 | #include <linux/usb.h> |
| 30 | #include <linux/usb/tmc.h> | 31 | #include <linux/usb/tmc.h> |
diff --git a/drivers/usb/core/devices.c b/drivers/usb/core/devices.c index d41811bfef2a..19bc03a9fecf 100644 --- a/drivers/usb/core/devices.c +++ b/drivers/usb/core/devices.c | |||
| @@ -50,7 +50,7 @@ | |||
| 50 | 50 | ||
| 51 | #include <linux/fs.h> | 51 | #include <linux/fs.h> |
| 52 | #include <linux/mm.h> | 52 | #include <linux/mm.h> |
| 53 | #include <linux/slab.h> | 53 | #include <linux/gfp.h> |
| 54 | #include <linux/poll.h> | 54 | #include <linux/poll.h> |
| 55 | #include <linux/usb.h> | 55 | #include <linux/usb.h> |
| 56 | #include <linux/smp_lock.h> | 56 | #include <linux/smp_lock.h> |
diff --git a/drivers/usb/core/driver.c b/drivers/usb/core/driver.c index f3c233806fa3..6a3b5cae3a6e 100644 --- a/drivers/usb/core/driver.c +++ b/drivers/usb/core/driver.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | 24 | ||
| 25 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | #include <linux/usb/quirks.h> | 28 | #include <linux/usb/quirks.h> |
| 28 | #include <linux/pm_runtime.h> | 29 | #include <linux/pm_runtime.h> |
diff --git a/drivers/usb/core/endpoint.c b/drivers/usb/core/endpoint.c index d26b9ea981f9..4f84a41ee7a8 100644 --- a/drivers/usb/core/endpoint.c +++ b/drivers/usb/core/endpoint.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/spinlock.h> | 13 | #include <linux/spinlock.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/idr.h> | 15 | #include <linux/idr.h> |
| 15 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 16 | #include "usb.h" | 17 | #include "usb.h" |
diff --git a/drivers/usb/core/file.c b/drivers/usb/core/file.c index c3536f151f02..f06f5dbc8cdc 100644 --- a/drivers/usb/core/file.c +++ b/drivers/usb/core/file.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/rwsem.h> | 20 | #include <linux/rwsem.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/smp_lock.h> | 22 | #include <linux/smp_lock.h> |
| 22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 23 | 24 | ||
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c index 12ac9cd32a07..df1bae9b048e 100644 --- a/drivers/usb/gadget/at91_udc.c +++ b/drivers/usb/gadget/at91_udc.c | |||
| @@ -1370,6 +1370,12 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc) | |||
| 1370 | { | 1370 | { |
| 1371 | struct at91_udc *udc = _udc; | 1371 | struct at91_udc *udc = _udc; |
| 1372 | u32 rescans = 5; | 1372 | u32 rescans = 5; |
| 1373 | int disable_clock = 0; | ||
| 1374 | |||
| 1375 | if (!udc->clocked) { | ||
| 1376 | clk_on(udc); | ||
| 1377 | disable_clock = 1; | ||
| 1378 | } | ||
| 1373 | 1379 | ||
| 1374 | while (rescans--) { | 1380 | while (rescans--) { |
| 1375 | u32 status; | 1381 | u32 status; |
| @@ -1458,6 +1464,9 @@ static irqreturn_t at91_udc_irq (int irq, void *_udc) | |||
| 1458 | } | 1464 | } |
| 1459 | } | 1465 | } |
| 1460 | 1466 | ||
| 1467 | if (disable_clock) | ||
| 1468 | clk_off(udc); | ||
| 1469 | |||
| 1461 | return IRQ_HANDLED; | 1470 | return IRQ_HANDLED; |
| 1462 | } | 1471 | } |
| 1463 | 1472 | ||
diff --git a/drivers/usb/gadget/atmel_usba_udc.c b/drivers/usb/gadget/atmel_usba_udc.c index f79bdfe4bed9..75a256f3d45b 100644 --- a/drivers/usb/gadget/atmel_usba_udc.c +++ b/drivers/usb/gadget/atmel_usba_udc.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
| 13 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
| 14 | #include <linux/io.h> | 14 | #include <linux/io.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/device.h> | 16 | #include <linux/device.h> |
| 16 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 17 | #include <linux/list.h> | 18 | #include <linux/list.h> |
diff --git a/drivers/usb/gadget/ci13xxx_udc.c b/drivers/usb/gadget/ci13xxx_udc.c index c7cb87a6fee2..699695128e33 100644 --- a/drivers/usb/gadget/ci13xxx_udc.c +++ b/drivers/usb/gadget/ci13xxx_udc.c | |||
| @@ -62,6 +62,7 @@ | |||
| 62 | #include <linux/kernel.h> | 62 | #include <linux/kernel.h> |
| 63 | #include <linux/module.h> | 63 | #include <linux/module.h> |
| 64 | #include <linux/pci.h> | 64 | #include <linux/pci.h> |
| 65 | #include <linux/slab.h> | ||
| 65 | #include <linux/usb/ch9.h> | 66 | #include <linux/usb/ch9.h> |
| 66 | #include <linux/usb/gadget.h> | 67 | #include <linux/usb/gadget.h> |
| 67 | 68 | ||
diff --git a/drivers/usb/gadget/config.c b/drivers/usb/gadget/config.c index e1191b9a316a..47e8e722682c 100644 --- a/drivers/usb/gadget/config.c +++ b/drivers/usb/gadget/config.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 23 | #include <linux/list.h> | 24 | #include <linux/list.h> |
| 24 | #include <linux/string.h> | 25 | #include <linux/string.h> |
diff --git a/drivers/usb/gadget/f_acm.c b/drivers/usb/gadget/f_acm.c index e49c7325dce2..400e1ebe6976 100644 --- a/drivers/usb/gadget/f_acm.c +++ b/drivers/usb/gadget/f_acm.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | /* #define VERBOSE_DEBUG */ | 15 | /* #define VERBOSE_DEBUG */ |
| 16 | 16 | ||
| 17 | #include <linux/slab.h> | ||
| 17 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 18 | #include <linux/device.h> | 19 | #include <linux/device.h> |
| 19 | 20 | ||
diff --git a/drivers/usb/gadget/f_audio.c b/drivers/usb/gadget/f_audio.c index f1e3aad76c37..43bf44514c41 100644 --- a/drivers/usb/gadget/f_audio.c +++ b/drivers/usb/gadget/f_audio.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * Licensed under the GPL-2 or later. | 9 | * Licensed under the GPL-2 or later. |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 13 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 14 | #include <asm/atomic.h> | 15 | #include <asm/atomic.h> |
diff --git a/drivers/usb/gadget/f_ecm.c b/drivers/usb/gadget/f_ecm.c index 2fff530efc19..4e595324c614 100644 --- a/drivers/usb/gadget/f_ecm.c +++ b/drivers/usb/gadget/f_ecm.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | /* #define VERBOSE_DEBUG */ | 22 | /* #define VERBOSE_DEBUG */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 26 | #include <linux/etherdevice.h> | 27 | #include <linux/etherdevice.h> |
diff --git a/drivers/usb/gadget/f_eem.c b/drivers/usb/gadget/f_eem.c index d4f0db58a8ad..38226e9a371d 100644 --- a/drivers/usb/gadget/f_eem.c +++ b/drivers/usb/gadget/f_eem.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 25 | #include <linux/etherdevice.h> | 25 | #include <linux/etherdevice.h> |
| 26 | #include <linux/crc32.h> | 26 | #include <linux/crc32.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "u_ether.h" | 29 | #include "u_ether.h" |
| 29 | 30 | ||
diff --git a/drivers/usb/gadget/f_loopback.c b/drivers/usb/gadget/f_loopback.c index 6cb29d3df575..e91d1b16d9be 100644 --- a/drivers/usb/gadget/f_loopback.c +++ b/drivers/usb/gadget/f_loopback.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | /* #define VERBOSE_DEBUG */ | 22 | /* #define VERBOSE_DEBUG */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 26 | 27 | ||
diff --git a/drivers/usb/gadget/f_obex.c b/drivers/usb/gadget/f_obex.c index b4a3ba654ea5..8f8c64371475 100644 --- a/drivers/usb/gadget/f_obex.c +++ b/drivers/usb/gadget/f_obex.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | 23 | ||
| 24 | /* #define VERBOSE_DEBUG */ | 24 | /* #define VERBOSE_DEBUG */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/kernel.h> | 27 | #include <linux/kernel.h> |
| 27 | #include <linux/device.h> | 28 | #include <linux/device.h> |
| 28 | 29 | ||
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index d2de10b9dc4b..3c6e1a058745 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * 02110-1301 USA | 20 | * 02110-1301 USA |
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 24 | #include <linux/device.h> | 25 | #include <linux/device.h> |
| 25 | 26 | ||
diff --git a/drivers/usb/gadget/f_rndis.c b/drivers/usb/gadget/f_rndis.c index a30e60c7f129..56b022150f22 100644 --- a/drivers/usb/gadget/f_rndis.c +++ b/drivers/usb/gadget/f_rndis.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | /* #define VERBOSE_DEBUG */ | 25 | /* #define VERBOSE_DEBUG */ |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 28 | #include <linux/device.h> | 29 | #include <linux/device.h> |
| 29 | #include <linux/etherdevice.h> | 30 | #include <linux/etherdevice.h> |
diff --git a/drivers/usb/gadget/f_serial.c b/drivers/usb/gadget/f_serial.c index db0aa93606ef..490b00b01a7d 100644 --- a/drivers/usb/gadget/f_serial.c +++ b/drivers/usb/gadget/f_serial.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | * either version 2 of that License or (at your option) any later version. | 10 | * either version 2 of that License or (at your option) any later version. |
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 14 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 15 | 16 | ||
diff --git a/drivers/usb/gadget/f_sourcesink.c b/drivers/usb/gadget/f_sourcesink.c index 09cba273d2db..6d3cc443d914 100644 --- a/drivers/usb/gadget/f_sourcesink.c +++ b/drivers/usb/gadget/f_sourcesink.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | /* #define VERBOSE_DEBUG */ | 22 | /* #define VERBOSE_DEBUG */ |
| 23 | 23 | ||
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 25 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 26 | 27 | ||
diff --git a/drivers/usb/gadget/f_subset.c b/drivers/usb/gadget/f_subset.c index a9c98fdb626d..8675ca415329 100644 --- a/drivers/usb/gadget/f_subset.c +++ b/drivers/usb/gadget/f_subset.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 23 | #include <linux/device.h> | 24 | #include <linux/device.h> |
| 24 | #include <linux/etherdevice.h> | 25 | #include <linux/etherdevice.h> |
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c index 04f6224b7e06..2b56ce621852 100644 --- a/drivers/usb/gadget/gmidi.c +++ b/drivers/usb/gadget/gmidi.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | /* #define VERBOSE_DEBUG */ | 21 | /* #define VERBOSE_DEBUG */ |
| 22 | 22 | ||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/utsname.h> | 25 | #include <linux/utsname.h> |
| 25 | #include <linux/device.h> | 26 | #include <linux/device.h> |
| 26 | 27 | ||
diff --git a/drivers/usb/gadget/imx_udc.c b/drivers/usb/gadget/imx_udc.c index 01ee0b9bc957..e743122fcd93 100644 --- a/drivers/usb/gadget/imx_udc.c +++ b/drivers/usb/gadget/imx_udc.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/clk.h> | 29 | #include <linux/clk.h> |
| 30 | #include <linux/delay.h> | 30 | #include <linux/delay.h> |
| 31 | #include <linux/timer.h> | 31 | #include <linux/timer.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <linux/usb/ch9.h> | 34 | #include <linux/usb/ch9.h> |
| 34 | #include <linux/usb/gadget.h> | 35 | #include <linux/usb/gadget.h> |
diff --git a/drivers/usb/gadget/lh7a40x_udc.c b/drivers/usb/gadget/lh7a40x_udc.c index 6cd3d54f5640..fded3fca793b 100644 --- a/drivers/usb/gadget/lh7a40x_udc.c +++ b/drivers/usb/gadget/lh7a40x_udc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "lh7a40x_udc.h" | 27 | #include "lh7a40x_udc.h" |
| 27 | 28 | ||
diff --git a/drivers/usb/gadget/m66592-udc.c b/drivers/usb/gadget/m66592-udc.c index a8c8543d1b08..166bf71fd348 100644 --- a/drivers/usb/gadget/m66592-udc.c +++ b/drivers/usb/gadget/m66592-udc.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 29 | #include <linux/usb/ch9.h> | 30 | #include <linux/usb/ch9.h> |
| 30 | #include <linux/usb/gadget.h> | 31 | #include <linux/usb/gadget.h> |
diff --git a/drivers/usb/gadget/pxa27x_udc.c b/drivers/usb/gadget/pxa27x_udc.c index 05b892c3d686..85b0d8921eae 100644 --- a/drivers/usb/gadget/pxa27x_udc.c +++ b/drivers/usb/gadget/pxa27x_udc.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/clk.h> | 31 | #include <linux/clk.h> |
| 32 | #include <linux/irq.h> | 32 | #include <linux/irq.h> |
| 33 | #include <linux/gpio.h> | 33 | #include <linux/gpio.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/byteorder.h> | 36 | #include <asm/byteorder.h> |
| 36 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
diff --git a/drivers/usb/gadget/r8a66597-udc.c b/drivers/usb/gadget/r8a66597-udc.c index 5e13d23b5f0c..888d8f166c0b 100644 --- a/drivers/usb/gadget/r8a66597-udc.c +++ b/drivers/usb/gadget/r8a66597-udc.c | |||
| @@ -23,11 +23,11 @@ | |||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 26 | #include <linux/err.h> | ||
| 27 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 28 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 29 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 30 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | 31 | ||
| 32 | #include <linux/usb/ch9.h> | 32 | #include <linux/usb/ch9.h> |
| 33 | #include <linux/usb/gadget.h> | 33 | #include <linux/usb/gadget.h> |
diff --git a/drivers/usb/gadget/rndis.c b/drivers/usb/gadget/rndis.c index 48267bc0b2e0..5c0d06c79a81 100644 --- a/drivers/usb/gadget/rndis.c +++ b/drivers/usb/gadget/rndis.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 29 | #include <linux/list.h> | 29 | #include <linux/list.h> |
| 30 | #include <linux/proc_fs.h> | 30 | #include <linux/proc_fs.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/seq_file.h> | 32 | #include <linux/seq_file.h> |
| 32 | #include <linux/netdevice.h> | 33 | #include <linux/netdevice.h> |
| 33 | 34 | ||
diff --git a/drivers/usb/gadget/s3c-hsotg.c b/drivers/usb/gadget/s3c-hsotg.c index f742c8e7397c..124a8ccfdcda 100644 --- a/drivers/usb/gadget/s3c-hsotg.c +++ b/drivers/usb/gadget/s3c-hsotg.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/seq_file.h> | 22 | #include <linux/seq_file.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/io.h> | 24 | #include <linux/io.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <linux/usb/ch9.h> | 27 | #include <linux/usb/ch9.h> |
| 27 | #include <linux/usb/gadget.h> | 28 | #include <linux/usb/gadget.h> |
diff --git a/drivers/usb/gadget/u_audio.c b/drivers/usb/gadget/u_audio.c index 35e0930f5bbb..7a86d2c9109c 100644 --- a/drivers/usb/gadget/u_audio.c +++ b/drivers/usb/gadget/u_audio.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/slab.h> | ||
| 13 | #include <linux/device.h> | 14 | #include <linux/device.h> |
| 14 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 15 | #include <linux/ctype.h> | 16 | #include <linux/ctype.h> |
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c index 84ca195c2d10..07f4178ad178 100644 --- a/drivers/usb/gadget/u_ether.c +++ b/drivers/usb/gadget/u_ether.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | /* #define VERBOSE_DEBUG */ | 23 | /* #define VERBOSE_DEBUG */ |
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/gfp.h> | ||
| 26 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 27 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
| 28 | #include <linux/etherdevice.h> | 29 | #include <linux/etherdevice.h> |
diff --git a/drivers/usb/gadget/u_serial.c b/drivers/usb/gadget/u_serial.c index adf8260c3a6a..16bdf77f582a 100644 --- a/drivers/usb/gadget/u_serial.c +++ b/drivers/usb/gadget/u_serial.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/tty.h> | 24 | #include <linux/tty.h> |
| 25 | #include <linux/tty_flip.h> | 25 | #include <linux/tty_flip.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "u_serial.h" | 28 | #include "u_serial.h" |
| 28 | 29 | ||
diff --git a/drivers/usb/gadget/zero.c b/drivers/usb/gadget/zero.c index fac81ee193dd..807280d069f9 100644 --- a/drivers/usb/gadget/zero.c +++ b/drivers/usb/gadget/zero.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | /* #define VERBOSE_DEBUG */ | 50 | /* #define VERBOSE_DEBUG */ |
| 51 | 51 | ||
| 52 | #include <linux/kernel.h> | 52 | #include <linux/kernel.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | #include <linux/utsname.h> | 54 | #include <linux/utsname.h> |
| 54 | #include <linux/device.h> | 55 | #include <linux/device.h> |
| 55 | 56 | ||
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index dc55a62859c6..207e7a85aeb0 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/ioport.h> | 24 | #include <linux/ioport.h> |
| 25 | #include <linux/sched.h> | 25 | #include <linux/sched.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 28 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| @@ -35,6 +34,7 @@ | |||
| 35 | #include <linux/moduleparam.h> | 34 | #include <linux/moduleparam.h> |
| 36 | #include <linux/dma-mapping.h> | 35 | #include <linux/dma-mapping.h> |
| 37 | #include <linux/debugfs.h> | 36 | #include <linux/debugfs.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | 38 | ||
| 39 | #include "../core/hcd.h" | 39 | #include "../core/hcd.h" |
| 40 | 40 | ||
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c index 23cd917088b4..ead59f42e69b 100644 --- a/drivers/usb/host/ehci-mxc.c +++ b/drivers/usb/host/ehci-mxc.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/usb/otg.h> | 23 | #include <linux/usb/otg.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include <mach/mxc_ehci.h> | 26 | #include <mach/mxc_ehci.h> |
| 26 | 27 | ||
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c index f0282d6bb7aa..a67a0030dd57 100644 --- a/drivers/usb/host/ehci-omap.c +++ b/drivers/usb/host/ehci-omap.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/clk.h> | 37 | #include <linux/clk.h> |
| 38 | #include <linux/gpio.h> | 38 | #include <linux/gpio.h> |
| 39 | #include <linux/regulator/consumer.h> | 39 | #include <linux/regulator/consumer.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <plat/usb.h> | 41 | #include <plat/usb.h> |
| 41 | 42 | ||
| 42 | /* | 43 | /* |
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c index 5dcfb3de9945..15379c636143 100644 --- a/drivers/usb/host/fhci-hcd.c +++ b/drivers/usb/host/fhci-hcd.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 28 | #include <linux/of_platform.h> | 28 | #include <linux/of_platform.h> |
| 29 | #include <linux/of_gpio.h> | 29 | #include <linux/of_gpio.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | #include <asm/qe.h> | 31 | #include <asm/qe.h> |
| 31 | #include <asm/fsl_gtm.h> | 32 | #include <asm/fsl_gtm.h> |
| 32 | #include "../core/hcd.h" | 33 | #include "../core/hcd.h" |
diff --git a/drivers/usb/host/fhci-mem.c b/drivers/usb/host/fhci-mem.c index 2c0736c99712..5591bfb499d1 100644 --- a/drivers/usb/host/fhci-mem.c +++ b/drivers/usb/host/fhci-mem.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 23 | #include "../core/hcd.h" | 24 | #include "../core/hcd.h" |
diff --git a/drivers/usb/host/fhci-q.c b/drivers/usb/host/fhci-q.c index b0a1446ba292..f73c92359beb 100644 --- a/drivers/usb/host/fhci-q.c +++ b/drivers/usb/host/fhci-q.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/spinlock.h> | 20 | #include <linux/spinlock.h> |
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/list.h> | 23 | #include <linux/list.h> |
| 23 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
| 24 | #include "../core/hcd.h" | 25 | #include "../core/hcd.h" |
diff --git a/drivers/usb/host/fhci-tds.c b/drivers/usb/host/fhci-tds.c index e1232890c78b..57013479d7f7 100644 --- a/drivers/usb/host/fhci-tds.c +++ b/drivers/usb/host/fhci-tds.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/types.h> | 19 | #include <linux/types.h> |
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/list.h> | 22 | #include <linux/list.h> |
| 22 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 23 | #include <linux/usb.h> | 24 | #include <linux/usb.h> |
diff --git a/drivers/usb/host/hwa-hc.c b/drivers/usb/host/hwa-hc.c index 88b03214622b..35742f8c7cda 100644 --- a/drivers/usb/host/hwa-hc.c +++ b/drivers/usb/host/hwa-hc.c | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | */ | 55 | */ |
| 56 | #include <linux/kernel.h> | 56 | #include <linux/kernel.h> |
| 57 | #include <linux/init.h> | 57 | #include <linux/init.h> |
| 58 | #include <linux/slab.h> | ||
| 58 | #include <linux/module.h> | 59 | #include <linux/module.h> |
| 59 | #include <linux/workqueue.h> | 60 | #include <linux/workqueue.h> |
| 60 | #include <linux/wait.h> | 61 | #include <linux/wait.h> |
diff --git a/drivers/usb/host/imx21-hcd.c b/drivers/usb/host/imx21-hcd.c index 213e270e1c29..8a12f297645f 100644 --- a/drivers/usb/host/imx21-hcd.c +++ b/drivers/usb/host/imx21-hcd.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | #include <linux/kernel.h> | 54 | #include <linux/kernel.h> |
| 55 | #include <linux/list.h> | 55 | #include <linux/list.h> |
| 56 | #include <linux/platform_device.h> | 56 | #include <linux/platform_device.h> |
| 57 | #include <linux/slab.h> | ||
| 57 | #include <linux/usb.h> | 58 | #include <linux/usb.h> |
| 58 | 59 | ||
| 59 | #include "../core/hcd.h" | 60 | #include "../core/hcd.h" |
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index a2b305477afe..92de71dc7729 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
| @@ -62,6 +62,7 @@ | |||
| 62 | #include <linux/errno.h> | 62 | #include <linux/errno.h> |
| 63 | #include <linux/init.h> | 63 | #include <linux/init.h> |
| 64 | #include <linux/list.h> | 64 | #include <linux/list.h> |
| 65 | #include <linux/slab.h> | ||
| 65 | #include <linux/usb.h> | 66 | #include <linux/usb.h> |
| 66 | #include <linux/usb/isp116x.h> | 67 | #include <linux/usb/isp116x.h> |
| 67 | #include <linux/platform_device.h> | 68 | #include <linux/platform_device.h> |
diff --git a/drivers/usb/host/ohci-q.c b/drivers/usb/host/ohci-q.c index 35288bcae0db..83094d067e0f 100644 --- a/drivers/usb/host/ohci-q.c +++ b/drivers/usb/host/ohci-q.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/irq.h> | 10 | #include <linux/irq.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | 12 | ||
| 12 | static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv) | 13 | static void urb_free_priv (struct ohci_hcd *hc, urb_priv_t *urb_priv) |
| 13 | { | 14 | { |
diff --git a/drivers/usb/host/r8a66597-hcd.c b/drivers/usb/host/r8a66597-hcd.c index f71a73a93d0c..d478ffad59b4 100644 --- a/drivers/usb/host/r8a66597-hcd.c +++ b/drivers/usb/host/r8a66597-hcd.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/io.h> | 37 | #include <linux/io.h> |
| 38 | #include <linux/mm.h> | 38 | #include <linux/mm.h> |
| 39 | #include <linux/irq.h> | 39 | #include <linux/irq.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <asm/cacheflush.h> | 41 | #include <asm/cacheflush.h> |
| 41 | 42 | ||
| 42 | #include "../core/hcd.h" | 43 | #include "../core/hcd.h" |
diff --git a/drivers/usb/host/uhci-debug.c b/drivers/usb/host/uhci-debug.c index e52b954dda47..98cf0b26b968 100644 --- a/drivers/usb/host/uhci-debug.c +++ b/drivers/usb/host/uhci-debug.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | * (C) Copyright 1999-2001 Johannes Erdfelt | 9 | * (C) Copyright 1999-2001 Johannes Erdfelt |
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/kernel.h> | 13 | #include <linux/kernel.h> |
| 13 | #include <linux/debugfs.h> | 14 | #include <linux/debugfs.h> |
| 14 | #include <linux/smp_lock.h> | 15 | #include <linux/smp_lock.h> |
diff --git a/drivers/usb/host/whci/asl.c b/drivers/usb/host/whci/asl.c index 562eba108816..773249306031 100644 --- a/drivers/usb/host/whci/asl.c +++ b/drivers/usb/host/whci/asl.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | #include <linux/dma-mapping.h> | 20 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/uwb/umc.h> | 21 | #include <linux/uwb/umc.h> |
| 21 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
diff --git a/drivers/usb/host/whci/debug.c b/drivers/usb/host/whci/debug.c index 8c1c610c9513..c5305b599ca0 100644 --- a/drivers/usb/host/whci/debug.c +++ b/drivers/usb/host/whci/debug.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * You should have received a copy of the GNU General Public License | 15 | * You should have received a copy of the GNU General Public License |
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 19 | #include <linux/debugfs.h> | 20 | #include <linux/debugfs.h> |
| 20 | #include <linux/seq_file.h> | 21 | #include <linux/seq_file.h> |
diff --git a/drivers/usb/host/whci/init.c b/drivers/usb/host/whci/init.c index 34a783cb0133..f7582e8e2169 100644 --- a/drivers/usb/host/whci/init.c +++ b/drivers/usb/host/whci/init.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | #include <linux/dma-mapping.h> | 20 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/uwb/umc.h> | 21 | #include <linux/uwb/umc.h> |
| 21 | 22 | ||
diff --git a/drivers/usb/host/whci/pzl.c b/drivers/usb/host/whci/pzl.c index 0db3fb2dc03a..33c5580b4d25 100644 --- a/drivers/usb/host/whci/pzl.c +++ b/drivers/usb/host/whci/pzl.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | #include <linux/dma-mapping.h> | 20 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/uwb/umc.h> | 21 | #include <linux/uwb/umc.h> |
| 21 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
diff --git a/drivers/usb/host/whci/qset.c b/drivers/usb/host/whci/qset.c index 7d4204db0f61..141d049beb3e 100644 --- a/drivers/usb/host/whci/qset.c +++ b/drivers/usb/host/whci/qset.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/dma-mapping.h> | 19 | #include <linux/dma-mapping.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/uwb/umc.h> | 21 | #include <linux/uwb/umc.h> |
| 21 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
| 22 | 23 | ||
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index bba9b19ed1b9..c09539bad1ee 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 24 | #include <linux/pci.h> | 24 | #include <linux/pci.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/dmapool.h> | 26 | #include <linux/dmapool.h> |
| 26 | 27 | ||
| 27 | #include "xhci.h" | 28 | #include "xhci.h" |
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index 6ba841bca4a2..85d7e8f2085e 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
| @@ -65,6 +65,7 @@ | |||
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/scatterlist.h> | 67 | #include <linux/scatterlist.h> |
| 68 | #include <linux/slab.h> | ||
| 68 | #include "xhci.h" | 69 | #include "xhci.h" |
| 69 | 70 | ||
| 70 | /* | 71 | /* |
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 492a61c2c79d..7e4277273908 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/irq.h> | 23 | #include <linux/irq.h> |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/moduleparam.h> | 25 | #include <linux/moduleparam.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "xhci.h" | 28 | #include "xhci.h" |
| 28 | 29 | ||
diff --git a/drivers/usb/misc/appledisplay.c b/drivers/usb/misc/appledisplay.c index 3adab041355a..094f91cbc578 100644 --- a/drivers/usb/misc/appledisplay.c +++ b/drivers/usb/misc/appledisplay.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/init.h> | 25 | #include <linux/init.h> |
| 26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 28 | #include <linux/backlight.h> | 29 | #include <linux/backlight.h> |
| 29 | #include <linux/timer.h> | 30 | #include <linux/timer.h> |
diff --git a/drivers/usb/misc/cypress_cy7c63.c b/drivers/usb/misc/cypress_cy7c63.c index 1547d8cac5fb..2f43c57743c9 100644 --- a/drivers/usb/misc/cypress_cy7c63.c +++ b/drivers/usb/misc/cypress_cy7c63.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 33 | #include <linux/module.h> | 33 | #include <linux/module.h> |
| 34 | #include <linux/kernel.h> | 34 | #include <linux/kernel.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | #include <linux/usb.h> | 36 | #include <linux/usb.h> |
| 36 | 37 | ||
| 37 | #define DRIVER_AUTHOR "Oliver Bock (bock@tfh-berlin.de)" | 38 | #define DRIVER_AUTHOR "Oliver Bock (bock@tfh-berlin.de)" |
diff --git a/drivers/usb/misc/cytherm.c b/drivers/usb/misc/cytherm.c index b9cbbbda8245..1d7251bc1b5f 100644 --- a/drivers/usb/misc/cytherm.c +++ b/drivers/usb/misc/cytherm.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 21 | #include <linux/usb.h> | 22 | #include <linux/usb.h> |
| 22 | 23 | ||
diff --git a/drivers/usb/misc/isight_firmware.c b/drivers/usb/misc/isight_firmware.c index 06e990adc6cd..fe1d44319d0a 100644 --- a/drivers/usb/misc/isight_firmware.c +++ b/drivers/usb/misc/isight_firmware.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/firmware.h> | 25 | #include <linux/firmware.h> |
| 26 | #include <linux/errno.h> | 26 | #include <linux/errno.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | static const struct usb_device_id id_table[] = { | 30 | static const struct usb_device_id id_table[] = { |
| 30 | {USB_DEVICE(0x05ac, 0x8300)}, | 31 | {USB_DEVICE(0x05ac, 0x8300)}, |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c b/drivers/usb/misc/sisusbvga/sisusb_con.c index b624320df903..b271b0557a1f 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_con.c +++ b/drivers/usb/misc/sisusbvga/sisusb_con.c | |||
| @@ -58,7 +58,6 @@ | |||
| 58 | #include <linux/string.h> | 58 | #include <linux/string.h> |
| 59 | #include <linux/kd.h> | 59 | #include <linux/kd.h> |
| 60 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 61 | #include <linux/slab.h> | ||
| 62 | #include <linux/vt_kern.h> | 61 | #include <linux/vt_kern.h> |
| 63 | #include <linux/selection.h> | 62 | #include <linux/selection.h> |
| 64 | #include <linux/spinlock.h> | 63 | #include <linux/spinlock.h> |
diff --git a/drivers/usb/misc/sisusbvga/sisusb_init.c b/drivers/usb/misc/sisusbvga/sisusb_init.c index 0ab990744830..cb8a3d91f970 100644 --- a/drivers/usb/misc/sisusbvga/sisusb_init.c +++ b/drivers/usb/misc/sisusbvga/sisusb_init.c | |||
| @@ -41,7 +41,6 @@ | |||
| 41 | #include <linux/errno.h> | 41 | #include <linux/errno.h> |
| 42 | #include <linux/poll.h> | 42 | #include <linux/poll.h> |
| 43 | #include <linux/init.h> | 43 | #include <linux/init.h> |
| 44 | #include <linux/slab.h> | ||
| 45 | #include <linux/spinlock.h> | 44 | #include <linux/spinlock.h> |
| 46 | 45 | ||
| 47 | #include "sisusb.h" | 46 | #include "sisusb.h" |
diff --git a/drivers/usb/misc/trancevibrator.c b/drivers/usb/misc/trancevibrator.c index 5da28eaee314..d77aba46ae85 100644 --- a/drivers/usb/misc/trancevibrator.c +++ b/drivers/usb/misc/trancevibrator.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/init.h> | 24 | #include <linux/init.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/module.h> | 26 | #include <linux/module.h> |
| 26 | #include <linux/usb.h> | 27 | #include <linux/usb.h> |
| 27 | 28 | ||
diff --git a/drivers/usb/misc/uss720.c b/drivers/usb/misc/uss720.c index f56fed53f2dd..796e2f68f749 100644 --- a/drivers/usb/misc/uss720.c +++ b/drivers/usb/misc/uss720.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/delay.h> | 49 | #include <linux/delay.h> |
| 50 | #include <linux/completion.h> | 50 | #include <linux/completion.h> |
| 51 | #include <linux/kref.h> | 51 | #include <linux/kref.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | 53 | ||
| 53 | /* | 54 | /* |
| 54 | * Version Information | 55 | * Version Information |
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index 6dd44bc1f5ff..ddf7f9a1b336 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/smp_lock.h> | 18 | #include <linux/smp_lock.h> |
| 19 | #include <linux/scatterlist.h> | 19 | #include <linux/scatterlist.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/uaccess.h> | 22 | #include <asm/uaccess.h> |
| 22 | 23 | ||
diff --git a/drivers/usb/mon/mon_main.c b/drivers/usb/mon/mon_main.c index e0c2db3b767b..e4af18b93c7d 100644 --- a/drivers/usb/mon/mon_main.c +++ b/drivers/usb/mon/mon_main.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/module.h> | 10 | #include <linux/module.h> |
| 11 | #include <linux/usb.h> | 11 | #include <linux/usb.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/notifier.h> | 13 | #include <linux/notifier.h> |
| 13 | #include <linux/mutex.h> | 14 | #include <linux/mutex.h> |
| 14 | 15 | ||
diff --git a/drivers/usb/mon/mon_stat.c b/drivers/usb/mon/mon_stat.c index ac8b0d5ce7f8..1becdc3837e6 100644 --- a/drivers/usb/mon/mon_stat.c +++ b/drivers/usb/mon/mon_stat.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/slab.h> | ||
| 11 | #include <linux/usb.h> | 12 | #include <linux/usb.h> |
| 12 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 13 | #include <asm/uaccess.h> | 14 | #include <asm/uaccess.h> |
diff --git a/drivers/usb/mon/mon_text.c b/drivers/usb/mon/mon_text.c index 31c11888ec6a..4d0be130f49b 100644 --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/list.h> | 8 | #include <linux/list.h> |
| 9 | #include <linux/usb.h> | 9 | #include <linux/usb.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/time.h> | 11 | #include <linux/time.h> |
| 11 | #include <linux/mutex.h> | 12 | #include <linux/mutex.h> |
| 12 | #include <linux/debugfs.h> | 13 | #include <linux/debugfs.h> |
diff --git a/drivers/usb/musb/blackfin.c b/drivers/usb/musb/blackfin.c index bcee1339d4fd..719a22d664ef 100644 --- a/drivers/usb/musb/blackfin.c +++ b/drivers/usb/musb/blackfin.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/list.h> | 15 | #include <linux/list.h> |
| 17 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
diff --git a/drivers/usb/musb/cppi_dma.c b/drivers/usb/musb/cppi_dma.c index 3c69a76ec392..59dc3d351b60 100644 --- a/drivers/usb/musb/cppi_dma.c +++ b/drivers/usb/musb/cppi_dma.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/platform_device.h> | 9 | #include <linux/platform_device.h> |
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/usb.h> | 11 | #include <linux/usb.h> |
| 11 | 12 | ||
| 12 | #include "musb_core.h" | 13 | #include "musb_core.h" |
diff --git a/drivers/usb/musb/davinci.c b/drivers/usb/musb/davinci.c index a883f9dd3f8a..29bce5c0fd10 100644 --- a/drivers/usb/musb/davinci.c +++ b/drivers/usb/musb/davinci.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/init.h> | 27 | #include <linux/init.h> |
| 29 | #include <linux/list.h> | 28 | #include <linux/list.h> |
| 30 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index a9f288cd70ed..6fca870e957e 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/moduleparam.h> | 43 | #include <linux/moduleparam.h> |
| 44 | #include <linux/stat.h> | 44 | #include <linux/stat.h> |
| 45 | #include <linux/dma-mapping.h> | 45 | #include <linux/dma-mapping.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | 47 | ||
| 47 | #include "musb_core.h" | 48 | #include "musb_core.h" |
| 48 | 49 | ||
diff --git a/drivers/usb/musb/musb_virthub.c b/drivers/usb/musb/musb_virthub.c index bfe5fe4ebfee..7775e1c0a215 100644 --- a/drivers/usb/musb/musb_virthub.c +++ b/drivers/usb/musb/musb_virthub.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <linux/module.h> | 35 | #include <linux/module.h> |
| 36 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
| 37 | #include <linux/sched.h> | 37 | #include <linux/sched.h> |
| 38 | #include <linux/slab.h> | ||
| 39 | #include <linux/errno.h> | 38 | #include <linux/errno.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/time.h> | 40 | #include <linux/time.h> |
diff --git a/drivers/usb/musb/musbhsdma.c b/drivers/usb/musb/musbhsdma.c index 2fa7d5c00f31..1008044a3bbc 100644 --- a/drivers/usb/musb/musbhsdma.c +++ b/drivers/usb/musb/musbhsdma.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/device.h> | 33 | #include <linux/device.h> |
| 34 | #include <linux/interrupt.h> | 34 | #include <linux/interrupt.h> |
| 35 | #include <linux/platform_device.h> | 35 | #include <linux/platform_device.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include "musb_core.h" | 37 | #include "musb_core.h" |
| 37 | #include "musbhsdma.h" | 38 | #include "musbhsdma.h" |
| 38 | 39 | ||
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c index 3fe16867b5a8..490cdf15ccb6 100644 --- a/drivers/usb/musb/omap2430.c +++ b/drivers/usb/musb/omap2430.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
| 29 | #include <linux/sched.h> | 29 | #include <linux/sched.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <linux/init.h> | 30 | #include <linux/init.h> |
| 32 | #include <linux/list.h> | 31 | #include <linux/list.h> |
| 33 | #include <linux/clk.h> | 32 | #include <linux/clk.h> |
diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c index 1c868096bd6f..5afa070d7dc9 100644 --- a/drivers/usb/musb/tusb6010_omap.c +++ b/drivers/usb/musb/tusb6010_omap.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/usb.h> | 15 | #include <linux/usb.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/dma-mapping.h> | 17 | #include <linux/dma-mapping.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <plat/dma.h> | 19 | #include <plat/dma.h> |
| 19 | #include <plat/mux.h> | 20 | #include <plat/mux.h> |
| 20 | 21 | ||
diff --git a/drivers/usb/otg/gpio_vbus.c b/drivers/usb/otg/gpio_vbus.c index 1c26c94513e9..221c44444ec6 100644 --- a/drivers/usb/otg/gpio_vbus.c +++ b/drivers/usb/otg/gpio_vbus.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/platform_device.h> | 12 | #include <linux/platform_device.h> |
| 13 | #include <linux/gpio.h> | 13 | #include <linux/gpio.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
| 15 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 16 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
diff --git a/drivers/usb/otg/nop-usb-xceiv.c b/drivers/usb/otg/nop-usb-xceiv.c index af456b48985f..e70014ab0976 100644 --- a/drivers/usb/otg/nop-usb-xceiv.c +++ b/drivers/usb/otg/nop-usb-xceiv.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/dma-mapping.h> | 31 | #include <linux/dma-mapping.h> |
| 32 | #include <linux/usb/otg.h> | 32 | #include <linux/usb/otg.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | struct nop_usb_xceiv { | 35 | struct nop_usb_xceiv { |
| 35 | struct otg_transceiver otg; | 36 | struct otg_transceiver otg; |
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c index 3e4e9f434d78..223cdf46ccb7 100644 --- a/drivers/usb/otg/twl4030-usb.c +++ b/drivers/usb/otg/twl4030-usb.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/regulator/consumer.h> | 37 | #include <linux/regulator/consumer.h> |
| 38 | #include <linux/err.h> | 38 | #include <linux/err.h> |
| 39 | #include <linux/notifier.h> | 39 | #include <linux/notifier.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | /* Register defines */ | 42 | /* Register defines */ |
| 42 | 43 | ||
diff --git a/drivers/usb/otg/ulpi.c b/drivers/usb/otg/ulpi.c index 896527456b7e..9010225e0d06 100644 --- a/drivers/usb/otg/ulpi.c +++ b/drivers/usb/otg/ulpi.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/usb.h> | 28 | #include <linux/usb.h> |
| 28 | #include <linux/usb/otg.h> | 29 | #include <linux/usb/otg.h> |
| 29 | #include <linux/usb/ulpi.h> | 30 | #include <linux/usb/ulpi.h> |
diff --git a/drivers/usb/serial/aircable.c b/drivers/usb/serial/aircable.c index 365db1097bfd..4fd7af98b1ae 100644 --- a/drivers/usb/serial/aircable.c +++ b/drivers/usb/serial/aircable.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | */ | 43 | */ |
| 44 | 44 | ||
| 45 | #include <linux/tty.h> | 45 | #include <linux/tty.h> |
| 46 | #include <linux/slab.h> | ||
| 46 | #include <linux/tty_flip.h> | 47 | #include <linux/tty_flip.h> |
| 47 | #include <linux/circ_buf.h> | 48 | #include <linux/circ_buf.h> |
| 48 | #include <linux/usb.h> | 49 | #include <linux/usb.h> |
diff --git a/drivers/usb/serial/ark3116.c b/drivers/usb/serial/ark3116.c index 547c9448c28c..9b66bf19f751 100644 --- a/drivers/usb/serial/ark3116.c +++ b/drivers/usb/serial/ark3116.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 27 | #include <linux/ioctl.h> | 27 | #include <linux/ioctl.h> |
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/tty_flip.h> | 30 | #include <linux/tty_flip.h> |
| 30 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 31 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
diff --git a/drivers/usb/serial/bus.c b/drivers/usb/serial/bus.c index ba555c528cc6..7f547dc3a590 100644 --- a/drivers/usb/serial/bus.c +++ b/drivers/usb/serial/bus.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/tty.h> | 13 | #include <linux/tty.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 15 | #include <linux/usb.h> | 16 | #include <linux/usb.h> |
| 16 | #include <linux/usb/serial.h> | 17 | #include <linux/usb/serial.h> |
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index 9f4fed1968b5..7e8e39818414 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/init.h> | 19 | #include <linux/init.h> |
| 20 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 23 | #include <linux/usb/serial.h> | 24 | #include <linux/usb/serial.h> |
| 24 | #include <linux/serial.h> | 25 | #include <linux/serial.h> |
diff --git a/drivers/usb/serial/navman.c b/drivers/usb/serial/navman.c index 04a6cbbed2c0..a6b207c84917 100644 --- a/drivers/usb/serial/navman.c +++ b/drivers/usb/serial/navman.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | * flags as the navman is rx only so cannot echo. | 12 | * flags as the navman is rx only so cannot echo. |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #include <linux/gfp.h> | ||
| 15 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 17 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
diff --git a/drivers/usb/serial/opticon.c b/drivers/usb/serial/opticon.c index 701452ae9197..ed01f3b2de8c 100644 --- a/drivers/usb/serial/opticon.c +++ b/drivers/usb/serial/opticon.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
| 15 | #include <linux/tty_driver.h> | 15 | #include <linux/tty_driver.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/tty_flip.h> | 17 | #include <linux/tty_flip.h> |
| 17 | #include <linux/serial.h> | 18 | #include <linux/serial.h> |
| 18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 950cb311ca94..ca9d866672aa 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/errno.h> | 37 | #include <linux/errno.h> |
| 38 | #include <linux/tty.h> | 38 | #include <linux/tty.h> |
| 39 | #include <linux/tty_flip.h> | 39 | #include <linux/tty_flip.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/module.h> | 41 | #include <linux/module.h> |
| 41 | #include <linux/bitops.h> | 42 | #include <linux/bitops.h> |
| 42 | #include <linux/usb.h> | 43 | #include <linux/usb.h> |
diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 4b463cd140ef..43a0cadd5782 100644 --- a/drivers/usb/serial/safe_serial.c +++ b/drivers/usb/serial/safe_serial.c | |||
| @@ -64,8 +64,8 @@ | |||
| 64 | 64 | ||
| 65 | #include <linux/kernel.h> | 65 | #include <linux/kernel.h> |
| 66 | #include <linux/errno.h> | 66 | #include <linux/errno.h> |
| 67 | #include <linux/gfp.h> | ||
| 67 | #include <linux/init.h> | 68 | #include <linux/init.h> |
| 68 | #include <linux/slab.h> | ||
| 69 | #include <linux/tty.h> | 69 | #include <linux/tty.h> |
| 70 | #include <linux/tty_driver.h> | 70 | #include <linux/tty_driver.h> |
| 71 | #include <linux/tty_flip.h> | 71 | #include <linux/tty_flip.h> |
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 34e6f894cba9..9202f94505e6 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/jiffies.h> | 26 | #include <linux/jiffies.h> |
| 27 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/tty_flip.h> | 30 | #include <linux/tty_flip.h> |
| 30 | #include <linux/module.h> | 31 | #include <linux/module.h> |
| 31 | #include <linux/usb.h> | 32 | #include <linux/usb.h> |
diff --git a/drivers/usb/serial/symbolserial.c b/drivers/usb/serial/symbolserial.c index ee190cc1757c..d9457bd4fe10 100644 --- a/drivers/usb/serial/symbolserial.c +++ b/drivers/usb/serial/symbolserial.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/tty_driver.h> | 16 | #include <linux/tty_driver.h> |
| 16 | #include <linux/tty_flip.h> | 17 | #include <linux/tty_flip.h> |
| 17 | #include <linux/module.h> | 18 | #include <linux/module.h> |
diff --git a/drivers/usb/serial/usb_debug.c b/drivers/usb/serial/usb_debug.c index 252cc2d993b2..28026b47344a 100644 --- a/drivers/usb/serial/usb_debug.c +++ b/drivers/usb/serial/usb_debug.c | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * 2 as published by the Free Software Foundation. | 8 | * 2 as published by the Free Software Foundation. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/gfp.h> | ||
| 11 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 12 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 13 | #include <linux/tty.h> | 14 | #include <linux/tty.h> |
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index 67edc65acb8e..42d0eaed4a01 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | */ | 32 | */ |
| 33 | 33 | ||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #include <scsi/scsi.h> | 37 | #include <scsi/scsi.h> |
| 37 | #include <scsi/scsi_cmnd.h> | 38 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/usb/storage/karma.c b/drivers/usb/storage/karma.c index 7953d93a7739..ba1b78906880 100644 --- a/drivers/usb/storage/karma.c +++ b/drivers/usb/storage/karma.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <scsi/scsi.h> | 24 | #include <scsi/scsi.h> |
| 24 | #include <scsi/scsi_cmnd.h> | 25 | #include <scsi/scsi_cmnd.h> |
diff --git a/drivers/usb/storage/option_ms.c b/drivers/usb/storage/option_ms.c index 773a5cd38c5a..89460181d122 100644 --- a/drivers/usb/storage/option_ms.c +++ b/drivers/usb/storage/option_ms.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | #include <linux/usb.h> | 23 | #include <linux/usb.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | 25 | ||
| 25 | #include "usb.h" | 26 | #include "usb.h" |
| 26 | #include "transport.h" | 27 | #include "transport.h" |
diff --git a/drivers/usb/storage/scsiglue.c b/drivers/usb/storage/scsiglue.c index 4cc035562cc2..d8d98cfecada 100644 --- a/drivers/usb/storage/scsiglue.c +++ b/drivers/usb/storage/scsiglue.c | |||
| @@ -43,7 +43,6 @@ | |||
| 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. | 43 | * 675 Mass Ave, Cambridge, MA 02139, USA. |
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/slab.h> | ||
| 47 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 48 | #include <linux/mutex.h> | 47 | #include <linux/mutex.h> |
| 49 | 48 | ||
diff --git a/drivers/usb/storage/sierra_ms.c b/drivers/usb/storage/sierra_ms.c index 4395c4100ec2..57fc2f532cab 100644 --- a/drivers/usb/storage/sierra_ms.c +++ b/drivers/usb/storage/sierra_ms.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | #include <scsi/scsi_cmnd.h> | 3 | #include <scsi/scsi_cmnd.h> |
| 4 | #include <scsi/scsi_device.h> | 4 | #include <scsi/scsi_device.h> |
| 5 | #include <linux/usb.h> | 5 | #include <linux/usb.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | 7 | ||
| 7 | #include "usb.h" | 8 | #include "usb.h" |
| 8 | #include "transport.h" | 9 | #include "transport.h" |
diff --git a/drivers/usb/storage/transport.c b/drivers/usb/storage/transport.c index 468038126e5e..f253edec3bb8 100644 --- a/drivers/usb/storage/transport.c +++ b/drivers/usb/storage/transport.c | |||
| @@ -44,8 +44,8 @@ | |||
| 44 | */ | 44 | */ |
| 45 | 45 | ||
| 46 | #include <linux/sched.h> | 46 | #include <linux/sched.h> |
| 47 | #include <linux/gfp.h> | ||
| 47 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | 49 | ||
| 50 | #include <linux/usb/quirks.h> | 50 | #include <linux/usb/quirks.h> |
| 51 | 51 | ||
diff --git a/drivers/usb/wusbcore/cbaf.c b/drivers/usb/wusbcore/cbaf.c index 51a8e0d5789d..c0c5665e60a9 100644 --- a/drivers/usb/wusbcore/cbaf.c +++ b/drivers/usb/wusbcore/cbaf.c | |||
| @@ -92,6 +92,7 @@ | |||
| 92 | #include <linux/interrupt.h> | 92 | #include <linux/interrupt.h> |
| 93 | #include <linux/delay.h> | 93 | #include <linux/delay.h> |
| 94 | #include <linux/random.h> | 94 | #include <linux/random.h> |
| 95 | #include <linux/slab.h> | ||
| 95 | #include <linux/mutex.h> | 96 | #include <linux/mutex.h> |
| 96 | #include <linux/uwb.h> | 97 | #include <linux/uwb.h> |
| 97 | #include <linux/usb/wusb.h> | 98 | #include <linux/usb/wusb.h> |
diff --git a/drivers/usb/wusbcore/crypto.c b/drivers/usb/wusbcore/crypto.c index 9579cf4c38bf..827c87f10cc5 100644 --- a/drivers/usb/wusbcore/crypto.c +++ b/drivers/usb/wusbcore/crypto.c | |||
| @@ -49,6 +49,7 @@ | |||
| 49 | #include <linux/module.h> | 49 | #include <linux/module.h> |
| 50 | #include <linux/err.h> | 50 | #include <linux/err.h> |
| 51 | #include <linux/uwb.h> | 51 | #include <linux/uwb.h> |
| 52 | #include <linux/slab.h> | ||
| 52 | #include <linux/usb/wusb.h> | 53 | #include <linux/usb/wusb.h> |
| 53 | #include <linux/scatterlist.h> | 54 | #include <linux/scatterlist.h> |
| 54 | 55 | ||
diff --git a/drivers/usb/wusbcore/devconnect.c b/drivers/usb/wusbcore/devconnect.c index 1c918286159c..46e79d349498 100644 --- a/drivers/usb/wusbcore/devconnect.c +++ b/drivers/usb/wusbcore/devconnect.c | |||
| @@ -88,6 +88,7 @@ | |||
| 88 | 88 | ||
| 89 | #include <linux/jiffies.h> | 89 | #include <linux/jiffies.h> |
| 90 | #include <linux/ctype.h> | 90 | #include <linux/ctype.h> |
| 91 | #include <linux/slab.h> | ||
| 91 | #include <linux/workqueue.h> | 92 | #include <linux/workqueue.h> |
| 92 | #include "wusbhc.h" | 93 | #include "wusbhc.h" |
| 93 | 94 | ||
diff --git a/drivers/usb/wusbcore/mmc.c b/drivers/usb/wusbcore/mmc.c index 2d827397e30b..0a57ff0a0b0c 100644 --- a/drivers/usb/wusbcore/mmc.c +++ b/drivers/usb/wusbcore/mmc.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | * - add timers that autoremove intervalled IEs? | 37 | * - add timers that autoremove intervalled IEs? |
| 38 | */ | 38 | */ |
| 39 | #include <linux/usb/wusb.h> | 39 | #include <linux/usb/wusb.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include "wusbhc.h" | 41 | #include "wusbhc.h" |
| 41 | 42 | ||
| 42 | /* Initialize the MMCIEs handling mechanism */ | 43 | /* Initialize the MMCIEs handling mechanism */ |
diff --git a/drivers/usb/wusbcore/rh.c b/drivers/usb/wusbcore/rh.c index 9fe4246cecb9..a68ad7aa0b59 100644 --- a/drivers/usb/wusbcore/rh.c +++ b/drivers/usb/wusbcore/rh.c | |||
| @@ -69,6 +69,7 @@ | |||
| 69 | * | 69 | * |
| 70 | * wusbhc_rh_start_port_reset() ??? unimplemented | 70 | * wusbhc_rh_start_port_reset() ??? unimplemented |
| 71 | */ | 71 | */ |
| 72 | #include <linux/slab.h> | ||
| 72 | #include "wusbhc.h" | 73 | #include "wusbhc.h" |
| 73 | 74 | ||
| 74 | /* | 75 | /* |
diff --git a/drivers/usb/wusbcore/security.c b/drivers/usb/wusbcore/security.c index edcd2d756037..b60799b811c1 100644 --- a/drivers/usb/wusbcore/security.c +++ b/drivers/usb/wusbcore/security.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * FIXME: docs | 23 | * FIXME: docs |
| 24 | */ | 24 | */ |
| 25 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/usb/ch9.h> | 27 | #include <linux/usb/ch9.h> |
| 27 | #include <linux/random.h> | 28 | #include <linux/random.h> |
| 28 | #include "wusbhc.h" | 29 | #include "wusbhc.h" |
diff --git a/drivers/usb/wusbcore/wa-hc.c b/drivers/usb/wusbcore/wa-hc.c index 9d04722415bb..59a748a0e5da 100644 --- a/drivers/usb/wusbcore/wa-hc.c +++ b/drivers/usb/wusbcore/wa-hc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | * | 22 | * |
| 23 | * FIXME: docs | 23 | * FIXME: docs |
| 24 | */ | 24 | */ |
| 25 | #include <linux/slab.h> | ||
| 25 | #include "wusbhc.h" | 26 | #include "wusbhc.h" |
| 26 | #include "wa-hc.h" | 27 | #include "wa-hc.h" |
| 27 | 28 | ||
diff --git a/drivers/usb/wusbcore/wa-nep.c b/drivers/usb/wusbcore/wa-nep.c index 17d2626038be..f67f7f1e6df9 100644 --- a/drivers/usb/wusbcore/wa-nep.c +++ b/drivers/usb/wusbcore/wa-nep.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | */ | 51 | */ |
| 52 | #include <linux/workqueue.h> | 52 | #include <linux/workqueue.h> |
| 53 | #include <linux/ctype.h> | 53 | #include <linux/ctype.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include "wa-hc.h" | 56 | #include "wa-hc.h" |
| 56 | #include "wusbhc.h" | 57 | #include "wusbhc.h" |
diff --git a/drivers/usb/wusbcore/wa-rpipe.c b/drivers/usb/wusbcore/wa-rpipe.c index 7369655f69cd..c7b1d8108de9 100644 --- a/drivers/usb/wusbcore/wa-rpipe.c +++ b/drivers/usb/wusbcore/wa-rpipe.c | |||
| @@ -60,6 +60,7 @@ | |||
| 60 | #include <linux/init.h> | 60 | #include <linux/init.h> |
| 61 | #include <asm/atomic.h> | 61 | #include <asm/atomic.h> |
| 62 | #include <linux/bitmap.h> | 62 | #include <linux/bitmap.h> |
| 63 | #include <linux/slab.h> | ||
| 63 | 64 | ||
| 64 | #include "wusbhc.h" | 65 | #include "wusbhc.h" |
| 65 | #include "wa-hc.h" | 66 | #include "wa-hc.h" |
diff --git a/drivers/usb/wusbcore/wa-xfer.c b/drivers/usb/wusbcore/wa-xfer.c index 489b47833e2c..112ef7e26f6b 100644 --- a/drivers/usb/wusbcore/wa-xfer.c +++ b/drivers/usb/wusbcore/wa-xfer.c | |||
| @@ -81,6 +81,7 @@ | |||
| 81 | */ | 81 | */ |
| 82 | #include <linux/init.h> | 82 | #include <linux/init.h> |
| 83 | #include <linux/spinlock.h> | 83 | #include <linux/spinlock.h> |
| 84 | #include <linux/slab.h> | ||
| 84 | #include <linux/hash.h> | 85 | #include <linux/hash.h> |
| 85 | 86 | ||
| 86 | #include "wa-hc.h" | 87 | #include "wa-hc.h" |
diff --git a/drivers/uwb/address.c b/drivers/uwb/address.c index ad21b1d7218c..973321327c44 100644 --- a/drivers/uwb/address.c +++ b/drivers/uwb/address.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * FIXME: docs | 23 | * FIXME: docs |
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/errno.h> | 27 | #include <linux/errno.h> |
| 27 | #include <linux/module.h> | 28 | #include <linux/module.h> |
| 28 | #include <linux/device.h> | 29 | #include <linux/device.h> |
diff --git a/drivers/uwb/allocator.c b/drivers/uwb/allocator.c index c13cec7dcbc5..436e4f7110cb 100644 --- a/drivers/uwb/allocator.c +++ b/drivers/uwb/allocator.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/uwb.h> | 20 | #include <linux/uwb.h> |
| 20 | 21 | ||
| 21 | #include "uwb-internal.h" | 22 | #include "uwb-internal.h" |
diff --git a/drivers/uwb/beacon.c b/drivers/uwb/beacon.c index 36bc3158006f..dcdd59bfcd09 100644 --- a/drivers/uwb/beacon.c +++ b/drivers/uwb/beacon.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/device.h> | 28 | #include <linux/device.h> |
| 29 | #include <linux/err.h> | 29 | #include <linux/err.h> |
| 30 | #include <linux/kdev_t.h> | 30 | #include <linux/kdev_t.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #include "uwb-internal.h" | 33 | #include "uwb-internal.h" |
| 33 | 34 | ||
diff --git a/drivers/uwb/drp-ie.c b/drivers/uwb/drp-ie.c index 2840d7bf9e67..520673109a7e 100644 --- a/drivers/uwb/drp-ie.c +++ b/drivers/uwb/drp-ie.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | */ | 18 | */ |
| 19 | #include <linux/kernel.h> | 19 | #include <linux/kernel.h> |
| 20 | #include <linux/random.h> | 20 | #include <linux/random.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <linux/uwb.h> | 22 | #include <linux/uwb.h> |
| 22 | 23 | ||
| 23 | #include "uwb-internal.h" | 24 | #include "uwb-internal.h" |
diff --git a/drivers/uwb/drp.c b/drivers/uwb/drp.c index 4f5ca99a04b9..a8d83e25e3b6 100644 --- a/drivers/uwb/drp.c +++ b/drivers/uwb/drp.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/kthread.h> | 21 | #include <linux/kthread.h> |
| 22 | #include <linux/freezer.h> | 22 | #include <linux/freezer.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 24 | #include "uwb-internal.h" | 25 | #include "uwb-internal.h" |
| 25 | 26 | ||
diff --git a/drivers/uwb/est.c b/drivers/uwb/est.c index 328fcc2b6099..a2eaa3c33b0b 100644 --- a/drivers/uwb/est.c +++ b/drivers/uwb/est.c | |||
| @@ -40,6 +40,7 @@ | |||
| 40 | * uwb_est_get_size() | 40 | * uwb_est_get_size() |
| 41 | */ | 41 | */ |
| 42 | #include <linux/spinlock.h> | 42 | #include <linux/spinlock.h> |
| 43 | #include <linux/slab.h> | ||
| 43 | 44 | ||
| 44 | #include "uwb-internal.h" | 45 | #include "uwb-internal.h" |
| 45 | 46 | ||
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c index b409c228f254..2babcd4fbfc1 100644 --- a/drivers/uwb/hwa-rc.c +++ b/drivers/uwb/hwa-rc.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | */ | 53 | */ |
| 54 | #include <linux/init.h> | 54 | #include <linux/init.h> |
| 55 | #include <linux/module.h> | 55 | #include <linux/module.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | #include <linux/usb.h> | 57 | #include <linux/usb.h> |
| 57 | #include <linux/usb/wusb.h> | 58 | #include <linux/usb/wusb.h> |
| 58 | #include <linux/usb/wusb-wa.h> | 59 | #include <linux/usb/wusb-wa.h> |
diff --git a/drivers/uwb/i1480/dfu/mac.c b/drivers/uwb/i1480/dfu/mac.c index 694d0daf88ab..6ec14f5fcde4 100644 --- a/drivers/uwb/i1480/dfu/mac.c +++ b/drivers/uwb/i1480/dfu/mac.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | */ | 28 | */ |
| 29 | #include <linux/delay.h> | 29 | #include <linux/delay.h> |
| 30 | #include <linux/firmware.h> | 30 | #include <linux/firmware.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | #include <linux/uwb.h> | 32 | #include <linux/uwb.h> |
| 32 | #include "i1480-dfu.h" | 33 | #include "i1480-dfu.h" |
| 33 | 34 | ||
diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c index a99e211a1b87..ba8664328afa 100644 --- a/drivers/uwb/i1480/dfu/usb.c +++ b/drivers/uwb/i1480/dfu/usb.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/module.h> | 37 | #include <linux/module.h> |
| 38 | #include <linux/usb.h> | 38 | #include <linux/usb.h> |
| 39 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | #include <linux/delay.h> | 41 | #include <linux/delay.h> |
| 41 | #include <linux/uwb.h> | 42 | #include <linux/uwb.h> |
| 42 | #include <linux/usb/wusb.h> | 43 | #include <linux/usb/wusb.h> |
diff --git a/drivers/uwb/i1480/i1480u-wlp/lc.c b/drivers/uwb/i1480/i1480u-wlp/lc.c index f272dfe54d49..def778cf2216 100644 --- a/drivers/uwb/i1480/i1480u-wlp/lc.c +++ b/drivers/uwb/i1480/i1480u-wlp/lc.c | |||
| @@ -55,6 +55,7 @@ | |||
| 55 | * is being removed. | 55 | * is being removed. |
| 56 | * i1480u_rm() | 56 | * i1480u_rm() |
| 57 | */ | 57 | */ |
| 58 | #include <linux/gfp.h> | ||
| 58 | #include <linux/if_arp.h> | 59 | #include <linux/if_arp.h> |
| 59 | #include <linux/etherdevice.h> | 60 | #include <linux/etherdevice.h> |
| 60 | 61 | ||
diff --git a/drivers/uwb/i1480/i1480u-wlp/netdev.c b/drivers/uwb/i1480/i1480u-wlp/netdev.c index b236e6969942..f98f6ce8b9e7 100644 --- a/drivers/uwb/i1480/i1480u-wlp/netdev.c +++ b/drivers/uwb/i1480/i1480u-wlp/netdev.c | |||
| @@ -39,6 +39,7 @@ | |||
| 39 | * i1480u_set_config(): | 39 | * i1480u_set_config(): |
| 40 | */ | 40 | */ |
| 41 | 41 | ||
| 42 | #include <linux/slab.h> | ||
| 42 | #include <linux/if_arp.h> | 43 | #include <linux/if_arp.h> |
| 43 | #include <linux/etherdevice.h> | 44 | #include <linux/etherdevice.h> |
| 44 | 45 | ||
diff --git a/drivers/uwb/i1480/i1480u-wlp/rx.c b/drivers/uwb/i1480/i1480u-wlp/rx.c index 25a2758beb61..d4e51e108aa4 100644 --- a/drivers/uwb/i1480/i1480u-wlp/rx.c +++ b/drivers/uwb/i1480/i1480u-wlp/rx.c | |||
| @@ -64,6 +64,7 @@ | |||
| 64 | * | 64 | * |
| 65 | */ | 65 | */ |
| 66 | 66 | ||
| 67 | #include <linux/gfp.h> | ||
| 67 | #include <linux/netdevice.h> | 68 | #include <linux/netdevice.h> |
| 68 | #include <linux/etherdevice.h> | 69 | #include <linux/etherdevice.h> |
| 69 | #include "i1480u-wlp.h" | 70 | #include "i1480u-wlp.h" |
diff --git a/drivers/uwb/i1480/i1480u-wlp/tx.c b/drivers/uwb/i1480/i1480u-wlp/tx.c index 3db3449dbda4..3c117a364564 100644 --- a/drivers/uwb/i1480/i1480u-wlp/tx.c +++ b/drivers/uwb/i1480/i1480u-wlp/tx.c | |||
| @@ -54,6 +54,7 @@ | |||
| 54 | * the times the MTU will be smaller than one page... | 54 | * the times the MTU will be smaller than one page... |
| 55 | */ | 55 | */ |
| 56 | 56 | ||
| 57 | #include <linux/slab.h> | ||
| 57 | #include "i1480u-wlp.h" | 58 | #include "i1480u-wlp.h" |
| 58 | 59 | ||
| 59 | enum { | 60 | enum { |
diff --git a/drivers/uwb/ie.c b/drivers/uwb/ie.c index ab976686175b..30acec740425 100644 --- a/drivers/uwb/ie.c +++ b/drivers/uwb/ie.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | * FIXME: docs | 24 | * FIXME: docs |
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/slab.h> | ||
| 27 | #include "uwb-internal.h" | 28 | #include "uwb-internal.h" |
| 28 | 29 | ||
| 29 | /** | 30 | /** |
diff --git a/drivers/uwb/lc-dev.c b/drivers/uwb/lc-dev.c index 1097e81b56d0..90113bafefca 100644 --- a/drivers/uwb/lc-dev.c +++ b/drivers/uwb/lc-dev.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | * FIXME: docs | 23 | * FIXME: docs |
| 24 | */ | 24 | */ |
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 27 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 28 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
diff --git a/drivers/uwb/lc-rc.c b/drivers/uwb/lc-rc.c index 9611ef3b787a..b0091c771b9a 100644 --- a/drivers/uwb/lc-rc.c +++ b/drivers/uwb/lc-rc.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | #include <linux/kdev_t.h> | 35 | #include <linux/kdev_t.h> |
| 36 | #include <linux/etherdevice.h> | 36 | #include <linux/etherdevice.h> |
| 37 | #include <linux/usb.h> | 37 | #include <linux/usb.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | 39 | ||
| 39 | #include "uwb-internal.h" | 40 | #include "uwb-internal.h" |
| 40 | 41 | ||
diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c index 78510a1f410d..697e56a5bcdd 100644 --- a/drivers/uwb/neh.c +++ b/drivers/uwb/neh.c | |||
| @@ -83,6 +83,7 @@ | |||
| 83 | */ | 83 | */ |
| 84 | #include <linux/kernel.h> | 84 | #include <linux/kernel.h> |
| 85 | #include <linux/timer.h> | 85 | #include <linux/timer.h> |
| 86 | #include <linux/slab.h> | ||
| 86 | #include <linux/err.h> | 87 | #include <linux/err.h> |
| 87 | 88 | ||
| 88 | #include "uwb-internal.h" | 89 | #include "uwb-internal.h" |
diff --git a/drivers/uwb/reset.c b/drivers/uwb/reset.c index 7f0512e43d9d..27849292b552 100644 --- a/drivers/uwb/reset.c +++ b/drivers/uwb/reset.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | */ | 30 | */ |
| 31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
| 32 | #include <linux/err.h> | 32 | #include <linux/err.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/delay.h> | 34 | #include <linux/delay.h> |
| 34 | 35 | ||
| 35 | #include "uwb-internal.h" | 36 | #include "uwb-internal.h" |
diff --git a/drivers/uwb/rsv.c b/drivers/uwb/rsv.c index 6b76f4bb4cc7..78c892233cf1 100644 --- a/drivers/uwb/rsv.c +++ b/drivers/uwb/rsv.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | */ | 17 | */ |
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/uwb.h> | 19 | #include <linux/uwb.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/random.h> | 21 | #include <linux/random.h> |
| 21 | 22 | ||
| 22 | #include "uwb-internal.h" | 23 | #include "uwb-internal.h" |
diff --git a/drivers/uwb/scan.c b/drivers/uwb/scan.c index 2d270748f32b..76a1a1ed7d3e 100644 --- a/drivers/uwb/scan.c +++ b/drivers/uwb/scan.c | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | 35 | ||
| 36 | #include <linux/device.h> | 36 | #include <linux/device.h> |
| 37 | #include <linux/err.h> | 37 | #include <linux/err.h> |
| 38 | #include <linux/slab.h> | ||
| 38 | #include "uwb-internal.h" | 39 | #include "uwb-internal.h" |
| 39 | 40 | ||
| 40 | 41 | ||
diff --git a/drivers/uwb/umc-dev.c b/drivers/uwb/umc-dev.c index 1fc7d8270bb8..43ea9982e687 100644 --- a/drivers/uwb/umc-dev.c +++ b/drivers/uwb/umc-dev.c | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * This file is released under the GNU GPL v2. | 6 | * This file is released under the GNU GPL v2. |
| 7 | */ | 7 | */ |
| 8 | #include <linux/kernel.h> | 8 | #include <linux/kernel.h> |
| 9 | #include <linux/slab.h> | ||
| 9 | #include <linux/uwb/umc.h> | 10 | #include <linux/uwb/umc.h> |
| 10 | 11 | ||
| 11 | static void umc_device_release(struct device *dev) | 12 | static void umc_device_release(struct device *dev) |
diff --git a/drivers/uwb/uwbd.c b/drivers/uwb/uwbd.c index 6210fe1fd1bb..001c8b4020a8 100644 --- a/drivers/uwb/uwbd.c +++ b/drivers/uwb/uwbd.c | |||
| @@ -69,6 +69,7 @@ | |||
| 69 | * Handler functions are called normally uwbd_evt_handle_*(). | 69 | * Handler functions are called normally uwbd_evt_handle_*(). |
| 70 | */ | 70 | */ |
| 71 | #include <linux/kthread.h> | 71 | #include <linux/kthread.h> |
| 72 | #include <linux/slab.h> | ||
| 72 | #include <linux/module.h> | 73 | #include <linux/module.h> |
| 73 | #include <linux/freezer.h> | 74 | #include <linux/freezer.h> |
| 74 | 75 | ||
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c index 01950c62dc8d..73495583c444 100644 --- a/drivers/uwb/whc-rc.c +++ b/drivers/uwb/whc-rc.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/sched.h> | 45 | #include <linux/sched.h> |
| 46 | #include <linux/dma-mapping.h> | 46 | #include <linux/dma-mapping.h> |
| 47 | #include <linux/interrupt.h> | 47 | #include <linux/interrupt.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/workqueue.h> | 49 | #include <linux/workqueue.h> |
| 49 | #include <linux/uwb.h> | 50 | #include <linux/uwb.h> |
| 50 | #include <linux/uwb/whci.h> | 51 | #include <linux/uwb/whci.h> |
diff --git a/drivers/uwb/whci.c b/drivers/uwb/whci.c index 2e2784627ad6..b221142446a2 100644 --- a/drivers/uwb/whci.c +++ b/drivers/uwb/whci.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | #include <linux/kernel.h> | 9 | #include <linux/kernel.h> |
| 10 | #include <linux/pci.h> | 10 | #include <linux/pci.h> |
| 11 | #include <linux/dma-mapping.h> | 11 | #include <linux/dma-mapping.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/uwb/whci.h> | 13 | #include <linux/uwb/whci.h> |
| 13 | #include <linux/uwb/umc.h> | 14 | #include <linux/uwb/umc.h> |
| 14 | 15 | ||
diff --git a/drivers/uwb/wlp/eda.c b/drivers/uwb/wlp/eda.c index 69e020039718..086fc0cf9401 100644 --- a/drivers/uwb/wlp/eda.c +++ b/drivers/uwb/wlp/eda.c | |||
| @@ -53,6 +53,7 @@ | |||
| 53 | 53 | ||
| 54 | #include <linux/netdevice.h> | 54 | #include <linux/netdevice.h> |
| 55 | #include <linux/etherdevice.h> | 55 | #include <linux/etherdevice.h> |
| 56 | #include <linux/slab.h> | ||
| 56 | #include <linux/wlp.h> | 57 | #include <linux/wlp.h> |
| 57 | #include "wlp-internal.h" | 58 | #include "wlp-internal.h" |
| 58 | 59 | ||
diff --git a/drivers/uwb/wlp/messages.c b/drivers/uwb/wlp/messages.c index 75164866c2d8..3a8e033dce21 100644 --- a/drivers/uwb/wlp/messages.c +++ b/drivers/uwb/wlp/messages.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | */ | 24 | */ |
| 25 | 25 | ||
| 26 | #include <linux/wlp.h> | 26 | #include <linux/wlp.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "wlp-internal.h" | 29 | #include "wlp-internal.h" |
| 29 | 30 | ||
diff --git a/drivers/uwb/wlp/txrx.c b/drivers/uwb/wlp/txrx.c index 7350ed6909f8..05dde44b3592 100644 --- a/drivers/uwb/wlp/txrx.c +++ b/drivers/uwb/wlp/txrx.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | */ | 25 | */ |
| 26 | 26 | ||
| 27 | #include <linux/etherdevice.h> | 27 | #include <linux/etherdevice.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | #include <linux/wlp.h> | 29 | #include <linux/wlp.h> |
| 29 | 30 | ||
| 30 | #include "wlp-internal.h" | 31 | #include "wlp-internal.h" |
diff --git a/drivers/uwb/wlp/wlp-lc.c b/drivers/uwb/wlp/wlp-lc.c index 13db739c4e39..7f6a630bf26c 100644 --- a/drivers/uwb/wlp/wlp-lc.c +++ b/drivers/uwb/wlp/wlp-lc.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | * FIXME: docs | 22 | * FIXME: docs |
| 23 | */ | 23 | */ |
| 24 | #include <linux/wlp.h> | 24 | #include <linux/wlp.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include "wlp-internal.h" | 27 | #include "wlp-internal.h" |
| 27 | 28 | ||
diff --git a/drivers/uwb/wlp/wss-lc.c b/drivers/uwb/wlp/wss-lc.c index 5913c7a5d922..90accdd54c07 100644 --- a/drivers/uwb/wlp/wss-lc.c +++ b/drivers/uwb/wlp/wss-lc.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | */ | 45 | */ |
| 46 | #include <linux/etherdevice.h> /* for is_valid_ether_addr */ | 46 | #include <linux/etherdevice.h> /* for is_valid_ether_addr */ |
| 47 | #include <linux/skbuff.h> | 47 | #include <linux/skbuff.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | #include <linux/wlp.h> | 49 | #include <linux/wlp.h> |
| 49 | 50 | ||
| 50 | #include "wlp-internal.h" | 51 | #include "wlp-internal.h" |
diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index a6a88dfd5029..9777583218ff 100644 --- a/drivers/vhost/net.c +++ b/drivers/vhost/net.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/workqueue.h> | 17 | #include <linux/workqueue.h> |
| 18 | #include <linux/rcupdate.h> | 18 | #include <linux/rcupdate.h> |
| 19 | #include <linux/file.h> | 19 | #include <linux/file.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include <linux/net.h> | 22 | #include <linux/net.h> |
| 22 | #include <linux/if_packet.h> | 23 | #include <linux/if_packet.h> |
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index 7bd7a1e4409d..5be11c99e18f 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | #include <linux/poll.h> | 22 | #include <linux/poll.h> |
| 23 | #include <linux/file.h> | 23 | #include <linux/file.h> |
| 24 | #include <linux/highmem.h> | 24 | #include <linux/highmem.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | 26 | ||
| 26 | #include <linux/net.h> | 27 | #include <linux/net.h> |
| 27 | #include <linux/if_packet.h> | 28 | #include <linux/if_packet.h> |
diff --git a/drivers/video/68328fb.c b/drivers/video/68328fb.c index 2110556f76b3..75a39eab70c3 100644 --- a/drivers/video/68328fb.c +++ b/drivers/video/68328fb.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
diff --git a/drivers/video/acornfb.c b/drivers/video/acornfb.c index 43d7d5067361..82acb8dc4aa1 100644 --- a/drivers/video/acornfb.c +++ b/drivers/video/acornfb.c | |||
| @@ -22,13 +22,13 @@ | |||
| 22 | #include <linux/errno.h> | 22 | #include <linux/errno.h> |
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | #include <linux/ctype.h> | 24 | #include <linux/ctype.h> |
| 25 | #include <linux/slab.h> | ||
| 26 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 27 | #include <linux/init.h> | 26 | #include <linux/init.h> |
| 28 | #include <linux/fb.h> | 27 | #include <linux/fb.h> |
| 29 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 30 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
| 31 | #include <linux/io.h> | 30 | #include <linux/io.h> |
| 31 | #include <linux/gfp.h> | ||
| 32 | 32 | ||
| 33 | #include <mach/hardware.h> | 33 | #include <mach/hardware.h> |
| 34 | #include <asm/irq.h> | 34 | #include <asm/irq.h> |
diff --git a/drivers/video/amifb.c b/drivers/video/amifb.c index 82bedd7f7789..dca48df98444 100644 --- a/drivers/video/amifb.c +++ b/drivers/video/amifb.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/errno.h> | 45 | #include <linux/errno.h> |
| 46 | #include <linux/string.h> | 46 | #include <linux/string.h> |
| 47 | #include <linux/mm.h> | 47 | #include <linux/mm.h> |
| 48 | #include <linux/slab.h> | ||
| 49 | #include <linux/delay.h> | 48 | #include <linux/delay.h> |
| 50 | #include <linux/interrupt.h> | 49 | #include <linux/interrupt.h> |
| 51 | #include <linux/fb.h> | 50 | #include <linux/fb.h> |
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 01554d696528..8d406fb689c1 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 40 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 41 | #include <linux/mm.h> | 41 | #include <linux/mm.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/vmalloc.h> | 42 | #include <linux/vmalloc.h> |
| 44 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 45 | #include <linux/interrupt.h> | 44 | #include <linux/interrupt.h> |
diff --git a/drivers/video/asiliantfb.c b/drivers/video/asiliantfb.c index e70bc225fe31..8cdf88e20b4b 100644 --- a/drivers/video/asiliantfb.c +++ b/drivers/video/asiliantfb.c | |||
| @@ -34,7 +34,6 @@ | |||
| 34 | #include <linux/errno.h> | 34 | #include <linux/errno.h> |
| 35 | #include <linux/string.h> | 35 | #include <linux/string.h> |
| 36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 37 | #include <linux/slab.h> | ||
| 38 | #include <linux/vmalloc.h> | 37 | #include <linux/vmalloc.h> |
| 39 | #include <linux/delay.h> | 38 | #include <linux/delay.h> |
| 40 | #include <linux/interrupt.h> | 39 | #include <linux/interrupt.h> |
diff --git a/drivers/video/atafb.c b/drivers/video/atafb.c index b7687c55fe16..f3aada20fa02 100644 --- a/drivers/video/atafb.c +++ b/drivers/video/atafb.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 53 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 54 | #include <linux/mm.h> | 54 | #include <linux/mm.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <linux/delay.h> | 55 | #include <linux/delay.h> |
| 57 | #include <linux/init.h> | 56 | #include <linux/init.h> |
| 58 | #include <linux/interrupt.h> | 57 | #include <linux/interrupt.h> |
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c index 11de3bfd4e54..8dce25126330 100644 --- a/drivers/video/atmel_lcdfb.c +++ b/drivers/video/atmel_lcdfb.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 19 | #include <linux/backlight.h> | 19 | #include <linux/backlight.h> |
| 20 | #include <linux/gfp.h> | ||
| 20 | 21 | ||
| 21 | #include <mach/board.h> | 22 | #include <mach/board.h> |
| 22 | #include <mach/cpu.h> | 23 | #include <mach/cpu.h> |
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index a489be0c4614..34a0851bcbfa 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
| @@ -52,7 +52,6 @@ | |||
| 52 | #include <linux/errno.h> | 52 | #include <linux/errno.h> |
| 53 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 54 | #include <linux/mm.h> | 54 | #include <linux/mm.h> |
| 55 | #include <linux/slab.h> | ||
| 56 | #include <linux/vmalloc.h> | 55 | #include <linux/vmalloc.h> |
| 57 | #include <linux/delay.h> | 56 | #include <linux/delay.h> |
| 58 | #include <linux/interrupt.h> | 57 | #include <linux/interrupt.h> |
diff --git a/drivers/video/aty/mach64_cursor.c b/drivers/video/aty/mach64_cursor.c index 04c710804bb0..2ba8b3c421a1 100644 --- a/drivers/video/aty/mach64_cursor.c +++ b/drivers/video/aty/mach64_cursor.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | * ATI Mach64 CT/VT/GT/LT Cursor Support | 2 | * ATI Mach64 CT/VT/GT/LT Cursor Support |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/slab.h> | ||
| 6 | #include <linux/fb.h> | 5 | #include <linux/fb.h> |
| 7 | #include <linux/init.h> | 6 | #include <linux/init.h> |
| 8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
diff --git a/drivers/video/aty/radeon_backlight.c b/drivers/video/aty/radeon_backlight.c index 9fc8c66be3ce..256966e9667d 100644 --- a/drivers/video/aty/radeon_backlight.c +++ b/drivers/video/aty/radeon_backlight.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include "radeonfb.h" | 13 | #include "radeonfb.h" |
| 14 | #include <linux/backlight.h> | 14 | #include <linux/backlight.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #ifdef CONFIG_PMAC_BACKLIGHT | 17 | #ifdef CONFIG_PMAC_BACKLIGHT |
| 17 | #include <asm/backlight.h> | 18 | #include <asm/backlight.h> |
diff --git a/drivers/video/aty/radeon_monitor.c b/drivers/video/aty/radeon_monitor.c index b4d4b88afc09..9261c918fde8 100644 --- a/drivers/video/aty/radeon_monitor.c +++ b/drivers/video/aty/radeon_monitor.c | |||
| @@ -1,4 +1,7 @@ | |||
| 1 | #include "radeonfb.h" | 1 | #include "radeonfb.h" |
| 2 | |||
| 3 | #include <linux/slab.h> | ||
| 4 | |||
| 2 | #include "../edid.h" | 5 | #include "../edid.h" |
| 3 | 6 | ||
| 4 | static struct fb_var_screeninfo radeonfb_default_var = { | 7 | static struct fb_var_screeninfo radeonfb_default_var = { |
diff --git a/drivers/video/au1100fb.c b/drivers/video/au1100fb.c index a699aab63820..40f61320ce16 100644 --- a/drivers/video/au1100fb.c +++ b/drivers/video/au1100fb.c | |||
| @@ -52,6 +52,7 @@ | |||
| 52 | #include <linux/ctype.h> | 52 | #include <linux/ctype.h> |
| 53 | #include <linux/dma-mapping.h> | 53 | #include <linux/dma-mapping.h> |
| 54 | #include <linux/platform_device.h> | 54 | #include <linux/platform_device.h> |
| 55 | #include <linux/slab.h> | ||
| 55 | 56 | ||
| 56 | #include <asm/mach-au1x00/au1000.h> | 57 | #include <asm/mach-au1x00/au1000.h> |
| 57 | 58 | ||
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 0d96f1d2d4c5..e77e8e4280fb 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
| @@ -41,6 +41,7 @@ | |||
| 41 | #include <linux/interrupt.h> | 41 | #include <linux/interrupt.h> |
| 42 | #include <linux/ctype.h> | 42 | #include <linux/ctype.h> |
| 43 | #include <linux/dma-mapping.h> | 43 | #include <linux/dma-mapping.h> |
| 44 | #include <linux/slab.h> | ||
| 44 | 45 | ||
| 45 | #include <asm/mach-au1x00/au1000.h> | 46 | #include <asm/mach-au1x00/au1000.h> |
| 46 | #include "au1200fb.h" | 47 | #include "au1200fb.h" |
diff --git a/drivers/video/backlight/88pm860x_bl.c b/drivers/video/backlight/88pm860x_bl.c index 93e25c77aeb2..68d2518fadaa 100644 --- a/drivers/video/backlight/88pm860x_bl.c +++ b/drivers/video/backlight/88pm860x_bl.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 17 | #include <linux/backlight.h> | 17 | #include <linux/backlight.h> |
| 18 | #include <linux/mfd/88pm860x.h> | 18 | #include <linux/mfd/88pm860x.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define MAX_BRIGHTNESS (0xFF) | 21 | #define MAX_BRIGHTNESS (0xFF) |
| 21 | #define MIN_BRIGHTNESS (0) | 22 | #define MIN_BRIGHTNESS (0) |
diff --git a/drivers/video/backlight/adp5520_bl.c b/drivers/video/backlight/adp5520_bl.c index 5183f0e4d314..9f436e014f85 100644 --- a/drivers/video/backlight/adp5520_bl.c +++ b/drivers/video/backlight/adp5520_bl.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/fb.h> | 12 | #include <linux/fb.h> |
| 13 | #include <linux/backlight.h> | 13 | #include <linux/backlight.h> |
| 14 | #include <linux/mfd/adp5520.h> | 14 | #include <linux/mfd/adp5520.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | struct adp5520_bl { | 17 | struct adp5520_bl { |
| 17 | struct device *master; | 18 | struct device *master; |
diff --git a/drivers/video/backlight/adx_bl.c b/drivers/video/backlight/adx_bl.c index b0624b983889..7f4a7c30a98b 100644 --- a/drivers/video/backlight/adx_bl.c +++ b/drivers/video/backlight/adx_bl.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/backlight.h> | 13 | #include <linux/backlight.h> |
| 14 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 15 | #include <linux/gfp.h> | ||
| 15 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 17 | #include <linux/platform_device.h> | 18 | #include <linux/platform_device.h> |
diff --git a/drivers/video/backlight/atmel-pwm-bl.c b/drivers/video/backlight/atmel-pwm-bl.c index 2d9760551a4b..e6a66dab088c 100644 --- a/drivers/video/backlight/atmel-pwm-bl.c +++ b/drivers/video/backlight/atmel-pwm-bl.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/backlight.h> | 17 | #include <linux/backlight.h> |
| 18 | #include <linux/atmel_pwm.h> | 18 | #include <linux/atmel_pwm.h> |
| 19 | #include <linux/atmel-pwm-bl.h> | 19 | #include <linux/atmel-pwm-bl.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | struct atmel_pwm_bl { | 22 | struct atmel_pwm_bl { |
| 22 | const struct atmel_pwm_bl_platform_data *pdata; | 23 | const struct atmel_pwm_bl_platform_data *pdata; |
diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c index 68bb838b9f11..e207810bba3c 100644 --- a/drivers/video/backlight/backlight.c +++ b/drivers/video/backlight/backlight.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/ctype.h> | 13 | #include <linux/ctype.h> |
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #ifdef CONFIG_PMAC_BACKLIGHT | 18 | #ifdef CONFIG_PMAC_BACKLIGHT |
| 18 | #include <asm/backlight.h> | 19 | #include <asm/backlight.h> |
diff --git a/drivers/video/backlight/corgi_lcd.c b/drivers/video/backlight/corgi_lcd.c index 73bdd8454c94..1e71c35083bb 100644 --- a/drivers/video/backlight/corgi_lcd.c +++ b/drivers/video/backlight/corgi_lcd.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/lcd.h> | 24 | #include <linux/lcd.h> |
| 25 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
| 26 | #include <linux/spi/corgi_lcd.h> | 26 | #include <linux/spi/corgi_lcd.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <asm/mach/sharpsl_param.h> | 28 | #include <asm/mach/sharpsl_param.h> |
| 28 | 29 | ||
| 29 | #define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL) | 30 | #define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL) |
diff --git a/drivers/video/backlight/cr_bllcd.c b/drivers/video/backlight/cr_bllcd.c index 1cce6031bff2..a4f4546f0be0 100644 --- a/drivers/video/backlight/cr_bllcd.c +++ b/drivers/video/backlight/cr_bllcd.c | |||
| @@ -36,6 +36,7 @@ | |||
| 36 | #include <linux/backlight.h> | 36 | #include <linux/backlight.h> |
| 37 | #include <linux/lcd.h> | 37 | #include <linux/lcd.h> |
| 38 | #include <linux/pci.h> | 38 | #include <linux/pci.h> |
| 39 | #include <linux/slab.h> | ||
| 39 | 40 | ||
| 40 | /* The LVDS- and panel power controls sits on the | 41 | /* The LVDS- and panel power controls sits on the |
| 41 | * GPIO port of the ISA bridge. | 42 | * GPIO port of the ISA bridge. |
diff --git a/drivers/video/backlight/da903x_bl.c b/drivers/video/backlight/da903x_bl.c index 686e4a789238..87659ed79bd7 100644 --- a/drivers/video/backlight/da903x_bl.c +++ b/drivers/video/backlight/da903x_bl.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/backlight.h> | 19 | #include <linux/backlight.h> |
| 20 | #include <linux/mfd/da903x.h> | 20 | #include <linux/mfd/da903x.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #define DA9030_WLED_CONTROL 0x25 | 23 | #define DA9030_WLED_CONTROL 0x25 |
| 23 | #define DA9030_WLED_CP_EN (1 << 6) | 24 | #define DA9030_WLED_CP_EN (1 << 6) |
diff --git a/drivers/video/backlight/ili9320.c b/drivers/video/backlight/ili9320.c index ba89b41b639c..5118a9f029ab 100644 --- a/drivers/video/backlight/ili9320.c +++ b/drivers/video/backlight/ili9320.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/lcd.h> | 18 | #include <linux/lcd.h> |
| 19 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
| 22 | 23 | ||
diff --git a/drivers/video/backlight/l4f00242t03.c b/drivers/video/backlight/l4f00242t03.c index 74abd6994b09..bcdb12c93efd 100644 --- a/drivers/video/backlight/l4f00242t03.c +++ b/drivers/video/backlight/l4f00242t03.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 17 | #include <linux/gpio.h> | 17 | #include <linux/gpio.h> |
| 18 | #include <linux/lcd.h> | 18 | #include <linux/lcd.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/regulator/consumer.h> | 20 | #include <linux/regulator/consumer.h> |
| 20 | 21 | ||
| 21 | #include <linux/spi/spi.h> | 22 | #include <linux/spi/spi.h> |
diff --git a/drivers/video/backlight/lcd.c b/drivers/video/backlight/lcd.c index 9b3be74cee5a..71a11cadffc4 100644 --- a/drivers/video/backlight/lcd.c +++ b/drivers/video/backlight/lcd.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/ctype.h> | 13 | #include <linux/ctype.h> |
| 14 | #include <linux/err.h> | 14 | #include <linux/err.h> |
| 15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \ | 18 | #if defined(CONFIG_FB) || (defined(CONFIG_FB_MODULE) && \ |
| 18 | defined(CONFIG_LCD_CLASS_DEVICE_MODULE)) | 19 | defined(CONFIG_LCD_CLASS_DEVICE_MODULE)) |
diff --git a/drivers/video/backlight/lms283gf05.c b/drivers/video/backlight/lms283gf05.c index 447b542a20ca..abc43a0eb97d 100644 --- a/drivers/video/backlight/lms283gf05.c +++ b/drivers/video/backlight/lms283gf05.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/device.h> | 11 | #include <linux/device.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/gpio.h> | 15 | #include <linux/gpio.h> |
| 15 | #include <linux/lcd.h> | 16 | #include <linux/lcd.h> |
| 16 | 17 | ||
diff --git a/drivers/video/backlight/ltv350qv.c b/drivers/video/backlight/ltv350qv.c index 4631ca8fa4a4..8010aaeb5adb 100644 --- a/drivers/video/backlight/ltv350qv.c +++ b/drivers/video/backlight/ltv350qv.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
| 14 | #include <linux/lcd.h> | 14 | #include <linux/lcd.h> |
| 15 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/spi/spi.h> | 17 | #include <linux/spi/spi.h> |
| 17 | 18 | ||
| 18 | #include "ltv350qv.h" | 19 | #include "ltv350qv.h" |
diff --git a/drivers/video/backlight/max8925_bl.c b/drivers/video/backlight/max8925_bl.c index c91adaf492cf..b5accc957ad3 100644 --- a/drivers/video/backlight/max8925_bl.c +++ b/drivers/video/backlight/max8925_bl.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/i2c.h> | 16 | #include <linux/i2c.h> |
| 17 | #include <linux/backlight.h> | 17 | #include <linux/backlight.h> |
| 18 | #include <linux/mfd/max8925.h> | 18 | #include <linux/mfd/max8925.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #define MAX_BRIGHTNESS (0xff) | 21 | #define MAX_BRIGHTNESS (0xff) |
| 21 | #define MIN_BRIGHTNESS (0) | 22 | #define MIN_BRIGHTNESS (0) |
diff --git a/drivers/video/backlight/omap1_bl.c b/drivers/video/backlight/omap1_bl.c index 333d28e6b062..d3bc56296c8d 100644 --- a/drivers/video/backlight/omap1_bl.c +++ b/drivers/video/backlight/omap1_bl.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/platform_device.h> | 24 | #include <linux/platform_device.h> |
| 25 | #include <linux/fb.h> | 25 | #include <linux/fb.h> |
| 26 | #include <linux/backlight.h> | 26 | #include <linux/backlight.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include <mach/hardware.h> | 29 | #include <mach/hardware.h> |
| 29 | #include <plat/board.h> | 30 | #include <plat/board.h> |
diff --git a/drivers/video/backlight/platform_lcd.c b/drivers/video/backlight/platform_lcd.c index 738694d23889..302330acf628 100644 --- a/drivers/video/backlight/platform_lcd.c +++ b/drivers/video/backlight/platform_lcd.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
| 17 | #include <linux/backlight.h> | 17 | #include <linux/backlight.h> |
| 18 | #include <linux/lcd.h> | 18 | #include <linux/lcd.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | 20 | ||
| 20 | #include <video/platform_lcd.h> | 21 | #include <video/platform_lcd.h> |
| 21 | 22 | ||
diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c index b89eebc3f77d..550443518891 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/err.h> | 19 | #include <linux/err.h> |
| 20 | #include <linux/pwm.h> | 20 | #include <linux/pwm.h> |
| 21 | #include <linux/pwm_backlight.h> | 21 | #include <linux/pwm_backlight.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | struct pwm_bl_data { | 24 | struct pwm_bl_data { |
| 24 | struct pwm_device *pwm; | 25 | struct pwm_device *pwm; |
diff --git a/drivers/video/backlight/tdo24m.c b/drivers/video/backlight/tdo24m.c index 4a3d46e08016..1997e12a1057 100644 --- a/drivers/video/backlight/tdo24m.c +++ b/drivers/video/backlight/tdo24m.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/spi/tdo24m.h> | 17 | #include <linux/spi/tdo24m.h> |
| 18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/lcd.h> | 19 | #include <linux/lcd.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | 21 | ||
| 21 | #define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL) | 22 | #define POWER_IS_ON(pwr) ((pwr) <= FB_BLANK_NORMAL) |
| 22 | 23 | ||
diff --git a/drivers/video/backlight/tosa_bl.c b/drivers/video/backlight/tosa_bl.c index f57bbf170049..e03e60bbfd85 100644 --- a/drivers/video/backlight/tosa_bl.c +++ b/drivers/video/backlight/tosa_bl.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 19 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 20 | #include <linux/backlight.h> | 20 | #include <linux/backlight.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | 22 | ||
| 22 | #include <asm/mach/sharpsl_param.h> | 23 | #include <asm/mach/sharpsl_param.h> |
| 23 | 24 | ||
diff --git a/drivers/video/backlight/tosa_lcd.c b/drivers/video/backlight/tosa_lcd.c index fa32b94a4546..772f6015219a 100644 --- a/drivers/video/backlight/tosa_lcd.c +++ b/drivers/video/backlight/tosa_lcd.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/device.h> | 15 | #include <linux/device.h> |
| 16 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 17 | #include <linux/i2c.h> | 17 | #include <linux/i2c.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/gpio.h> | 19 | #include <linux/gpio.h> |
| 19 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 20 | #include <linux/lcd.h> | 21 | #include <linux/lcd.h> |
diff --git a/drivers/video/backlight/wm831x_bl.c b/drivers/video/backlight/wm831x_bl.c index a4312709fb1b..08fd87f3aecc 100644 --- a/drivers/video/backlight/wm831x_bl.c +++ b/drivers/video/backlight/wm831x_bl.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 15 | #include <linux/backlight.h> | 15 | #include <linux/backlight.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/mfd/wm831x/core.h> | 18 | #include <linux/mfd/wm831x/core.h> |
| 18 | #include <linux/mfd/wm831x/pdata.h> | 19 | #include <linux/mfd/wm831x/pdata.h> |
diff --git a/drivers/video/bfin-lq035q1-fb.c b/drivers/video/bfin-lq035q1-fb.c index 03872365a36d..2baac7cc1425 100644 --- a/drivers/video/bfin-lq035q1-fb.c +++ b/drivers/video/bfin-lq035q1-fb.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 17 | #include <linux/types.h> | 18 | #include <linux/types.h> |
| 18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
diff --git a/drivers/video/bfin-t350mcqb-fb.c b/drivers/video/bfin-t350mcqb-fb.c index 31a2dec927bb..44e49c28b2a7 100644 --- a/drivers/video/bfin-t350mcqb-fb.c +++ b/drivers/video/bfin-t350mcqb-fb.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/gfp.h> | ||
| 35 | #include <linux/fb.h> | 36 | #include <linux/fb.h> |
| 36 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 37 | #include <linux/types.h> | 38 | #include <linux/types.h> |
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index b0b147cb4cb3..43320925c4ce 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
diff --git a/drivers/video/carminefb.c b/drivers/video/carminefb.c index 0c02f8ec4bf3..d8345fcc4fe3 100644 --- a/drivers/video/carminefb.c +++ b/drivers/video/carminefb.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/fb.h> | 11 | #include <linux/fb.h> |
| 12 | #include <linux/interrupt.h> | 12 | #include <linux/interrupt.h> |
| 13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | 15 | ||
| 15 | #include "carminefb.h" | 16 | #include "carminefb.h" |
| 16 | #include "carminefb_regs.h" | 17 | #include "carminefb_regs.h" |
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index 79e5f40e6486..bb5a96b1645d 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/string.h> | 27 | #include <linux/string.h> |
| 28 | #include <linux/fb.h> | 28 | #include <linux/fb.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <asm/types.h> | 29 | #include <asm/types.h> |
| 31 | #include <asm/io.h> | 30 | #include <asm/io.h> |
| 32 | #include "fb_draw.h" | 31 | #include "fb_draw.h" |
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index fe45a3b8d0e0..77a040af20a7 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index b2319fa7286f..30eedf79322c 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 0d47c6030e3d..6d0fcb43696e 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c index 57b9d276497e..d637e1f53172 100644 --- a/drivers/video/chipsfb.c +++ b/drivers/video/chipsfb.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/errno.h> | 19 | #include <linux/errno.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/vmalloc.h> | 22 | #include <linux/vmalloc.h> |
| 24 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 25 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c index 4c2bf923418c..8d8dfda2f868 100644 --- a/drivers/video/cirrusfb.c +++ b/drivers/video/cirrusfb.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/errno.h> | 39 | #include <linux/errno.h> |
| 40 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 41 | #include <linux/mm.h> | 41 | #include <linux/mm.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <linux/delay.h> | 42 | #include <linux/delay.h> |
| 44 | #include <linux/fb.h> | 43 | #include <linux/fb.h> |
| 45 | #include <linux/init.h> | 44 | #include <linux/init.h> |
diff --git a/drivers/video/console/bitblit.c b/drivers/video/console/bitblit.c index 6b7c8fbc5495..af88651b0735 100644 --- a/drivers/video/console/bitblit.c +++ b/drivers/video/console/bitblit.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 15 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
| 16 | #include <linux/vt_kern.h> | 17 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_ccw.c b/drivers/video/console/fbcon_ccw.c index bdf913ecf001..d135671d9961 100644 --- a/drivers/video/console/fbcon_ccw.c +++ b/drivers/video/console/fbcon_ccw.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_cw.c b/drivers/video/console/fbcon_cw.c index a6819b9d1770..126110f8454f 100644 --- a/drivers/video/console/fbcon_cw.c +++ b/drivers/video/console/fbcon_cw.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_rotate.c b/drivers/video/console/fbcon_rotate.c index 00884e013f0f..db6528f2d3f2 100644 --- a/drivers/video/console/fbcon_rotate.c +++ b/drivers/video/console/fbcon_rotate.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c index d9b5d6eb68a7..93a3e7381b50 100644 --- a/drivers/video/console/fbcon_ud.c +++ b/drivers/video/console/fbcon_ud.c | |||
| @@ -9,6 +9,7 @@ | |||
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/slab.h> | ||
| 12 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 13 | #include <linux/fb.h> | 14 | #include <linux/fb.h> |
| 14 | #include <linux/vt_kern.h> | 15 | #include <linux/vt_kern.h> |
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c index dd3eaaad4441..0b67866cae10 100644 --- a/drivers/video/console/mdacon.c +++ b/drivers/video/console/mdacon.c | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #include <linux/console.h> | 33 | #include <linux/console.h> |
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/kd.h> | 35 | #include <linux/kd.h> |
| 36 | #include <linux/slab.h> | ||
| 37 | #include <linux/vt_kern.h> | 36 | #include <linux/vt_kern.h> |
| 38 | #include <linux/vt_buffer.h> | 37 | #include <linux/vt_buffer.h> |
| 39 | #include <linux/selection.h> | 38 | #include <linux/selection.h> |
diff --git a/drivers/video/da8xx-fb.c b/drivers/video/da8xx-fb.c index 369a5b3ac649..8d244ba0f601 100644 --- a/drivers/video/da8xx-fb.c +++ b/drivers/video/da8xx-fb.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
| 31 | #include <linux/cpufreq.h> | 31 | #include <linux/cpufreq.h> |
| 32 | #include <linux/console.h> | 32 | #include <linux/console.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <video/da8xx-fb.h> | 34 | #include <video/da8xx-fb.h> |
| 34 | 35 | ||
| 35 | #define DRIVER_NAME "da8xx_lcdc" | 36 | #define DRIVER_NAME "da8xx_lcdc" |
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c index 80abbf323b99..f6a09ab0dac6 100644 --- a/drivers/video/display/display-sysfs.c +++ b/drivers/video/display/display-sysfs.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/idr.h> | 27 | #include <linux/idr.h> |
| 28 | #include <linux/err.h> | 28 | #include <linux/err.h> |
| 29 | #include <linux/kdev_t.h> | 29 | #include <linux/kdev_t.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | static ssize_t display_show_name(struct device *dev, | 32 | static ssize_t display_show_name(struct device *dev, |
| 32 | struct device_attribute *attr, char *buf) | 33 | struct device_attribute *attr, char *buf) |
diff --git a/drivers/video/dnfb.c b/drivers/video/dnfb.c index 606da043f4b4..ec56d2544c73 100644 --- a/drivers/video/dnfb.c +++ b/drivers/video/dnfb.c | |||
| @@ -2,7 +2,6 @@ | |||
| 2 | #include <linux/errno.h> | 2 | #include <linux/errno.h> |
| 3 | #include <linux/string.h> | 3 | #include <linux/string.h> |
| 4 | #include <linux/mm.h> | 4 | #include <linux/mm.h> |
| 5 | #include <linux/slab.h> | ||
| 6 | #include <linux/delay.h> | 5 | #include <linux/delay.h> |
| 7 | #include <linux/interrupt.h> | 6 | #include <linux/interrupt.h> |
| 8 | #include <linux/platform_device.h> | 7 | #include <linux/platform_device.h> |
diff --git a/drivers/video/ep93xx-fb.c b/drivers/video/ep93xx-fb.c index 27aab4a06198..0c99de0562ca 100644 --- a/drivers/video/ep93xx-fb.c +++ b/drivers/video/ep93xx-fb.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | 19 | ||
| 20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
| 21 | #include <linux/dma-mapping.h> | 21 | #include <linux/dma-mapping.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 23 | #include <linux/fb.h> | 24 | #include <linux/fb.h> |
| 24 | 25 | ||
diff --git a/drivers/video/epson1355fb.c b/drivers/video/epson1355fb.c index 6d755bb3a2bc..db9713b49ce9 100644 --- a/drivers/video/epson1355fb.c +++ b/drivers/video/epson1355fb.c | |||
| @@ -48,7 +48,6 @@ | |||
| 48 | #include <linux/errno.h> | 48 | #include <linux/errno.h> |
| 49 | #include <linux/string.h> | 49 | #include <linux/string.h> |
| 50 | #include <linux/mm.h> | 50 | #include <linux/mm.h> |
| 51 | #include <linux/slab.h> | ||
| 52 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 53 | #include <linux/fb.h> | 52 | #include <linux/fb.h> |
| 54 | #include <linux/init.h> | 53 | #include <linux/init.h> |
diff --git a/drivers/video/fb_ddc.c b/drivers/video/fb_ddc.c index 0cf96eb8a60f..4a874c8d039c 100644 --- a/drivers/video/fb_ddc.c +++ b/drivers/video/fb_ddc.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/fb.h> | 13 | #include <linux/fb.h> |
| 14 | #include <linux/i2c-algo-bit.h> | 14 | #include <linux/i2c-algo-bit.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | 16 | ||
| 16 | #include "edid.h" | 17 | #include "edid.h" |
| 17 | 18 | ||
diff --git a/drivers/video/fb_defio.c b/drivers/video/fb_defio.c index 44ce908a478b..6113c47e095a 100644 --- a/drivers/video/fb_defio.c +++ b/drivers/video/fb_defio.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/vmalloc.h> | 16 | #include <linux/vmalloc.h> |
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
diff --git a/drivers/video/fbcvt.c b/drivers/video/fbcvt.c index 0847c5e72cbd..7293eaccd81b 100644 --- a/drivers/video/fbcvt.c +++ b/drivers/video/fbcvt.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | * | 13 | * |
| 14 | */ | 14 | */ |
| 15 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | 17 | ||
| 17 | #define FB_CVT_CELLSIZE 8 | 18 | #define FB_CVT_CELLSIZE 8 |
| 18 | #define FB_CVT_GTF_C 40 | 19 | #define FB_CVT_GTF_C 40 |
diff --git a/drivers/video/fbmon.c b/drivers/video/fbmon.c index 9ae9cd32bd06..563a98b88e9b 100644 --- a/drivers/video/fbmon.c +++ b/drivers/video/fbmon.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/fb.h> | 29 | #include <linux/fb.h> |
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | #include <video/edid.h> | 33 | #include <video/edid.h> |
| 33 | #ifdef CONFIG_PPC_OF | 34 | #ifdef CONFIG_PPC_OF |
| 34 | #include <asm/prom.h> | 35 | #include <asm/prom.h> |
diff --git a/drivers/video/fbsysfs.c b/drivers/video/fbsysfs.c index d4a2c11d9809..81aa3129c17d 100644 --- a/drivers/video/fbsysfs.c +++ b/drivers/video/fbsysfs.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/fb.h> | 20 | #include <linux/fb.h> |
| 20 | #include <linux/console.h> | 21 | #include <linux/console.h> |
| 21 | #include <linux/module.h> | 22 | #include <linux/module.h> |
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 9dbb9646081f..a42fabab69df 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
diff --git a/drivers/video/g364fb.c b/drivers/video/g364fb.c index b7655c05da53..d662317d85e3 100644 --- a/drivers/video/g364fb.c +++ b/drivers/video/g364fb.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/errno.h> | 20 | #include <linux/errno.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/mm.h> | 22 | #include <linux/mm.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
diff --git a/drivers/video/gbefb.c b/drivers/video/gbefb.c index 5643a35c1746..7d8c55d7fd28 100644 --- a/drivers/video/gbefb.c +++ b/drivers/video/gbefb.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/dma-mapping.h> | 14 | #include <linux/dma-mapping.h> |
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
| 17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 18 | #include <linux/interrupt.h> | 19 | #include <linux/interrupt.h> |
diff --git a/drivers/video/geode/gx1fb_core.c b/drivers/video/geode/gx1fb_core.c index f20eff8c4a81..c6b554f72c6d 100644 --- a/drivers/video/geode/gx1fb_core.c +++ b/drivers/video/geode/gx1fb_core.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
diff --git a/drivers/video/geode/gxfb_core.c b/drivers/video/geode/gxfb_core.c index b3e639d1e12c..76e7dac6f259 100644 --- a/drivers/video/geode/gxfb_core.c +++ b/drivers/video/geode/gxfb_core.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/errno.h> | 25 | #include <linux/errno.h> |
| 26 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 27 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/fb.h> | 29 | #include <linux/fb.h> |
| 31 | #include <linux/console.h> | 30 | #include <linux/console.h> |
diff --git a/drivers/video/geode/lxfb_core.c b/drivers/video/geode/lxfb_core.c index 889cbe39e580..1a18da86d3fa 100644 --- a/drivers/video/geode/lxfb_core.c +++ b/drivers/video/geode/lxfb_core.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/console.h> | 17 | #include <linux/console.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/suspend.h> | 19 | #include <linux/suspend.h> |
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/fb.h> | 21 | #include <linux/fb.h> |
diff --git a/drivers/video/hecubafb.c b/drivers/video/hecubafb.c index f9d77adf035d..c77bcc6ab463 100644 --- a/drivers/video/hecubafb.c +++ b/drivers/video/hecubafb.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
| 33 | #include <linux/string.h> | 33 | #include <linux/string.h> |
| 34 | #include <linux/mm.h> | 34 | #include <linux/mm.h> |
| 35 | #include <linux/slab.h> | ||
| 36 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 37 | #include <linux/delay.h> | 36 | #include <linux/delay.h> |
| 38 | #include <linux/interrupt.h> | 37 | #include <linux/interrupt.h> |
diff --git a/drivers/video/hgafb.c b/drivers/video/hgafb.c index db9b785b56eb..8bbf251f83d9 100644 --- a/drivers/video/hgafb.c +++ b/drivers/video/hgafb.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/spinlock.h> | 36 | #include <linux/spinlock.h> |
| 37 | #include <linux/string.h> | 37 | #include <linux/string.h> |
| 38 | #include <linux/mm.h> | 38 | #include <linux/mm.h> |
| 39 | #include <linux/slab.h> | ||
| 40 | #include <linux/delay.h> | 39 | #include <linux/delay.h> |
| 41 | #include <linux/fb.h> | 40 | #include <linux/fb.h> |
| 42 | #include <linux/init.h> | 41 | #include <linux/init.h> |
diff --git a/drivers/video/hitfb.c b/drivers/video/hitfb.c index bf78779199c6..393f3f3d3dfe 100644 --- a/drivers/video/hitfb.c +++ b/drivers/video/hitfb.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 21 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 22 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
diff --git a/drivers/video/hpfb.c b/drivers/video/hpfb.c index b8ebff1e8493..c8e280f1bb0b 100644 --- a/drivers/video/hpfb.c +++ b/drivers/video/hpfb.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/errno.h> | 10 | #include <linux/errno.h> |
| 11 | #include <linux/string.h> | 11 | #include <linux/string.h> |
| 12 | #include <linux/mm.h> | 12 | #include <linux/mm.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
diff --git a/drivers/video/i810/i810-i2c.c b/drivers/video/i810/i810-i2c.c index 9dd55e5324a1..cd2c728a809b 100644 --- a/drivers/video/i810/i810-i2c.c +++ b/drivers/video/i810/i810-i2c.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/module.h> | 11 | #include <linux/module.h> |
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 14 | #include <linux/gfp.h> | ||
| 14 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
| 15 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
| 16 | #include "i810.h" | 17 | #include "i810.h" |
diff --git a/drivers/video/imsttfb.c b/drivers/video/imsttfb.c index 15d50b9906ce..efb2c10656b0 100644 --- a/drivers/video/imsttfb.c +++ b/drivers/video/imsttfb.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/errno.h> | 21 | #include <linux/errno.h> |
| 22 | #include <linux/string.h> | 22 | #include <linux/string.h> |
| 23 | #include <linux/mm.h> | 23 | #include <linux/mm.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/vmalloc.h> | 24 | #include <linux/vmalloc.h> |
| 26 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 27 | #include <linux/interrupt.h> | 26 | #include <linux/interrupt.h> |
diff --git a/drivers/video/intelfb/intelfbhw.c b/drivers/video/intelfb/intelfbhw.c index 81627466804e..38065cf94ac4 100644 --- a/drivers/video/intelfb/intelfbhw.c +++ b/drivers/video/intelfb/intelfbhw.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/fb.h> | 28 | #include <linux/fb.h> |
| 30 | #include <linux/ioport.h> | 29 | #include <linux/ioport.h> |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index e145e2d16fe3..1db55f128490 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 12 | #include <linux/errno.h> | 12 | #include <linux/errno.h> |
| 13 | #include <linux/string.h> | 13 | #include <linux/string.h> |
| 14 | #include <linux/slab.h> | ||
| 15 | #include <linux/delay.h> | 14 | #include <linux/delay.h> |
| 16 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 17 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c index f3728ab262f8..403b14445a78 100644 --- a/drivers/video/matrox/i2c-matroxfb.c +++ b/drivers/video/matrox/i2c-matroxfb.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include "matroxfb_base.h" | 13 | #include "matroxfb_base.h" |
| 14 | #include "matroxfb_maven.h" | 14 | #include "matroxfb_maven.h" |
| 15 | #include <linux/i2c.h> | 15 | #include <linux/i2c.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #include <linux/i2c-algo-bit.h> | 17 | #include <linux/i2c-algo-bit.h> |
| 17 | 18 | ||
| 18 | /* MGA-TVO I2C for G200, G400 */ | 19 | /* MGA-TVO I2C for G200, G400 */ |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 7064fb4427b6..052dd9f0b760 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
| @@ -113,6 +113,7 @@ | |||
| 113 | #include "matroxfb_g450.h" | 113 | #include "matroxfb_g450.h" |
| 114 | #include <linux/matroxfb.h> | 114 | #include <linux/matroxfb.h> |
| 115 | #include <linux/interrupt.h> | 115 | #include <linux/interrupt.h> |
| 116 | #include <linux/slab.h> | ||
| 116 | #include <linux/uaccess.h> | 117 | #include <linux/uaccess.h> |
| 117 | 118 | ||
| 118 | #ifdef CONFIG_PPC_PMAC | 119 | #ifdef CONFIG_PPC_PMAC |
diff --git a/drivers/video/matrox/matroxfb_crtc2.c b/drivers/video/matrox/matroxfb_crtc2.c index 78414baa5a54..d7112c39614b 100644 --- a/drivers/video/matrox/matroxfb_crtc2.c +++ b/drivers/video/matrox/matroxfb_crtc2.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include "matroxfb_misc.h" | 15 | #include "matroxfb_misc.h" |
| 16 | #include "matroxfb_DAC1064.h" | 16 | #include "matroxfb_DAC1064.h" |
| 17 | #include <linux/matroxfb.h> | 17 | #include <linux/matroxfb.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/uaccess.h> | 19 | #include <linux/uaccess.h> |
| 19 | 20 | ||
| 20 | /* **************************************************** */ | 21 | /* **************************************************** */ |
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 91af9159111f..1e3e8f19783e 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include "matroxfb_DAC1064.h" | 17 | #include "matroxfb_DAC1064.h" |
| 18 | #include <linux/i2c.h> | 18 | #include <linux/i2c.h> |
| 19 | #include <linux/matroxfb.h> | 19 | #include <linux/matroxfb.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <asm/div64.h> | 21 | #include <asm/div64.h> |
| 21 | 22 | ||
| 22 | #define MGATVO_B 1 | 23 | #define MGATVO_B 1 |
diff --git a/drivers/video/maxinefb.c b/drivers/video/maxinefb.c index 7854c7a37dc5..5cf52d3c8e75 100644 --- a/drivers/video/maxinefb.c +++ b/drivers/video/maxinefb.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/errno.h> | 28 | #include <linux/errno.h> |
| 29 | #include <linux/string.h> | 29 | #include <linux/string.h> |
| 30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/fb.h> | 33 | #include <linux/fb.h> |
diff --git a/drivers/video/mb862xx/mb862xxfb_accel.c b/drivers/video/mb862xx/mb862xxfb_accel.c index 049256052b1a..841424912ece 100644 --- a/drivers/video/mb862xx/mb862xxfb_accel.c +++ b/drivers/video/mb862xx/mb862xxfb_accel.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/init.h> | 17 | #include <linux/init.h> |
| 18 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #if defined(CONFIG_OF) | 21 | #if defined(CONFIG_OF) |
| 21 | #include <linux/of_platform.h> | 22 | #include <linux/of_platform.h> |
| 22 | #endif | 23 | #endif |
diff --git a/drivers/video/mbx/mbxdebugfs.c b/drivers/video/mbx/mbxdebugfs.c index 15b8b3c4330e..ecad96524570 100644 --- a/drivers/video/mbx/mbxdebugfs.c +++ b/drivers/video/mbx/mbxdebugfs.c | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #include <linux/debugfs.h> | 1 | #include <linux/debugfs.h> |
| 2 | #include <linux/slab.h> | ||
| 2 | 3 | ||
| 3 | #define BIG_BUFFER_SIZE (1024) | 4 | #define BIG_BUFFER_SIZE (1024) |
| 4 | 5 | ||
diff --git a/drivers/video/metronomefb.c b/drivers/video/metronomefb.c index 661bfd20d194..9b3d6e4584cc 100644 --- a/drivers/video/metronomefb.c +++ b/drivers/video/metronomefb.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/string.h> | 24 | #include <linux/string.h> |
| 25 | #include <linux/mm.h> | 25 | #include <linux/mm.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/vmalloc.h> | 26 | #include <linux/vmalloc.h> |
| 28 | #include <linux/delay.h> | 27 | #include <linux/delay.h> |
| 29 | #include <linux/interrupt.h> | 28 | #include <linux/interrupt.h> |
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index b895aae41630..0a4dbdc1693a 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/module.h> | 14 | #include <linux/module.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
| 16 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 17 | 18 | ||
diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c index 474421fe79a6..c1ff271017a9 100644 --- a/drivers/video/msm/mddi.c +++ b/drivers/video/msm/mddi.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
| 24 | #include <linux/gfp.h> | ||
| 24 | #include <linux/spinlock.h> | 25 | #include <linux/spinlock.h> |
| 25 | #include <linux/clk.h> | 26 | #include <linux/clk.h> |
| 26 | #include <linux/io.h> | 27 | #include <linux/io.h> |
diff --git a/drivers/video/msm/mddi_client_dummy.c b/drivers/video/msm/mddi_client_dummy.c index ebbae87885b6..d2a091cebe2c 100644 --- a/drivers/video/msm/mddi_client_dummy.c +++ b/drivers/video/msm/mddi_client_dummy.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | * GNU General Public License for more details. | 15 | * GNU General Public License for more details. |
| 16 | */ | 16 | */ |
| 17 | 17 | ||
| 18 | #include <linux/slab.h> | ||
| 18 | #include <linux/module.h> | 19 | #include <linux/module.h> |
| 19 | #include <linux/kernel.h> | 20 | #include <linux/kernel.h> |
| 20 | #include <linux/platform_device.h> | 21 | #include <linux/platform_device.h> |
diff --git a/drivers/video/msm/mddi_client_nt35399.c b/drivers/video/msm/mddi_client_nt35399.c index c9e9349451cb..f239f4a25e01 100644 --- a/drivers/video/msm/mddi_client_nt35399.c +++ b/drivers/video/msm/mddi_client_nt35399.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/sched.h> | 22 | #include <linux/sched.h> |
| 23 | #include <linux/gpio.h> | 23 | #include <linux/gpio.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <mach/msm_fb.h> | 25 | #include <mach/msm_fb.h> |
| 25 | 26 | ||
| 26 | static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait); | 27 | static DECLARE_WAIT_QUEUE_HEAD(nt35399_vsync_wait); |
diff --git a/drivers/video/msm/mddi_client_toshiba.c b/drivers/video/msm/mddi_client_toshiba.c index 71048e78f7f0..f9bc932ac46b 100644 --- a/drivers/video/msm/mddi_client_toshiba.c +++ b/drivers/video/msm/mddi_client_toshiba.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <mach/msm_fb.h> | 25 | #include <mach/msm_fb.h> |
| 25 | 26 | ||
| 26 | 27 | ||
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c index 6c519e2fa2b7..19c01c6208e8 100644 --- a/drivers/video/msm/mdp.c +++ b/drivers/video/msm/mdp.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/file.h> | 24 | #include <linux/file.h> |
| 25 | #include <linux/major.h> | 25 | #include <linux/major.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include <mach/msm_iomap.h> | 28 | #include <mach/msm_iomap.h> |
| 28 | #include <mach/msm_fb.h> | 29 | #include <mach/msm_fb.h> |
diff --git a/drivers/video/msm/msm_fb.c b/drivers/video/msm/msm_fb.c index 49101dda45ee..debe5933fd2e 100644 --- a/drivers/video/msm/msm_fb.c +++ b/drivers/video/msm/msm_fb.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
| 19 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 21 | 22 | ||
| 22 | #include <linux/freezer.h> | 23 | #include <linux/freezer.h> |
diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c index 6aaddb4f6788..d7994a173245 100644 --- a/drivers/video/nvidia/nv_i2c.c +++ b/drivers/video/nvidia/nv_i2c.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 17 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 18 | 19 | ||
diff --git a/drivers/video/nvidia/nv_of.c b/drivers/video/nvidia/nv_of.c index 73afd7eb9977..3bc13df4b120 100644 --- a/drivers/video/nvidia/nv_of.c +++ b/drivers/video/nvidia/nv_of.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 17 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 18 | 19 | ||
diff --git a/drivers/video/nvidia/nv_setup.c b/drivers/video/nvidia/nv_setup.c index eef2bb298d9f..2f2e162134fa 100644 --- a/drivers/video/nvidia/nv_setup.c +++ b/drivers/video/nvidia/nv_setup.c | |||
| @@ -50,6 +50,7 @@ | |||
| 50 | #include <video/vga.h> | 50 | #include <video/vga.h> |
| 51 | #include <linux/delay.h> | 51 | #include <linux/delay.h> |
| 52 | #include <linux/pci.h> | 52 | #include <linux/pci.h> |
| 53 | #include <linux/slab.h> | ||
| 53 | #include "nv_type.h" | 54 | #include "nv_type.h" |
| 54 | #include "nv_local.h" | 55 | #include "nv_local.h" |
| 55 | #include "nv_proto.h" | 56 | #include "nv_proto.h" |
diff --git a/drivers/video/offb.c b/drivers/video/offb.c index b043ac83c412..61f8b8f919b0 100644 --- a/drivers/video/offb.c +++ b/drivers/video/offb.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/vmalloc.h> | 20 | #include <linux/vmalloc.h> |
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/interrupt.h> | 22 | #include <linux/interrupt.h> |
diff --git a/drivers/video/omap/dispc.c b/drivers/video/omap/dispc.c index e192b058a688..529483467abf 100644 --- a/drivers/video/omap/dispc.c +++ b/drivers/video/omap/dispc.c | |||
| @@ -25,6 +25,7 @@ | |||
| 25 | #include <linux/clk.h> | 25 | #include <linux/clk.h> |
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/slab.h> | ||
| 28 | 29 | ||
| 29 | #include <plat/sram.h> | 30 | #include <plat/sram.h> |
| 30 | #include <plat/board.h> | 31 | #include <plat/board.h> |
diff --git a/drivers/video/omap/lcd_mipid.c b/drivers/video/omap/lcd_mipid.c index abe1c76a3257..64dcc7439c99 100644 --- a/drivers/video/omap/lcd_mipid.c +++ b/drivers/video/omap/lcd_mipid.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | */ | 20 | */ |
| 21 | #include <linux/device.h> | 21 | #include <linux/device.h> |
| 22 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/workqueue.h> | 24 | #include <linux/workqueue.h> |
| 24 | #include <linux/spi/spi.h> | 25 | #include <linux/spi/spi.h> |
| 25 | 26 | ||
diff --git a/drivers/video/omap/lcdc.c b/drivers/video/omap/lcdc.c index 9557f963662e..43ab7d8b66b2 100644 --- a/drivers/video/omap/lcdc.c +++ b/drivers/video/omap/lcdc.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/dma-mapping.h> | 28 | #include <linux/dma-mapping.h> |
| 29 | #include <linux/vmalloc.h> | 29 | #include <linux/vmalloc.h> |
| 30 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
| 31 | #include <linux/gfp.h> | ||
| 31 | 32 | ||
| 32 | #include <mach/lcdc.h> | 33 | #include <mach/lcdc.h> |
| 33 | #include <plat/dma.h> | 34 | #include <plat/dma.h> |
diff --git a/drivers/video/omap/omapfb_main.c b/drivers/video/omap/omapfb_main.c index 8ce60e1b220a..e264efd0278f 100644 --- a/drivers/video/omap/omapfb_main.c +++ b/drivers/video/omap/omapfb_main.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #include <linux/platform_device.h> | 27 | #include <linux/platform_device.h> |
| 28 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | #include <linux/uaccess.h> | 30 | #include <linux/uaccess.h> |
| 30 | 31 | ||
| 31 | #include <plat/dma.h> | 32 | #include <plat/dma.h> |
diff --git a/drivers/video/omap2/displays/panel-taal.c b/drivers/video/omap2/displays/panel-taal.c index 59769e85d41c..4f3988a41082 100644 --- a/drivers/video/omap2/displays/panel-taal.c +++ b/drivers/video/omap2/displays/panel-taal.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/gpio.h> | 30 | #include <linux/gpio.h> |
| 31 | #include <linux/completion.h> | 31 | #include <linux/completion.h> |
| 32 | #include <linux/workqueue.h> | 32 | #include <linux/workqueue.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <plat/display.h> | 35 | #include <plat/display.h> |
| 35 | 36 | ||
diff --git a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c index d578feee3550..e866e76b13d0 100644 --- a/drivers/video/omap2/displays/panel-tpo-td043mtea1.c +++ b/drivers/video/omap2/displays/panel-tpo-td043mtea1.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/regulator/consumer.h> | 15 | #include <linux/regulator/consumer.h> |
| 16 | #include <linux/gpio.h> | 16 | #include <linux/gpio.h> |
| 17 | #include <linux/err.h> | 17 | #include <linux/err.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | #include <plat/display.h> | 20 | #include <plat/display.h> |
| 20 | 21 | ||
diff --git a/drivers/video/omap2/dss/manager.c b/drivers/video/omap2/dss/manager.c index 9acef00c47ea..0820986d4a68 100644 --- a/drivers/video/omap2/dss/manager.c +++ b/drivers/video/omap2/dss/manager.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #define DSS_SUBSYS_NAME "MANAGER" | 23 | #define DSS_SUBSYS_NAME "MANAGER" |
| 24 | 24 | ||
| 25 | #include <linux/kernel.h> | 25 | #include <linux/kernel.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 27 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 28 | #include <linux/spinlock.h> | 29 | #include <linux/spinlock.h> |
diff --git a/drivers/video/omap2/dss/overlay.c b/drivers/video/omap2/dss/overlay.c index aed3f3194347..82336583adef 100644 --- a/drivers/video/omap2/dss/overlay.c +++ b/drivers/video/omap2/dss/overlay.c | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | #include <linux/kobject.h> | 29 | #include <linux/kobject.h> |
| 30 | #include <linux/platform_device.h> | 30 | #include <linux/platform_device.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/slab.h> | ||
| 32 | 33 | ||
| 33 | #include <plat/display.h> | 34 | #include <plat/display.h> |
| 34 | #include <plat/cpu.h> | 35 | #include <plat/cpu.h> |
diff --git a/drivers/video/omap2/omapfb/omapfb-main.c b/drivers/video/omap2/omapfb/omapfb-main.c index 4a76917b7cc8..4b4506da96da 100644 --- a/drivers/video/omap2/omapfb/omapfb-main.c +++ b/drivers/video/omap2/omapfb/omapfb-main.c | |||
| @@ -22,6 +22,7 @@ | |||
| 22 | 22 | ||
| 23 | #include <linux/module.h> | 23 | #include <linux/module.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/slab.h> | ||
| 25 | #include <linux/fb.h> | 26 | #include <linux/fb.h> |
| 26 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
| 27 | #include <linux/vmalloc.h> | 28 | #include <linux/vmalloc.h> |
diff --git a/drivers/video/omap2/vram.c b/drivers/video/omap2/vram.c index b266ffae0bde..3b1237ad85ed 100644 --- a/drivers/video/omap2/vram.c +++ b/drivers/video/omap2/vram.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
| 25 | #include <linux/list.h> | 25 | #include <linux/list.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/seq_file.h> | 27 | #include <linux/seq_file.h> |
| 27 | #include <linux/bootmem.h> | 28 | #include <linux/bootmem.h> |
| 28 | #include <linux/completion.h> | 29 | #include <linux/completion.h> |
diff --git a/drivers/video/output.c b/drivers/video/output.c index 5137aa016b83..0d6f2cda9369 100644 --- a/drivers/video/output.c +++ b/drivers/video/output.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | */ | 23 | */ |
| 24 | #include <linux/module.h> | 24 | #include <linux/module.h> |
| 25 | #include <linux/video_output.h> | 25 | #include <linux/video_output.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/err.h> | 27 | #include <linux/err.h> |
| 27 | #include <linux/ctype.h> | 28 | #include <linux/ctype.h> |
| 28 | 29 | ||
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 7fa4ab01b0d3..81440f2b9091 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
| @@ -10,7 +10,6 @@ | |||
| 10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
| 11 | #include <linux/errno.h> | 11 | #include <linux/errno.h> |
| 12 | #include <linux/string.h> | 12 | #include <linux/string.h> |
| 13 | #include <linux/slab.h> | ||
| 14 | #include <linux/delay.h> | 13 | #include <linux/delay.h> |
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include <linux/fb.h> | 15 | #include <linux/fb.h> |
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c index 0a366d86f08e..8a204e7a5b5b 100644 --- a/drivers/video/platinumfb.c +++ b/drivers/video/platinumfb.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | #include <linux/errno.h> | 24 | #include <linux/errno.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/mm.h> | 26 | #include <linux/mm.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 29 | #include <linux/delay.h> | 28 | #include <linux/delay.h> |
| 30 | #include <linux/interrupt.h> | 29 | #include <linux/interrupt.h> |
diff --git a/drivers/video/pmag-aa-fb.c b/drivers/video/pmag-aa-fb.c index 6515ec11c16b..838424817de2 100644 --- a/drivers/video/pmag-aa-fb.c +++ b/drivers/video/pmag-aa-fb.c | |||
| @@ -28,7 +28,6 @@ | |||
| 28 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 29 | #include <linux/timer.h> | 29 | #include <linux/timer.h> |
| 30 | #include <linux/mm.h> | 30 | #include <linux/mm.h> |
| 31 | #include <linux/slab.h> | ||
| 32 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 33 | #include <linux/init.h> | 32 | #include <linux/init.h> |
| 34 | #include <linux/fb.h> | 33 | #include <linux/fb.h> |
diff --git a/drivers/video/pnx4008/pnxrgbfb.c b/drivers/video/pnx4008/pnxrgbfb.c index 4db6b48a8715..b2252fea2858 100644 --- a/drivers/video/pnx4008/pnxrgbfb.c +++ b/drivers/video/pnx4008/pnxrgbfb.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/errno.h> | 18 | #include <linux/errno.h> |
| 19 | #include <linux/string.h> | 19 | #include <linux/string.h> |
| 20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/interrupt.h> | 23 | #include <linux/interrupt.h> |
diff --git a/drivers/video/pnx4008/sdum.c b/drivers/video/pnx4008/sdum.c index 2aa09bce3944..5ec4f2d439c9 100644 --- a/drivers/video/pnx4008/sdum.c +++ b/drivers/video/pnx4008/sdum.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/tty.h> | 22 | #include <linux/tty.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #include <linux/vmalloc.h> | 23 | #include <linux/vmalloc.h> |
| 25 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 26 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
| @@ -29,6 +28,7 @@ | |||
| 29 | #include <linux/init.h> | 28 | #include <linux/init.h> |
| 30 | #include <linux/dma-mapping.h> | 29 | #include <linux/dma-mapping.h> |
| 31 | #include <linux/clk.h> | 30 | #include <linux/clk.h> |
| 31 | #include <linux/gfp.h> | ||
| 32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
| 33 | #include <mach/gpio.h> | 33 | #include <mach/gpio.h> |
| 34 | 34 | ||
diff --git a/drivers/video/q40fb.c b/drivers/video/q40fb.c index de40a626dc76..fc32c323a381 100644 --- a/drivers/video/q40fb.c +++ b/drivers/video/q40fb.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/mm.h> | 16 | #include <linux/mm.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
| 19 | #include <linux/interrupt.h> | 18 | #include <linux/interrupt.h> |
| 20 | #include <linux/platform_device.h> | 19 | #include <linux/platform_device.h> |
diff --git a/drivers/video/s1d13xxxfb.c b/drivers/video/s1d13xxxfb.c index 7b63429f1a7c..a6247fc081ab 100644 --- a/drivers/video/s1d13xxxfb.c +++ b/drivers/video/s1d13xxxfb.c | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include <linux/fb.h> | 31 | #include <linux/fb.h> |
| 32 | #include <linux/spinlock_types.h> | 32 | #include <linux/spinlock_types.h> |
| 33 | #include <linux/spinlock.h> | 33 | #include <linux/spinlock.h> |
| 34 | #include <linux/slab.h> | ||
| 34 | 35 | ||
| 35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
| 36 | 37 | ||
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c index 53cb722c45a0..9682ecc60e12 100644 --- a/drivers/video/s3c-fb.c +++ b/drivers/video/s3c-fb.c | |||
| @@ -16,8 +16,8 @@ | |||
| 16 | #include <linux/module.h> | 16 | #include <linux/module.h> |
| 17 | #include <linux/platform_device.h> | 17 | #include <linux/platform_device.h> |
| 18 | #include <linux/dma-mapping.h> | 18 | #include <linux/dma-mapping.h> |
| 19 | #include <linux/slab.h> | ||
| 19 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 20 | #include <linux/gfp.h> | ||
| 21 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 22 | #include <linux/fb.h> | 22 | #include <linux/fb.h> |
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c index c3fad34309ed..d4471b4c0374 100644 --- a/drivers/video/s3fb.c +++ b/drivers/video/s3fb.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
| 19 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 22 | #include <linux/fb.h> | 21 | #include <linux/fb.h> |
| 23 | #include <linux/svga.h> | 22 | #include <linux/svga.h> |
diff --git a/drivers/video/savage/savagefb-i2c.c b/drivers/video/savage/savagefb-i2c.c index 574b29e9f8f2..ed371c868b3a 100644 --- a/drivers/video/savage/savagefb-i2c.c +++ b/drivers/video/savage/savagefb-i2c.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/module.h> | 13 | #include <linux/module.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/gfp.h> | ||
| 16 | #include <linux/pci.h> | 17 | #include <linux/pci.h> |
| 17 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 18 | 19 | ||
diff --git a/drivers/video/sh7760fb.c b/drivers/video/sh7760fb.c index 9f6d6e61f0cc..bea38fce2470 100644 --- a/drivers/video/sh7760fb.c +++ b/drivers/video/sh7760fb.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/kernel.h> | 26 | #include <linux/kernel.h> |
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/platform_device.h> | 28 | #include <linux/platform_device.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #include <asm/sh7760fb.h> | 31 | #include <asm/sh7760fb.h> |
| 31 | 32 | ||
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index bbd1dbf4026a..e14bd0749129 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
| 21 | #include <linux/vmalloc.h> | 21 | #include <linux/vmalloc.h> |
| 22 | #include <linux/ioctl.h> | 22 | #include <linux/ioctl.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <video/sh_mobile_lcdc.h> | 24 | #include <video/sh_mobile_lcdc.h> |
| 24 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 25 | 26 | ||
diff --git a/drivers/video/sstfb.c b/drivers/video/sstfb.c index 79840f11fecb..dee64c3b1e67 100644 --- a/drivers/video/sstfb.c +++ b/drivers/video/sstfb.c | |||
| @@ -86,7 +86,6 @@ | |||
| 86 | #include <linux/pci.h> | 86 | #include <linux/pci.h> |
| 87 | #include <linux/delay.h> | 87 | #include <linux/delay.h> |
| 88 | #include <linux/init.h> | 88 | #include <linux/init.h> |
| 89 | #include <linux/slab.h> | ||
| 90 | #include <asm/io.h> | 89 | #include <asm/io.h> |
| 91 | #include <linux/uaccess.h> | 90 | #include <linux/uaccess.h> |
| 92 | #include <video/sstfb.h> | 91 | #include <video/sstfb.h> |
diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c index a8248c0b9192..23e69e834a18 100644 --- a/drivers/video/sunxvr1000.c +++ b/drivers/video/sunxvr1000.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/fb.h> | 8 | #include <linux/fb.h> |
| 10 | #include <linux/init.h> | 9 | #include <linux/init.h> |
| 11 | #include <linux/of_device.h> | 10 | #include <linux/of_device.h> |
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c index b1dde09e7015..5848436c19da 100644 --- a/drivers/video/sunxvr2500.c +++ b/drivers/video/sunxvr2500.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/fb.h> | 8 | #include <linux/fb.h> |
| 10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index 4cd50497264d..b9c2b948d34d 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | 5 | ||
| 6 | #include <linux/module.h> | 6 | #include <linux/module.h> |
| 7 | #include <linux/kernel.h> | 7 | #include <linux/kernel.h> |
| 8 | #include <linux/slab.h> | ||
| 9 | #include <linux/fb.h> | 8 | #include <linux/fb.h> |
| 10 | #include <linux/pci.h> | 9 | #include <linux/pci.h> |
| 11 | #include <linux/init.h> | 10 | #include <linux/init.h> |
| @@ -242,11 +241,27 @@ static int __devinit e3d_set_fbinfo(struct e3d_info *ep) | |||
| 242 | static int __devinit e3d_pci_register(struct pci_dev *pdev, | 241 | static int __devinit e3d_pci_register(struct pci_dev *pdev, |
| 243 | const struct pci_device_id *ent) | 242 | const struct pci_device_id *ent) |
| 244 | { | 243 | { |
| 244 | struct device_node *of_node; | ||
| 245 | const char *device_type; | ||
| 245 | struct fb_info *info; | 246 | struct fb_info *info; |
| 246 | struct e3d_info *ep; | 247 | struct e3d_info *ep; |
| 247 | unsigned int line_length; | 248 | unsigned int line_length; |
| 248 | int err; | 249 | int err; |
| 249 | 250 | ||
| 251 | of_node = pci_device_to_OF_node(pdev); | ||
| 252 | if (!of_node) { | ||
| 253 | printk(KERN_ERR "e3d: Cannot find OF node of %s\n", | ||
| 254 | pci_name(pdev)); | ||
| 255 | return -ENODEV; | ||
| 256 | } | ||
| 257 | |||
| 258 | device_type = of_get_property(of_node, "device_type", NULL); | ||
| 259 | if (!device_type) { | ||
| 260 | printk(KERN_INFO "e3d: Ignoring secondary output device " | ||
| 261 | "at %s\n", pci_name(pdev)); | ||
| 262 | return -ENODEV; | ||
| 263 | } | ||
| 264 | |||
| 250 | err = pci_enable_device(pdev); | 265 | err = pci_enable_device(pdev); |
| 251 | if (err < 0) { | 266 | if (err < 0) { |
| 252 | printk(KERN_ERR "e3d: Cannot enable PCI device %s\n", | 267 | printk(KERN_ERR "e3d: Cannot enable PCI device %s\n", |
| @@ -265,13 +280,7 @@ static int __devinit e3d_pci_register(struct pci_dev *pdev, | |||
| 265 | ep->info = info; | 280 | ep->info = info; |
| 266 | ep->pdev = pdev; | 281 | ep->pdev = pdev; |
| 267 | spin_lock_init(&ep->lock); | 282 | spin_lock_init(&ep->lock); |
| 268 | ep->of_node = pci_device_to_OF_node(pdev); | 283 | ep->of_node = of_node; |
| 269 | if (!ep->of_node) { | ||
| 270 | printk(KERN_ERR "e3d: Cannot find OF node of %s\n", | ||
| 271 | pci_name(pdev)); | ||
| 272 | err = -ENODEV; | ||
| 273 | goto err_release_fb; | ||
| 274 | } | ||
| 275 | 284 | ||
| 276 | /* Read the PCI base register of the frame buffer, which we | 285 | /* Read the PCI base register of the frame buffer, which we |
| 277 | * need in order to interpret the RAMDAC_VID_*FB* values in | 286 | * need in order to interpret the RAMDAC_VID_*FB* values in |
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c index 9c7106701572..fdb45674e2f6 100644 --- a/drivers/video/svgalib.c +++ b/drivers/video/svgalib.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
| 16 | #include <linux/fb.h> | 16 | #include <linux/fb.h> |
| 17 | #include <linux/svga.h> | 17 | #include <linux/svga.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <asm/types.h> | 18 | #include <asm/types.h> |
| 20 | #include <asm/io.h> | 19 | #include <asm/io.h> |
| 21 | 20 | ||
diff --git a/drivers/video/syscopyarea.c b/drivers/video/syscopyarea.c index a352d5f46bbf..844a32fd38ed 100644 --- a/drivers/video/syscopyarea.c +++ b/drivers/video/syscopyarea.c | |||
| @@ -16,7 +16,6 @@ | |||
| 16 | #include <linux/kernel.h> | 16 | #include <linux/kernel.h> |
| 17 | #include <linux/string.h> | 17 | #include <linux/string.h> |
| 18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/slab.h> | ||
| 20 | #include <asm/types.h> | 19 | #include <asm/types.h> |
| 21 | #include <asm/io.h> | 20 | #include <asm/io.h> |
| 22 | #include "fb_draw.h" | 21 | #include "fb_draw.h" |
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index 45b883598bf0..c0c2b18fcdcf 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
| 18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
diff --git a/drivers/video/tgafb.c b/drivers/video/tgafb.c index a86046ff60ad..1b3b1c718e80 100644 --- a/drivers/video/tgafb.c +++ b/drivers/video/tgafb.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/pci.h> | 26 | #include <linux/pci.h> |
| 27 | #include <linux/selection.h> | 27 | #include <linux/selection.h> |
| 28 | #include <linux/slab.h> | ||
| 29 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 30 | #include <linux/tc.h> | 29 | #include <linux/tc.h> |
| 31 | 30 | ||
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c index 03a9c35e9f55..c6c77562839d 100644 --- a/drivers/video/tridentfb.c +++ b/drivers/video/tridentfb.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 20 | #include <linux/init.h> | 20 | #include <linux/init.h> |
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/slab.h> | ||
| 22 | 23 | ||
| 23 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 24 | #include <video/vga.h> | 25 | #include <video/vga.h> |
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index 54fbb2995a5f..7b8839ebf3c4 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | #include <linux/fb.h> | 18 | #include <linux/fb.h> |
| 19 | #include <linux/io.h> | 19 | #include <linux/io.h> |
| 20 | #include <linux/mutex.h> | 20 | #include <linux/mutex.h> |
| 21 | #include <linux/slab.h> | ||
| 21 | #include <video/edid.h> | 22 | #include <video/edid.h> |
| 22 | #include <video/uvesafb.h> | 23 | #include <video/uvesafb.h> |
| 23 | #ifdef CONFIG_X86 | 24 | #ifdef CONFIG_X86 |
diff --git a/drivers/video/vermilion/vermilion.c b/drivers/video/vermilion/vermilion.c index c18f1884b550..931a567f9aff 100644 --- a/drivers/video/vermilion/vermilion.c +++ b/drivers/video/vermilion/vermilion.c | |||
| @@ -33,6 +33,7 @@ | |||
| 33 | #include <linux/errno.h> | 33 | #include <linux/errno.h> |
| 34 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 35 | #include <linux/delay.h> | 35 | #include <linux/delay.h> |
| 36 | #include <linux/slab.h> | ||
| 36 | #include <linux/mm.h> | 37 | #include <linux/mm.h> |
| 37 | #include <linux/fb.h> | 38 | #include <linux/fb.h> |
| 38 | #include <linux/pci.h> | 39 | #include <linux/pci.h> |
diff --git a/drivers/video/vesafb.c b/drivers/video/vesafb.c index ef4128c8e57a..54ac91dc070b 100644 --- a/drivers/video/vesafb.c +++ b/drivers/video/vesafb.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
| 14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
| 15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/delay.h> | 16 | #include <linux/delay.h> |
| 18 | #include <linux/fb.h> | 17 | #include <linux/fb.h> |
| 19 | #include <linux/ioport.h> | 18 | #include <linux/ioport.h> |
diff --git a/drivers/video/vfb.c b/drivers/video/vfb.c index b8ab995fbda7..9b5532b4de35 100644 --- a/drivers/video/vfb.c +++ b/drivers/video/vfb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/vmalloc.h> | 18 | #include <linux/vmalloc.h> |
| 20 | #include <linux/delay.h> | 19 | #include <linux/delay.h> |
| 21 | #include <linux/interrupt.h> | 20 | #include <linux/interrupt.h> |
diff --git a/drivers/video/vga16fb.c b/drivers/video/vga16fb.c index 76d8dae5b1bb..bf638a47a5b3 100644 --- a/drivers/video/vga16fb.c +++ b/drivers/video/vga16fb.c | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 17 | #include <linux/mm.h> | 17 | #include <linux/mm.h> |
| 18 | #include <linux/slab.h> | ||
| 19 | #include <linux/delay.h> | 18 | #include <linux/delay.h> |
| 20 | #include <linux/fb.h> | 19 | #include <linux/fb.h> |
| 21 | #include <linux/ioport.h> | 20 | #include <linux/ioport.h> |
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c index ce7783b63f6a..777b38a06d40 100644 --- a/drivers/video/via/viafbdev.c +++ b/drivers/video/via/viafbdev.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/seq_file.h> | 23 | #include <linux/seq_file.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/stat.h> | 25 | #include <linux/stat.h> |
| 25 | #define _MASTER_FILE | 26 | #define _MASTER_FILE |
| 26 | 27 | ||
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c index 65ccd215d496..d31dc96f838a 100644 --- a/drivers/video/vt8623fb.c +++ b/drivers/video/vt8623fb.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/string.h> | 18 | #include <linux/string.h> |
| 19 | #include <linux/mm.h> | 19 | #include <linux/mm.h> |
| 20 | #include <linux/tty.h> | 20 | #include <linux/tty.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/fb.h> | 22 | #include <linux/fb.h> |
| 24 | #include <linux/svga.h> | 23 | #include <linux/svga.h> |
diff --git a/drivers/video/w100fb.c b/drivers/video/w100fb.c index 5d223959778a..31b0e17ed090 100644 --- a/drivers/video/w100fb.c +++ b/drivers/video/w100fb.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/kernel.h> | 30 | #include <linux/kernel.h> |
| 31 | #include <linux/mm.h> | 31 | #include <linux/mm.h> |
| 32 | #include <linux/platform_device.h> | 32 | #include <linux/platform_device.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/string.h> | 34 | #include <linux/string.h> |
| 34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 35 | #include <asm/io.h> | 36 | #include <asm/io.h> |
diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index 603598f4dbb1..fa97d3e7c21a 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
| 24 | #include <linux/fb.h> | 24 | #include <linux/fb.h> |
| 25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
| 27 | #include <linux/mm.h> | 28 | #include <linux/mm.h> |
| 28 | 29 | ||
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c index ed7c8d0ddccb..3fcb83f03881 100644 --- a/drivers/video/xilinxfb.c +++ b/drivers/video/xilinxfb.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/of_platform.h> | 34 | #include <linux/of_platform.h> |
| 35 | #include <linux/io.h> | 35 | #include <linux/io.h> |
| 36 | #include <linux/xilinxfb.h> | 36 | #include <linux/xilinxfb.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <asm/dcr.h> | 38 | #include <asm/dcr.h> |
| 38 | 39 | ||
| 39 | #define DRIVER_NAME "xilinxfb" | 40 | #define DRIVER_NAME "xilinxfb" |
diff --git a/drivers/virtio/virtio_balloon.c b/drivers/virtio/virtio_balloon.c index 369f2eebbad1..3aed38886f94 100644 --- a/drivers/virtio/virtio_balloon.c +++ b/drivers/virtio/virtio_balloon.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/kthread.h> | 24 | #include <linux/kthread.h> |
| 25 | #include <linux/freezer.h> | 25 | #include <linux/freezer.h> |
| 26 | #include <linux/delay.h> | 26 | #include <linux/delay.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | struct virtio_balloon | 29 | struct virtio_balloon |
| 29 | { | 30 | { |
diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c index 625447f645d9..24747aef1952 100644 --- a/drivers/virtio/virtio_pci.c +++ b/drivers/virtio/virtio_pci.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <linux/module.h> | 17 | #include <linux/module.h> |
| 18 | #include <linux/list.h> | 18 | #include <linux/list.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/slab.h> | ||
| 20 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 21 | #include <linux/virtio.h> | 22 | #include <linux/virtio.h> |
| 22 | #include <linux/virtio_config.h> | 23 | #include <linux/virtio_config.h> |
diff --git a/drivers/virtio/virtio_ring.c b/drivers/virtio/virtio_ring.c index 0db906b3c95d..0f90634bcb85 100644 --- a/drivers/virtio/virtio_ring.c +++ b/drivers/virtio/virtio_ring.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/virtio_ring.h> | 20 | #include <linux/virtio_ring.h> |
| 21 | #include <linux/virtio_config.h> | 21 | #include <linux/virtio_config.h> |
| 22 | #include <linux/device.h> | 22 | #include <linux/device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | /* virtio guest is communicating with a virtual "device" that actually runs on | 25 | /* virtio guest is communicating with a virtual "device" that actually runs on |
| 25 | * a host processor. Memory barriers are used to control SMP effects. */ | 26 | * a host processor. Memory barriers are used to control SMP effects. */ |
diff --git a/drivers/vlynq/vlynq.c b/drivers/vlynq/vlynq.c index 9554ad5f9af7..f2d9e667972d 100644 --- a/drivers/vlynq/vlynq.c +++ b/drivers/vlynq/vlynq.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <linux/vlynq.h> | 35 | #include <linux/vlynq.h> |
| 35 | 36 | ||
diff --git a/drivers/w1/masters/ds1wm.c b/drivers/w1/masters/ds1wm.c index 37f08c850608..6b85e7fefa43 100644 --- a/drivers/w1/masters/ds1wm.c +++ b/drivers/w1/masters/ds1wm.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 21 | #include <linux/mfd/core.h> | 21 | #include <linux/mfd/core.h> |
| 22 | #include <linux/mfd/ds1wm.h> | 22 | #include <linux/mfd/ds1wm.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | 24 | ||
| 24 | #include <asm/io.h> | 25 | #include <asm/io.h> |
| 25 | 26 | ||
diff --git a/drivers/w1/masters/ds2490.c b/drivers/w1/masters/ds2490.c index 59ad6e95af8f..02bf7bf7160b 100644 --- a/drivers/w1/masters/ds2490.c +++ b/drivers/w1/masters/ds2490.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/kernel.h> | 23 | #include <linux/kernel.h> |
| 24 | #include <linux/mod_devicetable.h> | 24 | #include <linux/mod_devicetable.h> |
| 25 | #include <linux/usb.h> | 25 | #include <linux/usb.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "../w1_int.h" | 28 | #include "../w1_int.h" |
| 28 | #include "../w1.h" | 29 | #include "../w1.h" |
diff --git a/drivers/w1/masters/mxc_w1.c b/drivers/w1/masters/mxc_w1.c index 492670358cbf..a3b6a74c67a7 100644 --- a/drivers/w1/masters/mxc_w1.c +++ b/drivers/w1/masters/mxc_w1.c | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | #include <linux/interrupt.h> | 21 | #include <linux/interrupt.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/clk.h> | 23 | #include <linux/clk.h> |
| 24 | #include <linux/slab.h> | ||
| 24 | #include <linux/delay.h> | 25 | #include <linux/delay.h> |
| 25 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 26 | 27 | ||
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c index 22977d30f89e..ef36fca2eed4 100644 --- a/drivers/w1/masters/omap_hdq.c +++ b/drivers/w1/masters/omap_hdq.c | |||
| @@ -12,6 +12,7 @@ | |||
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/interrupt.h> | 14 | #include <linux/interrupt.h> |
| 15 | #include <linux/slab.h> | ||
| 15 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 16 | #include <linux/clk.h> | 17 | #include <linux/clk.h> |
| 17 | #include <linux/io.h> | 18 | #include <linux/io.h> |
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c index 6f8866d6a905..fcbe742188a5 100644 --- a/drivers/w1/masters/w1-gpio.c +++ b/drivers/w1/masters/w1-gpio.c | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
| 12 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 13 | #include <linux/platform_device.h> | 13 | #include <linux/platform_device.h> |
| 14 | #include <linux/slab.h> | ||
| 14 | #include <linux/w1-gpio.h> | 15 | #include <linux/w1-gpio.h> |
| 15 | 16 | ||
| 16 | #include "../w1.h" | 17 | #include "../w1.h" |
diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 139447148822..d2bf32118a98 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/device.h> | 13 | #include <linux/device.h> |
| 14 | #include <linux/types.h> | 14 | #include <linux/types.h> |
| 15 | #include <linux/delay.h> | 15 | #include <linux/delay.h> |
| 16 | #include <linux/slab.h> | ||
| 16 | #ifdef CONFIG_W1_SLAVE_DS2433_CRC | 17 | #ifdef CONFIG_W1_SLAVE_DS2433_CRC |
| 17 | #include <linux/crc16.h> | 18 | #include <linux/crc16.h> |
| 18 | 19 | ||
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c index 59f708efe25f..6e153343e117 100644 --- a/drivers/w1/slaves/w1_ds2760.c +++ b/drivers/w1/slaves/w1_ds2760.c | |||
| @@ -16,6 +16,7 @@ | |||
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/mutex.h> | 17 | #include <linux/mutex.h> |
| 18 | #include <linux/idr.h> | 18 | #include <linux/idr.h> |
| 19 | #include <linux/gfp.h> | ||
| 19 | 20 | ||
| 20 | #include "../w1.h" | 21 | #include "../w1.h" |
| 21 | #include "../w1_int.h" | 22 | #include "../w1_int.h" |
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 4a46ed58ece9..b50be3f1073d 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c | |||
| @@ -23,6 +23,7 @@ | |||
| 23 | #include <linux/list.h> | 23 | #include <linux/list.h> |
| 24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
| 25 | #include <linux/kthread.h> | 25 | #include <linux/kthread.h> |
| 26 | #include <linux/slab.h> | ||
| 26 | 27 | ||
| 27 | #include "w1.h" | 28 | #include "w1.h" |
| 28 | #include "w1_log.h" | 29 | #include "w1_log.h" |
diff --git a/drivers/w1/w1_netlink.c b/drivers/w1/w1_netlink.c index 45c126fea31d..7e667bc77ef2 100644 --- a/drivers/w1/w1_netlink.c +++ b/drivers/w1/w1_netlink.c | |||
| @@ -19,6 +19,7 @@ | |||
| 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 20 | */ | 20 | */ |
| 21 | 21 | ||
| 22 | #include <linux/slab.h> | ||
| 22 | #include <linux/skbuff.h> | 23 | #include <linux/skbuff.h> |
| 23 | #include <linux/netlink.h> | 24 | #include <linux/netlink.h> |
| 24 | #include <linux/connector.h> | 25 | #include <linux/connector.h> |
diff --git a/drivers/watchdog/adx_wdt.c b/drivers/watchdog/adx_wdt.c index a5ca7a6ee133..af6e6b16475a 100644 --- a/drivers/watchdog/adx_wdt.c +++ b/drivers/watchdog/adx_wdt.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/fs.h> | 9 | #include <linux/fs.h> |
| 10 | #include <linux/gfp.h> | ||
| 10 | #include <linux/io.h> | 11 | #include <linux/io.h> |
| 11 | #include <linux/miscdevice.h> | 12 | #include <linux/miscdevice.h> |
| 12 | #include <linux/module.h> | 13 | #include <linux/module.h> |
diff --git a/drivers/watchdog/at32ap700x_wdt.c b/drivers/watchdog/at32ap700x_wdt.c index 6873376f986c..1cddf92cb9a6 100644 --- a/drivers/watchdog/at32ap700x_wdt.c +++ b/drivers/watchdog/at32ap700x_wdt.c | |||
| @@ -32,6 +32,7 @@ | |||
| 32 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 33 | #include <linux/io.h> | 33 | #include <linux/io.h> |
| 34 | #include <linux/spinlock.h> | 34 | #include <linux/spinlock.h> |
| 35 | #include <linux/slab.h> | ||
| 35 | 36 | ||
| 36 | #define TIMEOUT_MIN 1 | 37 | #define TIMEOUT_MIN 1 |
| 37 | #define TIMEOUT_MAX 2 | 38 | #define TIMEOUT_MAX 2 |
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c index 37ea052d4dee..ba2efce4b40e 100644 --- a/drivers/watchdog/cpwd.c +++ b/drivers/watchdog/cpwd.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/ioport.h> | 25 | #include <linux/ioport.h> |
| 26 | #include <linux/timer.h> | 26 | #include <linux/timer.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | #include <linux/smp_lock.h> | 28 | #include <linux/smp_lock.h> |
| 28 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 29 | #include <linux/of.h> | 30 | #include <linux/of.h> |
diff --git a/drivers/watchdog/davinci_wdt.c b/drivers/watchdog/davinci_wdt.c index 56162c87f5d8..596ba604e78d 100644 --- a/drivers/watchdog/davinci_wdt.c +++ b/drivers/watchdog/davinci_wdt.c | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | #include <linux/io.h> | 26 | #include <linux/io.h> |
| 27 | #include <linux/device.h> | 27 | #include <linux/device.h> |
| 28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
| 29 | #include <linux/slab.h> | ||
| 29 | 30 | ||
| 30 | #define MODULE_NAME "DAVINCI-WDT: " | 31 | #define MODULE_NAME "DAVINCI-WDT: " |
| 31 | 32 | ||
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index 70c2c24660d0..72f5a3707b48 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c | |||
| @@ -39,7 +39,6 @@ | |||
| 39 | #include <linux/efi.h> | 39 | #include <linux/efi.h> |
| 40 | #include <linux/string.h> | 40 | #include <linux/string.h> |
| 41 | #include <linux/bootmem.h> | 41 | #include <linux/bootmem.h> |
| 42 | #include <linux/slab.h> | ||
| 43 | #include <asm/desc.h> | 42 | #include <asm/desc.h> |
| 44 | #include <asm/cacheflush.h> | 43 | #include <asm/cacheflush.h> |
| 45 | 44 | ||
diff --git a/drivers/watchdog/ibmasr.c b/drivers/watchdog/ibmasr.c index 89fcefcc8510..195e0f798e76 100644 --- a/drivers/watchdog/ibmasr.c +++ b/drivers/watchdog/ibmasr.c | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include <linux/fs.h> | 13 | #include <linux/fs.h> |
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/slab.h> | ||
| 16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
| 17 | #include <linux/pci.h> | 16 | #include <linux/pci.h> |
| 18 | #include <linux/timer.h> | 17 | #include <linux/timer.h> |
diff --git a/drivers/watchdog/max63xx_wdt.c b/drivers/watchdog/max63xx_wdt.c index 6eb91d757604..75f3a83c0361 100644 --- a/drivers/watchdog/max63xx_wdt.c +++ b/drivers/watchdog/max63xx_wdt.c | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #include <linux/uaccess.h> | 28 | #include <linux/uaccess.h> |
| 29 | #include <linux/io.h> | 29 | #include <linux/io.h> |
| 30 | #include <linux/device.h> | 30 | #include <linux/device.h> |
| 31 | #include <linux/slab.h> | ||
| 31 | 32 | ||
| 32 | #define DEFAULT_HEARTBEAT 60 | 33 | #define DEFAULT_HEARTBEAT 60 |
| 33 | #define MAX_HEARTBEAT 60 | 34 | #define MAX_HEARTBEAT 60 |
diff --git a/drivers/watchdog/mpcore_wdt.c b/drivers/watchdog/mpcore_wdt.c index b0646dac924e..016c6a791cab 100644 --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/interrupt.h> | 30 | #include <linux/interrupt.h> |
| 31 | #include <linux/platform_device.h> | 31 | #include <linux/platform_device.h> |
| 32 | #include <linux/uaccess.h> | 32 | #include <linux/uaccess.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | 34 | ||
| 34 | #include <asm/hardware/arm_twd.h> | 35 | #include <asm/hardware/arm_twd.h> |
| 35 | 36 | ||
diff --git a/drivers/watchdog/nuc900_wdt.c b/drivers/watchdog/nuc900_wdt.c index adefe3a9d510..6cee33d4b161 100644 --- a/drivers/watchdog/nuc900_wdt.c +++ b/drivers/watchdog/nuc900_wdt.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/module.h> | 20 | #include <linux/module.h> |
| 21 | #include <linux/moduleparam.h> | 21 | #include <linux/moduleparam.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 24 | #include <linux/types.h> | 25 | #include <linux/types.h> |
| 25 | #include <linux/watchdog.h> | 26 | #include <linux/watchdog.h> |
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index c6aaf2845741..76b58abf4451 100644 --- a/drivers/watchdog/omap_wdt.c +++ b/drivers/watchdog/omap_wdt.c | |||
| @@ -42,6 +42,7 @@ | |||
| 42 | #include <linux/bitops.h> | 42 | #include <linux/bitops.h> |
| 43 | #include <linux/io.h> | 43 | #include <linux/io.h> |
| 44 | #include <linux/uaccess.h> | 44 | #include <linux/uaccess.h> |
| 45 | #include <linux/slab.h> | ||
| 45 | #include <mach/hardware.h> | 46 | #include <mach/hardware.h> |
| 46 | #include <plat/prcm.h> | 47 | #include <plat/prcm.h> |
| 47 | 48 | ||
diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index c7a9479934af..bf5b97c546eb 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/uaccess.h> | 31 | #include <linux/uaccess.h> |
| 32 | #include <linux/io.h> | 32 | #include <linux/io.h> |
| 33 | #include <linux/slab.h> | ||
| 33 | #include <mach/hardware.h> | 34 | #include <mach/hardware.h> |
| 34 | 35 | ||
| 35 | #define MODULE_NAME "PNX4008-WDT: " | 36 | #define MODULE_NAME "PNX4008-WDT: " |
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c index ae57bf9e1b03..ea7f803f6248 100644 --- a/drivers/watchdog/riowd.c +++ b/drivers/watchdog/riowd.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/of_device.h> | 15 | #include <linux/of_device.h> |
| 16 | #include <linux/io.h> | 16 | #include <linux/io.h> |
| 17 | #include <linux/uaccess.h> | 17 | #include <linux/uaccess.h> |
| 18 | #include <linux/slab.h> | ||
| 18 | 19 | ||
| 19 | 20 | ||
| 20 | /* RIO uses the NatSemi Super I/O power management logical device | 21 | /* RIO uses the NatSemi Super I/O power management logical device |
diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c index 8760a26ab2a3..e4cebef55177 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c | |||
| @@ -37,6 +37,7 @@ | |||
| 37 | #include <linux/uaccess.h> | 37 | #include <linux/uaccess.h> |
| 38 | #include <linux/io.h> | 38 | #include <linux/io.h> |
| 39 | #include <linux/cpufreq.h> | 39 | #include <linux/cpufreq.h> |
| 40 | #include <linux/slab.h> | ||
| 40 | 41 | ||
| 41 | #include <mach/map.h> | 42 | #include <mach/map.h> |
| 42 | 43 | ||
diff --git a/drivers/watchdog/ts72xx_wdt.c b/drivers/watchdog/ts72xx_wdt.c index 565a2c3321e5..458c499c1223 100644 --- a/drivers/watchdog/ts72xx_wdt.c +++ b/drivers/watchdog/ts72xx_wdt.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | #include <linux/miscdevice.h> | 20 | #include <linux/miscdevice.h> |
| 21 | #include <linux/mutex.h> | 21 | #include <linux/mutex.h> |
| 22 | #include <linux/platform_device.h> | 22 | #include <linux/platform_device.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/watchdog.h> | 24 | #include <linux/watchdog.h> |
| 24 | #include <linux/uaccess.h> | 25 | #include <linux/uaccess.h> |
| 25 | 26 | ||
diff --git a/drivers/watchdog/twl4030_wdt.c b/drivers/watchdog/twl4030_wdt.c index 8162a40d1522..dcabe77ad141 100644 --- a/drivers/watchdog/twl4030_wdt.c +++ b/drivers/watchdog/twl4030_wdt.c | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | 20 | ||
| 21 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 22 | #include <linux/types.h> | 22 | #include <linux/types.h> |
| 23 | #include <linux/slab.h> | ||
| 23 | #include <linux/kernel.h> | 24 | #include <linux/kernel.h> |
| 24 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 25 | #include <linux/watchdog.h> | 26 | #include <linux/watchdog.h> |
diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index f6738d8b02bc..1a0d8c2a0354 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c | |||
| @@ -43,6 +43,7 @@ | |||
| 43 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
| 44 | #include <linux/list.h> | 44 | #include <linux/list.h> |
| 45 | #include <linux/sysdev.h> | 45 | #include <linux/sysdev.h> |
| 46 | #include <linux/gfp.h> | ||
| 46 | 47 | ||
| 47 | #include <asm/page.h> | 48 | #include <asm/page.h> |
| 48 | #include <asm/pgalloc.h> | 49 | #include <asm/pgalloc.h> |
diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 2f8413794d05..db8f506817f0 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c | |||
| @@ -27,6 +27,7 @@ | |||
| 27 | #include <linux/module.h> | 27 | #include <linux/module.h> |
| 28 | #include <linux/string.h> | 28 | #include <linux/string.h> |
| 29 | #include <linux/bootmem.h> | 29 | #include <linux/bootmem.h> |
| 30 | #include <linux/slab.h> | ||
| 30 | 31 | ||
| 31 | #include <asm/ptrace.h> | 32 | #include <asm/ptrace.h> |
| 32 | #include <asm/irq.h> | 33 | #include <asm/irq.h> |
diff --git a/drivers/xen/evtchn.c b/drivers/xen/evtchn.c index f70a4f4698c5..66e185cfe92f 100644 --- a/drivers/xen/evtchn.c +++ b/drivers/xen/evtchn.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <linux/poll.h> | 45 | #include <linux/poll.h> |
| 46 | #include <linux/irq.h> | 46 | #include <linux/irq.h> |
| 47 | #include <linux/init.h> | 47 | #include <linux/init.h> |
| 48 | #include <linux/gfp.h> | ||
| 49 | #include <linux/mutex.h> | 48 | #include <linux/mutex.h> |
| 50 | #include <linux/cpu.h> | 49 | #include <linux/cpu.h> |
| 51 | 50 | ||
diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 4c6c0bd636a8..f66db3b91d61 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c | |||
| @@ -34,6 +34,7 @@ | |||
| 34 | #include <linux/module.h> | 34 | #include <linux/module.h> |
| 35 | #include <linux/sched.h> | 35 | #include <linux/sched.h> |
| 36 | #include <linux/mm.h> | 36 | #include <linux/mm.h> |
| 37 | #include <linux/slab.h> | ||
| 37 | #include <linux/vmalloc.h> | 38 | #include <linux/vmalloc.h> |
| 38 | #include <linux/uaccess.h> | 39 | #include <linux/uaccess.h> |
| 39 | 40 | ||
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c index 5d42d55e299b..2ac4440e7b08 100644 --- a/drivers/xen/manage.c +++ b/drivers/xen/manage.c | |||
| @@ -3,6 +3,7 @@ | |||
| 3 | */ | 3 | */ |
| 4 | #include <linux/kernel.h> | 4 | #include <linux/kernel.h> |
| 5 | #include <linux/err.h> | 5 | #include <linux/err.h> |
| 6 | #include <linux/slab.h> | ||
| 6 | #include <linux/reboot.h> | 7 | #include <linux/reboot.h> |
| 7 | #include <linux/sysrq.h> | 8 | #include <linux/sysrq.h> |
| 8 | #include <linux/stop_machine.h> | 9 | #include <linux/stop_machine.h> |
diff --git a/drivers/xen/sys-hypervisor.c b/drivers/xen/sys-hypervisor.c index bb71ab2336c8..60f1827a32cb 100644 --- a/drivers/xen/sys-hypervisor.c +++ b/drivers/xen/sys-hypervisor.c | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | * published by the Free Software Foundation. | 7 | * published by the Free Software Foundation. |
| 8 | */ | 8 | */ |
| 9 | 9 | ||
| 10 | #include <linux/slab.h> | ||
| 10 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
| 11 | #include <linux/module.h> | 12 | #include <linux/module.h> |
| 12 | #include <linux/kobject.h> | 13 | #include <linux/kobject.h> |
diff --git a/drivers/xen/xenbus/xenbus_client.c b/drivers/xen/xenbus/xenbus_client.c index 92a1ef80a288..7b3e973a1aee 100644 --- a/drivers/xen/xenbus/xenbus_client.c +++ b/drivers/xen/xenbus/xenbus_client.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | * IN THE SOFTWARE. | 30 | * IN THE SOFTWARE. |
| 31 | */ | 31 | */ |
| 32 | 32 | ||
| 33 | #include <linux/slab.h> | ||
| 33 | #include <linux/types.h> | 34 | #include <linux/types.h> |
| 34 | #include <linux/vmalloc.h> | 35 | #include <linux/vmalloc.h> |
| 35 | #include <asm/xen/hypervisor.h> | 36 | #include <asm/xen/hypervisor.h> |
diff --git a/drivers/xen/xenbus/xenbus_probe.c b/drivers/xen/xenbus/xenbus_probe.c index 2f7aaa99dc47..3479332113e9 100644 --- a/drivers/xen/xenbus/xenbus_probe.c +++ b/drivers/xen/xenbus/xenbus_probe.c | |||
| @@ -45,6 +45,7 @@ | |||
| 45 | #include <linux/kthread.h> | 45 | #include <linux/kthread.h> |
| 46 | #include <linux/mutex.h> | 46 | #include <linux/mutex.h> |
| 47 | #include <linux/io.h> | 47 | #include <linux/io.h> |
| 48 | #include <linux/slab.h> | ||
| 48 | 49 | ||
| 49 | #include <asm/page.h> | 50 | #include <asm/page.h> |
| 50 | #include <asm/pgtable.h> | 51 | #include <asm/pgtable.h> |
diff --git a/drivers/xen/xencomm.c b/drivers/xen/xencomm.c index a240b2c20b99..b91f8ff50d05 100644 --- a/drivers/xen/xencomm.c +++ b/drivers/xen/xencomm.c | |||
| @@ -18,8 +18,8 @@ | |||
| 18 | * Authors: Hollis Blanchard <hollisb@us.ibm.com> | 18 | * Authors: Hollis Blanchard <hollisb@us.ibm.com> |
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #include <linux/gfp.h> | ||
| 22 | #include <linux/mm.h> | 21 | #include <linux/mm.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | #include <xen/xencomm.h> | 24 | #include <xen/xencomm.h> |
| 25 | #include <xen/interface/xen.h> | 25 | #include <xen/interface/xen.h> |
diff --git a/drivers/xen/xenfs/xenbus.c b/drivers/xen/xenfs/xenbus.c index 6c4269b836b7..f28ece397361 100644 --- a/drivers/xen/xenfs/xenbus.c +++ b/drivers/xen/xenfs/xenbus.c | |||
| @@ -51,6 +51,7 @@ | |||
| 51 | #include <linux/init.h> | 51 | #include <linux/init.h> |
| 52 | #include <linux/namei.h> | 52 | #include <linux/namei.h> |
| 53 | #include <linux/string.h> | 53 | #include <linux/string.h> |
| 54 | #include <linux/slab.h> | ||
| 54 | 55 | ||
| 55 | #include "xenfs.h" | 56 | #include "xenfs.h" |
| 56 | #include "../xenbus/xenbus_comms.h" | 57 | #include "../xenbus/xenbus_comms.h" |