1. 27 6月, 2010 3 次提交
  2. 18 6月, 2010 2 次提交
    • L
      Merge branch 'bugzilla-15951' into release · 2cebc5e2
      Len Brown 提交于
      2cebc5e2
    • R
      ACPI / PM: Do not enable GPEs for system wakeup in advance · cb1cb178
      Rafael J. Wysocki 提交于
      After commit 9630bdd9
      (ACPI: Use GPE reference counting to support shared GPEs) the wakeup
      enable mask bits of GPEs are set as soon as the GPEs are enabled to
      wake up the system.  Unfortunately, this leads to a regression
      reported by Michal Hocko, where a system is woken up from ACPI S5 by
      a device that is not supposed to do that, because the wakeup enable
      mask bit of this device's GPE is always set when
      acpi_enter_sleep_state() calls acpi_hw_enable_all_wakeup_gpes(),
      although it should only be set if the device is supposed to wake up
      the system from the target state.
      
      To work around this issue, rework the ACPI power management code so
      that GPEs are not enabled to wake up the system upfront, but only
      during a system state transition when the target state of the system
      is known.  [Of course, this means that the reference counting of
      "wakeup" GPEs doesn't really make sense and it is sufficient to
      set/unset the wakeup mask bits for them during system sleep
      transitions.  This will allow us to simplify the GPE handling code
      quite a bit, but that change is too intrusive for 2.6.35.]
      
      Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15951Signed-off-by: NRafael J. Wysocki <rjw@sisk.pl>
      Reported-and-tested-by: NMichal Hocko <mhocko@suse.cz>
      Signed-off-by: NLen Brown <len.brown@intel.com>
      cb1cb178
  3. 15 6月, 2010 1 次提交
    • A
      kbuild: fix LOCALVERSION handling to match description · d5eda75f
      Andy Whitcroft 提交于
      In the commit below the version string handling was modified, adding
      a '+' where no other version information was supplied:
      
          commit 85a256d8
          Author: David Rientjes <rientjes@google.com>
          Date:   Wed Jan 13 13:01:05 2010 -0800
      
      From the commit the intent was as below:
      
           - when CONFIG_LOCALVERSION_AUTO is disabled, a `+' is appended if the
             repository has been revised beyond a tagged commit and LOCALVERSION=
             was not passed to "make".
      
      However if the user supplies an empty LOCALVERSION on the command line
      the plus suffix is still added.  This form is useful in the case where
      the build environment knows that the version as specified is correct and
      complete but does not correspond to a specific tag.
      
      This patch changes the implementation to match the documentation
      such that specifying LOCALVERSION= on the build line is sufficient
      to suppress any suffix.
      Signed-off-by: NAndy Whitcroft <apw@canonical.com>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Signed-off-by: NMichal Marek <mmarek@suse.cz>
      d5eda75f
  4. 12 6月, 2010 34 次提交