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

Commit 5f50ef45 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'misc' into test

parents 530bc23b e3deda9c

Documentation/kernel-parameters.txt

+1 −1
Original line number Original line Diff line number Diff line
@@ -2173,7 +2173,7 @@ and is between 256 and 4096 characters. It is defined in the file 




	thermal.crt=	[HW,ACPI]

	thermal.crt=	[HW,ACPI]

			-1: disable all critical trip points in all thermal zones

			-1: disable all critical trip points in all thermal zones

			<degrees C>: lower all critical trip points

			<degrees C>: override all critical trip points





	thermal.nocrt=	[HW,ACPI]

	thermal.nocrt=	[HW,ACPI]

			Set to disable actions on ACPI thermal zone

			Set to disable actions on ACPI thermal zone

arch/x86/kernel/acpi/boot.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -97,7 +97,6 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE; 
#warning ACPI uses CMPXCHG, i486 and later hardware

#warning ACPI uses CMPXCHG, i486 and later hardware

#endif

#endif





static int acpi_mcfg_64bit_base_addr __initdata = FALSE;





/* --------------------------------------------------------------------------

/* --------------------------------------------------------------------------

                              Boot-time Configuration

                              Boot-time Configuration
@@ -156,6 +155,9 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
}

}





#ifdef CONFIG_PCI_MMCONFIG

#ifdef CONFIG_PCI_MMCONFIG



static int acpi_mcfg_64bit_base_addr __initdata = FALSE;



/* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */

/* The physical address of the MMCONFIG aperture.  Set from ACPI tables. */

struct acpi_mcfg_allocation *pci_mmcfg_config;

struct acpi_mcfg_allocation *pci_mmcfg_config;

int pci_mmcfg_config_num;

int pci_mmcfg_config_num;

arch/x86/kernel/acpi/sleep.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ unsigned long acpi_realmode_flags; 
static unsigned long acpi_realmode;

static unsigned long acpi_realmode;





#if defined(CONFIG_SMP) && defined(CONFIG_64BIT)

#if defined(CONFIG_SMP) && defined(CONFIG_64BIT)

static char temp_stack[10240];

static char temp_stack[4096];

#endif

#endif





/**

/**
@@ -97,7 +97,7 @@ int acpi_save_state_mem(void) 
#else /* CONFIG_64BIT */

#else /* CONFIG_64BIT */

	header->trampoline_segment = setup_trampoline() >> 4;

	header->trampoline_segment = setup_trampoline() >> 4;

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	stack_start.sp = temp_stack + 4096;

	stack_start.sp = temp_stack + sizeof(temp_stack);

#endif

#endif

	initial_code = (unsigned long)wakeup_long64;

	initial_code = (unsigned long)wakeup_long64;

	saved_magic = 0x123456789abcdef0;

	saved_magic = 0x123456789abcdef0;

drivers/acpi/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -42,7 +42,7 @@ if ACPI 




config ACPI_SLEEP

config ACPI_SLEEP

	bool

	bool

	depends on PM_SLEEP

	depends on SUSPEND || HIBERNATION

	default y

	default y





config ACPI_PROCFS

config ACPI_PROCFS
@@ -252,7 +252,7 @@ config ACPI_ASUS 




config ACPI_TOSHIBA

config ACPI_TOSHIBA

	tristate "Toshiba Laptop Extras"

	tristate "Toshiba Laptop Extras"

	depends on X86

	depends on X86 && INPUT

	select BACKLIGHT_CLASS_DEVICE

	select BACKLIGHT_CLASS_DEVICE

	---help---

	---help---

	  This driver adds support for access to certain system settings

	  This driver adds support for access to certain system settings

drivers/acpi/ac.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -269,7 +269,7 @@ static int acpi_ac_add(struct acpi_device *device) 
	ac->device = device;

	ac->device = device;

	strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);

	strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME);

	strcpy(acpi_device_class(device), ACPI_AC_CLASS);

	strcpy(acpi_device_class(device), ACPI_AC_CLASS);

	acpi_driver_data(device) = ac;

	device->driver_data = ac;





	result = acpi_ac_get_state(ac);

	result = acpi_ac_get_state(ac);

	if (result)

	if (result)