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

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

Merge branch 'misc-2.6.35' into release

parents 42de5532 934231de

drivers/acpi/fan.c

+2 −1
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static int __init acpi_fan_init(void) 
{

	int result = 0;





#ifdef CONFIG_ACPI_PROCFS

	acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir);

	if (!acpi_fan_dir)
@@ -356,7 +355,9 @@ static int __init acpi_fan_init(void) 


	result = acpi_bus_register_driver(&acpi_fan_driver);

	if (result < 0) {

#ifdef CONFIG_ACPI_PROCFS

		remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir);

#endif

		return -ENODEV;

	}

drivers/acpi/processor_driver.c

+5 −0
Original line number Diff line number Diff line
@@ -581,6 +581,11 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device) 
		return 0;

	}



#ifdef CONFIG_SMP

	if (pr->id >= setup_max_cpus && pr->id != 0)

		return 0;

#endif



	BUG_ON((pr->id >= nr_cpu_ids) || (pr->id < 0));



	/*

init/main.c

+3 −1
Original line number Diff line number Diff line
@@ -125,7 +125,9 @@ static char *ramdisk_execute_command; 


#ifdef CONFIG_SMP

/* Setup configured maximum number of CPUs to activate */

unsigned int __initdata setup_max_cpus = NR_CPUS;

unsigned int setup_max_cpus = NR_CPUS;

EXPORT_SYMBOL(setup_max_cpus);





/*

 * Setup routine for controlling SMP activation