)]}' { "log": [ { "commit": "a76e99abc558aed633ba28ff61c5328116292bf3", "tree": "60f7677f0baafa00825accc1214839246b3e78dd", "parents": [ "a54734678ff9cb97938b9f7648547174f3b118e4", "1d05f993784973189395051cc711fdd6dd5eb389" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Fri Mar 30 00:09:34 2012 -0700" }, "message": "Merge branch \u0027Linux 3.0.21\u0027 into msm-3.0\n\nMerge Upstream\u0027s stable 3.0.21 branch into msm-3.0\nThis consists 814 commits and some merge conflicts.\n\nThe merge conflicts are because of some local changes to\nmsm-3.0 as well as some conflicts between google\u0027s tree and\nthe upstream tree.\n\nConflicts:\n\tarch/arm/kernel/head.S\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/mmc/core/core.c\n\tdrivers/tty/serial/serial_core.c\n\tdrivers/usb/host/ehci-hub.c\n\tdrivers/usb/serial/qcserial.c\n\tfs/namespace.c\n\tfs/proc/base.c\n\nChange-Id: I62e2edbe213f84915e27f8cd6e4f6ce23db22a21\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\u003e\n" }, { "commit": "d4e3d523925a6b0b31d96b78a052702c70c68135", "tree": "57a24f74de3a76fed38a56f66c48748c8e3c0199", "parents": [ "1942f21b1d31ef46ecaad76f963f2b889537ab12", "5ded52c2167dd3664cda89ebcd4e9aaaa37dd03a" ], "author": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Wed Mar 28 16:03:47 2012 -0700" }, "committer": { "name": "Rohit Vaswani", "email": "rvaswani@codeaurora.org", "time": "Wed Mar 28 16:03:47 2012 -0700" }, "message": "Merge branch \u0027google-android\u0027 into msm-3.0\n\nMerge Google\u0027s Android tree into msm-3.0\nThis consists of the following conflicts and 42 commits:\n\nConflicts:\n\tdrivers/mmc/core/bus.c\n\tdrivers/rtc/class.c\n\tdrivers/usb/gadget/android.c\n\nMost of the conflicts stem from the changes made to the\nlocal msm-3.0 branch.\n\ncommit 1f8c5cecfe44994cd617ba2803f41fb56d53e91c\nAuthor: Heiko Stuebner \u003cheiko@sntech.de\u003e\nDate: Wed Feb 1 10:33:01 2012 -0800\n\n Input: evdev - fix variable initialisation\n\n Commit 509f87c5f564 (evdev - do not block waiting for an event if\n fd\n is nonblock) created a code path were it was possible to use retval\n uninitialized.\n\n This could lead to the xorg evdev input driver getting corrupt data\n and refusing to work with log messages like\n \tAUO-Pixcir touchscreen: Read error: Success\n \tsg060_keys: Read error: Success\n \tAUO-Pixcir touchscreen: Read error: Success\n \tsg060_keys: Read error: Success\n (for drivers auo-pixcir-ts and gpio-keys).\n\n Signed-off-by: Heiko Stuebner \u003cheiko@sntech.de\u003e\n\n drivers/input/evdev.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit 4dc43d7079bdae572212368e1d29abea0177c932\nAuthor: Arve Hjønnevåg \u003carve@android.com\u003e\nDate: Fri Oct 17 15:20:55 2008 -0700\n\n Input: evdev - Add ioctl to block suspend while event queue is not empty.\n\n Add an ioctl, EVIOCSSUSPENDBLOCK, to enable a wakelock that will block\n suspend while the event queue is not empty. This allows userspace code to\n process input events while the device appears to be asleep.\n\n The current code holds the wakelock for up 5 seconds for every input\n device and client. This can prevent suspend if sensor with a high data\n rate is active, even when that sensor is not capable of waking the\n device once it is suspended.\n\n Change-Id: I624d66ef30a0b3abb543685c343382b8419b42b9\n Signed-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n\n drivers/input/evdev.c | 53 +++++++++++++++++++++++++++++++++++++++++++-----\n include/linux/input.h | 3 ++\n 2 files changed, 50 insertions(+), 6 deletions(-)\n\ncommit 7cc846069a8a9116d8c81526c459070eed0e3477\nAuthor: Arve Hjønnevåg \u003carve@android.com\u003e\nDate: Mon Jan 23 17:15:45 2012 -0800\n\n Input: evdev - Don\u0027t hold wakelock when no data is available to user-space\n\n If there is no SYN_REPORT event in the buffer the buffer data is invisible\n to user-space. The wakelock should not be held in this case.\n\n Change-Id: Idae890ff0da8eb46a2cfce61a95b3a97252551ad\n Signed-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n\n drivers/input/evdev.c | 5 +++--\n 1 files changed, 3 insertions(+), 2 deletions(-)\n\ncommit 0e80804a2e8134e31d4d32679bdfff070fc64bca\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Jan 31 11:06:23 2012 -0800\n\n net: wireless: bcmdhd: Increase pm_notify callback priority\n\n Make pm_notify callback to be called the first on suspend/resume path to\n ensure it will always be called.\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit dfc896e1c833916ef5062294e2d675d66294ac68\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Jan 30 15:43:31 2012 -0800\n\n net: wireless: bcmdhd: Fix crash on dhdsdio_probe_attach() failure\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 17 ++++++++++++++---\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 8 +++++++-\n 2 files changed, 21 insertions(+), 4 deletions(-)\n\ncommit 256a6b23be368f708672eb5929e961afc872f610\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Jan 30 13:03:19 2012 -0800\n\n net: wireless: bcmdhd: Daemonize wl_event_handler\n\n Daemonizing makes thread (besides other things) NON-FREEZABLE, and it will not\n get fake signal on suspend to quicl down_interruptible()\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 13 -------------\n drivers/net/wireless/bcmdhd/include/linuxver.h | 12 ++++++++++++\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 3 +++\n 3 files changed, 15 insertions(+), 13 deletions(-)\n\ncommit ff93146589f6f28ba8a46f85e9b319bbd2cc8cfd\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Jan 24 13:59:40 2012 -0800\n\n net: wireless: bcmdhd: Update to Version 5.90.195.23\n\n - WFD fixes\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_cfg80211.c | 269 -------------------------\n drivers/net/wireless/bcmdhd/dhd_linux.c | 2 +-\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 8 +-\n drivers/net/wireless/bcmdhd/include/epivers.h | 8 +-\n drivers/net/wireless/bcmdhd/siutils.c | 5 +\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 223 +++++++++++++++------\n drivers/net/wireless/bcmdhd/wl_cfgp2p.c | 175 ++++++++++++++++-\n drivers/net/wireless/bcmdhd/wl_cfgp2p.h | 37 ++--\n 8 files changed, 368 insertions(+), 359 deletions(-)\n\ncommit 96034c20069fe841f4be741755f94671a328702e\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Jan 24 13:55:00 2012 -0800\n\n net: wireless: bcmdhd: Update to Version 5.90.195.22\n\n - Disable Ad-hoc support for cfg80211\n - dhd_linux.c: Fix incorrect pid check\n - Merge Android changes from Android tree\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/bcmsdh_linux.c | 24 ++------------------\n drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c | 25 +++++++++++++++------\n drivers/net/wireless/bcmdhd/dhd_linux.c | 10 ++++----\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 11 +++++++--\n drivers/net/wireless/bcmdhd/hndpmu.c | 16 ++++++++++++++\n drivers/net/wireless/bcmdhd/include/bcmdevs.h | 2 +\n drivers/net/wireless/bcmdhd/include/epivers.h | 8 +++---\n drivers/net/wireless/bcmdhd/siutils.c | 3 ++\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 11 ++++++++-\n 9 files changed, 68 insertions(+), 42 deletions(-)\n\ncommit 494661a1acbd4767e4d7daaff8d7ce55328913d9\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Jan 24 13:47:47 2012 -0800\n\n net: wireless: bcmdhd: Update to Version 5.90.195.19\n\n - Add WFD changes\n - Add extra locking for internal ioctl operations\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/Makefile | 4 +-\n drivers/net/wireless/bcmdhd/bcmsdh_linux.c | 25 +-\n drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 4 +-\n drivers/net/wireless/bcmdhd/dhd.h | 10 +-\n drivers/net/wireless/bcmdhd/dhd_cdc.c | 7 +-\n drivers/net/wireless/bcmdhd/dhd_cfg80211.c | 862 ++++++++\n drivers/net/wireless/bcmdhd/dhd_cfg80211.h | 42 +\n drivers/net/wireless/bcmdhd/dhd_common.c | 7 +-\n drivers/net/wireless/bcmdhd/dhd_linux.c | 103 +-\n drivers/net/wireless/bcmdhd/dhd_linux_mon.c | 409 ----\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 4 +-\n drivers/net/wireless/bcmdhd/include/dhdioctl.h | 3 +-\n drivers/net/wireless/bcmdhd/include/epivers.h | 8 +-\n drivers/net/wireless/bcmdhd/include/proto/802.11.h | 12 +-\n drivers/net/wireless/bcmdhd/include/wlioctl.h | 19 +-\n drivers/net/wireless/bcmdhd/wl_android.c | 22 +-\n drivers/net/wireless/bcmdhd/wl_android.h | 2 +-\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 2142 ++++++--------------\n drivers/net/wireless/bcmdhd/wl_cfg80211.h | 125 +-\n drivers/net/wireless/bcmdhd/wl_cfgp2p.c | 245 ++-\n drivers/net/wireless/bcmdhd/wl_cfgp2p.h | 27 +-\n drivers/net/wireless/bcmdhd/wl_linux_mon.c | 409 ++++\n drivers/net/wireless/bcmdhd/wldev_common.c | 69 +-\n drivers/net/wireless/bcmdhd/wldev_common.h | 20 +-\n 24 files changed, 2485 insertions(+), 2095 deletions(-)\n\ncommit 1dddb0cc0de2840a2fe43a02fcb0196bb5cb86c8\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Jan 24 13:37:34 2012 -0800\n\n net: wireless: bcmdhd: Update to Version 5.90.195.15\n\n - Add WFD concurrent mode support\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/bcmevent.c | 8 +-\n drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c | 12 +-\n drivers/net/wireless/bcmdhd/bcmutils.c | 4 +-\n drivers/net/wireless/bcmdhd/dhd.h | 25 +-\n drivers/net/wireless/bcmdhd/dhd_cdc.c | 9 +-\n drivers/net/wireless/bcmdhd/dhd_common.c | 4 +-\n drivers/net/wireless/bcmdhd/dhd_linux.c | 148 +++--\n drivers/net/wireless/bcmdhd/dhd_linux_mon.c | 28 +-\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 27 +-\n drivers/net/wireless/bcmdhd/dhd_wlfc.h | 12 +-\n drivers/net/wireless/bcmdhd/hndpmu.c | 44 +-\n drivers/net/wireless/bcmdhd/include/Makefile | 2 +-\n drivers/net/wireless/bcmdhd/include/aidmp.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmcdc.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmdefs.h | 37 +-\n drivers/net/wireless/bcmdhd/include/bcmdevs.h | 573 +++++++++++++-\n drivers/net/wireless/bcmdhd/include/bcmendian.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmpcispi.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmperf.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmsdbus.h | 10 +-\n drivers/net/wireless/bcmdhd/include/bcmsdh.h | 10 +-\n drivers/net/wireless/bcmdhd/include/bcmsdh_sdmmc.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmsdpcm.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmsdspi.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmsdstd.h | 34 +-\n drivers/net/wireless/bcmdhd/include/bcmspi.h | 2 +-\n drivers/net/wireless/bcmdhd/include/bcmutils.h | 14 +-\n drivers/net/wireless/bcmdhd/include/bcmwifi.h | 2 +-\n drivers/net/wireless/bcmdhd/include/dhdioctl.h | 2 +-\n drivers/net/wireless/bcmdhd/include/epivers.h | 14 +-\n drivers/net/wireless/bcmdhd/include/hndpmu.h | 2 +-\n .../net/wireless/bcmdhd/include/hndrte_armtrap.h | 2 +-\n drivers/net/wireless/bcmdhd/include/hndrte_cons.h | 2 +-\n drivers/net/wireless/bcmdhd/include/hndsoc.h | 2 +-\n drivers/net/wireless/bcmdhd/include/htsf.h | 2 +-\n drivers/net/wireless/bcmdhd/include/linux_osl.h | 2 +-\n drivers/net/wireless/bcmdhd/include/linuxver.h | 6 +-\n drivers/net/wireless/bcmdhd/include/miniopt.h | 2 +-\n drivers/net/wireless/bcmdhd/include/msgtrace.h | 2 +-\n drivers/net/wireless/bcmdhd/include/osl.h | 2 +-\n .../wireless/bcmdhd/include/packed_section_end.h | 2 +-\n .../wireless/bcmdhd/include/packed_section_start.h | 2 +-\n drivers/net/wireless/bcmdhd/include/pcicfg.h | 28 +-\n drivers/net/wireless/bcmdhd/include/proto/802.11.h | 317 +++++++-\n .../net/wireless/bcmdhd/include/proto/802.11_bta.h | 2 +-\n .../net/wireless/bcmdhd/include/proto/802.11e.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/802.1d.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/bcmeth.h | 2 +-\n .../net/wireless/bcmdhd/include/proto/bcmevent.h | 9 +-\n drivers/net/wireless/bcmdhd/include/proto/bcmip.h | 2 +-\n .../net/wireless/bcmdhd/include/proto/bt_amp_hci.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/eapol.h | 2 +-\n .../net/wireless/bcmdhd/include/proto/ethernet.h | 3 +-\n drivers/net/wireless/bcmdhd/include/proto/p2p.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/sdspi.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/vlan.h | 2 +-\n drivers/net/wireless/bcmdhd/include/proto/wpa.h | 12 +-\n drivers/net/wireless/bcmdhd/include/sbchipc.h | 168 ++++-\n drivers/net/wireless/bcmdhd/include/sbconfig.h | 2 +-\n drivers/net/wireless/bcmdhd/include/sbhnddma.h | 6 +-\n drivers/net/wireless/bcmdhd/include/sbpcmcia.h | 2 +-\n drivers/net/wireless/bcmdhd/include/sbsdio.h | 2 +-\n drivers/net/wireless/bcmdhd/include/sbsdpcmdev.h | 2 +-\n drivers/net/wireless/bcmdhd/include/sbsocram.h | 2 +-\n drivers/net/wireless/bcmdhd/include/sdio.h | 5 +-\n drivers/net/wireless/bcmdhd/include/sdioh.h | 32 +-\n drivers/net/wireless/bcmdhd/include/sdiovar.h | 2 +-\n drivers/net/wireless/bcmdhd/include/siutils.h | 30 +-\n drivers/net/wireless/bcmdhd/include/trxhdr.h | 3 +-\n drivers/net/wireless/bcmdhd/include/typedefs.h | 5 +-\n drivers/net/wireless/bcmdhd/include/wlfc_proto.h | 2 +-\n drivers/net/wireless/bcmdhd/include/wlioctl.h | 87 ++-\n drivers/net/wireless/bcmdhd/linux_osl.c | 23 +-\n drivers/net/wireless/bcmdhd/siutils.c | 195 +++++-\n drivers/net/wireless/bcmdhd/wl_android.c | 6 +-\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 875 ++++++++++++--------\n drivers/net/wireless/bcmdhd/wl_cfg80211.h | 282 +++++---\n drivers/net/wireless/bcmdhd/wl_cfgp2p.c | 165 ++++-\n drivers/net/wireless/bcmdhd/wl_cfgp2p.h | 12 +-\n drivers/net/wireless/bcmdhd/wl_iw.c | 110 +++-\n drivers/net/wireless/bcmdhd/wl_iw.h | 17 +-\n 81 files changed, 2737 insertions(+), 752 deletions(-)\n\ncommit 52bdb6f54335bce7861d756ce1eb03ea9b7adb8f\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Jan 23 12:47:21 2012 -0800\n\n net: wireless: bcmdhd: Add WIPHY_FLAG_SUPPORTS_FW_ROAM flag\n\n Adding this flag will allow NL80211_ATTR_ROAM_SUPPORT, and will set\n WPA_DRIVER_FLAGS_BSS_SELECTION flag in wpa_supplicant\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 4 +++-\n 1 files changed, 3 insertions(+), 1 deletions(-)\n\ncommit b1a94205e9ab943d4c18f8e0a081b32bc8bd1f50\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Jan 20 14:15:05 2012 -0800\n\n net: wireless: bcmdhd: Fake PNO event to wake up the wpa_supplicant\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 4 +++-\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 20 ++++++++++++++++----\n 2 files changed, 19 insertions(+), 5 deletions(-)\n\ncommit 09701e3edf03f92f4215aad83b32cd8cec7fb689\nAuthor: Scott Anderson \u003csaa@google.com\u003e\nDate: Wed Jan 18 15:56:51 2012 -0800\n\n usb: gadget: android: Honor CONFIG_USB_GADGET_VBUS_DRAW\n\n The maximum current draw was hard coded to 500 mA. composite.c\n has code that uses CONFIG_USB_GADGET_VBUS_DRAW to set the\n bMaxPower and to set whether or not the device is self-powered if\n they haven\u0027t been set. This change removes the code in android.c\n to allow composite.c to set them.\n\n Change-Id: I9db37922e91ee86e9e5c0e14519e119e5c41ca48\n Signed-off-by: Scott Anderson \u003csaa@google.com\u003e\n\n drivers/usb/gadget/android.c | 3 ---\n 1 files changed, 0 insertions(+), 3 deletions(-)\n\ncommit a6ccb73389f3df11e788bf84254a7b27c430f949\nAuthor: Benoit Goby \u003cbenoit@android.com\u003e\nDate: Fri Jan 20 14:42:41 2012 -0800\n\n usb: gadget: Fix usb string id allocation\n\n Don\u0027t reset next_string_id every time the gadget is enabled, this makes\n the next strings allocated overwrite strings allocated at probe time.\n Instead, fix rndis not to allocate new string ids on every config bind.\n\n Change-Id: Ied28ee416bb6f00c434c34176fe5b7f0dcb2b2d4\n Signed-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n\n drivers/usb/gadget/android.c | 1 -\n drivers/usb/gadget/f_rndis.c | 12 +++++-------\n drivers/usb/gadget/rndis.c | 11 +++++++++++\n 3 files changed, 16 insertions(+), 8 deletions(-)\n\ncommit 87159de9c30dab02b84cbaffa7498140d4ebc1a1\nAuthor: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nDate: Thu Aug 11 11:46:22 2011 +0300\n\n nl80211/cfg80211: Make addition of new sinfo fields safer\n\n Add a comment pointing out the use of enum station_info_flags for\n all new struct station_info fields. In addition, memset the sinfo\n buffer to zero before use on all paths in the current tree to avoid\n leaving uninitialized pointers in the data.\n\n Signed-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\n Signed-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n include/net/cfg80211.h | 5 +++++\n net/mac80211/sta_info.c | 1 +\n net/wireless/nl80211.c | 1 +\n 3 files changed, 7 insertions(+), 0 deletions(-)\n\ncommit d692df224b8605095cb7f770c1c99d3150834daf\nAuthor: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\nDate: Mon Aug 8 12:11:52 2011 +0300\n\n cfg80211/nl80211: Send AssocReq IEs to user space in AP mode\n\n When user space SME/MLME (e.g., hostapd) is not used in AP mode, the\n IEs from the (Re)Association Request frame that was processed in\n firmware need to be made available for user space (e.g., RSN IE for\n hostapd). Allow this to be done with cfg80211_new_sta().\n\n Signed-off-by: Jouni Malinen \u003cjouni@qca.qualcomm.com\u003e\n Acked-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\n Signed-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n include/net/cfg80211.h | 8 ++++++++\n net/wireless/nl80211.c | 4 ++++\n 2 files changed, 12 insertions(+), 0 deletions(-)\n\ncommit d1e94136fc4fe8ea608f4e9d21befa00c86e1e29\nAuthor: Dima Zavin \u003cdima@android.com\u003e\nDate: Mon Jan 23 10:39:02 2012 -0800\n\n misc: remove android pmem driver, it\u0027s obsolete.\n\n Change-Id: I48d9778007e1e9eed2bb34e33ceee818c23afaa5\n Signed-off-by: Dima Zavin \u003cdima@android.com\u003e\n\n drivers/misc/Kconfig | 4 -\n drivers/misc/Makefile | 1 -\n drivers/misc/pmem.c | 1345 ------------------------------------------\n include/linux/android_pmem.h | 93 ---\n 4 files changed, 0 insertions(+), 1443 deletions(-)\n\ncommit dac306d896642f3dfcd878ab6a0a5b8c123722f3\nAuthor: Dima Zavin \u003cdima@android.com\u003e\nDate: Thu Jan 19 09:51:07 2012 -0800\n\n Revert \"proc: enable writing to /proc/pid/mem\"\n\n This reverts commit 198214a7ee50375fa71a65e518341980cfd4b2f0.\n\n fs/proc/base.c | 5 +++++\n 1 files changed, 5 insertions(+), 0 deletions(-)\n\ncommit a65e28a0149261776678977962cfa0f90973e1d4\nAuthor: Dima Zavin \u003cdima@android.com\u003e\nDate: Thu Jan 12 15:55:25 2012 -0800\n\n ram_console: set CON_ANYTIME console flag\n\n We want to ensure that we get all the console messages, even ones\n that occur while the printing CPU is not yet online.\n\n Change-Id: I1d2694d05ac9415669a92f38efdd8e71c927705b\n Signed-off-by: Dima Zavin \u003cdima@android.com\u003e\n\n drivers/staging/android/ram_console.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit f16e6fb3e3bbbc279579b3c3def7951787c88a0a\nAuthor: Benoit Goby \u003cbenoit@android.com\u003e\nDate: Thu Dec 15 18:40:37 2011 -0800\n\n Revert \"usb: gadget: rndis: don\u0027t use dev_get_stats\"\n\n This reverts commit ffdab0c0c40bab6de78b1952bb07aed221994b73.\n\n Not needed anymore in 2.6.39 and 3.0, dev_get_stats has been fixed\n and may be called from atomic context. See:\n 1ac9ad1 net: remove dev_txq_stats_fold()\n\n drivers/usb/gadget/rndis.c | 23 ++---------------------\n 1 files changed, 2 insertions(+), 21 deletions(-)\n\ncommit e1493f1544e804f228efd4a48a843bb1d81d2d2c\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Dec 19 10:24:09 2011 -0800\n\n net: wireless: bcmdhd: Enable wlan access on resume for all sdio functions\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/bcmsdh_sdmmc_linux.c | 4 +---\n 1 files changed, 1 insertions(+), 3 deletions(-)\n\ncommit bbd08c6e95880dfc3bf1fe9b07486beb33a9cdd1\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Dec 16 12:54:51 2011 -0800\n\n net: wireless: bcmdhd: Fix P2P interface removal\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 3 ++\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 43 ++++++++++++++++++++++-------\n drivers/net/wireless/bcmdhd/wl_cfg80211.h | 9 ++++--\n 3 files changed, 42 insertions(+), 13 deletions(-)\n\ncommit 37ff4411a5f5ce21feb3825296308f2a767e3662\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Thu Dec 15 12:12:20 2011 -0800\n\n net: wireless: bcm4329: Fix pno_enable if disassociated\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcm4329/dhd_common.c | 43 ++++++++++++++++++++++++-----\n 1 files changed, 36 insertions(+), 7 deletions(-)\n\ncommit 599c8566fa1f34f297df6c683c23a213ff748d02\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Dec 13 17:39:48 2011 -0800\n\n net: wireless: bcmdhd: Fix proper scan command even if request is NULL\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 16 ++++++++++------\n 1 files changed, 10 insertions(+), 6 deletions(-)\n\ncommit f227b88c89e84371e3897207ddab3877f6af6113\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Dec 13 12:27:49 2011 -0800\n\n net: wireless: bcmdhd: Decrease event wake_lock timeout to 1500 ms\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd.h | 4 ++--\n drivers/net/wireless/bcmdhd/dhd_linux.c | 8 ++++----\n drivers/net/wireless/bcmdhd/wl_iw.c | 2 +-\n 3 files changed, 7 insertions(+), 7 deletions(-)\n\ncommit ed3f35608786481035165a3b0321ab0b04768b5d\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Dec 12 15:40:33 2011 -0800\n\n net: wireless: bcmdhd: Fix getting arp_hostip table\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_common.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit c561cedf2b6c9d6e7c26ee69dd17c97c0a852a17\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Tue Dec 6 16:27:37 2011 -0800\n\n net: wireless: bcmdhd: Allow to push more packets to FW for Tx\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit 4f36cb88d6e7e5afcdef42f6d2d70cbffbd2c541\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Dec 2 13:24:01 2011 -0800\n\n net: wireless: bcmdhd: Fix scan crash in ibss mode\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit af16732d4c98078988755337fb5e197fc31ca77e\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Dec 2 13:10:47 2011 -0800\n\n net: wireless: bcmdhd: Add FW reloading in case of FW hang\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_linux.c | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ncommit 7caeacd6ed135e2ee4fbbc26aa0fc0aea4cb166d\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Wed Nov 30 12:49:02 2011 -0800\n\n net: wireless: bcmdhd: Update to Version 5.90.125.94.1\n\n - Return zeroed private command buffer\n - Fix memory leak in wl_inform_single_bss()\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/dhd_common.c | 5 +++--\n drivers/net/wireless/bcmdhd/dhd_linux_mon.c | 10 ++++++----\n drivers/net/wireless/bcmdhd/include/epivers.h | 2 +-\n drivers/net/wireless/bcmdhd/wl_android.c | 9 ++++++---\n drivers/net/wireless/bcmdhd/wl_cfg80211.c | 9 ++++++---\n 5 files changed, 22 insertions(+), 13 deletions(-)\n\ncommit 8d71d882e7062dfbcdb2f790470f803cc536b8ae\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Nov 11 16:04:12 2011 -0800\n\n net: wireless: bcmdhd: Use CONFIG_DHD_USE_STATIC_BUF for preallocated memory\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/net/wireless/bcmdhd/Kconfig | 7 +++\n drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 16 ++++----\n drivers/net/wireless/bcmdhd/dhd.h | 4 +-\n drivers/net/wireless/bcmdhd/dhd_cdc.c | 4 +-\n drivers/net/wireless/bcmdhd/dhd_linux.c | 4 +-\n drivers/net/wireless/bcmdhd/dhd_sdio.c | 4 +-\n drivers/net/wireless/bcmdhd/include/linux_osl.h | 2 +-\n drivers/net/wireless/bcmdhd/linux_osl.c | 52 +++++++++++++----------\n drivers/net/wireless/bcmdhd/wl_android.c | 7 ++-\n 9 files changed, 57 insertions(+), 43 deletions(-)\n\ncommit 35047200c401cdd1bb43b5574270d1ac86a47937\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Mon Dec 19 12:32:21 2011 -0800\n\n wireless: Protect regdomain change by mutex\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n net/wireless/reg.c | 5 ++++-\n 1 files changed, 4 insertions(+), 1 deletions(-)\n\ncommit ea693bf7f87603b072f4ceea6684221fa0b8e863\nAuthor: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\nDate: Fri Dec 16 17:52:18 2011 -0800\n\n mmc: Set suspend/resume bus operations if CONFIG_PM_RUNTIME is used\n\n Signed-off-by: Dmitry Shmidt \u003cdimitrysh@google.com\u003e\n\n drivers/mmc/core/bus.c | 24 +++++++-----------------\n 1 files changed, 7 insertions(+), 17 deletions(-)\n\ncommit dc1b6340394ef744e210247ab786df66639f5a33\nAuthor: Benoit Goby \u003cbenoit@android.com\u003e\nDate: Fri Dec 9 18:05:00 2011 -0800\n\n usb: gadget: android: Don\u0027t allow changing the functions list if enabled\n\n Change-Id: I3ad39b420ce79a8602a7eca1daac1f56b30bad5c\n Signed-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n\n drivers/usb/gadget/android.c | 28 ++++++++++++++++++++++++----\n 1 files changed, 24 insertions(+), 4 deletions(-)\n\ncommit e0de0a507d83e84c833d01de9e46a44b12419431\nAuthor: Benoit Goby \u003cbenoit@android.com\u003e\nDate: Tue Nov 29 13:49:27 2011 -0800\n\n usb: gadget: android: Cancel pending ctrlrequest before disabling\n\n Make sure there is no pending ctrlrequest before removing the config.\n Otherwise the ctrlrequest complete callback could access structures\n after they have been freed. Unbind cancels pending transfers but not\n ep0 requests.\n\n Bug: 5513065 5440193\n\n Change-Id: I063c22bf5d104a3d2df71cf622409459fac5f27a\n Signed-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n\n drivers/usb/gadget/android.c | 2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ncommit b86fd0b62252fbba6a5d6acda09fd325fb8e201b\nAuthor: Colin Cross \u003cccross@android.com\u003e\nDate: Tue Nov 29 16:37:07 2011 -0800\n\n ARM: idle: call idle notifiers before stopping nohz tick\n\n If an idle notifier modifies a timer, calling the notifier after\n the sched tick has been stopped may leave the sched tick set too\n early. Move teh idle notifier call before the call to\n tick_nohz_stop_sched_tick.\n\n Change-Id: I0db3284bec6d0193bc5e2a57650ab06bd8342319\n Signed-off-by: Colin Cross \u003cccross@android.com\u003e\n\n arch/arm/kernel/process.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit 6a4a38525d60db7e915d559273d8c89db5a98edf\nAuthor: Benoit Goby \u003cbenoit@android.com\u003e\nDate: Mon Nov 28 18:01:03 2011 -0800\n\n usb: gadget: android: Reset next_string_id before enable\n\n Reset next_string_id to 0 before enabling the gadget driver. Otherwise,\n after a large number of enable/disable cycles, bind will fail\n because we cannot allocate new string ids. String ids cannot be larger\n than 254 per USB spec.\n\n Change-Id: I44f5fece45008b7a0a18c025d4eb5ce842585c28\n Signed-off-by: Benoit Goby \u003cbenoit@android.com\u003e\n\n drivers/usb/gadget/android.c | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ncommit dbb18fb2c1519b7810018580ee5123f9be73f213\nAuthor: hyungseoung.yoo \u003chyungseoung.yoo@samsung.com\u003e\nDate: Fri Nov 18 13:57:01 2011 +0900\n\n Bluetooth: Keep master role when SCO or eSCO is active\n\n This improves compatbility with a lot of headset / chipset\n combinations. Ideally this should not be needed.\n\n Change-Id: I8b676701e12e416aa7d60801b9d353b15d102709\n Signed-off-by: hyungseoung.yoo \u003chyungseoung.yoo@samsung.com\u003e\n Signed-off-by: Jaikumar Ganesh \u003cjaikumarg@android.com\u003e\n\n net/bluetooth/hci_event.c | 12 +++++++++++-\n 1 files changed, 11 insertions(+), 1 deletions(-)\n\ncommit 9d187300dfeb825b3c851458427a7046d9302c06\nAuthor: Arve Hjønnevåg \u003carve@android.com\u003e\nDate: Tue Nov 22 14:56:50 2011 -0800\n\n rtc: Fix some bugs that allowed accumulating time drift in suspend/resume\n\n The current code checks if abs(delta_delta.tv_sec) is greater or\n equal to two before it discards the old delta value, but this can\n trigger at close to -1 seconds since -1.000000001 seconds is stored\n as tv_sec -2 and tv_nsec 999999999 in a normalized timespec.\n\n rtc_resume had an early return check if the rtc value had not changed\n since rtc_suspend. This effectivly stops time for the duration of the\n short sleep. Check if sleep_time is positive after all the adjustments\n have been applied instead since this allows the old_system adjustment\n in rtc_suspend to have an effect even for short sleep cycles.\n\n Change-Id: I00b45c0349ec91a4bab9b41a126b377515427898\n Signed-off-by: Arve Hjønnevåg \u003carve@android.com\u003e\n\n drivers/rtc/class.c | 10 +++++-----\n 1 files changed, 5 insertions(+), 5 deletions(-)\n\ncommit 452d440ab295475afb04dee90879f5fb70254659\nAuthor: Arve Hjønnevåg \u003carve@android.com\u003e\nDate: Tue Nov 22 15:28:27 2011 -0800\n\n Fix \"time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime\" to compile on 3.0\n\n Change-Id: I1225f279cda04dedbfb7f853f6b58f1032bd6d2b\n\n kernel/time/timekeeping.c | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ncommit cf70c6a40073530c9e23fb373a541c09996429c7\nAuthor: John Stultz \u003cjohn.stultz@linaro.org\u003e\nDate: Wed Jun 1 18:18:09 2011 -0700\n\n time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime\n\n Arve suggested making sure we catch possible negative sleep time\n intervals that could be passed into timekeeping_inject_sleeptime.\n\n CC: Arve Hjønnevåg \u003carve@android.com\u003e\n CC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Signed-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n\n kernel/time/timekeeping.c | 6 ++++++\n 1 files changed, 6 insertions(+), 0 deletions(-)\n\ncommit 340ede367101d47c8fd69e83e5e6db9077f4caad\nAuthor: John Stultz \u003cjohn.stultz@linaro.org\u003e\nDate: Fri May 27 11:33:18 2011 -0700\n\n rtc: Avoid accumulating time drift in suspend/resume\n\n Because the RTC interface is only a second granular interface,\n each time we read from the RTC for suspend/resume, we introduce a\n half second (on average) of error.\n\n In order to avoid this error accumulating as the system is suspended\n over and over, this patch measures the time delta between the RTC\n and the system CLOCK_REALTIME.\n\n If the delta is less then 2 seconds from the last suspend, we compensate\n by using the previous time delta (keeping it close). If it is larger\n then 2 seconds, we assume the clock was set or has been changed, so we\n do no correction and update the delta.\n\n Note: If NTP is running, ths could seem to \"fight\" with the NTP corrected\n time, where as if the system time was off by 1 second, and NTP slewed the\n value in, a suspend/resume cycle could undo this correction, by trying to\n restore the previous offset from the RTC. However, without this patch,\n since each read could cause almost a full second worth of error, its\n possible to get almost 2 seconds of error just from the suspend/resume\n cycle alone, so this about equal to any offset added by the compensation.\n\n Further on systems that suspend/resume frequently, this should keep time\n closer then NTP could compensate for if the errors were allowed to\n accumulate.\n\n Credits to Arve Hjønnevåg for suggesting this solution.\n\n This patch also improves some of the variable names and adds more clear\n comments.\n\n CC: Arve Hjønnevåg \u003carve@android.com\u003e\n CC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Signed-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n\n drivers/rtc/class.c | 65 +++++++++++++++++++++++++++++++++++++-------------\n 1 files changed, 48 insertions(+), 17 deletions(-)\n\nChange-Id: I16f522e7ee2b301cbdaea62d52d50d7249f565c2\nSigned-off-by: Rohit Vaswani \u003crvaswani@codeaurora.org\u003e\n" }, { "commit": "f10f2a8bad44078c11378d9a0da025bc4a8e0f15", "tree": "b486463f6c5278b8fe1ab0641ab5da20c11e8591", "parents": [ "0c629385aede73f6121148cdddb791d384d6ca9d" ], "author": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Mon Dec 19 13:17:51 2011 -0800" }, "committer": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Wed Jan 04 12:24:24 2012 -0800" }, "message": "tick-sched: change the cpu that updates rq_stats\n\nIt can happen that the scheduler tick stops on cpu 0 but keeps\nrunning on some other cpu. Make the cpu in-charge of updating\nthe jiffies also update the rq_stats.\n\nChange-Id: Idb1a8132bd96500c68c516b4a99663965cec28e1\nSigned-off-by: Amar Singhal \u003casinghal@codeaurora.org\u003e\n" }, { "commit": "ef7386b5de11f6269eaf072c5ef522d2a43172c2", "tree": "18626ff19e69fb04b75257a60cd37d51671583de", "parents": [ "6636552f1dd0d2e2be2f87605ea2cd3aa4d2e5b6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 30 13:24:40 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Jan 03 10:42:00 2012 -0800" }, "message": "Revert \"clockevents: Set noop handler in clockevents_exchange_device()\"\n\ncommit 3b87487ac5008072f138953b07505a7e3493327f upstream.\n\nThis reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.\n\nIt results in resume problems for various people. See for example\n\n http://thread.gmane.org/gmane.linux.kernel/1233033\n http://thread.gmane.org/gmane.linux.kernel/1233389\n http://thread.gmane.org/gmane.linux.kernel/1233159\n http://thread.gmane.org/gmane.linux.kernel/1227868/focus\u003d1230877\n\nand the fedora and ubuntu bug reports\n\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d767248\n https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569\n\nwhich got bisected down to the stable version of this commit.\n\nReported-by: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nReported-by: Phil Miller \u003cmille121@illinois.edu\u003e\nReported-by: Philip Langdale \u003cphilipl@overt.org\u003e\nReported-by: Tim Gardner \u003ctim.gardner@canonical.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "612e5dbc550f30c787e40b958d351720e72091c6", "tree": "3ba8f13e9a8d7f7bf0a6511bffe48f04d305c9e4", "parents": [ "2a72a47b80bf4dfbdec91889d1d2c4702f134da5" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Dec 05 21:20:23 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 12:57:34 2011 -0800" }, "message": "alarmtimers: Fix time comparison\n\ncommit c9c024b3f3e07d087974db4c0dc46217fff3a6c0 upstream.\n\nThe expiry function compares the timer against current time and does\nnot expire the timer when the expiry time is \u003e\u003d now. That\u0027s wrong. If\nthe timer is set for now, then it must expire.\n\nMake the condition expiry \u003e now for breaking out the loop.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "b01b383bbd04e9dcf7d9fe6ca3751b77ccdc533c", "tree": "011972826f7b83c5aafece5ef589e93a4d011508", "parents": [ "4078977c46f627f553ed2d8ea047b9bf25dee48d" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Dec 02 16:02:45 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:53 2011 -0800" }, "message": "clockevents: Set noop handler in clockevents_exchange_device()\n\ncommit de28f25e8244c7353abed8de0c7792f5f883588c upstream.\n\nIf a device is shutdown, then there might be a pending interrupt,\nwhich will be processed after we reenable interrupts, which causes the\noriginal handler to be run. If the old handler is the (broadcast)\nperiodic handler the shutdown state might hang the kernel completely.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "4078977c46f627f553ed2d8ea047b9bf25dee48d", "tree": "fd257cf2fde90205159813141edc07102e387901", "parents": [ "0bbf5c70251286fbc3b7aac5e7961b4568115bfd" ], "author": { "name": "Yang Honggang (Joseph)", "email": "eagle.rtlinux@gmail.com", "time": "Thu Dec 01 22:22:41 2011 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:52 2011 -0800" }, "message": "clocksource: Fix bug with max_deferment margin calculation\n\ncommit b1f919664d04a8d0ba29cb76673c7ca3325a2006 upstream.\n\nIn order to leave a margin of 12.5% we should \u003e\u003e 3 not \u003e\u003e 5.\n\nSigned-off-by: Yang Honggang (Joseph) \u003ceagle.rtlinux@gmail.com\u003e\n[jstultz: Modified commit subject]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "d80dee54533aa4bfe29def921edb31715fdba214", "tree": "f509a1896113dc10a0288052bbee448682f387d6", "parents": [ "eda31b190f7c7033b86ff6e8de3866a4ca25b7df" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Dec 02 12:34:16 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:48 2011 -0800" }, "message": "tick-broadcast: Stop active broadcast device when replacing it\n\ncommit c1be84309c58b1e7c6d626e28fba41a22b364c3d upstream.\n\nWhen a better rated broadcast device is installed, then the current\nactive device is not disabled, which results in two running broadcast\ndevices.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e1ef77bdad527601e9e47b377cbef5bee9df8248", "tree": "384280ecb7c3c04ddb0e1083a462a73783b4dd06", "parents": [ "953d0c888eda75de7d248017f6dd2e5e254ad0cc" ], "author": { "name": "Hector Palacios", "email": "hector.palacios@digi.com", "time": "Mon Nov 14 11:15:25 2011 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 09 08:52:28 2011 -0800" }, "message": "timekeeping: add arch_offset hook to ktime_get functions\n\ncommit d004e024058a0eaca097513ce62cbcf978913e0a upstream.\n\nktime_get and ktime_get_ts were calling timekeeping_get_ns()\nbut later they were not calling arch_gettimeoffset() so architectures\nusing this mechanism returned 0 ns when calling these functions.\n\nThis happened for example when running Busybox\u0027s ping which calls\nsyscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts) which eventually\ncalls ktime_get. As a result the returned ping travel time was zero.\n\nSigned-off-by: Hector Palacios \u003chector.palacios@digi.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "45db69a9fd0d36ec3fafcf0255cf9a592df0c49c", "tree": "ac411234281e424f48c674a86cb42ca874e8f605", "parents": [ "b9599f1d4d913ecc85cdd0ebe16dee8210120753" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Tue Aug 23 13:20:46 2011 +0200" }, "committer": { "name": "Jeff Ohlstein", "email": "johlstei@codeaurora.org", "time": "Wed Dec 07 13:12:14 2011 -0800" }, "message": "nohz: Remove \"Switched to NOHz mode\" debugging messages\n\nWhen performing cpu hotplug tests the kernel printk log buffer gets flooded\nwith pointless \"Switched to NOHz mode...\" messages. Especially when afterwards\nanalyzing a dump this might have removed more interesting stuff out of the\nbuffer.\nAssuming that switching to NOHz mode simply works just remove the printk.\n\nChange-Id: I1746f8c0119a512055716c3fd77a966b735ca49b\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20110823112046.GB2540@osiris.boeblingen.de.ibm.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Jeff Ohlstein \u003cjohlstei@codeaurora.org\u003e\n" }, { "commit": "452d440ab295475afb04dee90879f5fb70254659", "tree": "9e9dd3c13903b316c9e016fde1e4ea5b3373caf6", "parents": [ "cf70c6a40073530c9e23fb373a541c09996429c7" ], "author": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Nov 22 15:28:27 2011 -0800" }, "committer": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Nov 22 16:49:43 2011 -0800" }, "message": "Fix \"time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime\" to compile on 3.0\n\nChange-Id: I1225f279cda04dedbfb7f853f6b58f1032bd6d2b\n" }, { "commit": "cf70c6a40073530c9e23fb373a541c09996429c7", "tree": "ed3729edc89111a87447373523f2a4cf2bc6d5e4", "parents": [ "340ede367101d47c8fd69e83e5e6db9077f4caad" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Jun 01 18:18:09 2011 -0700" }, "committer": { "name": "Arve Hjønnevåg", "email": "arve@android.com", "time": "Tue Nov 22 16:49:29 2011 -0800" }, "message": "time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime\n\nArve suggested making sure we catch possible negative sleep time\nintervals that could be passed into timekeeping_inject_sleeptime.\n\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "d074fa2796bdbc42c4f918c78d6711bafc80b1c8", "tree": "033929706a0aae95f65c134a8fc09cec3fb3e75d", "parents": [ "53ae1740b250e4d02dd7a6ca82075355ad99dc23", "9ab6a29787b1221a697f85835645549668258bdc" ], "author": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Wed Nov 16 13:52:50 2011 -0800" }, "committer": { "name": "Bryan Huntsman", "email": "bryanh@codeaurora.org", "time": "Wed Nov 16 13:52:50 2011 -0800" }, "message": "Merge remote-tracking branch \u0027common/android-3.0\u0027 into msm-3.0\n\n* common/android-3.0: (570 commits)\n misc: remove kernel debugger core\n ARM: common: fiq_debugger: dump sysrq directly to console if enabled\n ARM: common: fiq_debugger: add irq context debug functions\n net: wireless: bcmdhd: Call init_ioctl() only if was started properly for WEXT\n net: wireless: bcmdhd: Call init_ioctl() only if was started properly\n net: wireless: bcmdhd: Fix possible memory leak in escan/iscan\n cpufreq: interactive governor: default 20ms timer\n cpufreq: interactive governor: go to intermediate hi speed before max\n cpufreq: interactive governor: scale to max only if at min speed\n cpufreq: interactive governor: apply intermediate load on current speed\n ARM: idle: update idle ticks before call idle end notifier\n input: gpio_input: don\u0027t print debounce message unless flag is set\n net: wireless: bcm4329: Skip dhd_bus_stop() if bus is already down\n net: wireless: bcmdhd: Skip dhd_bus_stop() if bus is already down\n net: wireless: bcmdhd: Improve suspend/resume processing\n net: wireless: bcmdhd: Check if FW is Ok for internal FW call\n tcp: Don\u0027t nuke connections for the wrong protocol\n ARM: common: fiq_debugger: make uart irq be no_suspend\n net: wireless: Skip connect warning for CONFIG_CFG80211_ALLOW_RECONNECT\n mm: avoid livelock on !__GFP_FS allocations\n ...\n\nConflicts:\n\tarch/arm/mm/cache-l2x0.c\n\tarch/arm/vfp/vfpmodule.c\n\tdrivers/mmc/core/host.c\n\tkernel/power/wakelock.c\n\tnet/bluetooth/hci_event.c\n\nSigned-off-by: Bryan Huntsman \u003cbryanh@codeaurora.org\u003e\n" }, { "commit": "2bb3e310159b65c88caf0c67a20ed257568be267", "tree": "e4ad01c06a9e27939781c5dd9d0cb92e6fcd54d5", "parents": [ "2f53cb72c1574d3880d9e88e254b756565fe2f6d", "97596c34030ed28657ccafddb67e17a03890b90a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 27 15:01:19 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Oct 27 15:01:19 2011 -0700" }, "message": "Merge commit \u0027v3.0.8\u0027 into android-3.0\n" }, { "commit": "f49d99bc4168c7937655bb09989cc72525163b40", "tree": "ad0c9564e7bb8b3e845917440ee34578fb8f5e51", "parents": [ "a21ec56a1e1d13b1cc3a6f62a39c2be49c450747" ], "author": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Mon Aug 22 19:02:04 2011 -0700" }, "committer": { "name": "Amar Singhal", "email": "asinghal@codeaurora.org", "time": "Thu Oct 20 14:35:49 2011 -0700" }, "message": "rq_stats: Doing rq_stats calculation in the scheduler tick.\n\nWith this change, we do the average run queue statistics calculation\nin the scheduler tick itself. This helps avoid any extra timers to\ndo the same. Also doing this calculation in the scheduler tick avoids\nany bias if the calculation is done in a workqueue\n\nChange-Id: I854d90acc05cc7a7226487be5555976826d8c837\nSigned-off-by: Amar Singhal \u003casinghal@codeaurora.org\u003e\n" }, { "commit": "c3a44b4d23f4cb1b3eafb8c2c74d88f452d50a6d", "tree": "1ae49d74350fd3febbc73b1516924bc7faed7e7d", "parents": [ "0898dd1603e1dec711217b85329c031b30f81710" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Aug 10 10:26:09 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Oct 03 11:40:07 2011 -0700" }, "message": "alarmtimers: Avoid possible denial of service with high freq periodic timers\n\ncommit 6af7e471e5a7746b8024d70b4363d3dfe41d36b8 upstream.\n\nIts possible to jam up the alarm timers by setting very small interval\ntimers, which will cause the alarmtimer subsystem to spend all of its time\nfiring and restarting timers. This can effectivly lock up a box.\n\nA deeper fix is needed, closely mimicking the hrtimer code, but for now\njust cap the interval to 100us to avoid userland hanging the system.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "0898dd1603e1dec711217b85329c031b30f81710", "tree": "fce87fc0b31865100b5e35d26ce1159fc5261a36", "parents": [ "26cf1a7ba1a6cc19d48c993bebd3be94c48af74a" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Aug 04 07:51:56 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Oct 03 11:40:07 2011 -0700" }, "message": "alarmtimers: Memset itimerspec passed into alarm_timer_get\n\ncommit ea7802f630d356acaf66b3c0b28c00a945fc35dc upstream.\n\nFollowing common_timer_get, zero out the itimerspec passed in.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "26cf1a7ba1a6cc19d48c993bebd3be94c48af74a", "tree": "d58851c18bab62e7ce380ca8c32fa2b515149599", "parents": [ "5607cbd164dc1913cc52abba893c0961617eafd2" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Aug 04 07:25:35 2011 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Mon Oct 03 11:40:06 2011 -0700" }, "message": "alarmtimers: Avoid possible null pointer traversal\n\ncommit 971c90bfa2f0b4fe52d6d9002178d547706f1343 upstream.\n\nWe don\u0027t check if old_setting is non null before assigning it, so\ncorrect this.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e55d4fa96762fd767a3b6d842c904e994db6bb2e", "tree": "c74157e01cb128cb97f106a50cfadc4c8b872c41", "parents": [ "e32c14667e4fe9f16ac9b918d15d29abd2315a55", "b0af8dfdd67699e25083478c63eedef2e72ebd85" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jun 29 13:54:42 2011 -0700" }, "message": "Merge commit \u0027v3.0-rc5\u0027 into android-3.0\n" }, { "commit": "1c6b39ad3f01514fd8dd84b5b412bafb75c19388", "tree": "bd31cf5d3e67acc9ef23c97ddd92c961b73f40c7", "parents": [ "c008ba58af24dc5d0d8e9fe6e59d876910254761" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jun 16 18:47:37 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jun 21 16:32:28 2011 -0700" }, "message": "alarmtimers: Return -ENOTSUPP if no RTC device is present\n\nToralf Förster and Richard Weinberger noted that if there is\nno RTC device, the alarm timers core prints out an annoying\n\"ALARM timers will not wake from suspend\" message.\n\nThis warning has been removed in a previous patch, however\nthe issue still remains: The original idea was to support\nalarm timers even if there was no rtc device, as long as the\nsystem didn\u0027t go into suspend.\n\nHowever, after further consideration, communicating to the application\nthat alarmtimers are not fully functional seems like the better\nsolution.\n\nSo this patch makes it so we return -ENOTSUPP to any posix _ALARM\nclockid calls if there is no backing RTC device on the system.\n\nFurther this changes the behavior where when there is no rtc device\nwe will check for one on clock_getres, clock_gettime, timer_create,\nand timer_nsleep instead of on suspend.\n\nCC: Toralf Förster \u003ctoralf.foerster@gmx.de\u003e\nCC: Richard Weinberger \u003crichard@nod.at\nCC: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Toralf Förster \u003ctoralf.foerster@gmx.de\u003e\nReported by: Richard Weinberger \u003crichard@nod.at\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "c008ba58af24dc5d0d8e9fe6e59d876910254761", "tree": "0e718ce49992b6a7dfde619cd6ebf05afe06ae12", "parents": [ "e08f6d4131ab964420f0bcabecc68d75fb49df79" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jun 16 18:27:09 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jun 21 15:38:33 2011 -0700" }, "message": "alarmtimers: Handle late rtc module loading\n\nThe alarmtimers code currently picks a rtc device to use at\nlate init time. However, if your rtc driver is loaded as a module,\nit may be registered after the alarmtimers late init code, leaving\nthe alarmtimers nonfunctional.\n\nThis patch moves the the rtcdevice selection to when we actually try\nto use it, allowing us to make use of rtc modules that may have been\nloaded at any point since bootup.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Meelis Roos \u003cmroos@ut.ee\u003e\nReported-by: Meelis Roos \u003cmroos@ut.ee\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "b5199515c25cca622495eb9c6a8a1d275e775088", "tree": "250fc4f3d02c58eddf770e9d040edeafd0012e76", "parents": [ "1123d93963cbd2546449d4d9f0c568e323cb0ac6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 16:22:08 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jun 16 19:30:53 2011 +0200" }, "message": "clocksource: Make watchdog robust vs. interruption\n\nThe clocksource watchdog code is interruptible and it has been\nobserved that this can trigger false positives which disable the TSC.\n\nThe reason is that an interrupt storm or a long running interrupt\nhandler between the read of the watchdog source and the read of the\nTSC brings the two far enough apart that the delta is larger than the\nunstable treshold. Move both reads into a short interrupt disabled\nregion to avoid that.\n\nReported-and-tested-by: Vernon Mauery \u003cvernux@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: stable@kernel.org\n" }, { "commit": "abbb445f65bbb139202fde5a66f9a249977058c9", "tree": "07f1a792c9c1fba2c291b64887f9cb08b661e811", "parents": [ "4700c54b66189fe2acaa49df63e56a1615d99d32" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 11:36:39 2011 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jun 14 11:37:53 2011 -0700" }, "message": "HACK: time: Disable alarmtimer\n\nkernel/time/alarmtimer.c conflicts with drivers/rtc/alarm.c,\ndisable it for now.\n\nChange-Id: I6cdb3b885828d45836a54971adf16143039b0a0e\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n" }, { "commit": "1b054b67d3bfc6dca9f634c104780f3f24ff3eec", "tree": "af50fb7333001692879c18474e84ac2736f984d1", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jun 03 11:13:33 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Jun 03 11:13:33 2011 +0200" }, "message": "clockevents: Handle empty cpumask gracefully\n\nFor UP it\u0027s stupid to request an initialized cpumask for the clock\nevent devices. Though we need the mask set even on UP to avoid a\nhorrible ifdeffery especially in the broadcast code.\n\nFor SMP we can at least try to survive with a warning and set the\ncpumask of the cpu we\u0027re running on. That gives a decent chance to\nbring the machine up and retrieve the debug info.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Linus Walleij \u003clinus.walleij@linaro.org\nCc: Lee Jones \u003clee.jones@linaro.org\u003e\nCc: Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e\nCc: Stephen Boyd \u003csboyd@codeaurora.org\u003e\n" }, { "commit": "ab8177bc53e8ae3a3ba6d200ce2c2dae263f7ee5", "tree": "c8b370496497b4f96d6a17da906bdd9314e9a090", "parents": [ "f24444b01bf6c51c300fd3ffc73423383d747882" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 13:05:15 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 23 13:59:54 2011 +0200" }, "message": "hrtimers: Avoid touching inactive timer bases\n\nInstead of iterating over all possible timer bases avoid it by marking\nthe active bases in the cpu base.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReviewed-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\n" }, { "commit": "250f972d85effad5b6e10da4bbd877e6a4b503b6", "tree": "007393a6fc6439af7e0121dd99a6f9f9fb8405bc", "parents": [ "7372b0b122af0f6675f3ab65bfd91c8a438e0480", "bbe7b8bef48c567f5ff3f6041c1fb011292e8f12" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 20:06:24 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 20:08:05 2011 +0200" }, "message": "Merge branch \u0027timers/urgent\u0027 into timers/core\n\nReason: Get upstream fixes and kfree_rcu which is necessary for a\nfollow up patch.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c0e299b1a91cbdb21ae08e382a4176200398bc36", "tree": "096a6b082fcf1bd816d78654057d11af823361c5", "parents": [ "257313b2a87795e07a0bdf58d0fffbdba8b31051" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 10:50:52 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 20 10:50:52 2011 +0200" }, "message": "clockevents/source: Use u64 to make 32bit happy\n\nunsigned long is not 64bit on 32bit machine.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "78c4def67e8eebe602655a3dec9aa08f0e2f7c4b", "tree": "8c0c756bbff7325f5c2a773f8cc64d8390ebe5b5", "parents": [ "7e6628e4bcb3b3546c625ec63ca724f28ab14f0c", "942c3c5c329274fa6de5998cb911cf3d0a42d0b1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:45:08 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:45:08 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimer: Make lookup table const\n RTC: Disable CONFIG_RTC_CLASS from being built as a module\n timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS\u003dn\n timers: Remove delayed irqwork from alarmtimers implementation\n timers: Improve alarmtimer comments and minor fixes\n timers: Posix interface for alarm-timers\n timers: Introduce in-kernel alarm-timer interface\n timers: Add rb_init_node() to allow for stack allocated rb nodes\n time: Add timekeeping_inject_sleeptime\n" }, { "commit": "7e6628e4bcb3b3546c625ec63ca724f28ab14f0c", "tree": "111a94cefa9d800ec5c5e59520f4b5d1880965d0", "parents": [ "0f1bdc1815c4cb29b3cd71a7091b478e426faa0b", "ab0e08f15d23628dd8d50bf6ce1a935a8840c7dc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 19 17:44:40 2011 -0700" }, "message": "Merge branch \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-clockevents-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: hpet: Cleanup the clockevents init and register code\n x86: Convert PIT to clockevents_config_and_register()\n clockevents: Provide interface to reconfigure an active clock event device\n clockevents: Provide combined configure and register function\n clockevents: Restructure clock_event_device members\n clocksource: Get rid of the hardcoded 5 seconds sleep time limit\n clocksource: Restructure clocksource struct members\n" }, { "commit": "80b816b736cfa5b9582279127099b20a479ab7d9", "tree": "94a2963c05e8e24d6153a0a2fae2f43fe05605bc", "parents": [ "57f0fcbe1dea8a36c9d1673086326059991c5f81" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 18 21:33:42 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 19 14:24:16 2011 +0200" }, "message": "clockevents: Provide interface to reconfigure an active clock event device\n\nSome ARM SoCs have clock event devices which have their frequency\nmodified due to frequency scaling. Provide an interface which allows\nto reconfigure an active device. After reconfiguration reprogram the\ncurrent pending event.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: LAK \u003clinux-arm-kernel@lists.infradead.org\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nLink: http://lkml.kernel.org/r/%3C20110518210136.437459958%40linutronix.de%3E\n" }, { "commit": "57f0fcbe1dea8a36c9d1673086326059991c5f81", "tree": "c56c00307052034a64d2577819fdf21271446ebe", "parents": [ "847b2f42be203f3cff7f243fdd3ee50c1e06c882" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 18 21:33:41 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 19 14:24:15 2011 +0200" }, "message": "clockevents: Provide combined configure and register function\n\nAll clockevent devices have the same open coded initialization\nfunctions. Provide an interface which does all necessary\ninitialization in the core code.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nLink: http://lkml.kernel.org/r/%3C20110518210136.331975870%40linutronix.de%3E\n" }, { "commit": "724ed53e8ac2c5278af8955673049714c1073464", "tree": "51762a734e564fb973758014997ee99406693541", "parents": [ "369db4c9524b7487faf1ff89646eee396c1363e1" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 18 21:33:40 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 19 14:24:15 2011 +0200" }, "message": "clocksource: Get rid of the hardcoded 5 seconds sleep time limit\n\nSlow clocksources can have a way longer sleep time than 5 seconds and\neven fast ones can easily cope with 600 seconds and still maintain\nproper accuracy.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nLink: http://lkml.kernel.org/r/%3C20110518210136.109811585%40linutronix.de%3E\n" }, { "commit": "07f4beb0b5bbfaf36a64aa00d59e670ec578a95a", "tree": "13c0fbeb4586cd0a9c7cd8258575c39e0481ca7a", "parents": [ "557d97d57446f55d2c4a66593794ea31ffd0a74d" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 16 11:07:48 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 16 23:35:41 2011 +0200" }, "message": "tick: Clear broadcast active bit when switching to oneshot\n\nThe first cpu which switches from periodic to oneshot mode switches\nalso the broadcast device into oneshot mode. The broadcast device\nserves as a backup for per cpu timers which stop in deeper\nC-states. To avoid starvation of the cpus which might be in idle and\ndepend on broadcast mode it marks the other cpus as broadcast active\nand sets the brodcast expiry value of those cpus to the next tick.\n\nThe oneshot mode broadcast bit for the other cpus is sticky and gets\nonly cleared when those cpus exit idle. If a cpu was not idle while\nthe bit got set in consequence the bit prevents that the broadcast\ndevice is armed on behalf of that cpu when it enters idle for the\nfirst time after it switched to oneshot mode.\n\nIn most cases that goes unnoticed as one of the other cpus has usually\na timer pending which keeps the broadcast device armed with a short\ntimeout. Now if the only cpu which has a short timer active has the\nbit set then the broadcast device will not be armed on behalf of that\ncpu and will fire way after the expected timer expiry. In the case of\nChristians bug report it took ~145 seconds which is about half of the\nwrap around time of HPET (the limit for that device) due to the fact\nthat all other cpus had no timers armed which expired before the 145\nseconds timeframe.\n\nThe solution is simply to clear the broadcast active bit\nunconditionally when a cpu switches to oneshot mode after the first\ncpu switched the broadcast device over. It\u0027s not idle at that point\notherwise it would not be executing that code.\n\n[ I fundamentally hate that broadcast crap. Why the heck thought some\n folks that when going into deep idle it\u0027s a brilliant concept to\n switch off the last device which brings the cpu back from that\n state? ]\n\nThanks to Christian for providing all the valuable debug information!\n\nReported-and-tested-by: Christian Hoffmann \u003cemail@christianhoffmann.info\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/%3Calpine.LFD.2.02.1105161105170.3078%40ionos%3E\nCc: stable@kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "7372b0b122af0f6675f3ab65bfd91c8a438e0480", "tree": "5dcd0f94e0064b76573837da09ca5277b7e5f068", "parents": [ "179eb03268aa1da03d90f1566ea85dc1478d3ae3" ], "author": { "name": "Andi Kleen", "email": "ak@linux.intel.com", "time": "Wed May 04 15:09:27 2011 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 05 17:32:13 2011 +0200" }, "message": "clockevents: Move C3 stop test outside lock\n\nAvoid taking broadcast_lock in the idle path for systems where the\ntimer doesn\u0027t stop in C3.\n\n[ tglx: Removed the stale label and added comment ]\n\nSigned-off-by: Andi Kleen \u003cak@linux.intel.com\u003e\nCc: Dave Kleikamp \u003cdkleikamp@gmail.com\u003e\nCc: Chris Mason \u003cchris.mason@oracle.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Tim Chen \u003ctim.c.chen@linux.intel.com\u003e\nCc: lenb@kernel.org\nCc: paulmck@us.ibm.com\nLink: http://lkml.kernel.org/r/%3C20110504234806.GF2925%40one.firstfloor.org%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "e05b2efb82596905ebfe88e8612ee81dec9b6592", "tree": "9b688eb473943588adf667729c0ffa3b9f032cac", "parents": [ "5895198c56d131cc696556a45f7ff0ea99ac297b" ], "author": { "name": "john stultz", "email": "johnstul@us.ibm.com", "time": "Wed May 04 18:16:50 2011 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu May 05 15:23:26 2011 +0200" }, "message": "clocksource: Install completely before selecting\n\nChristian Hoffmann reported that the command line clocksource override\nwith acpi_pm timer fails:\n\n Kernel command line: \u003cSNIP\u003e clocksource\u003dacpi_pm\n hpet clockevent registered\n Switching to clocksource hpet\n Override clocksource acpi_pm is not HRT compatible.\n Cannot switch while in HRT/NOHZ mode.\n\nThe watchdog code is what enables CLOCK_SOURCE_VALID_FOR_HRES, but we\nactually end up selecting the clocksource before we enqueue it into\nthe watchdog list, so that\u0027s why we see the warning and fail to switch\nto acpi_pm timer as requested. That\u0027s particularly bad when we want to\ndebug timekeeping related problems in early boot.\n\nPut the selection call last.\n\nReported-by: Christian Hoffmann \u003cemail@christianhoffmann.info\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: stable@kernel.org # 32...\nLink: http://lkml.kernel.org/r/%3C1304558210.2943.24.camel%40work-vm%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "179eb03268aa1da03d90f1566ea85dc1478d3ae3", "tree": "fda7d48258075bf84f12ce143ab7cd260bbc92e8", "parents": [ "ce788f930b0cdf821de7ee8f84cfe8cf7fcb6311" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 04 08:18:34 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 04 08:18:34 2011 +0200" }, "message": "alarmtimer: Drop device refcount after rtc_open()\n\nclass_find_device() takes a refcount on the rtc device. rtc_open()\ntakes another one, so we can drop it after the rtc_open() call.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "ce788f930b0cdf821de7ee8f84cfe8cf7fcb6311", "tree": "4f4d451b4e81d6693199fcfb405f6133e6cae61c", "parents": [ "99ee5315dac6211e972fa3f23bcc9a0343ff58c4" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 04 08:00:47 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed May 04 08:18:17 2011 +0200" }, "message": "alarmtimer: Check return value of class_find_device()\n\nalarmtimer_late_init() uses class_find_device() to find a alarm\ncapable rtc device. The match callback stores a pointer to the name in\nthe char pointer handed in from the call site. alarmtimer_late_init()\nchecks the char pointer for NULL, but the pointer is on the stack and\nnot initialized to NULL before the call. So it can have random content\nwhen the match function did not identify a device, which leads to\nrandom access in the following rtc_open() call where the pointer is\ndereferenced\n\nInstead of relying on the char pointer, check the return value of\nclass_find_device. If a device is found then the name pointer is valid\nas well.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "99ee5315dac6211e972fa3f23bcc9a0343ff58c4", "tree": "6663d6ceaabcb9bac03193e2781cdbe6a139f70c", "parents": [ "b12a03ce4880bd13786a98db6de494a3e0123129" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Apr 27 14:16:42 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 02 21:39:15 2011 +0200" }, "message": "timerfd: Allow timers to be cancelled when clock was set\n\nSome applications must be aware of clock realtime being set\nbackward. A simple example is a clock applet which arms a timer for\nthe next minute display. If clock realtime is set backward then the\napplet displays a stale time for the amount of time which the clock\nwas set backwards. Due to that applications poll the time because we\ndon\u0027t have an interface.\n\nExtend the timerfd interface by adding a flag which puts the timer\nonto a different internal realtime clock. All timers on this clock are\nexpired whenever the clock was set.\n\nThe timerfd core records the monotonic offset when the timer is\ncreated. When the timer is armed, then the current offset is compared\nto the previous recorded offset. When it has changed, then\ntimerfd_settime returns -ECANCELED. When a timer is read the offset is\ncompared and if it changed -ECANCELED returned to user space. Periodic\ntimers are not rearmed in the cancelation case.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Chris Friesen \u003cchris.friesen@genband.com\u003e\nTested-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: \"Kirill A. Shutemov\" \u003ckirill@shutemov.name\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nReviewed-by: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nLink: http://lkml.kernel.org/r/%3Calpine.LFD.2.02.1104271359580.3323%40ionos%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "b12a03ce4880bd13786a98db6de494a3e0123129", "tree": "2a8f2cf0d1d6749b4a33cc07c9b7839a4a139e9a", "parents": [ "942c3c5c329274fa6de5998cb911cf3d0a42d0b1" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 02 16:48:57 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 02 21:37:58 2011 +0200" }, "message": "hrtimers: Prepare for cancel on clock was set timers\n\nMake clock_was_set() unconditional and rename hres_timers_resume to\nhrtimers_resume. This is a preparatory patch for hrtimers which are\ncancelled when clock realtime was set.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "472647dcd7e351dbeda750e5ab3e8f7b06d1199a", "tree": "536842fa33d135d4b18e6d1dd5cf573a5b53719c", "parents": [ "7068b7a16270f1e85a8893d74b0f3c58d7826883" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Apr 29 15:03:10 2011 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon May 02 21:36:57 2011 +0200" }, "message": "timers: Fix alarmtimer build issues when CONFIG_RTC_CLASS\u003dn\n\nIngo pointed out that the alarmtimers won\u0027t build if CONFIG_RTC_CLASS\u003dn.\nThis patch adds proper ifdefs to the alarmtimer code to disable the rtc\nusage if it is not built in.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "7068b7a16270f1e85a8893d74b0f3c58d7826883", "tree": "114143f4724543c89d93e95bbb7d3f03f1abb5d6", "parents": [ "180bf812ceaf01eb8ac69b86f3be0bd57f697668" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Apr 28 13:29:18 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Apr 28 13:39:18 2011 -0700" }, "message": "timers: Remove delayed irqwork from alarmtimers implementation\n\nThomas asked about the delayed irq work in the alarmtimers code,\nand I realized that it was a legacy from when the alarmtimer base\nlock was a mutex (due to concerns that we\u0027d be interacting with\nthe RTC device, which is protected by mutexes).\n\nSince the alarmtimer base is now protected by a spinlock, we can\nsimply execute alarmtimer functions directly from the hrtimer\ncallback. Should any future alarmtimer functions sleep, they can\nsimply manage scheduling any delayed work themselves.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "180bf812ceaf01eb8ac69b86f3be0bd57f697668", "tree": "e61166d1267a15115dc602875ec03835afc1afe7", "parents": [ "9a7adcf5c6dea63d2e47e6f6d2f7a6c9f48b9337" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Apr 28 12:58:11 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Apr 28 13:39:17 2011 -0700" }, "message": "timers: Improve alarmtimer comments and minor fixes\n\nThis patch addresses a number of minor comment improvements and\nother minor issues from Thomas\u0027 review of the alarmtimers code.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "9a7adcf5c6dea63d2e47e6f6d2f7a6c9f48b9337", "tree": "151f7fbb135053945fc6eae99c9175e860ad343c", "parents": [ "ff3ead96d17f47ee70c294a5cc2cce9b61e82f0f" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 11 09:54:33 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Apr 26 14:01:46 2011 -0700" }, "message": "timers: Posix interface for alarm-timers\n\nThis patch exposes alarm-timers to userland via the posix clock\nand timers interface, using two new clockids: CLOCK_REALTIME_ALARM\nand CLOCK_BOOTTIME_ALARM. Both clockids behave identically to\nCLOCK_REALTIME and CLOCK_BOOTTIME, respectively, but timers\nset against the _ALARM suffixed clockids will wake the system if\nit is suspended.\n\nSome background can be found here:\n\thttps://lwn.net/Articles/429925/\n\nThe concept for Alarm-timers was inspired by the Android Alarm\ndriver (by Arve Hjønnevåg) found in the Android kernel tree.\n\nSee: http://android.git.kernel.org/?p\u003dkernel/common.git;a\u003dblob;f\u003ddrivers/rtc/alarm.c;h\u003d1250edfbdf3302f5e4ea6194847c6ef4bb7beb1c;hb\u003dandroid-2.6.36\n\nWhile the in-kernel interface is pretty similar between\nalarm-timers and Android alarm driver, the user-space interface\nfor the Android alarm driver is via ioctls to a new char device.\nAs mentioned above, I\u0027ve instead chosen to export this functionality\nvia the posix interface, as it seemed a little simpler and avoids\ncreating duplicate interfaces to things like CLOCK_REALTIME and\nCLOCK_MONOTONIC under alternate names (ie:ANDROID_ALARM_RTC and\nANDROID_ALARM_SYSTEMTIME).\n\nThe semantics of the Android alarm driver are different from what\nthis posix interface provides. For instance, threads other then\nthe thread waiting on the Android alarm driver are able to modify\nthe alarm being waited on. Also this interface does not allow\nthe same wakelock semantics that the Android driver provides\n(ie: kernel takes a wakelock on RTC alarm-interupt, and holds it\nthrough process wakeup, and while the process runs, until the\nprocess either closes the char device or calls back in to wait\non a new alarm).\n\nOne potential way to implement similar semantics may be via\nthe timerfd infrastructure, but this needs more research.\n\nThere may also need to be some sort of sysfs system level policy\nhooks that allow alarm timers to be disabled to keep them\nfrom firing at inappropriate times (ie: laptop in a well insulated\nbag, mid-flight).\n\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "ff3ead96d17f47ee70c294a5cc2cce9b61e82f0f", "tree": "e87fc16e1fc4a80b9591c2b1d02c99459254aa95", "parents": [ "88d19cf37952a7e1e38b2bf87a00f0e857e63180" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Jan 11 09:42:13 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Apr 26 14:01:44 2011 -0700" }, "message": "timers: Introduce in-kernel alarm-timer interface\n\nThis provides the in kernel interface and infrastructure for\nalarm-timers.\n\nAlarm-timers are a hybrid style timer, similar to hrtimers,\nbut when the system is suspended, the RTC device is set to\nfire and wake the system for when the soonest alarm-timer\nexpires.\n\nThe concept for Alarm-timers was inspired by the Android Alarm\ndriver (by Arve Hjønnevåg) found in the Android kernel tree.\n\nSee: http://android.git.kernel.org/?p\u003dkernel/common.git;a\u003dblob;f\u003ddrivers/rtc/alarm.c;h\u003d1250edfbdf3302f5e4ea6194847c6ef4bb7beb1c;hb\u003dandroid-2.6.36\n\nThis in-kernel interface should be fairly compatible with the\nAndroid alarm driver in-kernel interface, but has the advantage\nof utilizing the new RTC timerqueue code instead of doing direct\nRTC manipulation.\n\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "304529b1b6f8612ccbb4582e997051b48b94f4a4", "tree": "025b53989f39b463621e9a9eb8e903dc54dd87e1", "parents": [ "4175242c0dc1d92e821d2b45bc8fe06d4650a7b5" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Apr 01 14:32:09 2011 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Apr 26 14:01:41 2011 -0700" }, "message": "time: Add timekeeping_inject_sleeptime\n\nSome platforms cannot implement read_persistent_clock, as\ntheir RTC devices are only accessible when interrupts are enabled.\nThis keeps them from being used by the timekeeping code on resume\nto measure the time in suspend.\n\nThe RTC layer tries to work around this, by calling do_settimeofday\non resume after irqs are reenabled to set the time properly. However,\nthis only corrects CLOCK_REALTIME, and does not properly adjust\nthe sleep time value. This causes btime in /proc/stat to be incorrect\nas well as making the new CLOCK_BOTTTIME inaccurate.\n\nThis patch resolves the issue by introducing a new timekeeping hook\nto allow the RTC layer to inject the sleep time on resume.\n\nThe code also checks to make sure that read_persistent_clock is\nnonfunctional before setting the sleep time, so that should the RTC\u0027s\nHCTOSYS option be configured in on a system that does support\nread_persistent_clock we will not increase the total_sleep_time twice.\n\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "1791f881435fab951939ad700e947b66c062e083", "tree": "53739cfe3847e425b9bb64f22bc7526da26a9a0c", "parents": [ "a1b49cb7e2a7961ec3aa8b64860bf480d4ec9077" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Wed Mar 30 15:24:21 2011 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Apr 18 10:39:38 2011 +0200" }, "message": "posix clocks: Replace mutex with reader/writer semaphore\n\nA dynamic posix clock is protected from asynchronous removal by a mutex.\nHowever, using a mutex has the unwanted effect that a long running clock\noperation in one process will unnecessarily block other processes.\n\nFor example, one process might call read() to get an external time stamp\ncoming in at one pulse per second. A second process calling clock_gettime\nwould have to wait for almost a whole second.\n\nThis patch fixes the issue by using a reader/writer semaphore instead of\na mutex.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nLink: http://lkml.kernel.org/r/%3C20110330132421.GA31771%40riccoc20.at.omicron.at%3E\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "42933bac11e811f02200c944d8562a15f8ec4ff0", "tree": "fcdd9afe56eb0e746565ddd1f92f22d36678b843", "parents": [ "2b9accbee563f535046ff2cd382d0acaa92e130c", "25985edcedea6396277003854657b5f3cb31a628" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 07 11:14:49 2011 -0700" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6\n\n* \u0027for-linus2\u0027 of git://git.profusion.mobi/users/lucas/linux-2.6:\n Fix common misspellings\n" }, { "commit": "4352d9d44b935e4d000be6ec89ddb55c2bf35f24", "tree": "26b9d37f5a41b4c01d800a444ad230eafb48e47a", "parents": [ "b3b896c73b4b04b506816a09994192e3a54f0fef" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Mon Apr 04 08:31:23 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Apr 04 08:31:23 2011 -0700" }, "message": "ntp: fix non privileged system time shifting\n\nThe ADJ_SETOFFSET bit added in commit 094aa188 (\"ntp: Add ADJ_SETOFFSET\nmode bit\") also introduced a way for any user to change the system time.\nSneaky or buggy calls to adjtimex() could set\n\n ADJ_OFFSET_SS_READ | ADJ_SETOFFSET\n\nwhich would result in a successful call to timekeeping_inject_offset().\nThis patch fixes the issue by adding the capability check.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "25985edcedea6396277003854657b5f3cb31a628", "tree": "f026e810210a2ee7290caeb737c23cb6472b7c38", "parents": [ "6aba74f2791287ec407e0f92487a725a25908067" ], "author": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Wed Mar 30 22:57:33 2011 -0300" }, "committer": { "name": "Lucas De Marchi", "email": "lucas.demarchi@profusion.mobi", "time": "Thu Mar 31 11:26:23 2011 -0300" }, "message": "Fix common misspellings\n\nFixes generated by \u0027codespell\u0027 and manually reviewed.\n\nSigned-off-by: Lucas De Marchi \u003clucas.demarchi@profusion.mobi\u003e\n" }, { "commit": "e1a85b2c519551d4792180cdab4074d7e99bf2c9", "tree": "ee53aed254043d06a7e30151af6500eab3bf0407", "parents": [ "f3c6ea1b06c71b43f751b36bd99345369fe911af" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Mar 23 22:16:04 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Mar 23 22:16:04 2011 +0100" }, "message": "timekeeping: Use syscore_ops instead of sysdev class and sysdev\n\nThe timekeeping subsystem uses a sysdev class and a sysdev for\nexecuting timekeeping_suspend() after interrupts have been turned off\non the boot CPU (during system suspend) and for executing\ntimekeeping_resume() before turning on interrupts on the boot CPU\n(during system resume). However, since both of these functions\nignore their arguments, the entire mechanism may be replaced with a\nstruct syscore_ops object which is simpler.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "420c1c572d4ceaa2f37b6311b7017ac6cf049fe2", "tree": "df04e6b4b756b7a46d9887462d54a3ad0e1f91d5", "parents": [ "9620639b7ea3843983f4ced8b4c81eb4d8974838", "6e6823d17b157f185be09f4c70181299f9273f0b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 15 18:53:35 2011 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (62 commits)\n posix-clocks: Check write permissions in posix syscalls\n hrtimer: Remove empty hrtimer_init_hres_timer()\n hrtimer: Update hrtimer-\u003estate documentation\n hrtimer: Update base[CLOCK_BOOTTIME].offset correctly\n timers: Export CLOCK_BOOTTIME via the posix timers interface\n timers: Add CLOCK_BOOTTIME hrtimer base\n time: Extend get_xtime_and_monotonic_offset() to also return sleep\n time: Introduce get_monotonic_boottime and ktime_get_boottime\n hrtimers: extend hrtimer base code to handle more then 2 clockids\n ntp: Remove redundant and incorrect parameter check\n mn10300: Switch do_timer() to xtimer_update()\n posix clocks: Introduce dynamic clocks\n posix-timers: Cleanup namespace\n posix-timers: Add support for fd based clocks\n x86: Add clock_adjtime for x86\n posix-timers: Introduce a syscall for clock tuning.\n time: Splitout compat timex accessors\n ntp: Add ADJ_SETOFFSET mode bit\n time: Introduce timekeeping_inject_offset\n posix-timer: Update comment\n ...\n\nFix up new system-call-related conflicts in\n\tarch/x86/ia32/ia32entry.S\n\tarch/x86/include/asm/unistd_32.h\n\tarch/x86/include/asm/unistd_64.h\n\tarch/x86/kernel/syscall_table_32.S\n(name_to_handle_at()/open_by_handle_at() vs clock_adjtime()), and some\ndue to movement of get_jiffies_64() in:\n\tkernel/time.c\n" }, { "commit": "6e6823d17b157f185be09f4c70181299f9273f0b", "tree": "8a9009e2d54955c1a9c5a033493c8668915d09f8", "parents": [ "a9e7acfff0a279792918b7b0de74106e576e9988" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Mar 03 18:26:14 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 12 21:27:07 2011 +0100" }, "message": "posix-clocks: Check write permissions in posix syscalls\n\npc_clock_settime() and pc_clock_adjtime() do not check whether the fd\nwas opened in write mode, so a clock can be set with a read only fd.\n\n[ tglx: We deliberately do not return -EPERM as we want this to be\n \tdistingushable from the capability based permission check ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nLKML-Reference: \u003c1299173174-348-4-git-send-email-torbenh@gmx.de\u003e\nCc: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "3a142a0672b48a853f00af61f184c7341ac9c99d", "tree": "e84f2647dc2ae71f2e54f2256ebce87624c11d97", "parents": [ "493f3358cb289ccf716c5a14fa5bb52ab75943e5" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Feb 25 22:34:23 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Feb 26 09:45:28 2011 +0100" }, "message": "clockevents: Prevent oneshot mode when broadcast device is periodic\n\nWhen the per cpu timer is marked CLOCK_EVT_FEAT_C3STOP, then we only\ncan switch into oneshot mode, when the backup broadcast device\nsupports oneshot mode as well. Otherwise we would try to switch the\nbroadcast device into an unsupported mode unconditionally. This went\nunnoticed so far as the current available broadcast devices support\noneshot mode. Seth unearthed this problem while debugging and working\naround an hpet related BIOS wreckage.\n\nAdd the necessary check to tick_is_oneshot_available().\n\nReported-and-tested-by: Seth Forshee \u003cseth.forshee@canonical.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nLKML-Reference: \u003calpine.LFD.2.00.1102252231200.2701@localhost6.localdomain6\u003e\nCc: stable@kernel.org # .21 -\u003e\n" }, { "commit": "314ac37150011ebb398f522db528d2dbcc611189", "tree": "0731fced7713d3889bd783577673068a6bc93796", "parents": [ "abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Feb 14 18:43:08 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Feb 21 12:53:07 2011 -0800" }, "message": "time: Extend get_xtime_and_monotonic_offset() to also return sleep\n\nExtend get_xtime_and_monotonic_offset to\nget_xtime_and_monotonic_and_sleep_offset().\n\nCC: Jamie Lokier \u003cjamie@shareable.org\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "abb3a4ea2e0ea7114a4475745da2f32bd9ad5b73", "tree": "ba78d928a1b58faf16c2507777b8430d54666f52", "parents": [ "e06383db9ec591696a06654257474b85bac1f8cb" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Feb 14 17:52:09 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Feb 21 12:53:05 2011 -0800" }, "message": "time: Introduce get_monotonic_boottime and ktime_get_boottime\n\nThis adds new functions that return the monotonic time since boot\n(in other words, CLOCK_MONOTONIC + suspend time).\n\nCC: Jamie Lokier \u003cjamie@shareable.org\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Alexander Shishkin \u003cvirtuoso@slind.org\u003e\nCC: Arve Hjønnevåg \u003carve@android.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "db1c1cce4a653dcbe6949c72ae7b9f42cab1b929", "tree": "c90203be70d8fbe19e462e45f0573e34208a8927", "parents": [ "22b7fcdae562b6792b3f5517e89fd7e0337180ae" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Fri Feb 18 10:07:25 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Feb 18 17:01:12 2011 +0100" }, "message": "ntp: Remove redundant and incorrect parameter check\n\nThe ADJ_SETOFFSET code redundantly checks the range of the nanoseconds\nfield of the time value. This field is checked again in the subsequent\ncall to timekeeping_inject_offset(). Also, as is, the check will not\ndetect whether the number of microseconds is out of range.\n\nLet timekeeping_inject_offset() do the error checking.\n \nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nCc: johnstul@us.ibm.com\nLKML-Reference: \u003c20110218090724.GA2924@riccoc20.at.omicron.at\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "f590308536db432e4747f562b29e5858123938e9", "tree": "ece1e37bcd1f62b22801f43e72cd097b2fc1eee9", "parents": [ "d2478521afc20227658a10a8c5c2bf1a2aa615b3" ], "author": { "name": "Kees Cook", "email": "kees.cook@canonical.com", "time": "Fri Feb 11 19:21:25 2011 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Feb 12 14:11:56 2011 +0100" }, "message": "timer debug: Hide kernel addresses via %pK in /proc/timer_list\n\nIn the continuing effort to avoid kernel addresses leaking to\nunprivileged users, this patch switches to %pK for\n/proc/timer_list reporting.\n\nSigned-off-by: Kees Cook \u003ckees.cook@canonical.com\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Dan Rosenberg \u003cdrosenberg@vsecurity.com\u003e\nCc: Eugene Teo \u003ceugeneteo@kernel.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c20110212032125.GA23571@outflux.net\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0606f422b453f76c31ab2b1bd52943ff06a2dcf2", "tree": "14f4859e8492f01e97140248a28ab98355c415cf", "parents": [ "527087374faa488776a789375a7d6ea74fda6f71" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Feb 01 13:52:35 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 02 15:28:20 2011 +0100" }, "message": "posix clocks: Introduce dynamic clocks\n\nThis patch adds support for adding and removing posix clocks. The\nclock lifetime cycle is patterned after usb devices. Each clock is\nrepresented by a standard character device. In addition, the driver\nmay optionally implement custom character device operations.\n\nThe posix clock and timer system calls listed below now work with\ndynamic posix clocks, as well as the traditional static clocks.\nThe following system calls are affected:\n\n - clock_adjtime (brand new syscall)\n - clock_gettime\n - clock_getres\n - clock_settime\n - timer_create\n - timer_delete\n - timer_gettime\n - timer_settime\n\n[ tglx: Adapted to the posix-timer cleanup. Moved clock_posix_dynamic\n \tto posix-clock.c and made all referenced functions static ]\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c20110201134420.164172635@linutronix.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "094aa1881fdc1b8889b442eb3511b31f3ec2b762", "tree": "2eec808286e2f57eff45178741ba3ea048de7c37", "parents": [ "c528f7c6c208f1fae6b4025957173dec045e5f21" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Tue Feb 01 13:52:20 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 02 15:28:18 2011 +0100" }, "message": "ntp: Add ADJ_SETOFFSET mode bit\n\nThis patch adds a new mode bit into the timex structure. When set, the bit\ninstructs the kernel to add the given time value to the current time.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c20110201134320.688829863@linutronix.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c528f7c6c208f1fae6b4025957173dec045e5f21", "tree": "86986bf39f82622ea81179dad3382fc4580875a8", "parents": [ "0061748dd2400d0bcd4d49d258db5d7b5d106ca0" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Feb 01 13:52:17 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 02 15:28:18 2011 +0100" }, "message": "time: Introduce timekeeping_inject_offset\n\nThis adds a kernel-internal timekeeping interface to add or subtract\na fixed amount from CLOCK_REALTIME. This makes it so kernel users or\ninterfaces trying to do so do not have to read the time, then add an\noffset and then call settimeofday(), which adds some extra error in\ncomparision to just simply adding the offset in the kernel timekeeping\ncore.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nLKML-Reference: \u003c20110201134419.584311693@linutronix.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "1e6d767924c74929c0cfe839ae8f37bcee9e544e", "tree": "4ace06971e2b3519e556bea2f7e3e999e860eedd", "parents": [ "7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4" ], "author": { "name": "Richard Cochran", "email": "richard.cochran@omicron.at", "time": "Tue Feb 01 13:50:58 2011 +0000" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 02 15:28:11 2011 +0100" }, "message": "time: Correct the *settime* parameters\n\nBoth settimeofday() and clock_settime() promise with a \u0027const\u0027\nattribute not to alter the arguments passed in. This patch adds the\nmissing \u0027const\u0027 attribute into the various kernel functions\nimplementing these calls.\n\nSigned-off-by: Richard Cochran \u003crichard.cochran@omicron.at\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c20110201134417.545698637@linutronix.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "7cf37e87dd2cfa17a64f28ea7f31eed4525f79e4", "tree": "fd802bad0c724185f6cb8e8790fc8d3bf0466494", "parents": [ "e2830b5c1b2b2217894370a3b95af87d4a958401" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Feb 01 09:34:58 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Feb 01 09:46:47 2011 +0100" }, "message": "time: Fix legacy arch fallout\n\nThe xtime/dotimer cleanup broke architectures which do not implement\nclockevents. Time to send out another __do_IRQ threat.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nLKML-Reference: \u003c20110127145905.23248.30458.stgit@localhost\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e2830b5c1b2b2217894370a3b95af87d4a958401", "tree": "9eec3de82a30fffc32beae7826e4a356220c52f7", "parents": [ "d12b0e24c56c6fb2398609f26858e5278d688840" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 16:00:32 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 19:26:50 2011 +0100" }, "message": "time: Make do_timer() and xtime_lock local to kernel/time/\n\nAll callers of do_timer() are converted to xtime_update(). The only\nusers of xtime_lock are in kernel/time/. Make both local to\nkernel/time/ and remove them from the global header files.\n\n[ tglx: Reuse tick-internal.h instead of creating another local header\n \tfile. Massaged changelog ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "f0af911a9dec9de702645182c8d269449e24d24b", "tree": "17cd5683ab3878479b59d9786102fcf699d3051a", "parents": [ "79ecaf0d15344d78904becf0f25de3fc9b49d430" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:59:10 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:43 2011 +0100" }, "message": "time: Provide xtime_update()\n\nxtime_update() takes xtime_lock write locked and calls\ndo_timer(). Provided to replace the do_timer() calls in the\narchitecture code.\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nLKML-Reference: \u003c20110127145910.23248.21379.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "79ecaf0d15344d78904becf0f25de3fc9b49d430", "tree": "1fb8b5f73c86dbb2636c9a6e3458212f0843e378", "parents": [ "48cf76f7104f655bbd48a75c7759dce82c3e1ab6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 11:07:54 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:43 2011 +0100" }, "message": "time: Remove unused __get_wall_to_monotonic()\n\nNo users left. Remove it.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "48cf76f7104f655bbd48a75c7759dce82c3e1ab6", "tree": "2b3cf138fd277ba9c551d75ccbe575a40974560a", "parents": [ "fbad1ea94159a71bc0f68b00e57ae803606af9fb" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:59:05 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:42 2011 +0100" }, "message": "time: Provide get_xtime_and_monotonic_offset()\n\nThe hrtimer code accesses timekeeping variables under\nxtime_lock. Provide a sensible accessor function and use it.\n\n[ tglx: Removed the conditionals, unused variable, fixed codingstyle\n \tand massaged changelog ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nLKML-Reference: \u003c20110127145905.23248.30458.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "fbad1ea94159a71bc0f68b00e57ae803606af9fb", "tree": "bcd350cc5faa6d3607d2c279d66fa58e96c53425", "parents": [ "871cf1e5f2a17702f58539a3af8b18fc8666ad4c" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:59:00 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:42 2011 +0100" }, "message": "time: Move get_jiffies_64 to kernel/time/jiffies.c\n\nMove the jiffies access functions to the jiffies clocksource code.\n\n[ tglx: Add missing include ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nLKML-Reference: \u003c20110127145900.23248.73352.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "871cf1e5f2a17702f58539a3af8b18fc8666ad4c", "tree": "da80fbad2c79dee33d4ac559c8881ce4c77476b7", "parents": [ "70d1f365568e0cdbc9f4ab92428e1830fdb09ab0" ], "author": { "name": "Torben Hohn", "email": "torbenh@gmx.de", "time": "Thu Jan 27 15:58:55 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jan 31 14:55:41 2011 +0100" }, "message": "time: Move do_timer() to kernel/time/timekeeping.c\n\ndo_timer() is primary timekeeping related. calc_global_load() is\ncalled from do_timer() as well, but that\u0027s more for historical\nreasons.\n\n[ tglx: Fixed up the calc_global_load() reject andmassaged changelog ]\n\nSigned-off-by: Torben Hohn \u003ctorbenh@gmx.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: johnstul@us.ibm.com\nCc: yong.zhang0@gmail.com\nCc: hch@infradead.org\nLKML-Reference: \u003c20110127145855.23248.56933.stgit@localhost\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "2d0640b47da74cff7c11642c798d40de861ed524", "tree": "51d41c213dbd5b27c3eeb6fe7527d04d2918edbb", "parents": [ "c56eb8fb6dccb83d9fe62fd4dc00c834de9bc470" ], "author": { "name": "Stephen Boyd", "email": "sboyd@codeaurora.org", "time": "Tue Jan 18 22:46:34 2011 -0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 19 20:08:15 2011 +0100" }, "message": "hrtimers: Notify hrtimer users of switches to NOHZ mode\n\nWhen NOHZ\u003dy and high res timers are disabled (via cmdline or\nKconfig) tick_nohz_switch_to_nohz() will notify the user about\nswitching into NOHZ mode. Nothing is printed for the case where\nHIGH_RES_TIMERS\u003dy. Fix this for the HIGH_RES_TIMERS\u003dy case by\nduplicating the printk from the low res NOHZ path in the high\nres NOHZ path.\n\nThis confused me since I was thinking \u0027dmesg | grep -i NOHZ\u0027 would\ntell me if NOHZ was enabled, but if I have hrtimers there is\nnothing.\n\nSigned-off-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1295419594-13085-1-git-send-email-sboyd@codeaurora.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f9ee7f60d6f37ae0184812b4c59b3869f875768b", "tree": "6c30a7e94b90cfa3a43cda45f4bdb2f254f3ba10", "parents": [ "16c1020362083b320868c0deef492249089c3cd3", "1161ec944916069ceec21c487e30247d9ff22857", "76d1f7bfcd5872056902c5a88b5fcd5d4d00a7a9", "afa14e7c553ebe45844d76208f66017a43abd0e2", "7c46d8da09df22361d1d43465c4f1b06cecaf25f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:45:00 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 15 12:45:00 2011 -0800" }, "message": "Merge branches \u0027core-fixes-for-linus\u0027, \u0027x86-fixes-for-linus\u0027, \u0027timers-fixes-for-linus\u0027 and \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n rcu: avoid pointless blocked-task warnings\n rcu: demote SRCU_SYNCHRONIZE_DELAY from kernel-parameter status\n rtmutex: Fix comment about why new_owner can be NULL in wake_futex_pi()\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, olpc: Add missing Kconfig dependencies\n x86, mrst: Set correct APB timer IRQ affinity for secondary cpu\n x86: tsc: Fix calibration refinement conditionals to avoid divide by zero\n x86, ia64, acpi: Clean up x86-ism in drivers/acpi/numa.c\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timekeeping: Make local variables static\n time: Rename misnamed minsec argument of clocks_calc_mult_shift()\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Remove syscall_exit_fields\n tracing: Only process module tracepoints once\n perf record: Add \"nodelay\" mode, disabled by default\n perf sched: Fix list of events, dropping unsupported \u0027:r\u0027 modifier\n Revert \"perf tools: Emit clearer message for sys_perf_event_open ENOENT return\"\n perf top: Fix annotate segv\n perf evsel: Fix order of event list deletion\n" }, { "commit": "008d23e4852d78bb2618f2035f8b2110b6a6b968", "tree": "81c88f744f6f3fc84132527c1ddc0b4da410c5e2", "parents": [ "8f685fbda43deccd130d192c9fcef1444649eaca", "bfc672dcf323877228682aff79dff8ecd9f30ff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 10:05:56 2011 -0800" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits)\n Documentation/trace/events.txt: Remove obsolete sched_signal_send.\n writeback: fix global_dirty_limits comment runtime -\u003e real-time\n ppc: fix comment typo singal -\u003e signal\n drivers: fix comment typo diable -\u003e disable.\n m68k: fix comment typo diable -\u003e disable.\n wireless: comment typo fix diable -\u003e disable.\n media: comment typo fix diable -\u003e disable.\n remove doc for obsolete dynamic-printk kernel-parameter\n remove extraneous \u0027is\u0027 from Documentation/iostats.txt\n Fix spelling milisec -\u003e ms in snd_ps3 module parameter description\n Fix spelling mistakes in comments\n Revert conflicting V4L changes\n i7core_edac: fix typos in comments\n mm/rmap.c: fix comment\n sound, ca0106: Fix assignment to \u0027channel\u0027.\n hrtimer: fix a typo in comment\n init/Kconfig: fix typo\n anon_inodes: fix wrong function name in comment\n fix comment typos concerning \"consistent\"\n poll: fix a typo in comment\n ...\n\nFix up trivial conflicts in:\n - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c)\n - fs/ext4/ext4.h\n\nAlso fix missed \u0027diabled\u0027 typo in drivers/net/bnx2x/bnx2x.h while at it.\n" }, { "commit": "e2c18e49a0d4f822ffc29fb4958943beb1ff08b7", "tree": "227dbb544277f7908fa1666ce21a15e6b2282ccb", "parents": [ "025b40abe715d638e60516a657d354e8560c1a85" ], "author": { "name": "Alexander Gordeev", "email": "lasaine@lvk.cs.msu.su", "time": "Wed Jan 12 17:00:57 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:21 2011 -0800" }, "message": "pps: capture MONOTONIC_RAW timestamps as well\n\nMONOTONIC_RAW clock timestamps are ideally suited for frequency\ncalculation and also fit well into the original NTP hardpps design. Now\nphase and frequency can be adjusted separately: the former based on\nREALTIME clock and the latter based on MONOTONIC_RAW clock.\n\nA new function getnstime_raw_and_real is added to timekeeping subsystem to\ncapture both timestamps at the same time and atomically.\n\nSigned-off-by: Alexander Gordeev \u003clasaine@lvk.cs.msu.su\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Rodolfo Giometti \u003cgiometti@enneenne.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "025b40abe715d638e60516a657d354e8560c1a85", "tree": "9320d3993c65c4eb56d3ab30337d590eb8c892fd", "parents": [ "12f9b1f9c11700893a7b453705d95b260d78f268" ], "author": { "name": "Alexander Gordeev", "email": "lasaine@lvk.cs.msu.su", "time": "Wed Jan 12 17:00:56 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 08:03:20 2011 -0800" }, "message": "ntp: add hardpps implementation\n\nThis commit adds hardpps() implementation based upon the original one from\nthe NTPv4 reference kernel code from David Mills. However, it is highly\noptimized towards very fast syncronization and maximum stickness to PPS\nsignal. The typical error is less then a microsecond.\n\nTo make it sync faster I had to throw away exponential phase filter so\nthat the full phase offset is corrected immediately. Then I also had to\nthrow away median phase filter because it gives a bigger error itself if\nused without exponential filter.\n\nMaybe we will find an appropriate filtering scheme in the future but it\u0027s\nnot necessary if the signal quality is ok.\n\nSigned-off-by: Alexander Gordeev \u003clasaine@lvk.cs.msu.su\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Rodolfo Giometti \u003cgiometti@enneenne.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "afa14e7c553ebe45844d76208f66017a43abd0e2", "tree": "2f1d13e996ba3db9be9d34b793edb432f6368bdd", "parents": [ "5fdade95f26372154459347dfb9f60721d22cfc7" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Tue Jan 11 17:59:38 2011 -0600" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jan 12 12:23:13 2011 +0100" }, "message": "timekeeping: Make local variables static\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c0D753D10438DA54287A00B027084269764CE0E54B7@AUSP01VMBX24.collaborationhost.net\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "5fdade95f26372154459347dfb9f60721d22cfc7", "tree": "17575b462302904b9b2c0a912d245f0fa3572aa8", "parents": [ "cb600d2f83c854ec3d6660063e4466431999489b" ], "author": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Tue Jan 11 12:18:12 2011 -0500" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jan 12 12:23:12 2011 +0100" }, "message": "time: Rename misnamed minsec argument of clocks_calc_mult_shift()\n\nThe minsec argument to clocks_calc_mult_shift() is misnamed. It is used \nto clamp the magnitude of the mult factor so that a multiplication with \nany value in the given range won\u0027t overflow a 64 bit result. Let\u0027s \nrename it to match the actual usage.\n\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003calpine.LFD.2.00.1101111207140.17086@xanadu.home\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "72eb6a791459c87a0340318840bb3bd9252b627b", "tree": "3bfb8ad99f9c7e511f37f72d57b56a2cea06d753", "parents": [ "23d69b09b78c4876e134f104a3814c30747c53f1", "55ee4ef30241a62b700f79517e6d5ef2ddbefa67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:02:58 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 07 17:02:58 2011 -0800" }, "message": "Merge branch \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-2.6.38\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)\n gameport: use this_cpu_read instead of lookup\n x86: udelay: Use this_cpu_read to avoid address calculation\n x86: Use this_cpu_inc_return for nmi counter\n x86: Replace uses of current_cpu_data with this_cpu ops\n x86: Use this_cpu_ops to optimize code\n vmstat: User per cpu atomics to avoid interrupt disable / enable\n irq_work: Use per cpu atomics instead of regular atomics\n cpuops: Use cmpxchg for xchg to avoid lock semantics\n x86: this_cpu_cmpxchg and this_cpu_xchg operations\n percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support\n percpu,x86: relocate this_cpu_add_return() and friends\n connector: Use this_cpu operations\n xen: Use this_cpu_inc_return\n taskstats: Use this_cpu_ops\n random: Use this_cpu_inc_return\n fs: Use this_cpu_inc_return in buffer.c\n highmem: Use this_cpu_xx_return() operations\n vmstat: Use this_cpu_inc_return for vm statistics\n x86: Support for this_cpu_add, sub, dec, inc_return\n percpu: Generic support for this_cpu_add, sub, dec, inc_return\n ...\n\nFixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}\nas per Tejun.\n" }, { "commit": "3c0cb7c31c206aaedb967e44b98442bbeb17a6c4", "tree": "3ecba45d7ffae4fba4a5aafaef4af5b0b1105bde", "parents": [ "f70f5b9dc74ca7d0a64c4ead3fb28da09dc1b234", "404a02cbd2ae8bf256a2fa1169bdfe86bb5ebb34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 06 16:50:35 2011 -0800" }, "message": "Merge branch \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027devel\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (416 commits)\n ARM: DMA: add support for DMA debugging\n ARM: PL011: add DMA burst threshold support for ST variants\n ARM: PL011: Add support for transmit DMA\n ARM: PL011: Ensure IRQs are disabled in UART interrupt handler\n ARM: PL011: Separate hardware FIFO size from TTY FIFO size\n ARM: PL011: Allow better handling of vendor data\n ARM: PL011: Ensure error flags are clear at startup\n ARM: PL011: include revision number in boot-time port printk\n ARM: vexpress: add sched_clock() for Versatile Express\n ARM i.MX53: Make MX53 EVK bootable\n ARM i.MX53: Some bug fix about MX53 MSL code\n ARM: 6607/1: sa1100: Update platform device registration\n ARM: 6606/1: sa1100: Fix platform device registration\n ARM i.MX51: rename IPU irqs\n ARM i.MX51: Add ipu clock support\n ARM: imx/mx27_3ds: Add PMIC support\n ARM: DMA: Replace page_to_dma()/dma_to_page() with pfn_to_dma()/dma_to_pfn()\n mx51: fix usb clock support\n MX51: Add support for usb host 2\n arch/arm/plat-mxc/ehci.c: fix errors/typos\n ...\n" }, { "commit": "b5776c4a6d0afc13697e8452b9ebe1cc4d961b74", "tree": "0b60b679d636a9759849fea1cd36a33438fff5ef", "parents": [ "5e06b6492e53ab2a4e467763a9ee9f70b032c301" ], "author": { "name": "john stultz", "email": "johnstul@us.ibm.com", "time": "Thu Dec 16 19:03:27 2010 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Dec 22 22:44:43 2010 +0000" }, "message": "Fix rounding in clocks_calc_mult_shift()\n\nRussell King reports:\n| On the ARM dev boards, we have a 32-bit counter running at 24MHz. Calling\n| clocks_calc_mult_shift(\u0026mult, \u0026shift, 24MHz, NSEC_PER_SEC, 60) gives\n| us a multiplier of 2796202666 and a shift of 26.\n|\n| Over a large counter delta, this produces an error - lets take a count\n| from 362976315 to 4280663372:\n|\n| (4280663372-362976315) * 2796202666 / 2^26 - (4280663372-362976315) * (1000/24)\n| \u003d\u003e -38.91872422891230269990\n|\n| Can we do better?\n|\n| (4280663372-362976315) * 2796202667 / 2^26 - (4280663372-362976315) * (1000/24)\n| 19.45936211449532822051\n|\n| which is about twice as good as the 2796202666 multiplier.\n|\n| Looking at the equivalent divisions obtained, 2796202666 / 2^26 gives\n| 41.66666665673255920410ns per tick, whereas 2796202667 / 2^26 gives\n| 41.66666667163372039794ns. The actual value wanted is 1000/24 \u003d\n| 41.66666666666666666666ns.\n\nFix this by ensuring we round to nearest when calculating the\nmultiplier.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nTested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nTested-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nTested-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nTested-by: Eric Miao \u003ceric.y.miao@gmail.com\u003e\nTested-by: Olof Johansson \u003colof@lixom.net\u003e\nTested-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "909ea96468096b07fbb41aaf69be060d92bd9271", "tree": "a7e015edd96b5f674874fe78cdd889769e130a2a", "parents": [ "780f36d8b3fa9572f731d4fb85067b2e45e6f993" ], "author": { "name": "Christoph Lameter", "email": "cl@linux.com", "time": "Wed Dec 08 16:22:55 2010 +0100" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Dec 17 15:07:19 2010 +0100" }, "message": "core: Replace __get_cpu_var with __this_cpu_read if not used for an address.\n\n__get_cpu_var() can be replaced with this_cpu_read and will then use a\nsingle read instruction with implied address calculation to access the\ncorrect per cpu instance.\n\nHowever, the address of a per cpu variable passed to __this_cpu_read()\ncannot be determined (since it\u0027s an implied address conversion through\nsegment prefixes). Therefore apply this only to uses of __get_cpu_var\nwhere the address of the variable is not used.\n\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "998adc3dda59f811966b3ccb21eb223680b25ec4", "tree": "791597e9afe00877a3fb1a71c1178e8573767647", "parents": [ "9bb99b147018945366c763b3d4d7008927dc8557" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Sep 20 19:19:17 2010 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Dec 10 11:54:35 2010 -0800" }, "message": "hrtimers: Convert hrtimers to use timerlist infrastructure\n\nConverts the hrtimer code to use the new timerlist infrastructure\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nLKML Reference: \u003c1290136329-18291-3-git-send-email-john.stultz@linaro.org\u003e\nReviewed-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\n" }, { "commit": "b595076a180a56d1bb170e6eceda6eb9d76f4cd3", "tree": "bc01ec7283808013e0b8ce7713fd6fc40f810429", "parents": [ "6aaccece1c483f189f76f1282b3984ff4c7ecb0a" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Nov 01 15:38:34 2010 -0400" }, "message": "tree-wide: fix comment/printk typos\n\n\"gadget\", \"through\", \"command\", \"maintain\", \"maintain\", \"controller\", \"address\",\n\"between\", \"initiali[zs]e\", \"instead\", \"function\", \"select\", \"already\",\n\"equal\", \"access\", \"management\", \"hierarchy\", \"registration\", \"interest\",\n\"relative\", \"memory\", \"offset\", \"already\",\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "2bf1c05e3c406925e498d06da66b4828f0209ea6", "tree": "4125c428e84e66c825020f7b41671de6b6af5574", "parents": [ "aaabe31c25a439b92cc281b14ca18b85bae7e7a6" ], "author": { "name": "Nikitas Angelinas", "email": "nikitasangelinas@googlemail.com", "time": "Wed Oct 20 15:57:31 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Oct 21 17:30:06 2010 +0200" }, "message": "time: Use ARRAY_SIZE macro in timecompare.c\n\nReplace sizeof(buffer)/sizeof(buffer[0]) with ARRAY_SIZE(buffer) in\nkernel/time/timecompare.c\n\nSigned-off-by: Nikitas Angelinas \u003cnikitasangelinas@googlemail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "a386b5af8edda1c742ce9f77891e112eefffc005", "tree": "8a74b512d751758144b219988f60d69a5fd028f9", "parents": [ "8af3c153baf95374eff20a37f00c59a295b52756" ], "author": { "name": "Kasper Pedersen", "email": "kkp2010@kasperkp.dk", "time": "Wed Oct 20 15:55:15 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Oct 21 17:30:05 2010 +0200" }, "message": "time: Compensate for rounding on odd-frequency clocksources\n\nWhen the clocksource is not a multiple of HZ, the clock will be off. For\nacpi_pm, HZ\u003d1000 the error is 127.111 ppm:\n\nThe rounding of cycle_interval ends up generating a false error term in\nntp_error accumulation since xtime_interval is not exactly 1/HZ. So, we\nsubtract out the error caused by the rounding.\n\nThis has been visible since 2.6.32-rc2\n\tcommit a092ff0f90cae22b2ac8028ecd2c6f6c1a9e4601\n\ttime: Implement logarithmic time accumulation\nThat commit raised NTP_INTERVAL_FREQ and exposed the rounding error.\n\ntesting tool: http://n1.taur.dk/permanent/testpmt.c\nAlso tested with ntpd and a frequency counter.\n\nSigned-off-by: Kasper Pedersen \u003ckkp2010@kasperkp.dk\u003e\nAcked-by: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: John Kacur \u003cjkacur@redhat.com\u003e\nCc: Clark Williams \u003cwilliams@redhat.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "8af3c153baf95374eff20a37f00c59a295b52756", "tree": "db80f770b668f7067c3e95af92cc92933edce4e0", "parents": [ "d56557af19867edb8c0e96f8e26399698a08857f" ], "author": { "name": "Miroslav Lichvar", "email": "mlichvar@redhat.com", "time": "Tue Sep 07 16:43:46 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Sep 09 20:48:37 2010 +0200" }, "message": "ntp: Clamp PLL update interval\n\nClamp update interval to reduce PLL gain with low sampling rate (e.g.\nintermittent network connection) to avoid instability.\n\nThe clamp roughly corresponds to the loop time constant, it\u0027s 8 * poll\ninterval for SHIFT_PLL 2 and 32 * poll interval for SHIFT_PLL 4. This\ngives good results without affecting the gain in normal conditions where\nntpd skips only up to seven consecutive samples.\n\nSigned-off-by: Miroslav Lichvar \u003cmlichvar@redhat.com\u003e\nAcked-by: john stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1283870626-9472-1-git-send-email-mlichvar@redhat.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c7dcf87a6881bf796faee83003163eb3de41a309", "tree": "1e4333e588ad6e8e69e310d8ae71798af1c0bdb5", "parents": [ "2be1f3a73dd02e38e181cf5abacb3d45a6a2d6b8" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Fri Aug 13 11:30:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 12:03:24 2010 -0700" }, "message": "time: Workaround gcc loop optimization that causes 64bit div errors\n\nEarly 4.3 versions of gcc apparently aggressively optimize the raw\ntime accumulation loop, replacing it with a divide.\n\nOn 32bit systems, this causes the following link errors:\n\tundefined reference to `__umoddi3\u0027\n\tundefined reference to `__udivdi3\u0027\n\nThe gcc issue has been fixed in 4.4 and greater.\n\nThis patch replaces the accumulation loop with a do_div, as suggested\nby Linus.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCC: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCC: Larry Finger \u003cLarry.Finger@lwfinger.net\u003e\nCC: Ingo Molnar \u003cmingo@elte.hu\u003e\nCC: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "deda2e81961e96be4f2c09328baca4710a2fd1a0", "tree": "da1968f7e6791cb96735e8f2c602aa55e76fec21", "parents": [ "95f4572737da469b66ebfd1badd69d9adc340409" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Mon Aug 09 14:20:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 12 09:53:39 2010 -0700" }, "message": "timekeeping: Fix overflow in rawtime tv_nsec on 32 bit archs\n\nThe tv_nsec is a long and when added to the shifted interval it can wrap\nand become negative which later causes looping problems in the\ngetrawmonotonic(). The edge case occurs when the system has slept for\na short period of time of ~2 seconds.\n\nA trace printk of the values in this patch illustrate the problem:\n\nftrace time stamp: log\n43.716079: logarithmic_accumulation: raw: 3d0913 tv_nsec d687faa\n43.718513: logarithmic_accumulation: raw: 3d0913 tv_nsec da588bd\n43.722161: logarithmic_accumulation: raw: 3d0913 tv_nsec de291d0\n46.349925: logarithmic_accumulation: raw: 7a122600 tv_nsec e1f9ae3\n46.349930: logarithmic_accumulation: raw: 1e848980 tv_nsec 8831c0e3\n\nThe kernel starts looping at 46.349925 in the getrawmonotonic() due to\nthe negative value from adding the raw value to tv_nsec.\n\nA simple solution is to accumulate into a u64, and then normalize it\nto a timespec_t.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\n [ Reworked variable names and simplified some of the code. - John ]\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b62ad9ab181a67207a4c8c373461b587c4861a68", "tree": "ace1572964d81f5f9bbc10b7960c1f742832d744", "parents": [ "af390084359a5de20046c901529b2b6a50b941cb", "b29230769e3482bbd62a07d6d9485371ee66a18f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "message": "Merge branch \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n um: Fix read_persistent_clock fallout\n kgdb: Do not access xtime directly\n powerpc: Clean up obsolete code relating to decrementer and timebase\n powerpc: Rework VDSO gettimeofday to prevent time going backwards\n clocksource: Add __clocksource_updatefreq_hz/khz methods\n x86: Convert common clocksources to use clocksource_register_hz/khz\n timekeeping: Make xtime and wall_to_monotonic static\n hrtimer: Cleanup direct access to wall_to_monotonic\n um: Convert to use read_persistent_clock\n timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n powerpc: Cleanup xtime usage\n powerpc: Simplify update_vsyscall\n time: Kill off CONFIG_GENERIC_TIME\n time: Implement timespec_add\n x86: Fix vtime/file timestamp inconsistencies\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\n\nMuch less trivial conflicts in arch/powerpc/kernel/time.c resolved as\nper Thomas\u0027 earlier merge commit 47916be4e28c (\"Merge branch\n\u0027powerpc.cherry-picks\u0027 into timers/clocksource\")\n" }, { "commit": "af390084359a5de20046c901529b2b6a50b941cb", "tree": "b73a6261d1b1f9fb34432cc9a47411a49330b8dc", "parents": [ "7645e4320497b35ce9fb6c2269ebcd57af9fe735", "0fcb80818bc3ade5befd409051089f710adcf7b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:12:36 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:12:36 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n Documentation: Add timers/timers-howto.txt\n timer: Added usleep_range timer\n Revert \"timer: Added usleep[_range] timer\"\n clockevents: Remove the per cpu tick skew\n posix_timer: Move copy_to_user(created_timer_id) down in timer_create()\n timer: Added usleep[_range] timer\n timers: Document meaning of deferrable timer\n" }, { "commit": "c4efd6b569b2646e1346a08a4c40286f8bcb5f11", "tree": "bf33e8594ac4e628cc95f2ef25513788b8273601", "parents": [ "4aed2fd8e3181fea7c09ba79cf64e7e3f4413bf9", "0bcfe75807944106a3aa655a54bb610d62f3a7f5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:39:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:39:22 2010 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)\n sched: Use correct macro to display sched_child_runs_first in /proc/sched_debug\n sched: No need for bootmem special cases\n sched: Revert nohz_ratelimit() for now\n sched: Reduce update_group_power() calls\n sched: Update rq-\u003eclock for nohz balanced cpus\n sched: Fix spelling of sibling\n sched, cpuset: Drop __cpuexit from cpu hotplug callbacks\n sched: Fix the racy usage of thread_group_cputimer() in fastpath_timer_check()\n sched: run_posix_cpu_timers: Don\u0027t check -\u003eexit_state, use lock_task_sighand()\n sched: thread_group_cputime: Simplify, document the \"alive\" check\n sched: Remove the obsolete exit_state/signal hacks\n sched: task_tick_rt: Remove the obsolete -\u003esignal !\u003d NULL check\n sched: __sched_setscheduler: Read the RLIMIT_RTPRIO value lockless\n sched: Fix comments to make them DocBook happy\n sched: Fix fix_small_capacity\n powerpc: Exclude arch_sd_sibiling_asym_packing() on UP\n powerpc: Enable asymmetric SMT scheduling on POWER7\n sched: Add asymmetric group packing option for sibling domain\n sched: Fix capacity calculations for SMT4\n sched: Change nohz idle load balancing logic to push model\n ...\n" }, { "commit": "0bcfe75807944106a3aa655a54bb610d62f3a7f5", "tree": "d48d848e09d1bf48fe7fa23e9226f38ef342eed4", "parents": [ "eebef74695e1498e04e5f85be9c6f84bd2e7358a", "396e894d289d69bacf5acd983c97cd6e21a14c08" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 05 09:46:29 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Aug 05 09:46:29 2010 +0200" }, "message": "Merge branch \u0027sched/urgent\u0027 into sched/core\n\nConflicts:\n\tinclude/linux/sched.h\n\nMerge reason: Add the leftover .35 urgent bits, fix the conflict.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "af5ab277ded04bd9bc6b048c5a2f0e7d70ef0867", "tree": "7c593610e47096dd6592b8dbfe166428cc079ed6", "parents": [ "2b08de0073a5697cf84d6f448d6dbc6cf02fc6b5" ], "author": { "name": "Arjan van de Ven", "email": "arjan@infradead.org", "time": "Tue Jul 27 21:02:10 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Aug 02 21:45:58 2010 +0200" }, "message": "clockevents: Remove the per cpu tick skew\n\nHistorically, Linux has tried to make the regular timer tick on the\nvarious CPUs not happen at the same time, to avoid contention on\nxtime_lock.\n\nNowadays, with the tickless kernel, this contention no longer happens\nsince time keeping and updating are done differently. In addition,\nthis skew is actually hurting power consumption in a measurable way on\nmany-core systems.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nLKML-Reference: \u003c20100727210210.58d3118c@infradead.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "852db46d55e85b475a72e665ca08d3317769ceef", "tree": "3802273b1135f0f650868fe9e048d7c0594195fe", "parents": [ "f12a15be63d1de9a35971f35f06b73088fa25c3a" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:28 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:55 2010 +0200" }, "message": "clocksource: Add __clocksource_updatefreq_hz/khz methods\n\nTo properly handle clocksources that change frequencies\nat the clocksource-\u003eenable() point, this patch adds\na method that will update the clocksource\u0027s mult/shift and\nmax_idle_ns values.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-12-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "0fb86b06298b6cd3205cac2e68a499f269282dac", "tree": "3adcd4149fbe643ea8cae88578e169d02b7a9e5f", "parents": [ "8ab4351a4c888016620f43bde605b3d0964af339" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:26 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:55 2010 +0200" }, "message": "timekeeping: Make xtime and wall_to_monotonic static\n\nThis patch makes xtime and wall_to_monotonic static, as planned in\nDocumentation/feature-removal-schedule.txt. This will allow for\nfurther cleanups to the timekeeping core.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-10-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "8ab4351a4c888016620f43bde605b3d0964af339", "tree": "9d92ee7fbf9391bfcfdc1e49fecc31b9fa4e03c0", "parents": [ "9f31f5774961a735687fee17953ab505b3df3abf" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:25 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:55 2010 +0200" }, "message": "hrtimer: Cleanup direct access to wall_to_monotonic\n\nProvides an accessor function to replace hrtimer.c\u0027s\ndirect access of wall_to_monotonic.\n\nThis will allow wall_to_monotonic to be made static as\nplanned in Documentation/feature-removal-schedule.txt\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-9-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "7615856ebfee52b080c22d263ca4debbd0df0ac1", "tree": "beb06e60af7560c28d5bad41f03a5238636e91fc", "parents": [ "06d518e3dfb25334282c7e38b4d7a4eada215f6d" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:23 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:54 2010 +0200" }, "message": "timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n\nupdate_vsyscall() did not provide the wall_to_monotoinc offset,\nso arch specific implementations tend to reference wall_to_monotonic\ndirectly. This limits future cleanups in the timekeeping core, so\nthis patch fixes the update_vsyscall interface to provide\nwall_to_monotonic, allowing wall_to_monotonic to be made static\nas planned in Documentation/feature-removal-schedule.txt\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Anton Blanchard \u003canton@samba.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nLKML-Reference: \u003c1279068988-21864-7-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "592913ecb87a9e06f98ddb55b298f1a66bf94c6b", "tree": "0f63f5535fe517faf418e0f7e69800fcf1e4d8db", "parents": [ "ce3bf7ab22527183634a76512d9854a38615e4d5" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:20 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:54 2010 +0200" }, "message": "time: Kill off CONFIG_GENERIC_TIME\n\nNow that all arches have been converted over to use generic time via\nclocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME\nconfig option and simplify the generic code.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-4-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "ce3bf7ab22527183634a76512d9854a38615e4d5", "tree": "79e48c7c84618d968664bd660c75e03fc98e7d11", "parents": [ "8c73626ab28527b7eb7f3061c027fbfe530c488c" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:19 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:53 2010 +0200" }, "message": "time: Implement timespec_add\n\nAfter accidentally misusing timespec_add_safe, I wanted to make sure\nwe don\u0027t accidently trip over that issue again, so I created a simple\ntimespec_add() function which we can use to replace the instances\nof timespec_add_safe() that don\u0027t want the overflow detection.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-3-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "dca45ad8af54963c005393a484ad117b8ba6150f", "tree": "7c9a6966283a6bb12b54e5680a67d203be292930", "parents": [ "68c38fc3cb4e5a60f502ee9c45f3dfe70e5165ad", "cd5b8f8755a89a57fc8c408d284b8b613f090345" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:45:02 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:45:08 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into sched/core\n\nMerge reason: Move from the -rc3 to the almost-rc6 base.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "396e894d289d69bacf5acd983c97cd6e21a14c08", "tree": "ec3e3ba19e332a799e1229f62663625d9c7583dd", "parents": [ "f469461df6ff822f71b8737bda86eea20f16ff93" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 09 15:12:27 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 17 12:05:44 2010 +0200" }, "message": "sched: Revert nohz_ratelimit() for now\n\nNorbert reported that nohz_ratelimit() causes his laptop to burn about\n4W (40%) extra. For now back out the change and see if we can adjust\nthe power management code to make better decisions.\n\nReported-by: Norbert Preining \u003cpreining@logic.at\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Arjan van de Ven \u003carjan@infradead.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" } ], "next": "698f93159a735bd29a8767c9f60d9b2d75870f8e" }