Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa96ce0a authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc-2.6.33' into release

parents 2900681b bf8b4542

drivers/acpi/acpi_pad.c

+2 −1
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static void round_robin_cpu(unsigned int tsk_index) 
	struct cpumask *pad_busy_cpus = to_cpumask(pad_busy_cpus_bits);

	cpumask_var_t tmp;

	int cpu;

	unsigned long min_weight = -1, preferred_cpu;

	unsigned long min_weight = -1;

	unsigned long uninitialized_var(preferred_cpu);



	if (!alloc_cpumask_var(&tmp, GFP_KERNEL))

		return;

drivers/acpi/battery.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ static void acpi_battery_notify(struct acpi_device *device, u32 event) 
					dev_name(&device->dev), event,

					acpi_battery_present(battery));

#ifdef CONFIG_ACPI_SYSFS_POWER

	/* acpi_batter_update could remove power_supply object */

	/* acpi_battery_update could remove power_supply object */

	if (battery->bat.dev)

		kobject_uevent(&battery->bat.dev->kobj, KOBJ_CHANGE);

#endif

drivers/acpi/fan.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int acpi_fan_add(struct acpi_device *device) 
		goto end;

	}



	dev_info(&device->dev, "registered as cooling_device%d\n", cdev->id);

	dev_dbg(&device->dev, "registered as cooling_device%d\n", cdev->id);



	device->driver_data = cdev;

	result = sysfs_create_link(&device->dev.kobj,

drivers/acpi/numa.c

+6 −15
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/types.h>

#include <linux/errno.h>

#include <linux/acpi.h>

#include <linux/numa.h>

#include <acpi/acpi_bus.h>



#define PREFIX "ACPI: "
@@ -40,14 +41,14 @@ static nodemask_t nodes_found_map = NODE_MASK_NONE; 


/* maps to convert between proximity domain and logical node ID */

static int pxm_to_node_map[MAX_PXM_DOMAINS]

				= { [0 ... MAX_PXM_DOMAINS - 1] = NID_INVAL };

			= { [0 ... MAX_PXM_DOMAINS - 1] = NUMA_NO_NODE };

static int node_to_pxm_map[MAX_NUMNODES]

			= { [0 ... MAX_NUMNODES - 1] = PXM_INVAL };



int pxm_to_node(int pxm)

{

	if (pxm < 0)

		return NID_INVAL;

		return NUMA_NO_NODE;

	return pxm_to_node_map[pxm];

}
@@ -70,7 +71,7 @@ int acpi_map_pxm_to_node(int pxm) 


	if (node < 0) {

		if (nodes_weight(nodes_found_map) >= MAX_NUMNODES)

			return NID_INVAL;

			return NUMA_NO_NODE;

		node = first_unset_node(nodes_found_map);

		__acpi_map_pxm_to_node(pxm, node);

		node_set(node, nodes_found_map);
@@ -79,16 +80,6 @@ int acpi_map_pxm_to_node(int pxm) 
	return node;

}



#if 0

void __cpuinit acpi_unmap_pxm_to_node(int node)

{

	int pxm = node_to_pxm_map[node];

	pxm_to_node_map[pxm] = NID_INVAL;

	node_to_pxm_map[node] = PXM_INVAL;

	node_clear(node, nodes_found_map);

}

#endif  /*  0  */



static void __init

acpi_table_print_srat_entry(struct acpi_subtable_header *header)

{

drivers/acpi/osl.c

+1 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,7 @@ __setup("acpi_enforce_resources=", acpi_enforce_resources_setup); 


/* Check for resource conflicts between ACPI OperationRegions and native

 * drivers */

int acpi_check_resource_conflict(struct resource *res)

int acpi_check_resource_conflict(const struct resource *res)

{

	struct acpi_res_list *res_list_elem;

	int ioport;