From 0703ea2ad48ec0050ab348bc57dbb341eeee2164 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Tue, 3 Jan 2006 16:03:07 -0500 Subject: [PATCH] --- yaml --- r: 15381 b: refs/heads/master c: d78fef14c2218ba9666687aabc57392c54569048 h: refs/heads/master i: 15379: 89f64d5e76e9b6b392006d449c41f0b673813fe2 v: v3 --- [refs] | 2 +- trunk/Documentation/kernel-parameters.txt | 4 ++++ trunk/MAINTAINERS | 2 +- trunk/drivers/acpi/tables.c | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0dc2b500db71..69554bd52d0c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 88026842b0a760145aa71d69e74fbc9ec118ca44 +refs/heads/master: d78fef14c2218ba9666687aabc57392c54569048 diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt index 5dffcfefc3c7..6e9f1dc26884 100644 --- a/trunk/Documentation/kernel-parameters.txt +++ b/trunk/Documentation/kernel-parameters.txt @@ -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. diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 6af683025ae0..07fd0a23379c 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -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 diff --git a/trunk/drivers/acpi/tables.c b/trunk/drivers/acpi/tables.c index a2bf25b05e1c..31d4f3ffc265 100644 --- a/trunk/drivers/acpi/tables.c +++ b/trunk/drivers/acpi/tables.c @@ -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) {