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

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

Pull trivial2 into release branch

parents de59e3aa 9c576ff1

arch/ia64/kernel/acpi.c

+2 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ EXPORT_SYMBOL(pm_power_off); 
unsigned char acpi_kbd_controller_present = 1;

unsigned char acpi_legacy_devices;



static unsigned int __initdata acpi_madt_rev;



unsigned int acpi_cpei_override;

unsigned int acpi_cpei_phys_cpuid;
@@ -243,6 +241,8 @@ acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end) 
	return iosapic_init(iosapic->address, iosapic->global_irq_base);

}



static unsigned int __initdata acpi_madt_rev;



static int __init

acpi_parse_plat_int_src(acpi_table_entry_header * header,

			const unsigned long end)

arch/ia64/mm/init.c

+2 −0
Original line number Diff line number Diff line
@@ -671,9 +671,11 @@ int add_memory(u64 start, u64 size) 


	return ret;

}

EXPORT_SYMBOL_GPL(add_memory);



int remove_memory(u64 start, u64 size)

{

	return -EINVAL;

}

EXPORT_SYMBOL_GPL(remove_memory);

#endif

drivers/acpi/asus_acpi.c

+1 −1
Original line number Diff line number Diff line
@@ -1245,7 +1245,7 @@ static int __init asus_acpi_init(void) 
	if (!asus_hotk_found) {

		acpi_bus_unregister_driver(&asus_hotk_driver);

		remove_proc_entry(PROC_ASUS, acpi_root_dir);

		return -ENODEV;

		return result;

	}



	return 0;

drivers/acpi/processor_idle.c

+4 −4
Original line number Diff line number Diff line
@@ -54,10 +54,10 @@ ACPI_MODULE_NAME("acpi_processor") 
#define US_TO_PM_TIMER_TICKS(t)		((t * (PM_TIMER_FREQUENCY/1000)) / 1000)

#define C2_OVERHEAD			4	/* 1us (3.579 ticks per us) */

#define C3_OVERHEAD			4	/* 1us (3.579 ticks per us) */

static void (*pm_idle_save) (void);

static void (*pm_idle_save) (void) __read_mostly;

module_param(max_cstate, uint, 0644);



static unsigned int nocst = 0;

static unsigned int nocst __read_mostly;

module_param(nocst, uint, 0000);



/*
@@ -67,7 +67,7 @@ module_param(nocst, uint, 0000); 
 * 100 HZ: 0x0000000F: 4 jiffies = 40ms

 * reduce history for more aggressive entry into C3

 */

static unsigned int bm_history =

static unsigned int bm_history __read_mostly =

    (HZ >= 800 ? 0xFFFFFFFF : ((1U << (HZ / 25)) - 1));

module_param(bm_history, uint, 0644);

/* --------------------------------------------------------------------------
@@ -1081,7 +1081,7 @@ int acpi_processor_power_init(struct acpi_processor *pr, 
			      struct acpi_device *device)

{

	acpi_status status = 0;

	static int first_run = 0;

	static int first_run;

	struct proc_dir_entry *entry = NULL;

	unsigned int i;

drivers/acpi/thermal.c

+1 −1
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int acpi_thermal_add(struct acpi_device *device) 


	result = acpi_thermal_add_fs(device);

	if (result)

		return_VALUE(result);

		goto end;



	init_timer(&tz->timer);