Rafael J. Wysocki
30e3ce6dcb
PM / Sleep: Change wakeup source statistics to follow Android ...
Wakeup statistics used by Android are slightly different from what we
have in wakeup sources at the moment and there aren't any known
users of those statistics other than Android, so modify them to make
it easier for Android to switch to wakeup sources.
This removes the struct wakeup_source's hit_cout field, which is very
rough and therefore not very useful, and adds two new fields,
wakeup_count and expire_count. The first one tracks how many times
the wakeup source is activated with events_check_enabled set (which
roughly corresponds to the situations when a system power transition
to a sleep state is in progress and would be aborted by this wakeup
source if it were the only active one at that time) and the second
one is the number of times the wakeup source has been activated with
a timeout that expired.
Additionally, the last_time field is now updated when the wakeup
source is deactivated too (previously it was only updated during
the wakeup source's activation), which seems to be what Android does
with the analogous counter for wakelocks.
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-01 21:25:11 +02:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-04-25 21:29:26 -07:00
ARM: 7366/3: amba: Remove AMBA level regulator support
2012-04-13 14:04:08 +01:00
libata: forbid port runtime pm by default, fixing regression
2012-04-18 14:33:25 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
PM / Sleep: Change wakeup source statistics to follow Android
2012-05-01 21:25:11 +02:00
bcma: use fallback sprom if no on chip sprom is available
2012-04-16 13:32:01 -04:00
Fixes in various components:
2012-04-20 11:31:00 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth
2012-04-09 15:47:49 -04:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
Revert "clocksource: Load the ACPI PM clocksource asynchronously"
2012-04-12 00:05:05 +02:00
cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS
2012-04-13 17:57:40 -07:00
Merge branches 'idle-fix' and 'misc' into release
2012-04-06 21:48:59 -04:00
crypto: talitos - properly lock access to global talitos registers
2012-04-09 15:13:40 +08:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
2012-04-06 17:56:20 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ARM: pxa: fix gpio wakeup setting
2012-04-27 10:46:45 +08:00
drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.
2012-04-28 08:05:15 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-04-20 10:39:33 -07:00
HSI: hsi_char: Remove max_data_size from sysfs
2012-04-23 14:23:32 +03:00
hwmon: (fam15h_power) Fix pci_device_id array
2012-04-26 08:40:08 -07:00
i2c: prevent spurious interrupt on Designware controllers
2012-04-10 08:09:03 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
A few fixes for regressions introduced in 3.4-rc1:
2012-04-26 15:35:35 -07:00
mfd: Convert twl6040 to i2c driver, and separate it from twl core
2012-04-16 16:45:34 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
tty and serial fixes for 3.4-rc2
2012-04-12 15:36:33 -07:00
leds-atmel-pwm.c: Make pwmled_probe() __devinit
2012-04-17 16:29:31 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
md: fix possible corruption of array metadata on shutdown.
2012-04-24 10:23:16 +10:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-04-21 12:43:23 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
mfd: Fix modular builds of rc5t583 regulator support
2012-04-16 21:27:07 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-05 15:30:34 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-04-26 15:33:36 -07:00
drivers/net: Do not free an IRQ if its request failed
2012-04-21 16:41:11 -04:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
gpio: Fix range check in of_gpio_simple_xlate()
2012-04-10 14:20:56 -06:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
Disintegrate and delete asm/system.h
2012-03-28 15:58:21 -07:00
Merge branch 'for-v3.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2012-04-27 19:32:37 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia
2012-03-29 16:00:48 -07:00
pinctrl: implement pinctrl_check_ops
2012-04-11 09:31:02 +02:00
Merge branch 'akpm' (Andrew's patch-bomb)
2012-04-26 15:24:45 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-03-30 16:45:39 -07:00
Various small bugfixes and enhancements, plus two new drivers:
2012-03-30 16:09:02 -07:00
regulator: Fix a build warning in the anatop driver for 3.4
2012-04-10 10:26:41 -07:00
simple_open: automatically convert to simple_open()
2012-04-05 15:25:50 -07:00
drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled
2012-04-25 21:26:34 -07:00
[S390] s390/char/vmur.c: fix memory leak
2012-04-11 14:28:24 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
SCSI: Fix error handling when no ULD is attached
2012-04-15 11:08:53 -07:00
SuperH updates for 3.4 merge window
2012-03-30 00:09:17 -07:00
spi/spi-bfin5xx: Fix flush of last bit after each spi transfer
2012-04-27 12:20:39 -06:00
staging: ozwpan: Fix bug where kfree is called twice.
2012-04-26 12:40:53 -07:00
tcm_fc: Do not free tpg structure during wq allocation failure
2012-04-06 18:57:05 -07:00
drivers/tty/amiserial.c: add missing tty_unlock
2012-04-19 19:15:35 -07:00
usb: fixes for v3.4-rc cycle
2012-04-27 07:50:34 -07:00
uwb: fix error handling
2012-04-18 13:15:51 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-04-22 21:02:57 -07:00
blackfin: fix compile error in bfin-lq035q1-fb.c
2012-04-26 14:46:51 -04:00
virtio_balloon: fix handling of PAGE_SIZE != 4k
2012-04-15 11:51:06 +03:00
hpwdt: Only BYTE reads/writes to WD Timer port 0x72
2012-04-26 14:38:07 +02:00
xen/acpi: Workaround broken BIOSes exporting non-existing C-states.
2012-04-26 22:07:28 -04:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi
2012-04-02 09:50:40 -07:00
30e3ce6dcb