Merge branch 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik...

* 'dmi-const' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6:
  drivers/firmware: const-ify DMI API and internals

diff --combined arch/x86/kernel/acpi/boot.c
index cacdd883bf2b8d545b7045daf79f2ad8325dd69a,afd2afe9102d33e26d8c837333ca4115215d578b..afd2afe9102d33e26d8c837333ca4115215d578b
--- 1/arch/x86/kernel/acpi/boot.c
--- 2/arch/i386/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@@ -907,7 -907,7 +907,7 @@@ static void __init acpi_process_madt(vo
  
  #ifdef __i386__
  
- static int __init disable_acpi_irq(struct dmi_system_id *d)
+ static int __init disable_acpi_irq(const struct dmi_system_id *d)
  {
        if (!acpi_force) {
                printk(KERN_NOTICE "%s detected: force use of acpi=noirq\n",
@@@ -917,7 -917,7 +917,7 @@@
        return 0;
  }
  
- static int __init disable_acpi_pci(struct dmi_system_id *d)
+ static int __init disable_acpi_pci(const struct dmi_system_id *d)
  {
        if (!acpi_force) {
                printk(KERN_NOTICE "%s detected: force use of pci=noacpi\n",
@@@ -927,7 -927,7 +927,7 @@@
        return 0;
  }
  
- static int __init dmi_disable_acpi(struct dmi_system_id *d)
+ static int __init dmi_disable_acpi(const struct dmi_system_id *d)
  {
        if (!acpi_force) {
                printk(KERN_NOTICE "%s detected: acpi off\n", d->ident);
@@@ -942,7 -942,7 +942,7 @@@
  /*
   * Limit ACPI to CPU enumeration for HT
   */
- static int __init force_acpi_ht(struct dmi_system_id *d)
+ static int __init force_acpi_ht(const struct dmi_system_id *d)
  {
        if (!acpi_force) {
                printk(KERN_NOTICE "%s detected: force use of acpi=ht\n",

diff --combined arch/x86/kernel/acpi/sleep_32.c
index c42b5ab49deb0dc58aaef80d91d01ed940091b9f,10699489cfe7f776e9666ad588cf8265b21642b1..10699489cfe7f776e9666ad588cf8265b21642b1
--- 1/arch/x86/kernel/acpi/sleep_32.c
--- 2/arch/i386/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep_32.c
@@@ -84,7 -84,7 +84,7 @@@ __setup("acpi_sleep=", acpi_sleep_setup
  
  /* Ouch, we want to delete this. We already have better version in userspace, in
     s2ram from suspend.sf.net project */
- static __init int reset_videomode_after_s3(struct dmi_system_id *d)
+ static __init int reset_videomode_after_s3(const struct dmi_system_id *d)
  {
        acpi_realmode_flags |= 2;
        return 0;

diff --combined arch/x86/kernel/apm_32.c
index f02a8aca826be21abc18ac3e31fe8a59caeebb9e,32f2365c26ed3bcaef228f0d494f3edc18145d4f..32f2365c26ed3bcaef228f0d494f3edc18145d4f
--- 1/arch/x86/kernel/apm_32.c
--- 2/arch/i386/kernel/apm.c
+++ b/arch/x86/kernel/apm_32.c
@@@ -1869,7 -1869,7 +1869,7 @@@ static struct miscdevice apm_device = 
  
  
  /* Simple "print if true" callback */
- static int __init print_if_true(struct dmi_system_id *d)
+ static int __init print_if_true(const struct dmi_system_id *d)
  {
        printk("%s\n", d->ident);
        return 0;
@@@ -1879,14 -1879,14 +1879,14 @@@
   * Some Bioses enable the PS/2 mouse (touchpad) at resume, even if it was
   * disabled before the suspend. Linux used to get terribly confused by that.
   */
- static int __init broken_ps2_resume(struct dmi_system_id *d)
+ static int __init broken_ps2_resume(const struct dmi_system_id *d)
  {
        printk(KERN_INFO "%s machine detected. Mousepad Resume Bug workaround hopefully not needed.\n", d->ident);
        return 0;
  }
  
  /* Some bioses have a broken protected mode poweroff and need to use realmode */
- static int __init set_realmode_power_off(struct dmi_system_id *d)
+ static int __init set_realmode_power_off(const struct dmi_system_id *d)
  {
        if (apm_info.realmode_power_off == 0) {
                apm_info.realmode_power_off = 1;
@@@ -1896,7 -1896,7 +1896,7 @@@
  }
  
  /* Some laptops require interrupts to be enabled during APM calls */
- static int __init set_apm_ints(struct dmi_system_id *d)
+ static int __init set_apm_ints(const struct dmi_system_id *d)
  {
        if (apm_info.allow_ints == 0) {
                apm_info.allow_ints = 1;
@@@ -1906,7 -1906,7 +1906,7 @@@
  }
  
  /* Some APM bioses corrupt memory or just plain do not work */
- static int __init apm_is_horked(struct dmi_system_id *d)
+ static int __init apm_is_horked(const struct dmi_system_id *d)
  {
        if (apm_info.disabled == 0) {
                apm_info.disabled = 1;
@@@ -1915,7 -1915,7 +1915,7 @@@
        return 0;
  }
  
- static int __init apm_is_horked_d850md(struct dmi_system_id *d)
+ static int __init apm_is_horked_d850md(const struct dmi_system_id *d)
  {
        if (apm_info.disabled == 0) {
                apm_info.disabled = 1;
@@@ -1927,7 -1927,7 +1927,7 @@@
  }
  
  /* Some APM bioses hang on APM idle calls */
- static int __init apm_likes_to_melt(struct dmi_system_id *d)
+ static int __init apm_likes_to_melt(const struct dmi_system_id *d)
  {
        if (apm_info.forbid_idle == 0) {
                apm_info.forbid_idle = 1;
@@@ -1951,7 -1951,7 +1951,7 @@@
   *    Phoenix A04  08/24/2000 is known bad (Dell Inspiron 5000e)
   *    Phoenix A07  09/29/2000 is known good (Dell Inspiron 5000)
   */
- static int __init broken_apm_power(struct dmi_system_id *d)
+ static int __init broken_apm_power(const struct dmi_system_id *d)
  {
        apm_info.get_power_status_broken = 1;
        printk(KERN_WARNING "BIOS strings suggest APM bugs, disabling power status reporting.\n");
@@@ -1962,7 -1962,7 +1962,7 @@@
   * This bios swaps the APM minute reporting bytes over (Many sony laptops
   * have this problem).
   */
- static int __init swab_apm_power_in_minutes(struct dmi_system_id *d)
+ static int __init swab_apm_power_in_minutes(const struct dmi_system_id *d)
  {
        apm_info.get_power_status_swabinminutes = 1;
        printk(KERN_WARNING "BIOS strings suggest APM reports battery life in minutes and wrong byte order.\n");

diff --combined arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
index 705e13a3078136df5bd9700ca344ac643cd145df,b6434a7ef8b2b311f76aad4307f642e64746dd8b..b6434a7ef8b2b311f76aad4307f642e64746dd8b
--- 1/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
--- 2/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c
@@@ -533,13 -533,13 +533,13 @@@ static int __init acpi_cpufreq_early_in
   */
  static int bios_with_sw_any_bug;
  
- static int sw_any_bug_found(struct dmi_system_id *d)
+ static int sw_any_bug_found(const struct dmi_system_id *d)
  {
        bios_with_sw_any_bug = 1;
        return 0;
  }
  
- static struct dmi_system_id sw_any_bug_dmi_table[] = {
+ static const struct dmi_system_id sw_any_bug_dmi_table[] = {
        {
                .callback = sw_any_bug_found,
                .ident = "Supermicro Server X6DLP",

diff --combined arch/x86/kernel/reboot_32.c
index 0d796248866cfcf892f53b5d79717aa9ecf9e10f,b37ed226830aa78c081fcd2698e800ec83b44ea6..b37ed226830aa78c081fcd2698e800ec83b44ea6
--- 1/arch/x86/kernel/reboot_32.c
--- 2/arch/i386/kernel/reboot.c
+++ b/arch/x86/kernel/reboot_32.c
@@@ -79,7 -79,7 +79,7 @@@ __setup("reboot=", reboot_setup)
  /*
   * Some machines require the "reboot=b"  commandline option, this quirk makes that automatic.
   */
- static int __init set_bios_reboot(struct dmi_system_id *d)
+ static int __init set_bios_reboot(const struct dmi_system_id *d)
  {
        if (!reboot_thru_bios) {
                reboot_thru_bios = 1;

diff --combined arch/x86/kernel/tsc_32.c
index a39280b4dd3a53f107a23ac85df1b01d5ac6b7c4,3ed0ae8c918ddfd95da7fa452157c80f2a84e1b0..3ed0ae8c918ddfd95da7fa452157c80f2a84e1b0
--- 1/arch/x86/kernel/tsc_32.c
--- 2/arch/i386/kernel/tsc.c
+++ b/arch/x86/kernel/tsc_32.c
@@@ -305,7 -305,7 +305,7 @@@ void mark_tsc_unstable(char *reason
  }
  EXPORT_SYMBOL_GPL(mark_tsc_unstable);
  
- static int __init dmi_mark_tsc_unstable(struct dmi_system_id *d)
+ static int __init dmi_mark_tsc_unstable(const struct dmi_system_id *d)
  {
        printk(KERN_NOTICE "%s detected: marking TSC unstable.\n",
                       d->ident);

diff --combined arch/x86/mach-generic/bigsmp.c
index 58a477baec30b575e94300f82210c938e80ef970,292a225edabe5f2102c8235d2d45e1da45a56d87..292a225edabe5f2102c8235d2d45e1da45a56d87
--- 1/arch/x86/mach-generic/bigsmp.c
--- 2/arch/i386/mach-generic/bigsmp.c
+++ b/arch/x86/mach-generic/bigsmp.c
@@@ -21,7 -21,7 +21,7 @@@
  
  static int dmi_bigsmp; /* can be set by dmi scanners */
  
- static int hp_ht_bigsmp(struct dmi_system_id *d)
+ static int hp_ht_bigsmp(const struct dmi_system_id *d)
  {
  #ifdef CONFIG_X86_GENERICARCH
        printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident);
@@@ -31,7 -31,7 +31,7 @@@
  }
  
  
- static struct dmi_system_id bigsmp_dmi_table[] = {
+ static const struct dmi_system_id bigsmp_dmi_table[] = {
        { hp_ht_bigsmp, "HP ProLiant DL760 G2", {
                DMI_MATCH(DMI_BIOS_VENDOR, "HP"),
                DMI_MATCH(DMI_BIOS_VERSION, "P44-"),

diff --combined arch/x86/pci/common.c
index ebc6f3c66340ccb319be52002283c53a2545312b,07d5223442bf2ca09073fd7b4e84312a239f37ef..07d5223442bf2ca09073fd7b4e84312a239f37ef
--- 1/arch/x86/pci/common.c
--- 2/arch/i386/pci/common.c
+++ b/arch/x86/pci/common.c
@@@ -123,7 -123,7 +123,7 @@@ void __devinit  pcibios_fixup_bus(struc
   * on the kernel command line (which was parsed earlier).
   */
  
- static int __devinit set_bf_sort(struct dmi_system_id *d)
+ static int __devinit set_bf_sort(const struct dmi_system_id *d)
  {
        if (pci_bf_sort == pci_bf_sort_default) {
                pci_bf_sort = pci_dmi_bf;
@@@ -136,7 -136,7 +136,7 @@@
   * Enable renumbering of PCI bus# ranges to reach all PCI busses (Cardbus)
   */
  #ifdef __i386__
- static int __devinit assign_all_busses(struct dmi_system_id *d)
+ static int __devinit assign_all_busses(const struct dmi_system_id *d)
  {
        pci_probe |= PCI_ASSIGN_ALL_BUSSES;
        printk(KERN_INFO "%s detected: enabling PCI bus# renumbering"

diff --combined arch/x86/pci/irq.c
index 8434f2323b8700ad29e44259f2604b7bcc51f704,d98c6b096f8e34e7c4877521bf69fa5b9dff400d..d98c6b096f8e34e7c4877521bf69fa5b9dff400d
--- 1/arch/x86/pci/irq.c
--- 2/arch/i386/pci/irq.c
+++ b/arch/x86/pci/irq.c
@@@ -1010,7 -1010,7 +1010,7 @@@ static void __init pcibios_fixup_irqs(v
   * Work around broken HP Pavilion Notebooks which assign USB to
   * IRQ 9 even though it is actually wired to IRQ 11
   */
- static int __init fix_broken_hp_bios_irq9(struct dmi_system_id *d)
+ static int __init fix_broken_hp_bios_irq9(const struct dmi_system_id *d)
  {
        if (!broken_hp_bios_irq9) {
                broken_hp_bios_irq9 = 1;
@@@ -1023,7 -1023,7 +1023,7 @@@
   * Work around broken Acer TravelMate 360 Notebooks which assign
   * Cardbus to IRQ 11 even though it is actually wired to IRQ 10
   */
- static int __init fix_acer_tm360_irqrouting(struct dmi_system_id *d)
+ static int __init fix_acer_tm360_irqrouting(const struct dmi_system_id *d)
  {
        if (!acer_tm360_irqrouting) {
                acer_tm360_irqrouting = 1;