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

Commit e75f801f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging 

Pull dmi update from Jean Delvare:
 "Mark all struct dmi_system_id instances const"

* 'dmi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  dmi: Mark all struct dmi_system_id instances const
parents ba768535 6faadbbb

arch/x86/kernel/acpi/boot.c

+2 −2
Original line number Diff line number Diff line
@@ -1373,7 +1373,7 @@ static void __init acpi_reduced_hw_init(void) 
 * If your system is blacklisted here, but you find that acpi=force

 * works for you, please contact linux-acpi@vger.kernel.org

 */

static struct dmi_system_id __initdata acpi_dmi_table[] = {

static const struct dmi_system_id acpi_dmi_table[] __initconst = {

	/*

	 * Boxes that need ACPI disabled

	 */
@@ -1448,7 +1448,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = { 
};



/* second table for DMI checks that should run after early-quirks */

static struct dmi_system_id __initdata acpi_dmi_table_late[] = {

static const struct dmi_system_id acpi_dmi_table_late[] __initconst = {

	/*

	 * HP laptops which use a DSDT reporting as HP/SB400/10000,

	 * which includes some code which overrides all temperature

arch/x86/kernel/apm_32.c

+1 −1
Original line number Diff line number Diff line
@@ -2043,7 +2043,7 @@ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d) 
	return 0;

}



static struct dmi_system_id __initdata apm_dmi_table[] = {

static const struct dmi_system_id apm_dmi_table[] __initconst = {

	{

		print_if_true,

		KERN_WARNING "IBM T23 - BIOS 1.03b+ and controller firmware 1.02+ may be needed for Linux APM.",

arch/x86/kernel/io_delay.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static int __init dmi_io_delay_0xed_port(const struct dmi_system_id *id) 
 * Quirk table for systems that misbehave (lock up, etc.) if port

 * 0x80 is used:

 */

static struct dmi_system_id __initdata io_delay_0xed_port_dmi_table[] = {

static const struct dmi_system_id io_delay_0xed_port_dmi_table[] __initconst = {

	{

		.callback	= dmi_io_delay_0xed_port,

		.ident		= "Compaq Presario V6000",

arch/x86/kernel/reboot.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ static int __init set_kbd_reboot(const struct dmi_system_id *d) 
/*

 * This is a single dmi_table handling all reboot quirks.

 */

static struct dmi_system_id __initdata reboot_dmi_table[] = {

static const struct dmi_system_id reboot_dmi_table[] __initconst = {



	/* Acer */

	{	/* Handle reboot issue on Acer Aspire one */

arch/x86/pci/irq.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d) 
	return 0;

}



static struct dmi_system_id __initdata pciirq_dmi_table[] = {

static const struct dmi_system_id pciirq_dmi_table[] __initconst = {

	{

		.callback = fix_broken_hp_bios_irq9,

		.ident = "HP Pavilion N5400 Series Laptop",