Pull linus into release branch
authorLen Brown <len.brown@intel.com>
Tue, 3 Jan 2006 21:03:07 +0000 (16:03 -0500)
committerLen Brown <len.brown@intel.com>
Tue, 3 Jan 2006 21:03:07 +0000 (16:03 -0500)
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/acpi/tables.c

index 5dffcfefc3c715698eca24b519df8eab6d8a799d..6e9f1dc26884d6bf06f63406dd7b38dac4b89b92 100644 (file)
@@ -1160,6 +1160,10 @@ running once the system is up.
                        Limit processor to maximum C-state
                        max_cstate=9 overrides any DMI blacklist limit.
 
+       processor.nocst [HW,ACPI]
+                       Ignore the _CST method to determine C-states,
+                       instead using the legacy FADT method
+
        prompt_ramdisk= [RAM] List of RAM disks to prompt for floppy disk
                        before loading.
                        See Documentation/ramdisk.txt.
index 6af683025ae045101a510c30e0fb076bbdf97bda..07fd0a23379cba7d681df098d14810540029fc2b 100644 (file)
@@ -182,7 +182,7 @@ S:  Supported
 ACPI
 P:     Len Brown
 M:     len.brown@intel.com
-L:     acpi-devel@lists.sourceforge.net
+L:     linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 T:     git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
 S:     Maintained
index a2bf25b05e1c08156d77571505e162c51fbc7075..31d4f3ffc265b5b2d28055ea1eaec5b317c8f5d4 100644 (file)
@@ -37,7 +37,7 @@
 
 #define PREFIX                 "ACPI: "
 
-#define ACPI_MAX_TABLES                256
+#define ACPI_MAX_TABLES                128
 
 static char *acpi_table_signatures[ACPI_TABLE_COUNT] = {
        [ACPI_TABLE_UNKNOWN] = "????",
@@ -74,7 +74,7 @@ struct acpi_table_sdt {
 static unsigned long sdt_pa;   /* Physical Address */
 static unsigned long sdt_count;        /* Table count */
 
-static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES];
+static struct acpi_table_sdt sdt_entry[ACPI_MAX_TABLES] __initdata;
 
 void acpi_table_print(struct acpi_table_header *header, unsigned long phys_addr)
 {