Merge branches 'release', 'bugzilla-6217', 'bugzilla-6629', 'bugzilla-6933',... (c64768a7) · Commits · 戴 / test

Documentation/00-INDEX

+3 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ Following translations are available on the WWW:
		- this file.
		ABI/
		- info on kernel <-> userspace ABI and relative interface stability.

		BUG-HUNTING
		- brute force method of doing binary search of patches to find bug.
		Changes
		@@ -66,6 +67,8 @@ VGA-softcursor.txt
		- how to change your VGA cursor from a blinking underscore.
		accounting/
		- documentation on accounting and taskstats.
		acpi/
		- info on ACPI-specific hooks in the kernel.
		aoe/
		- description of AoE (ATA over Ethernet) along with config examples.
		applying-patches.txt

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		/sys/module/acpi/parameters/:

		trace_method_name
		The AML method name that the user wants to trace

		trace_debug_layer
		The temporary debug_layer used when tracing the method.
		Using 0xffffffff by default if it is 0.

		trace_debug_level
		The temporary debug_level used when tracing the method.
		Using 0x00ffffff by default if it is 0.

		trace_state
		The status of the tracing feature.

		"enabled" means this feature is enabled
		and the AML method is traced every time it's executed.

		"1" means this feature is enabled and the AML method
		will only be traced during the next execution.

		"disabled" means this feature is disabled.
		Users can enable/disable this debug tracing feature by
		"echo string > /sys/module/acpi/parameters/trace_state".
		"string" should be one of "enable", "disable" and "1".

+14 −12

Original line number	Diff line number	Diff line
		@@ -69,6 +69,20 @@ unsigned int acpi_cpei_phys_cpuid;

		unsigned long acpi_wakeup_address = 0;

		#ifdef CONFIG_IA64_GENERIC
		static unsigned long __init acpi_find_rsdp(void)
		{
		unsigned long rsdp_phys = 0;

		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
		rsdp_phys = efi.acpi20;
		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
		printk(KERN_WARNING PREFIX
		"v1.0/r0.71 tables no longer supported\n");
		return rsdp_phys;
		}
		#endif

		const char __init *
		acpi_get_sysname(void)
		{
		@@ -631,18 +645,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
		return 0;
		}

		unsigned long __init acpi_find_rsdp(void)
		{
		unsigned long rsdp_phys = 0;

		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
		rsdp_phys = efi.acpi20;
		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
		printk(KERN_WARNING PREFIX
		"v1.0/r0.71 tables no longer supported\n");
		return rsdp_phys;
		}

		int __init acpi_boot_init(void)
		{

+0 −40

Original line number	Diff line number	Diff line
		@@ -587,25 +587,6 @@ int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)

		EXPORT_SYMBOL(acpi_unregister_ioapic);

		static unsigned long __init
		acpi_scan_rsdp(unsigned long start, unsigned long length)
		{
		unsigned long offset = 0;
		unsigned long sig_len = sizeof("RSD PTR ") - 1;

		/*
		* Scan all 16-byte boundaries of the physical memory region for the
		* RSDP signature.
		*/
		for (offset = 0; offset < length; offset += 16) {
		if (strncmp((char *)(phys_to_virt(start) + offset), "RSD PTR ", sig_len))
		continue;
		return (start + offset);
		}

		return 0;
		}

		static int __init acpi_parse_sbf(struct acpi_table_header *table)
		{
		struct acpi_table_boot *sb;
		@@ -748,27 +729,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
		return 0;
		}

		unsigned long __init acpi_find_rsdp(void)
		{
		unsigned long rsdp_phys = 0;

		if (efi_enabled) {
		if (efi.acpi20 != EFI_INVALID_TABLE_ADDR)
		return efi.acpi20;
		else if (efi.acpi != EFI_INVALID_TABLE_ADDR)
		return efi.acpi;
		}
		/*
		* Scan memory looking for the RSDP signature. First search EBDA (low
		* memory) paragraphs and then search upper memory (E0000-FFFFF).
		*/
		rsdp_phys = acpi_scan_rsdp(0, 0x400);
		if (!rsdp_phys)
		rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);

		return rsdp_phys;
		}

		#ifdef CONFIG_X86_LOCAL_APIC
		/*
		* Parse LAPIC entries in MADT

+1 −4

Original line number	Diff line number	Diff line
		@@ -189,9 +189,6 @@ static unsigned int pentium4_get_frequency(void)
		printk(KERN_DEBUG "speedstep-lib: couldn't detect FSB speed. Please send an e-mail to <linux@brodo.de>\n");

		/* Multiplier. */
		if (c->x86_model < 2)
		mult = msr_lo >> 27;
		else
		mult = msr_lo >> 24;

		dprintk("P4 - FSB %u kHz; Multiplier %u; Speed %u kHz\n", fsb, mult, (fsb * mult));