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

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (30 commits)
  ACPI: Kconfig text - Fix the ACPI_CONTAINER module name according to the real module name.
  eeepc-laptop: fix oops when changing backlight brightness during eeepc-laptop init
  ACPICA: Fix table entry truncation calculation
  ACPI: Enable bit 11 in _PDC to advertise hw coord
  ACPI: struct device - replace bus_id with dev_name(), dev_set_name()
  ACPI: add missing KERN_* constants to printks
  ACPI: dock: Don't eval _STA on every show_docked sysfs read
  ACPI: disable ACPI cleanly when bad RSDP found
  ACPI: delete CPU_IDLE=n code
  ACPI: cpufreq: Remove deprecated /proc/acpi/processor/../performance proc entries
  ACPI: make some IO ports off-limits to AML
  ACPICA: add debug dump of BIOS _OSI strings
  ACPI: proc_dir_entry 'video/VGA' already registered
  ACPI: Skip the first two elements in the _BCL package
  ACPI: remove BM_RLD access from idle entry path
  ACPI: remove locking from PM1x_STS register reads
  eeepc-laptop: use netlink interface
  eeepc-laptop: Implement rfkill hotplugging in eeepc-laptop
  eeepc-laptop: Check return values from rfkill_register
  eeepc-laptop: Add support for extended hotkeys
  ...
parents ccfef646 2d29c6a0

Documentation/cpu-freq/user-guide.txt

+0 −16
Original line number Diff line number Diff line
@@ -195,19 +195,3 @@ scaling_setspeed. By "echoing" a new frequency into this 
				you can change the speed of the CPU,

				but only within the limits of

				scaling_min_freq and scaling_max_freq.
 
				



3.2 Deprecated Interfaces

-------------------------



Depending on your kernel configuration, you might find the following 

cpufreq-related files:

/proc/cpufreq

/proc/sys/cpu/*/speed

/proc/sys/cpu/*/speed-min

/proc/sys/cpu/*/speed-max



These are files for deprecated interfaces to cpufreq, which offer far

less functionality. Because of this, these interfaces aren't described

here.

arch/x86/kernel/acpi/sleep.c

+2 −2
Original line number Diff line number Diff line
@@ -156,11 +156,11 @@ static int __init acpi_sleep_setup(char *str) 
#ifdef CONFIG_HIBERNATION

		if (strncmp(str, "s4_nohwsig", 10) == 0)

			acpi_no_s4_hw_signature();

		if (strncmp(str, "s4_nonvs", 8) == 0)

			acpi_s4_no_nvs();

#endif

		if (strncmp(str, "old_ordering", 12) == 0)

			acpi_old_suspend_ordering();

		if (strncmp(str, "s4_nonvs", 8) == 0)

			acpi_s4_no_nvs();

		str = strchr(str, ',');

		if (str != NULL)

			str += strspn(str, ", \t");

arch/x86/kernel/cpu/cpufreq/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -245,17 +245,6 @@ config X86_E_POWERSAVER 


comment "shared options"



config X86_ACPI_CPUFREQ_PROC_INTF

	bool "/proc/acpi/processor/../performance interface (deprecated)"

	depends on PROC_FS

	depends on X86_ACPI_CPUFREQ || X86_POWERNOW_K7_ACPI || X86_POWERNOW_K8_ACPI

	help

	  This enables the deprecated /proc/acpi/processor/../performance

	  interface. While it is helpful for debugging, the generic,

	  cross-architecture cpufreq interfaces should be used.



	  If in doubt, say N.



config X86_SPEEDSTEP_LIB

	tristate

	default (X86_SPEEDSTEP_ICH || X86_SPEEDSTEP_SMI || X86_P4_CLOCKMOD)

drivers/acpi/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ menuconfig ACPI 
	depends on PCI

	depends on PM

	select PNP

	select CPU_IDLE

	default y

	---help---

	  Advanced Configuration and Power Interface (ACPI) support for
@@ -287,7 +288,7 @@ config ACPI_CONTAINER 
	  support physical cpu/memory hot-plug.



	  If one selects "m", this driver can be loaded with

	  "modprobe acpi_container".

	  "modprobe container".



config ACPI_HOTPLUG_MEMORY

	tristate "Memory Hotplug"

drivers/acpi/acpica/tbutils.c

+3 −4
Original line number Diff line number Diff line
@@ -538,10 +538,9 @@ acpi_tb_parse_root_table(acpi_physical_address rsdp_address, u8 flags) 
			if (ACPI_FAILURE(status)) {

				ACPI_WARNING((AE_INFO,

					      "Truncating %u table entries!",

					      (unsigned)

					      (acpi_gbl_root_table_list.size -

					       acpi_gbl_root_table_list.

					       count)));

					      (unsigned) (table_count -

					       (acpi_gbl_root_table_list.

					       count - 2))));

				break;

			}

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE