Skip to content

L
linux

xiphi1978 / linux

通知 2
Star 0
Fork 0
L
linux

体验新版 GitCode，发现更多精彩内容 >>

提交 35f9162d 编写于 作者: L Linus Torvalds
浏览文件
操作

Merge tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI and power management fixes from Rafael Wysocki:
 "These fix two recent bugs in ACPIPHP (ACPI-based PCI hotplug) and
  update a bunch of web links and e-mail addresses in MAINTAINERS, docs
  and Kconfig that either are stale or will expire soon.

  Specifics:

   - The WARN_ON() in acpiphp_enumerate_slots() triggers as a false
     positive in some cases, so drop it.

   - Add a missing pci_dev_put() to an error code path in
     acpiphp_enumerate_slots().

   - Replace my old e-mail address that's going to expire with a new
     one.

   - Update ACPI web links and git tree information in MAINTAINERS.

   - Update links to the Linux-ACPI project's page in MAINTAINERS.

   - Update some stale links and e-mail addresses under Documentation
     and in the ACPI Kconfig file"

* tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
  ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
  ACPI / PM / Documentation: Replace outdated project links and addresses
  MAINTAINERS / ACPI: Update links to the Linux-ACPI project web page
  MAINTAINERS / ACPI: Update links and git tree information
  MAINTAINERS / Documentation: Update Rafael's e-mail address
上级 61e6cfa8 2c5bfce8
隐藏空白更改
内联 并排
Showing with 51 addition and 49 deletion
Documentation/ABI/stable/sysfs-bus-usb
浏览文件 @ 35f9162d
...@@ -37,8 +37,8 @@ Description: ...@@ -37,8 +37,8 @@ Description:
that the USB device has been connected to the machine. This that the USB device has been connected to the machine. This
file is read-only. file is read-only.
Users: Users:
PowerTOP <power@bughost.org> PowerTOP <powertop@lists.01.org>
http://www.lesswatts.org/projects/powertop/ https://01.org/powertop/
What: /sys/bus/usb/device/.../power/active_duration What: /sys/bus/usb/device/.../power/active_duration
Date: January 2008 Date: January 2008
...@@ -57,8 +57,8 @@ Description: ...@@ -57,8 +57,8 @@ Description:
will give an integer percentage. Note that this does not will give an integer percentage. Note that this does not
account for counter wrap. account for counter wrap.
Users: Users:
PowerTOP <power@bughost.org> PowerTOP <powertop@lists.01.org>
http://www.lesswatts.org/projects/powertop/ https://01.org/powertop/
What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend What: /sys/bus/usb/devices/<busnum>-<port[.port]>...:<config num>-<interface num>/supports_autosuspend
Date: January 2008 Date: January 2008
......
Documentation/ABI/testing/sysfs-devices-power
浏览文件 @ 35f9162d
What: /sys/devices/.../power/ What: /sys/devices/.../power/
Date: January 2009 Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power directory contains attributes The /sys/devices/.../power directory contains attributes
allowing the user space to check and modify some power allowing the user space to check and modify some power
...@@ -8,7 +8,7 @@ Description: ...@@ -8,7 +8,7 @@ Description:
What: /sys/devices/.../power/wakeup What: /sys/devices/.../power/wakeup
Date: January 2009 Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power/wakeup attribute allows the user The /sys/devices/.../power/wakeup attribute allows the user
space to check if the device is enabled to wake up the system space to check if the device is enabled to wake up the system
...@@ -34,7 +34,7 @@ Description: ...@@ -34,7 +34,7 @@ Description:
What: /sys/devices/.../power/control What: /sys/devices/.../power/control
Date: January 2009 Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power/control attribute allows the user The /sys/devices/.../power/control attribute allows the user
space to control the run-time power management of the device. space to control the run-time power management of the device.
...@@ -53,7 +53,7 @@ Description: ...@@ -53,7 +53,7 @@ Description:
What: /sys/devices/.../power/async What: /sys/devices/.../power/async
Date: January 2009 Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../async attribute allows the user space to The /sys/devices/.../async attribute allows the user space to
enable or diasble the device's suspend and resume callbacks to enable or diasble the device's suspend and resume callbacks to
...@@ -79,7 +79,7 @@ Description: ...@@ -79,7 +79,7 @@ Description:
What: /sys/devices/.../power/wakeup_count What: /sys/devices/.../power/wakeup_count
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_count attribute contains the number The /sys/devices/.../wakeup_count attribute contains the number
of signaled wakeup events associated with the device. This of signaled wakeup events associated with the device. This
...@@ -88,7 +88,7 @@ Description: ...@@ -88,7 +88,7 @@ Description:
What: /sys/devices/.../power/wakeup_active_count What: /sys/devices/.../power/wakeup_active_count
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_active_count attribute contains the The /sys/devices/.../wakeup_active_count attribute contains the
number of times the processing of wakeup events associated with number of times the processing of wakeup events associated with
...@@ -98,7 +98,7 @@ Description: ...@@ -98,7 +98,7 @@ Description:
What: /sys/devices/.../power/wakeup_abort_count What: /sys/devices/.../power/wakeup_abort_count
Date: February 2012 Date: February 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_abort_count attribute contains the The /sys/devices/.../wakeup_abort_count attribute contains the
number of times the processing of a wakeup event associated with number of times the processing of a wakeup event associated with
...@@ -109,7 +109,7 @@ Description: ...@@ -109,7 +109,7 @@ Description:
What: /sys/devices/.../power/wakeup_expire_count What: /sys/devices/.../power/wakeup_expire_count
Date: February 2012 Date: February 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_expire_count attribute contains the The /sys/devices/.../wakeup_expire_count attribute contains the
number of times a wakeup event associated with the device has number of times a wakeup event associated with the device has
...@@ -119,7 +119,7 @@ Description: ...@@ -119,7 +119,7 @@ Description:
What: /sys/devices/.../power/wakeup_active What: /sys/devices/.../power/wakeup_active
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_active attribute contains either 1, The /sys/devices/.../wakeup_active attribute contains either 1,
or 0, depending on whether or not a wakeup event associated with or 0, depending on whether or not a wakeup event associated with
...@@ -129,7 +129,7 @@ Description: ...@@ -129,7 +129,7 @@ Description:
What: /sys/devices/.../power/wakeup_total_time_ms What: /sys/devices/.../power/wakeup_total_time_ms
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_total_time_ms attribute contains The /sys/devices/.../wakeup_total_time_ms attribute contains
the total time of processing wakeup events associated with the the total time of processing wakeup events associated with the
...@@ -139,7 +139,7 @@ Description: ...@@ -139,7 +139,7 @@ Description:
What: /sys/devices/.../power/wakeup_max_time_ms What: /sys/devices/.../power/wakeup_max_time_ms
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_max_time_ms attribute contains The /sys/devices/.../wakeup_max_time_ms attribute contains
the maximum time of processing a single wakeup event associated the maximum time of processing a single wakeup event associated
...@@ -149,7 +149,7 @@ Description: ...@@ -149,7 +149,7 @@ Description:
What: /sys/devices/.../power/wakeup_last_time_ms What: /sys/devices/.../power/wakeup_last_time_ms
Date: September 2010 Date: September 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_last_time_ms attribute contains The /sys/devices/.../wakeup_last_time_ms attribute contains
the value of the monotonic clock corresponding to the time of the value of the monotonic clock corresponding to the time of
...@@ -160,7 +160,7 @@ Description: ...@@ -160,7 +160,7 @@ Description:
What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms What: /sys/devices/.../power/wakeup_prevent_sleep_time_ms
Date: February 2012 Date: February 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute The /sys/devices/.../wakeup_prevent_sleep_time_ms attribute
contains the total time the device has been preventing contains the total time the device has been preventing
...@@ -189,7 +189,7 @@ Description: ...@@ -189,7 +189,7 @@ Description:
What: /sys/devices/.../power/pm_qos_latency_us What: /sys/devices/.../power/pm_qos_latency_us
Date: March 2012 Date: March 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power/pm_qos_resume_latency_us attribute The /sys/devices/.../power/pm_qos_resume_latency_us attribute
contains the PM QoS resume latency limit for the given device, contains the PM QoS resume latency limit for the given device,
...@@ -207,7 +207,7 @@ Description: ...@@ -207,7 +207,7 @@ Description:
What: /sys/devices/.../power/pm_qos_no_power_off What: /sys/devices/.../power/pm_qos_no_power_off
Date: September 2012 Date: September 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power/pm_qos_no_power_off attribute The /sys/devices/.../power/pm_qos_no_power_off attribute
is used for manipulating the PM QoS "no power off" flag. If is used for manipulating the PM QoS "no power off" flag. If
...@@ -222,7 +222,7 @@ Description: ...@@ -222,7 +222,7 @@ Description:
What: /sys/devices/.../power/pm_qos_remote_wakeup What: /sys/devices/.../power/pm_qos_remote_wakeup
Date: September 2012 Date: September 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/devices/.../power/pm_qos_remote_wakeup attribute The /sys/devices/.../power/pm_qos_remote_wakeup attribute
is used for manipulating the PM QoS "remote wakeup required" is used for manipulating the PM QoS "remote wakeup required"
......
Documentation/ABI/testing/sysfs-power
浏览文件 @ 35f9162d
What: /sys/power/ What: /sys/power/
Date: August 2006 Date: August 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power directory will contain files that will The /sys/power directory will contain files that will
provide a unified interface to the power management provide a unified interface to the power management
...@@ -8,7 +8,7 @@ Description: ...@@ -8,7 +8,7 @@ Description:
What: /sys/power/state What: /sys/power/state
Date: August 2006 Date: August 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/state file controls the system power state. The /sys/power/state file controls the system power state.
Reading from this file returns what states are supported, Reading from this file returns what states are supported,
...@@ -22,7 +22,7 @@ Description: ...@@ -22,7 +22,7 @@ Description:
What: /sys/power/disk What: /sys/power/disk
Date: September 2006 Date: September 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/disk file controls the operating mode of the The /sys/power/disk file controls the operating mode of the
suspend-to-disk mechanism. Reading from this file returns suspend-to-disk mechanism. Reading from this file returns
...@@ -67,7 +67,7 @@ Description: ...@@ -67,7 +67,7 @@ Description:
What: /sys/power/image_size What: /sys/power/image_size
Date: August 2006 Date: August 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/image_size file controls the size of the image The /sys/power/image_size file controls the size of the image
created by the suspend-to-disk mechanism. It can be written a created by the suspend-to-disk mechanism. It can be written a
...@@ -84,7 +84,7 @@ Description: ...@@ -84,7 +84,7 @@ Description:
What: /sys/power/pm_trace What: /sys/power/pm_trace
Date: August 2006 Date: August 2006
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/pm_trace file controls the code which saves the The /sys/power/pm_trace file controls the code which saves the
last PM event point in the RTC across reboots, so that you can last PM event point in the RTC across reboots, so that you can
...@@ -133,7 +133,7 @@ Description: ...@@ -133,7 +133,7 @@ Description:
What: /sys/power/pm_async What: /sys/power/pm_async
Date: January 2009 Date: January 2009
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/pm_async file controls the switch allowing the The /sys/power/pm_async file controls the switch allowing the
user space to enable or disable asynchronous suspend and resume user space to enable or disable asynchronous suspend and resume
...@@ -146,7 +146,7 @@ Description: ...@@ -146,7 +146,7 @@ Description:
What: /sys/power/wakeup_count What: /sys/power/wakeup_count
Date: July 2010 Date: July 2010
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/wakeup_count file allows user space to put the The /sys/power/wakeup_count file allows user space to put the
system into a sleep state while taking into account the system into a sleep state while taking into account the
...@@ -161,7 +161,7 @@ Description: ...@@ -161,7 +161,7 @@ Description:
What: /sys/power/reserved_size What: /sys/power/reserved_size
Date: May 2011 Date: May 2011
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/reserved_size file allows user space to control The /sys/power/reserved_size file allows user space to control
the amount of memory reserved for allocations made by device the amount of memory reserved for allocations made by device
...@@ -175,7 +175,7 @@ Description: ...@@ -175,7 +175,7 @@ Description:
What: /sys/power/autosleep What: /sys/power/autosleep
Date: April 2012 Date: April 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/autosleep file can be written one of the strings The /sys/power/autosleep file can be written one of the strings
returned by reads from /sys/power/state. If that happens, a returned by reads from /sys/power/state. If that happens, a
...@@ -192,7 +192,7 @@ Description: ...@@ -192,7 +192,7 @@ Description:
What: /sys/power/wake_lock What: /sys/power/wake_lock
Date: February 2012 Date: February 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/wake_lock file allows user space to create The /sys/power/wake_lock file allows user space to create
wakeup source objects and activate them on demand (if one of wakeup source objects and activate them on demand (if one of
...@@ -219,7 +219,7 @@ Description: ...@@ -219,7 +219,7 @@ Description:
What: /sys/power/wake_unlock What: /sys/power/wake_unlock
Date: February 2012 Date: February 2012
Contact: Rafael J. Wysocki <rjw@sisk.pl> Contact: Rafael J. Wysocki <rjw@rjwysocki.net>
Description: Description:
The /sys/power/wake_unlock file allows user space to deactivate The /sys/power/wake_unlock file allows user space to deactivate
wakeup sources created with the help of /sys/power/wake_lock. wakeup sources created with the help of /sys/power/wake_lock.
......
Documentation/acpi/dsdt-override.txt
浏览文件 @ 35f9162d
...@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel. ...@@ -4,4 +4,4 @@ CONFIG_ACPI_CUSTOM_DSDT builds the image into the kernel.
When to use this method is described in detail on the When to use this method is described in detail on the
Linux/ACPI home page: Linux/ACPI home page:
http://www.lesswatts.org/projects/acpi/overridingDSDT.php https://01.org/linux-acpi/documentation/overriding-dsdt
MAINTAINERS
浏览文件 @ 35f9162d
...@@ -237,11 +237,11 @@ F: drivers/platform/x86/acer-wmi.c ...@@ -237,11 +237,11 @@ F: drivers/platform/x86/acer-wmi.c
ACPI ACPI
M: Len Brown <lenb@kernel.org> M: Len Brown <lenb@kernel.org>
M: Rafael J. Wysocki <rjw@sisk.pl> M: Rafael J. Wysocki <rjw@rjwysocki.net>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: https://01.org/linux-acpi
Q: http://patchwork.kernel.org/project/linux-acpi/list/ Q: https://patchwork.kernel.org/project/linux-acpi/list/
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
S: Supported S: Supported
F: drivers/acpi/ F: drivers/acpi/
F: drivers/pnp/pnpacpi/ F: drivers/pnp/pnpacpi/
...@@ -256,21 +256,21 @@ F: drivers/pci/*/*/*acpi* ...@@ -256,21 +256,21 @@ F: drivers/pci/*/*/*acpi*
ACPI FAN DRIVER ACPI FAN DRIVER
M: Zhang Rui <rui.zhang@intel.com> M: Zhang Rui <rui.zhang@intel.com>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: https://01.org/linux-acpi
S: Supported S: Supported
F: drivers/acpi/fan.c F: drivers/acpi/fan.c
ACPI THERMAL DRIVER ACPI THERMAL DRIVER
M: Zhang Rui <rui.zhang@intel.com> M: Zhang Rui <rui.zhang@intel.com>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: https://01.org/linux-acpi
S: Supported S: Supported
F: drivers/acpi/*thermal* F: drivers/acpi/*thermal*
ACPI VIDEO DRIVER ACPI VIDEO DRIVER
M: Zhang Rui <rui.zhang@intel.com> M: Zhang Rui <rui.zhang@intel.com>
L: linux-acpi@vger.kernel.org L: linux-acpi@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: https://01.org/linux-acpi
S: Supported S: Supported
F: drivers/acpi/video.c F: drivers/acpi/video.c
...@@ -2300,7 +2300,7 @@ S: Maintained ...@@ -2300,7 +2300,7 @@ S: Maintained
F: drivers/net/ethernet/ti/cpmac.c F: drivers/net/ethernet/ti/cpmac.c
CPU FREQUENCY DRIVERS CPU FREQUENCY DRIVERS
M: Rafael J. Wysocki <rjw@sisk.pl> M: Rafael J. Wysocki <rjw@rjwysocki.net>
M: Viresh Kumar <viresh.kumar@linaro.org> M: Viresh Kumar <viresh.kumar@linaro.org>
L: cpufreq@vger.kernel.org L: cpufreq@vger.kernel.org
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
...@@ -2331,7 +2331,7 @@ S: Maintained ...@@ -2331,7 +2331,7 @@ S: Maintained
F: drivers/cpuidle/cpuidle-big_little.c F: drivers/cpuidle/cpuidle-big_little.c
CPUIDLE DRIVERS CPUIDLE DRIVERS
M: Rafael J. Wysocki <rjw@sisk.pl> M: Rafael J. Wysocki <rjw@rjwysocki.net>
M: Daniel Lezcano <daniel.lezcano@linaro.org> M: Daniel Lezcano <daniel.lezcano@linaro.org>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Maintained S: Maintained
...@@ -3553,7 +3553,7 @@ F: fs/freevxfs/ ...@@ -3553,7 +3553,7 @@ F: fs/freevxfs/
FREEZER FREEZER
M: Pavel Machek <pavel@ucw.cz> M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl> M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Supported S: Supported
F: Documentation/power/freezing-of-tasks.txt F: Documentation/power/freezing-of-tasks.txt
...@@ -3889,7 +3889,7 @@ F: drivers/video/hgafb.c ...@@ -3889,7 +3889,7 @@ F: drivers/video/hgafb.c
HIBERNATION (aka Software Suspend, aka swsusp) HIBERNATION (aka Software Suspend, aka swsusp)
M: Pavel Machek <pavel@ucw.cz> M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl> M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Supported S: Supported
F: arch/x86/power/ F: arch/x86/power/
...@@ -4339,7 +4339,7 @@ F: drivers/video/i810/ ...@@ -4339,7 +4339,7 @@ F: drivers/video/i810/
INTEL MENLOW THERMAL DRIVER INTEL MENLOW THERMAL DRIVER
M: Sujith Thomas <sujith.thomas@intel.com> M: Sujith Thomas <sujith.thomas@intel.com>
L: platform-driver-x86@vger.kernel.org L: platform-driver-x86@vger.kernel.org
W: http://www.lesswatts.org/projects/acpi/ W: https://01.org/linux-acpi
S: Supported S: Supported
F: drivers/platform/x86/intel_menlow.c F: drivers/platform/x86/intel_menlow.c
...@@ -8095,7 +8095,7 @@ F: drivers/sh/ ...@@ -8095,7 +8095,7 @@ F: drivers/sh/
SUSPEND TO RAM SUSPEND TO RAM
M: Len Brown <len.brown@intel.com> M: Len Brown <len.brown@intel.com>
M: Pavel Machek <pavel@ucw.cz> M: Pavel Machek <pavel@ucw.cz>
M: "Rafael J. Wysocki" <rjw@sisk.pl> M: "Rafael J. Wysocki" <rjw@rjwysocki.net>
L: linux-pm@vger.kernel.org L: linux-pm@vger.kernel.org
S: Supported S: Supported
F: Documentation/power/ F: Documentation/power/
......
drivers/acpi/Kconfig
浏览文件 @ 35f9162d
...@@ -24,7 +24,7 @@ menuconfig ACPI ...@@ -24,7 +24,7 @@ menuconfig ACPI
are configured, ACPI is used. are configured, ACPI is used.
The project home page for the Linux ACPI subsystem is here: The project home page for the Linux ACPI subsystem is here:
<http://www.lesswatts.org/projects/acpi/> <https://01.org/linux-acpi>
Linux support for ACPI is based on Intel Corporation's ACPI Linux support for ACPI is based on Intel Corporation's ACPI
Component Architecture (ACPI CA). For more information on the Component Architecture (ACPI CA). For more information on the
......
drivers/pci/hotplug/acpiphp_glue.c
浏览文件 @ 35f9162d
...@@ -994,14 +994,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus) ...@@ -994,14 +994,16 @@ void acpiphp_enumerate_slots(struct pci_bus *bus)
/* /*
* This bridge should have been registered as a hotplug function * This bridge should have been registered as a hotplug function
* under its parent, so the context has to be there. If not, we * under its parent, so the context should be there, unless the
* are in deep goo. * parent is going to be handled by pciehp, in which case this
* bridge is not interesting to us either.
*/ */
mutex_lock(&acpiphp_context_lock); mutex_lock(&acpiphp_context_lock);
context = acpiphp_get_context(handle); context = acpiphp_get_context(handle);
if (WARN_ON(!context)) { if (!context) {
mutex_unlock(&acpiphp_context_lock); mutex_unlock(&acpiphp_context_lock);
put_device(&bus->dev); put_device(&bus->dev);
pci_dev_put(bridge->pci_dev);
kfree(bridge); kfree(bridge);
return; return;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或