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

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

Pull fluff into release branch 



Conflicts:

	arch/x86_64/pci/mmconfig.c
	drivers/acpi/bay.c

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 81450b73 db2d4ccd

arch/i386/kernel/acpi/boot.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -850,10 +850,9 @@ static inline int acpi_parse_madt_ioapic_entries(void) 
static void __init acpi_process_madt(void)

static void __init acpi_process_madt(void)

{

{

#ifdef CONFIG_X86_LOCAL_APIC

#ifdef CONFIG_X86_LOCAL_APIC

	int count, error;

	int error;





	count = acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt);

	if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {

	if (count >= 1) {





		/*

		/*

		 * Parse MADT LAPIC entries

		 * Parse MADT LAPIC entries

arch/ia64/kernel/acpi.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -651,7 +651,7 @@ int __init acpi_boot_init(void) 
	 * information -- the successor to MPS tables.

	 * information -- the successor to MPS tables.

	 */

	 */





	if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt) < 1) {

	if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {

		printk(KERN_ERR PREFIX "Can't find MADT\n");

		printk(KERN_ERR PREFIX "Can't find MADT\n");

		goto skip_madt;

		goto skip_madt;

	}

	}
@@ -702,7 +702,7 @@ int __init acpi_boot_init(void) 
	 * gets interrupts such as power and sleep buttons.  If it's not

	 * gets interrupts such as power and sleep buttons.  If it's not

	 * on a Legacy interrupt, it needs to be setup.

	 * on a Legacy interrupt, it needs to be setup.

	 */

	 */

	if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt) < 1)

	if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt))

		printk(KERN_ERR PREFIX "Can't find FADT\n");

		printk(KERN_ERR PREFIX "Can't find FADT\n");





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

arch/x86_64/kernel/early-quirks.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -53,7 +53,9 @@ static void nvidia_bugs(void) 
		return;

		return;





	nvidia_hpet_detected = 0;

	nvidia_hpet_detected = 0;

	acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check);

	if (acpi_table_parse(ACPI_SIG_HPET, nvidia_hpet_check))

		return;



	if (nvidia_hpet_detected == 0) {

	if (nvidia_hpet_detected == 0) {

		acpi_skip_timer_override = 1;

		acpi_skip_timer_override = 1;

		printk(KERN_INFO "Nvidia board "

		printk(KERN_INFO "Nvidia board "

drivers/acpi/ac.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -35,7 +35,6 @@ 
#define ACPI_AC_COMPONENT		0x00020000

#define ACPI_AC_COMPONENT		0x00020000

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_CLASS			"ac_adapter"

#define ACPI_AC_HID 			"ACPI0003"

#define ACPI_AC_HID 			"ACPI0003"

#define ACPI_AC_DRIVER_NAME		"ACPI AC Adapter Driver"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_DEVICE_NAME		"AC Adapter"

#define ACPI_AC_FILE_STATE		"state"

#define ACPI_AC_FILE_STATE		"state"

#define ACPI_AC_NOTIFY_STATUS		0x80

#define ACPI_AC_NOTIFY_STATUS		0x80
@@ -44,10 +43,10 @@ 
#define ACPI_AC_STATUS_UNKNOWN		0xFF

#define ACPI_AC_STATUS_UNKNOWN		0xFF





#define _COMPONENT		ACPI_AC_COMPONENT

#define _COMPONENT		ACPI_AC_COMPONENT

ACPI_MODULE_NAME("acpi_ac")

ACPI_MODULE_NAME("ac");





MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_AUTHOR("Paul Diefenbaugh");

MODULE_DESCRIPTION(ACPI_AC_DRIVER_NAME);

MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





extern struct proc_dir_entry *acpi_lock_ac_dir(void);

extern struct proc_dir_entry *acpi_lock_ac_dir(void);
@@ -58,7 +57,7 @@ static int acpi_ac_remove(struct acpi_device *device, int type); 
static int acpi_ac_open_fs(struct inode *inode, struct file *file);

static int acpi_ac_open_fs(struct inode *inode, struct file *file);





static struct acpi_driver acpi_ac_driver = {

static struct acpi_driver acpi_ac_driver = {

	.name = ACPI_AC_DRIVER_NAME,

	.name = "ac",

	.class = ACPI_AC_CLASS,

	.class = ACPI_AC_CLASS,

	.ids = ACPI_AC_HID,

	.ids = ACPI_AC_HID,

	.ops = {

	.ops = {

drivers/acpi/acpi_memhotplug.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -35,14 +35,13 @@ 
#define ACPI_MEMORY_DEVICE_COMPONENT		0x08000000UL

#define ACPI_MEMORY_DEVICE_COMPONENT		0x08000000UL

#define ACPI_MEMORY_DEVICE_CLASS		"memory"

#define ACPI_MEMORY_DEVICE_CLASS		"memory"

#define ACPI_MEMORY_DEVICE_HID			"PNP0C80"

#define ACPI_MEMORY_DEVICE_HID			"PNP0C80"

#define ACPI_MEMORY_DEVICE_DRIVER_NAME		"Hotplug Mem Driver"

#define ACPI_MEMORY_DEVICE_NAME			"Hotplug Mem Device"

#define ACPI_MEMORY_DEVICE_NAME			"Hotplug Mem Device"





#define _COMPONENT		ACPI_MEMORY_DEVICE_COMPONENT

#define _COMPONENT		ACPI_MEMORY_DEVICE_COMPONENT





ACPI_MODULE_NAME("acpi_memory")

ACPI_MODULE_NAME("acpi_memhotplug");

MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");

MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>");

MODULE_DESCRIPTION(ACPI_MEMORY_DEVICE_DRIVER_NAME);

MODULE_DESCRIPTION("Hotplug Mem Driver");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





/* ACPI _STA method values */

/* ACPI _STA method values */
@@ -60,7 +59,7 @@ static int acpi_memory_device_remove(struct acpi_device *device, int type); 
static int acpi_memory_device_start(struct acpi_device *device);

static int acpi_memory_device_start(struct acpi_device *device);





static struct acpi_driver acpi_memory_device_driver = {

static struct acpi_driver acpi_memory_device_driver = {

	.name = ACPI_MEMORY_DEVICE_DRIVER_NAME,

	.name = "acpi_memhotplug",

	.class = ACPI_MEMORY_DEVICE_CLASS,

	.class = ACPI_MEMORY_DEVICE_CLASS,

	.ids = ACPI_MEMORY_DEVICE_HID,

	.ids = ACPI_MEMORY_DEVICE_HID,

	.ops = {

	.ops = {