)]}' { "log": [ { "commit": "766ce4e5a952510f9f27511cbfecc884bf5147cd", "tree": "93ad1970e254fc3b1fb0650a4dc449d86ad5114e", "parents": [ "3bc527393379fcd740cc66c700da808abdbf5a5d" ], "author": { "name": "Ivan Grinko", "email": "iivanich@gmail.com", "time": "Thu Apr 28 22:06:41 2016 +0300" }, "committer": { "name": "William Bellavance", "email": "flintman@flintmancomputers.com", "time": "Tue May 17 08:03:16 2016 -0400" }, "message": "Linux 3.4.112\n\nhttps://cdn.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.4.112\n\nChange-Id: Ic146bc84c10ebcfe256eb6bffa8ffef44c9a1d38\n" }, { "commit": "698785c12d3c6da117152dc520e2fb9a46fa31f8", "tree": "c17d2e3eb1f6c587c4744835e526a403ca6da57a", "parents": [ "22acfde0a291977c02b5f4461487dd81dd901da7" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Feb 09 23:30:36 2015 -0800" }, "committer": { "name": "William Bellavance", "email": "flintman@flintmancomputers.com", "time": "Wed Feb 10 20:02:13 2016 -0500" }, "message": "ntp: Fixup adjtimex freq validation on 32-bit systems\n\ncommit 29183a70b0b828500816bd794b3fe192fce89f73 upstream.\n\nAdditional validation of adjtimex freq values to avoid\npotential multiplication overflows were added in commit\n5e5aeb4367b (time: adjtimex: Validate the ADJ_FREQUENCY values)\n\nUnfortunately the patch used LONG_MAX/MIN instead of\nLLONG_MAX/MIN, which was fine on 64-bit systems, but being\nmuch smaller on 32-bit systems caused false positives\nresulting in most direct frequency adjustments to fail w/\nEINVAL.\n\nntpd only does direct frequency adjustments at startup, so\nthe issue was not as easily observed there, but other time\nsync applications like ptpd and chrony were more effected by\nthe bug.\n\nSee bugs:\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d92481\n https://bugzilla.redhat.com/show_bug.cgi?id\u003d1188074\n\nThis patch changes the checks to use LLONG_MAX for\nclarity, and additionally the checks are disabled\non 32-bit systems since LLONG_MAX/PPM_SCALE is always\nlarger then the 32-bit long freq value, so multiplication\noverflows aren\u0027t possible there.\n\nReported-by: Josh Boyer \u003cjwboyer@fedoraproject.org\u003e\nReported-by: George Joseph \u003cgeorge.joseph@fairview5.com\u003e\nTested-by: George Joseph \u003cgeorge.joseph@fairview5.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Peter Zijlstra (Intel) \u003cpeterz@infradead.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Sasha Levin \u003csasha.levin@oracle.com\u003e\nLink: http://lkml.kernel.org/r/1423553436-29747-1-git-send-email-john.stultz@linaro.org\n[ Prettified the changelog and the comments a bit. ]\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Zefan Li \u003clizefan@huawei.com\u003e\n" }, { "commit": "eae81ccc389ac4ce8e6c8925aafecd49e44a5af4", "tree": "846f11277d55b986419ad6ad23c8f554dc40270c", "parents": [ "70da5b358e7e43293fac0f78317c339d1eff96fa" ], "author": { "name": "Sasha Levin", "email": "sasha.levin@oracle.com", "time": "Wed Dec 03 19:25:05 2014 -0500" }, "committer": { "name": "William Bellavance", "email": "flintman@flintmancomputers.com", "time": "Wed Feb 10 20:00:36 2016 -0500" }, "message": "time: adjtimex: Validate the ADJ_FREQUENCY values\n\ncommit 5e5aeb4367b450a28f447f6d5ab57d8f2ab16a5f upstream.\n\nVerify that the frequency value from userspace is valid and makes sense.\n\nUnverified values can cause overflows later on.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Sasha Levin \u003csasha.levin@oracle.com\u003e\n[jstultz: Fix up bug for negative values and drop redunent cap check]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n[lizf: Backported to 3.4: adjust context]\nSigned-off-by: Zefan Li \u003clizefan@huawei.com\u003e\n" }, { "commit": "1097d78180e1a2916c2bcdb15cb90ba131af9cd8", "tree": "5910f8fc0dcb85c71011ccccee18895769699390", "parents": [ "3ded4adc97887ddde3c1855f29f062e015d19425", "7fd7a446b1c2b96252e4389746e5419eae04faef" ], "author": { "name": "Paul", "email": "javelinanddart@gmail.com", "time": "Sun Jan 11 17:15:40 2015 -0800" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Sun Jan 11 17:20:45 2015 -0800" }, "message": "Merge tag \u0027v3.4.105\u0027 into cm-12.0\n\nThis is the 3.4.105 stable release\n\nConflicts:\n\tarch/arm/mm/proc-v7.S\n\tdrivers/bluetooth/hci_ldisc.c\n\tdrivers/media/dvb/dvb-core/dmxdev.c\n\tdrivers/usb/core/driver.c\n\tdrivers/usb/dwc3/core.c\n\tdrivers/usb/host/xhci-hub.c\n\tdrivers/usb/host/xhci.c\n\tdrivers/usb/serial/qcserial.c\n\tdrivers/usb/serial/usb_wwan.c\n\tkernel/events/core.c\n\tkernel/time/tick-sched.ck\n\tkernel/futex.c\n\tmm/memory_hotplug.c\n\tmm/vmscan.c\n\tnet/bluetooth/hci_conn.c\n\tnet/bluetooth/hci_event.c\n\tnet/bluetooth/l2cap_core.c\n\tnet/ipv4/ping.c\n\tnet/wireless/nl80211.c\n\tsound/soc/soc-core.c\n\nChange-Id: Id09da84afb427ba1a32ff26e74f2bb86458d4a2e\n" }, { "commit": "e06503426ebc296f1ae67bfd4733afadb69076cb", "tree": "f2830b94df6dca8837d91a538787dc6120d07c51", "parents": [ "b114657d1e55a0484bcfdb3f3b946f96bb2f80e7" ], "author": { "name": "Richard Larocque", "email": "rlarocque@google.com", "time": "Tue Sep 09 18:31:05 2014 -0700" }, "committer": { "name": "Zefan Li", "email": "lizefan@huawei.com", "time": "Mon Dec 01 18:02:31 2014 +0800" }, "message": "alarmtimer: Lock k_itimer during timer callback\n\ncommit 474e941bed9262f5fa2394f9a4a67e24499e5926 upstream.\n\nLocks the k_itimer\u0027s it_lock member when handling the alarm timer\u0027s\nexpiry callback.\n\nThe regular posix timers defined in posix-timers.c have this lock held\nduring timout processing because their callbacks are routed through\nposix_timer_fn(). The alarm timers follow a different path, so they\nought to grab the lock somewhere else.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Sharvil Nanavati \u003csharvil@google.com\u003e\nSigned-off-by: Richard Larocque \u003crlarocque@google.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Zefan Li \u003clizefan@huawei.com\u003e\n" }, { "commit": "b114657d1e55a0484bcfdb3f3b946f96bb2f80e7", "tree": "b2e1e5035bb4dd5ecf74f3513241c2478a36df87", "parents": [ "7ccf24be49f1020e408ee27a3714d41590009422" ], "author": { "name": "Richard Larocque", "email": "rlarocque@google.com", "time": "Tue Sep 09 18:31:04 2014 -0700" }, "committer": { "name": "Zefan Li", "email": "lizefan@huawei.com", "time": "Mon Dec 01 18:02:31 2014 +0800" }, "message": "alarmtimer: Do not signal SIGEV_NONE timers\n\ncommit 265b81d23a46c39df0a735a3af4238954b41a4c2 upstream.\n\nAvoids sending a signal to alarm timers created with sigev_notify set to\nSIGEV_NONE by checking for that special case in the timeout callback.\n\nThe regular posix timers avoid sending signals to SIGEV_NONE timers by\nnot scheduling any callbacks for them in the first place. Although it\nwould be possible to do something similar for alarm timers, it\u0027s simpler\nto handle this as a special case in the timeout.\n\nPrior to this patch, the alarm timer would ignore the sigev_notify value\nand try to deliver signals to the process anyway. Even worse, the\nsanity check for the value of sigev_signo is skipped when SIGEV_NONE was\nspecified, so the signal number could be bogus. If sigev_signo was an\nunitialized value (as it often would be if SIGEV_NONE is used), then\nit\u0027s hard to predict which signal will be sent.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Sharvil Nanavati \u003csharvil@google.com\u003e\nSigned-off-by: Richard Larocque \u003crlarocque@google.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Zefan Li \u003clizefan@huawei.com\u003e\n" }, { "commit": "7ccf24be49f1020e408ee27a3714d41590009422", "tree": "c16f56adfb93c06a50e0b45a3bc77b60d9473d20", "parents": [ "40ee8d0faf83eb55d4829796a28dacf48519caec" ], "author": { "name": "Richard Larocque", "email": "rlarocque@google.com", "time": "Tue Sep 09 18:31:03 2014 -0700" }, "committer": { "name": "Zefan Li", "email": "lizefan@huawei.com", "time": "Mon Dec 01 18:02:31 2014 +0800" }, "message": "alarmtimer: Return relative times in timer_gettime\n\ncommit e86fea764991e00a03ff1e56409ec9cacdbda4c9 upstream.\n\nReturns the time remaining for an alarm timer, rather than the time at\nwhich it is scheduled to expire. If the timer has already expired or it\nis not currently scheduled, the it_value\u0027s members are set to zero.\n\nThis new behavior matches that of the other posix-timers and the POSIX\nspecifications.\n\nThis is a change in user-visible behavior, and may break existing\napplications. Hopefully, few users rely on the old incorrect behavior.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Sharvil Nanavati \u003csharvil@google.com\u003e\nSigned-off-by: Richard Larocque \u003crlarocque@google.com\u003e\n[jstultz: minor style tweak]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n[lizf: Backported to 3.4:\n - add alarm_expires_remaining() introduced by commit 6cffe00f7d4e]\nSigned-off-by: Zefan Li \u003clizefan@huawei.com\u003e\n" }, { "commit": "fbbb7208969e8bfbd07782bbec069878a29d3267", "tree": "b0b5110b20ae77407f43801d002e26dd12764c09", "parents": [ "f73ff697833654ee578b606ea746d15dc1220aab" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Fri Aug 01 12:20:02 2014 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Aug 07 12:00:10 2014 -0700" }, "message": "timer: Fix lock inversion between hrtimer_bases.lock and scheduler locks\n\ncommit 504d58745c9ca28d33572e2d8a9990b43e06075d upstream.\n\nclockevents_increase_min_delta() calls printk() from under\nhrtimer_bases.lock. That causes lock inversion on scheduler locks because\nprintk() can call into the scheduler. Lockdep puts it as:\n\n\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ INFO: possible circular locking dependency detected ]\n3.15.0-rc8-06195-g939f04b #2 Not tainted\n-------------------------------------------------------\ntrinity-main/74 is trying to acquire lock:\n (\u0026port_lock_key){-.....}, at: [\u003c811c60be\u003e] serial8250_console_write+0x8c/0x10c\n\nbut task is already holding lock:\n (hrtimer_bases.lock){-.-...}, at: [\u003c8103caeb\u003e] hrtimer_try_to_cancel+0x13/0x66\n\nwhich lock already depends on the new lock.\n\nthe existing dependency chain (in reverse order) is:\n\n-\u003e #5 (hrtimer_bases.lock){-.-...}:\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f11d\u003e] _raw_spin_lock_irqsave+0x2e/0x3e\n [\u003c8103c918\u003e] __hrtimer_start_range_ns+0x1c/0x197\n [\u003c8107ec20\u003e] perf_swevent_start_hrtimer.part.41+0x7a/0x85\n [\u003c81080792\u003e] task_clock_event_start+0x3a/0x3f\n [\u003c810807a4\u003e] task_clock_event_add+0xd/0x14\n [\u003c8108259a\u003e] event_sched_in+0xb6/0x17a\n [\u003c810826a2\u003e] group_sched_in+0x44/0x122\n [\u003c81082885\u003e] ctx_sched_in.isra.67+0x105/0x11f\n [\u003c810828e6\u003e] perf_event_sched_in.isra.70+0x47/0x4b\n [\u003c81082bf6\u003e] __perf_install_in_context+0x8b/0xa3\n [\u003c8107eb8e\u003e] remote_function+0x12/0x2a\n [\u003c8105f5af\u003e] smp_call_function_single+0x2d/0x53\n [\u003c8107e17d\u003e] task_function_call+0x30/0x36\n [\u003c8107fb82\u003e] perf_install_in_context+0x87/0xbb\n [\u003c810852c9\u003e] SYSC_perf_event_open+0x5c6/0x701\n [\u003c810856f9\u003e] SyS_perf_event_open+0x17/0x19\n [\u003c8142f8ee\u003e] syscall_call+0x7/0xb\n\n-\u003e #4 (\u0026ctx-\u003elock){......}:\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f04c\u003e] _raw_spin_lock+0x21/0x30\n [\u003c81081df3\u003e] __perf_event_task_sched_out+0x1dc/0x34f\n [\u003c8142cacc\u003e] __schedule+0x4c6/0x4cb\n [\u003c8142cae0\u003e] schedule+0xf/0x11\n [\u003c8142f9a6\u003e] work_resched+0x5/0x30\n\n-\u003e #3 (\u0026rq-\u003elock){-.-.-.}:\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f04c\u003e] _raw_spin_lock+0x21/0x30\n [\u003c81040873\u003e] __task_rq_lock+0x33/0x3a\n [\u003c8104184c\u003e] wake_up_new_task+0x25/0xc2\n [\u003c8102474b\u003e] do_fork+0x15c/0x2a0\n [\u003c810248a9\u003e] kernel_thread+0x1a/0x1f\n [\u003c814232a2\u003e] rest_init+0x1a/0x10e\n [\u003c817af949\u003e] start_kernel+0x303/0x308\n [\u003c817af2ab\u003e] i386_start_kernel+0x79/0x7d\n\n-\u003e #2 (\u0026p-\u003epi_lock){-.-...}:\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f11d\u003e] _raw_spin_lock_irqsave+0x2e/0x3e\n [\u003c810413dd\u003e] try_to_wake_up+0x1d/0xd6\n [\u003c810414cd\u003e] default_wake_function+0xb/0xd\n [\u003c810461f3\u003e] __wake_up_common+0x39/0x59\n [\u003c81046346\u003e] __wake_up+0x29/0x3b\n [\u003c811b8733\u003e] tty_wakeup+0x49/0x51\n [\u003c811c3568\u003e] uart_write_wakeup+0x17/0x19\n [\u003c811c5dc1\u003e] serial8250_tx_chars+0xbc/0xfb\n [\u003c811c5f28\u003e] serial8250_handle_irq+0x54/0x6a\n [\u003c811c5f57\u003e] serial8250_default_handle_irq+0x19/0x1c\n [\u003c811c56d8\u003e] serial8250_interrupt+0x38/0x9e\n [\u003c810510e7\u003e] handle_irq_event_percpu+0x5f/0x1e2\n [\u003c81051296\u003e] handle_irq_event+0x2c/0x43\n [\u003c81052cee\u003e] handle_level_irq+0x57/0x80\n [\u003c81002a72\u003e] handle_irq+0x46/0x5c\n [\u003c810027df\u003e] do_IRQ+0x32/0x89\n [\u003c8143036e\u003e] common_interrupt+0x2e/0x33\n [\u003c8142f23c\u003e] _raw_spin_unlock_irqrestore+0x3f/0x49\n [\u003c811c25a4\u003e] uart_start+0x2d/0x32\n [\u003c811c2c04\u003e] uart_write+0xc7/0xd6\n [\u003c811bc6f6\u003e] n_tty_write+0xb8/0x35e\n [\u003c811b9beb\u003e] tty_write+0x163/0x1e4\n [\u003c811b9cd9\u003e] redirected_tty_write+0x6d/0x75\n [\u003c810b6ed6\u003e] vfs_write+0x75/0xb0\n [\u003c810b7265\u003e] SyS_write+0x44/0x77\n [\u003c8142f8ee\u003e] syscall_call+0x7/0xb\n\n-\u003e #1 (\u0026tty-\u003ewrite_wait){-.....}:\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f11d\u003e] _raw_spin_lock_irqsave+0x2e/0x3e\n [\u003c81046332\u003e] __wake_up+0x15/0x3b\n [\u003c811b8733\u003e] tty_wakeup+0x49/0x51\n [\u003c811c3568\u003e] uart_write_wakeup+0x17/0x19\n [\u003c811c5dc1\u003e] serial8250_tx_chars+0xbc/0xfb\n [\u003c811c5f28\u003e] serial8250_handle_irq+0x54/0x6a\n [\u003c811c5f57\u003e] serial8250_default_handle_irq+0x19/0x1c\n [\u003c811c56d8\u003e] serial8250_interrupt+0x38/0x9e\n [\u003c810510e7\u003e] handle_irq_event_percpu+0x5f/0x1e2\n [\u003c81051296\u003e] handle_irq_event+0x2c/0x43\n [\u003c81052cee\u003e] handle_level_irq+0x57/0x80\n [\u003c81002a72\u003e] handle_irq+0x46/0x5c\n [\u003c810027df\u003e] do_IRQ+0x32/0x89\n [\u003c8143036e\u003e] common_interrupt+0x2e/0x33\n [\u003c8142f23c\u003e] _raw_spin_unlock_irqrestore+0x3f/0x49\n [\u003c811c25a4\u003e] uart_start+0x2d/0x32\n [\u003c811c2c04\u003e] uart_write+0xc7/0xd6\n [\u003c811bc6f6\u003e] n_tty_write+0xb8/0x35e\n [\u003c811b9beb\u003e] tty_write+0x163/0x1e4\n [\u003c811b9cd9\u003e] redirected_tty_write+0x6d/0x75\n [\u003c810b6ed6\u003e] vfs_write+0x75/0xb0\n [\u003c810b7265\u003e] SyS_write+0x44/0x77\n [\u003c8142f8ee\u003e] syscall_call+0x7/0xb\n\n-\u003e #0 (\u0026port_lock_key){-.....}:\n [\u003c8104a62d\u003e] __lock_acquire+0x9ea/0xc6d\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c8142f11d\u003e] _raw_spin_lock_irqsave+0x2e/0x3e\n [\u003c811c60be\u003e] serial8250_console_write+0x8c/0x10c\n [\u003c8104e402\u003e] call_console_drivers.constprop.31+0x87/0x118\n [\u003c8104f5d5\u003e] console_unlock+0x1d7/0x398\n [\u003c8104fb70\u003e] vprintk_emit+0x3da/0x3e4\n [\u003c81425f76\u003e] printk+0x17/0x19\n [\u003c8105bfa0\u003e] clockevents_program_min_delta+0x104/0x116\n [\u003c8105c548\u003e] clockevents_program_event+0xe7/0xf3\n [\u003c8105cc1c\u003e] tick_program_event+0x1e/0x23\n [\u003c8103c43c\u003e] hrtimer_force_reprogram+0x88/0x8f\n [\u003c8103c49e\u003e] __remove_hrtimer+0x5b/0x79\n [\u003c8103cb21\u003e] hrtimer_try_to_cancel+0x49/0x66\n [\u003c8103cb4b\u003e] hrtimer_cancel+0xd/0x18\n [\u003c8107f102\u003e] perf_swevent_cancel_hrtimer.part.60+0x2b/0x30\n [\u003c81080705\u003e] task_clock_event_stop+0x20/0x64\n [\u003c81080756\u003e] task_clock_event_del+0xd/0xf\n [\u003c81081350\u003e] event_sched_out+0xab/0x11e\n [\u003c810813e0\u003e] group_sched_out+0x1d/0x66\n [\u003c81081682\u003e] ctx_sched_out+0xaf/0xbf\n [\u003c81081e04\u003e] __perf_event_task_sched_out+0x1ed/0x34f\n [\u003c8142cacc\u003e] __schedule+0x4c6/0x4cb\n [\u003c8142cae0\u003e] schedule+0xf/0x11\n [\u003c8142f9a6\u003e] work_resched+0x5/0x30\n\nother info that might help us debug this:\n\nChain exists of:\n \u0026port_lock_key --\u003e \u0026ctx-\u003elock --\u003e hrtimer_bases.lock\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(hrtimer_bases.lock);\n lock(\u0026ctx-\u003elock);\n lock(hrtimer_bases.lock);\n lock(\u0026port_lock_key);\n\n *** DEADLOCK ***\n\n4 locks held by trinity-main/74:\n #0: (\u0026rq-\u003elock){-.-.-.}, at: [\u003c8142c6f3\u003e] __schedule+0xed/0x4cb\n #1: (\u0026ctx-\u003elock){......}, at: [\u003c81081df3\u003e] __perf_event_task_sched_out+0x1dc/0x34f\n #2: (hrtimer_bases.lock){-.-...}, at: [\u003c8103caeb\u003e] hrtimer_try_to_cancel+0x13/0x66\n #3: (console_lock){+.+...}, at: [\u003c8104fb5d\u003e] vprintk_emit+0x3c7/0x3e4\n\nstack backtrace:\nCPU: 0 PID: 74 Comm: trinity-main Not tainted 3.15.0-rc8-06195-g939f04b #2\n 00000000 81c3a310 8b995c14 81426f69 8b995c44 81425a99 8161f671 8161f570\n 8161f538 8161f559 8161f538 8b995c78 8b142bb0 00000004 8b142fdc 8b142bb0\n 8b995ca8 8104a62d 8b142fac 000016f2 81c3a310 00000001 00000001 00000003\nCall Trace:\n [\u003c81426f69\u003e] dump_stack+0x16/0x18\n [\u003c81425a99\u003e] print_circular_bug+0x18f/0x19c\n [\u003c8104a62d\u003e] __lock_acquire+0x9ea/0xc6d\n [\u003c8104a942\u003e] lock_acquire+0x92/0x101\n [\u003c811c60be\u003e] ? serial8250_console_write+0x8c/0x10c\n [\u003c811c6032\u003e] ? wait_for_xmitr+0x76/0x76\n [\u003c8142f11d\u003e] _raw_spin_lock_irqsave+0x2e/0x3e\n [\u003c811c60be\u003e] ? serial8250_console_write+0x8c/0x10c\n [\u003c811c60be\u003e] serial8250_console_write+0x8c/0x10c\n [\u003c8104af87\u003e] ? lock_release+0x191/0x223\n [\u003c811c6032\u003e] ? wait_for_xmitr+0x76/0x76\n [\u003c8104e402\u003e] call_console_drivers.constprop.31+0x87/0x118\n [\u003c8104f5d5\u003e] console_unlock+0x1d7/0x398\n [\u003c8104fb70\u003e] vprintk_emit+0x3da/0x3e4\n [\u003c81425f76\u003e] printk+0x17/0x19\n [\u003c8105bfa0\u003e] clockevents_program_min_delta+0x104/0x116\n [\u003c8105cc1c\u003e] tick_program_event+0x1e/0x23\n [\u003c8103c43c\u003e] hrtimer_force_reprogram+0x88/0x8f\n [\u003c8103c49e\u003e] __remove_hrtimer+0x5b/0x79\n [\u003c8103cb21\u003e] hrtimer_try_to_cancel+0x49/0x66\n [\u003c8103cb4b\u003e] hrtimer_cancel+0xd/0x18\n [\u003c8107f102\u003e] perf_swevent_cancel_hrtimer.part.60+0x2b/0x30\n [\u003c81080705\u003e] task_clock_event_stop+0x20/0x64\n [\u003c81080756\u003e] task_clock_event_del+0xd/0xf\n [\u003c81081350\u003e] event_sched_out+0xab/0x11e\n [\u003c810813e0\u003e] group_sched_out+0x1d/0x66\n [\u003c81081682\u003e] ctx_sched_out+0xaf/0xbf\n [\u003c81081e04\u003e] __perf_event_task_sched_out+0x1ed/0x34f\n [\u003c8104416d\u003e] ? __dequeue_entity+0x23/0x27\n [\u003c81044505\u003e] ? pick_next_task_fair+0xb1/0x120\n [\u003c8142cacc\u003e] __schedule+0x4c6/0x4cb\n [\u003c81047574\u003e] ? trace_hardirqs_off_caller+0xd7/0x108\n [\u003c810475b0\u003e] ? trace_hardirqs_off+0xb/0xd\n [\u003c81056346\u003e] ? rcu_irq_exit+0x64/0x77\n\nFix the problem by using printk_deferred() which does not call into the\nscheduler.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "299e667e26e9e3382fa471370121b117fa8ae987", "tree": "cb7dc72c583b7c561369c7ed28f6cfa3ad8874e8", "parents": [ "b63dd4c81b9eccf95c1d08775bb7f2d05d70c8f1" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Jul 07 14:06:11 2014 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Jul 28 07:06:46 2014 -0700" }, "message": "alarmtimer: Fix bug where relative alarm timers were treated as absolute\n\ncommit 16927776ae757d0d132bdbfabbfe2c498342bd59 upstream.\n\nSharvil noticed with the posix timer_settime interface, using the\nCLOCK_REALTIME_ALARM or CLOCK_BOOTTIME_ALARM clockid, if the users\ntried to specify a relative time timer, it would incorrectly be\ntreated as absolute regardless of the state of the flags argument.\n\nThis patch corrects this, properly checking the absolute/relative flag,\nas well as adds further error checking that no invalid flag bits are set.\n\nReported-by: Sharvil Nanavati \u003csharvil@google.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Sharvil Nanavati \u003csharvil@google.com\u003e\nLink: http://lkml.kernel.org/r/1404767171-6902-1-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "3f8f4ae48f4023e1c53722b1dc1a7ab897cbca14", "tree": "2677e4c998e385b214a5a04f09343133b2ebc8be", "parents": [ "7be9d6cd4b57ebd5b344e4a006c0aa6e7a08aba3" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Nov 29 12:18:13 2013 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jun 26 15:10:29 2014 -0400" }, "message": "nohz: Fix another inconsistency between CONFIG_NO_HZ\u003dn and nohz\u003doff\n\ncommit 0e576acbc1d9600cf2d9b4a141a2554639959d50 upstream.\n\nIf CONFIG_NO_HZ\u003dn tick_nohz_get_sleep_length() returns NSEC_PER_SEC/HZ.\n\nIf CONFIG_NO_HZ\u003dy and the nohz functionality is disabled via the\ncommand line option \"nohz\u003doff\" or not enabled due to missing hardware\nsupport, then tick_nohz_get_sleep_length() returns 0. That happens\nbecause ts-\u003esleep_length is never set in that case.\n\nSet it to NSEC_PER_SEC/HZ when the NOHZ mode is inactive.\n\nReported-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nReported-by: Borislav Petkov \u003cbp@alien8.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Rui Xiang \u003crui.xiang@huawei.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "66d383de0963dd351051304e36247e9a6fa66b77", "tree": "5cd17ffcb6edfa4385a2ceddb63ada9efdea2ee1", "parents": [ "c523abc466c9b7c693e4a528ca2f54c6e931b6a6", "2606524141e4ff9b6a5d0bcbd9d601dfc5a8285c" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Fri Mar 07 11:56:04 2014 -0800" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Fri Mar 07 11:56:04 2014 -0800" }, "message": "Merge tag \u0027v3.4.82\u0027 into cm-11.0\n\nThis is the 3.4.82 stable release\n\nConflicts:\n\tarch/arm/kernel/traps.c\n\tmm/internal.h\n\nChange-Id: Ie3b1ffdfe133e76cfa3eaaa4305535af8490d7cc\n" }, { "commit": "d6e20e8145341ed1b5d605a8d9ab8463b0ca6ed8", "tree": "4e83c6dc0f10988e10a9341d33d47aef3a93e744", "parents": [ "cd6f6b709eebe70d80a3e542d218228bcf189654" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Fri Jan 24 16:41:36 2014 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sat Feb 22 10:32:46 2014 -0800" }, "message": "time: Fix overflow when HZ is smaller than 60\n\ncommit 80d767d770fd9c697e434fd080c2db7b5c60c6dd upstream.\n\nWhen compiling for the IA-64 ski emulator, HZ is set to 32 because the\nemulation is slow and we don\u0027t want to waste too many cycles processing\ntimers. Alpha also has an option to set HZ to 32.\n\nThis causes integer underflow in\nkernel/time/jiffies.c:\nkernel/time/jiffies.c:66:2: warning: large integer implicitly truncated to unsigned type [-Woverflow]\n .mult \u003d NSEC_PER_JIFFY \u003c\u003c JIFFIES_SHIFT, /* details above */\n ^\n\nThis patch reduces the JIFFIES_SHIFT value to avoid the overflow.\n\nSigned-off-by: Mikulas Patocka \u003cmikulas@artax.karlin.mff.cuni.cz\u003e\nLink: http://lkml.kernel.org/r/alpine.LRH.2.02.1401241639100.23871@file01.intranet.prod.int.rdu2.redhat.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "f5a4c4b79e57f875b6788f6f8352ca246bfd8450", "tree": "936b2200d4581b36faa0c94fab560013486885be", "parents": [ "e2d51f27e382be7b70a755f3ea2fbbeacdb50834" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu May 17 17:15:29 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 20 10:45:32 2014 -0800" }, "message": "sched/nohz: Fix rq-\u003ecpu_load calculations some more\n\ncommit 5aaa0b7a2ed5b12692c9ffb5222182bd558d3146 upstream.\n\nFollow up on commit 556061b00 (\"sched/nohz: Fix rq-\u003ecpu_load[]\ncalculations\") since while that fixed the busy case it regressed the\nmostly idle case.\n\nAdd a callback from the nohz exit to also age the rq-\u003ecpu_load[]\narray. This closes the hole where either there was no nohz load\nbalance pass during the nohz, or there was a \u0027significant\u0027 amount of\nidle time between the last nohz balance and the nohz exit.\n\nSo we\u0027ll update unconditionally from the tick to not insert any\naccidental 0 load periods while busy, and we try and catch up from\nnohz idle balance and nohz exit. Both these are still prone to missing\na jiffy, but that has always been the case.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: pjt@google.com\nCc: Venkatesh Pallipadi \u003cvenki@google.com\u003e\nLink: http://lkml.kernel.org/n/tip-kt0trz0apodbf84ucjfdbr1a@git.kernel.org\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Li Zefan \u003clizefan@huawei.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "cd34de10471a5ddad397739fae33555d47e53769", "tree": "99e2e27194d72d5767093568a956751b835fdf43", "parents": [ "cf85cc93b24891b7e57b1d9939742b5774570b19" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Feb 10 13:16:29 2014 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 13 11:51:21 2014 -0800" }, "message": "3.4.y: timekeeping: fix 32-bit overflow in get_monotonic_boottime\n\nfixed upstream in v3.6 by ec145babe754f9ea1079034a108104b6001e001c\n\nget_monotonic_boottime adds three nanonsecond values stored\nin longs, followed by an s64. If the long values are all\nclose to 1e9 the first three additions can overflow and\nbecome negative when added to the s64. Cast the first\nvalue to s64 so that all additions are 64 bit.\n\nSigned-off-by: Colin Cross \u003cccross@android.com\u003e\n[jstultz: Fished this out of the AOSP commong.git tree. This was\nfixed upstream in v3.6 by ec145babe754f9ea1079034a108104b6001e001c]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "cf85cc93b24891b7e57b1d9939742b5774570b19", "tree": "2a4719b1695dc561a13ea93b3083a60bca871e7b", "parents": [ "ab99a94d45f5db1ed178ed986f93b938bc018a87" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Dec 10 17:18:18 2013 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Feb 13 11:51:20 2014 -0800" }, "message": "timekeeping: Avoid possible deadlock from clock_was_set_delayed\n\ncommit 6fdda9a9c5db367130cf32df5d6618d08b89f46a upstream.\n\nAs part of normal operaions, the hrtimer subsystem frequently calls\ninto the timekeeping code, creating a locking order of\n hrtimer locks -\u003e timekeeping locks\n\nclock_was_set_delayed() was suppoed to allow us to avoid deadlocks\nbetween the timekeeping the hrtimer subsystem, so that we could\nnotify the hrtimer subsytem the time had changed while holding\nthe timekeeping locks. This was done by scheduling delayed work\nthat would run later once we were out of the timekeeing code.\n\nBut unfortunately the lock chains are complex enoguh that in\nscheduling delayed work, we end up eventually trying to grab\nan hrtimer lock.\n\nSasha Levin noticed this in testing when the new seqlock lockdep\nenablement triggered the following (somewhat abrieviated) message:\n\n[ 251.100221] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 251.100221] [ INFO: possible circular locking dependency detected ]\n[ 251.100221] 3.13.0-rc2-next-20131206-sasha-00005-g8be2375-dirty #4053 Not tainted\n[ 251.101967] -------------------------------------------------------\n[ 251.101967] kworker/10:1/4506 is trying to acquire lock:\n[ 251.101967] (timekeeper_seq){----..}, at: [\u003cffffffff81160e96\u003e] retrigger_next_event+0x56/0x70\n[ 251.101967]\n[ 251.101967] but task is already holding lock:\n[ 251.101967] (hrtimer_bases.lock#11){-.-...}, at: [\u003cffffffff81160e7c\u003e] retrigger_next_event+0x3c/0x70\n[ 251.101967]\n[ 251.101967] which lock already depends on the new lock.\n[ 251.101967]\n[ 251.101967]\n[ 251.101967] the existing dependency chain (in reverse order) is:\n[ 251.101967]\n-\u003e #5 (hrtimer_bases.lock#11){-.-...}:\n[snipped]\n-\u003e #4 (\u0026rt_b-\u003ert_runtime_lock){-.-...}:\n[snipped]\n-\u003e #3 (\u0026rq-\u003elock){-.-.-.}:\n[snipped]\n-\u003e #2 (\u0026p-\u003epi_lock){-.-.-.}:\n[snipped]\n-\u003e #1 (\u0026(\u0026pool-\u003elock)-\u003erlock){-.-...}:\n[ 251.101967] [\u003cffffffff81194803\u003e] validate_chain+0x6c3/0x7b0\n[ 251.101967] [\u003cffffffff81194d9d\u003e] __lock_acquire+0x4ad/0x580\n[ 251.101967] [\u003cffffffff81194ff2\u003e] lock_acquire+0x182/0x1d0\n[ 251.101967] [\u003cffffffff84398500\u003e] _raw_spin_lock+0x40/0x80\n[ 251.101967] [\u003cffffffff81153e69\u003e] __queue_work+0x1a9/0x3f0\n[ 251.101967] [\u003cffffffff81154168\u003e] queue_work_on+0x98/0x120\n[ 251.101967] [\u003cffffffff81161351\u003e] clock_was_set_delayed+0x21/0x30\n[ 251.101967] [\u003cffffffff811c4bd1\u003e] do_adjtimex+0x111/0x160\n[ 251.101967] [\u003cffffffff811e2711\u003e] compat_sys_adjtimex+0x41/0x70\n[ 251.101967] [\u003cffffffff843a4b49\u003e] ia32_sysret+0x0/0x5\n[ 251.101967]\n-\u003e #0 (timekeeper_seq){----..}:\n[snipped]\n[ 251.101967] other info that might help us debug this:\n[ 251.101967]\n[ 251.101967] Chain exists of:\n timekeeper_seq --\u003e \u0026rt_b-\u003ert_runtime_lock --\u003e hrtimer_bases.lock#11\n\n[ 251.101967] Possible unsafe locking scenario:\n[ 251.101967]\n[ 251.101967] CPU0 CPU1\n[ 251.101967] ---- ----\n[ 251.101967] lock(hrtimer_bases.lock#11);\n[ 251.101967] lock(\u0026rt_b-\u003ert_runtime_lock);\n[ 251.101967] lock(hrtimer_bases.lock#11);\n[ 251.101967] lock(timekeeper_seq);\n[ 251.101967]\n[ 251.101967] *** DEADLOCK ***\n[ 251.101967]\n[ 251.101967] 3 locks held by kworker/10:1/4506:\n[ 251.101967] #0: (events){.+.+.+}, at: [\u003cffffffff81154960\u003e] process_one_work+0x200/0x530\n[ 251.101967] #1: (hrtimer_work){+.+...}, at: [\u003cffffffff81154960\u003e] process_one_work+0x200/0x530\n[ 251.101967] #2: (hrtimer_bases.lock#11){-.-...}, at: [\u003cffffffff81160e7c\u003e] retrigger_next_event+0x3c/0x70\n[ 251.101967]\n[ 251.101967] stack backtrace:\n[ 251.101967] CPU: 10 PID: 4506 Comm: kworker/10:1 Not tainted 3.13.0-rc2-next-20131206-sasha-00005-g8be2375-dirty #4053\n[ 251.101967] Workqueue: events clock_was_set_work\n\nSo the best solution is to avoid calling clock_was_set_delayed() while\nholding the timekeeping lock, and instead using a flag variable to\ndecide if we should call clock_was_set() once we\u0027ve released the locks.\n\nThis works for the case here, where the do_adjtimex() was the deadlock\ntrigger point. Unfortuantely, in update_wall_time() we still hold\nthe jiffies lock, which would deadlock with the ipi triggered by\nclock_was_set(), preventing us from calling it even after we drop the\ntimekeeping lock. So instead call clock_was_set_delayed() at that point.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Sasha Levin \u003csasha.levin@oracle.com\u003e\nReported-by: Sasha Levin \u003csasha.levin@oracle.com\u003e\nTested-by: Sasha Levin \u003csasha.levin@oracle.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n\n" }, { "commit": "38b17156cd7847f3b1e378f6f8ef4227ffbe6d44", "tree": "b5ae275ac41b7076b932320cc9ac25783917db03", "parents": [ "70d01bbd5d9dd6d6cbf0ad9a49e82ed615d4f957" ], "author": { "name": "Daniel Lezcano", "email": "daniel.lezcano@linaro.org", "time": "Sat Mar 02 11:10:11 2013 +0100" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Fri Jan 17 22:12:28 2014 -0800" }, "message": "tick: Dynamically set broadcast irq affinity\n\nWhen a cpu goes to a deep idle state where its local timer is\nshutdown, it notifies the time frame work to use the broadcast timer\ninstead. Unfortunately, the broadcast device could wake up any CPU,\nincluding an idle one which is not concerned by the wake up at all. So\nin the worst case an idle CPU will wake up to send an IPI to the CPU\nwhose timer expired.\n\nProvide an opt-in feature CLOCK_EVT_FEAT_DYNIRQ which tells the core\nthat is should set the interrupt affinity of the broadcast interrupt\nto the cpu which has the earliest expiry time. This avoids unnecessary\nspurious wakeups and IPIs.\n\n[ tglx: Adopted to cpumask rework, silenced an uninitialized warning,\n massaged changelog ]\n\nSigned-off-by: Daniel Lezcano \u003cdaniel.lezcano@linaro.org\u003e\nCc: viresh.kumar@linaro.org\nCc: jacob.jun.pan@linux.intel.com\nCc: linux-arm-kernel@lists.infradead.org\nCc: santosh.shilimkar@ti.com\nCc: linaro-kernel@lists.linaro.org\nCc: patches@linaro.org\nCc: rickard.andersson@stericsson.com\nCc: vincent.guittot@linaro.org\nCc: linus.walleij@stericsson.com\nCc: john.stultz@linaro.org\nLink: http://lkml.kernel.org/r/1362219013-18173-3-git-send-email-daniel.lezcano@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\nChange-Id: I6a880a39dd595526b80a6d72b88be74163513da9\nSigned-off-by: Karthik Parsha \u003ckparsha@codeaurora.org\u003e\nSigned-off-by: Mahesh Sivasubramanian \u003cmsivasub@codeaurora.org\u003e\n" }, { "commit": "2a38ada0f1ab9f894eea4428731ebc811b51c3f3", "tree": "759c765808a23a3a35e4ba10d8306c847c0205b7", "parents": [ "19218e895cefdd389c96af12c93c89e7276bbaad", "44d19f5a04ae4e433548ba2f25e4d2ccfcac765e" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Sun Dec 08 12:50:38 2013 -0800" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Sun Dec 08 12:50:38 2013 -0800" }, "message": "Merge tag \u0027v3.4.72\u0027 into tmp\n\nThis is the 3.4.72 stable release\n\nConflicts:\n\tarch/arm/Kconfig\n\tarch/arm/include/asm/mutex.h\n\tarch/arm/kernel/perf_event.c\n\tarch/arm/kernel/traps.c\n\tarch/arm/mm/dma-mapping.c\n\tdrivers/base/power/main.c\n\tdrivers/bluetooth/ath3k.c\n\tdrivers/bluetooth/btusb.c\n\tdrivers/gpu/drm/radeon/radeon_mode.h\n\tdrivers/mmc/card/block.c\n\tdrivers/mmc/host/sdhci.c\n\tdrivers/usb/core/message.c\n\tdrivers/usb/host/xhci-plat.c\n\tdrivers/usb/host/xhci.h\n\tdrivers/virtio/virtio_ring.c\n\tfs/ubifs/dir.c\n\tinclude/linux/freezer.h\n\tinclude/linux/virtio.h\n\tinclude/media/v4l2-ctrls.h\n\tinclude/net/bluetooth/hci_core.h\n\tinclude/net/bluetooth/mgmt.h\n\tkernel/cgroup.c\n\tkernel/futex.c\n\tkernel/signal.c\n\tnet/bluetooth/hci_conn.c\n\tnet/bluetooth/hci_core.c\n\tnet/bluetooth/hci_event.c\n\tnet/bluetooth/l2cap_core.c\n\tnet/bluetooth/mgmt.c\n\tnet/bluetooth/rfcomm/sock.c\n\tnet/bluetooth/smp.c\n\nChange-Id: I4fb0d5de74ca76f933d95d98e1a9c2c859402f34\n" }, { "commit": "3e05092412210f3a298ef2a4e5f58857513e9954", "tree": "d9bb8d5c47986907e7ac939ef90cad5a32708c2b", "parents": [ "664eaaa26bca6272673eff01ba5468f95905039d" ], "author": { "name": "KOSAKI Motohiro", "email": "kosaki.motohiro@jp.fujitsu.com", "time": "Mon Oct 14 17:33:16 2013 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Dec 04 10:50:14 2013 -0800" }, "message": "alarmtimer: return EINVAL instead of ENOTSUPP if rtcdev doesn\u0027t exist\n\ncommit 98d6f4dd84a134d942827584a3c5f67ffd8ec35f upstream.\n\nFedora Ruby maintainer reported latest Ruby doesn\u0027t work on Fedora Rawhide\non ARM. (http://bugs.ruby-lang.org/issues/9008)\n\nBecause of, commit 1c6b39ad3f (alarmtimers: Return -ENOTSUPP if no\nRTC device is present) intruduced to return ENOTSUPP when\nclock_get{time,res} can\u0027t find a RTC device. However this is incorrect.\n\nFirst, ENOTSUPP isn\u0027t exported to userland (ENOTSUP or EOPNOTSUP are the\nclosest userland equivlents).\n\nSecond, Posix and Linux man pages agree that clock_gettime and\nclock_getres should return EINVAL if clk_id argument is invalid.\nWhile the arugment that the clockid is valid, but just not supported\non this hardware could be made, this is just a technicality that\ndoesn\u0027t help userspace applicaitons, and only complicates error\nhandling.\n\nThus, this patch changes the code to use EINVAL.\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReported-by: Vit Ondruch \u003cv.ondruch@tiscali.cz\u003e\nSigned-off-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\n[jstultz: Tweaks to commit message to include full rational]\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "f81d0a99446a0c4548d5783807529d075b06c64e", "tree": "b0697e8167ee4daf0d8b66f38270670498998f20", "parents": [ "268417aeea96a1941c2cd14f0f8b5b39c374ad25" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Sep 24 21:50:23 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Wed Nov 13 12:01:48 2013 +0900" }, "message": "clockevents: Sanitize ticks to nsec conversion\n\ncommit 97b9410643475d6557d2517c2aff9fd2221141a9 upstream.\n\nMarc Kleine-Budde pointed out, that commit 77cc982 \"clocksource: use\nclockevents_config_and_register() where possible\" caused a regression\nfor some of the converted subarchs.\n\nThe reason is, that the clockevents core code converts the minimal\nhardware tick delta to a nanosecond value for core internal\nusage. This conversion is affected by integer math rounding loss, so\nthe backwards conversion to hardware ticks will likely result in a\nvalue which is less than the configured hardware limitation. The\naffected subarchs used their own workaround (SIGH!) which got lost in\nthe conversion.\n\nThe solution for the issue at hand is simple: adding evt-\u003emult - 1 to\nthe shifted value before the integer divison in the core conversion\nfunction takes care of it. But this only works for the case where for\nthe scaled math mult/shift pair \"mult \u003c\u003d 1 \u003c\u003c shift\" is true. For the\ncase where \"mult \u003e 1 \u003c\u003c shift\" we can apply the rounding add only for\nthe minimum delta value to make sure that the backward conversion is\nnot less than the given hardware limit. For the upper bound we need to\nomit the rounding add, because the backwards conversion is always\nlarger than the original latch value. That would violate the upper\nbound of the hardware device.\n\nThough looking closer at the details of that function reveals another\nbogosity: The upper bounds check is broken as well. Checking for a\nresulting \"clc\" value greater than KTIME_MAX after the conversion is\npointless. The conversion does:\n\n u64 clc \u003d (latch \u003c\u003c evt-\u003eshift) / evt-\u003emult;\n\nSo there is no sanity check for (latch \u003c\u003c evt-\u003eshift) exceeding the\n64bit boundary. The latch argument is \"unsigned long\", so on a 64bit\narch the handed in argument could easily lead to an unnoticed shift\noverflow. With the above rounding fix applied the calculation before\nthe divison is:\n\n u64 clc \u003d (latch \u003c\u003c evt-\u003eshift) + evt-\u003emult - 1;\n\nSo we need to make sure, that neither the shift nor the rounding add\nis overflowing the u64 boundary.\n\n[ukl: move assignment to rnd after eventually changing mult, fix build\n issue and correct comment with the right math]\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e\nCc: Marc Kleine-Budde \u003cmkl@pengutronix.de\u003e\nCc: nicolas.ferre@atmel.com\nCc: Marc Pignat \u003cmarc.pignat@hevs.ch\u003e\nCc: john.stultz@linaro.org\nCc: kernel@pengutronix.de\nCc: Ronald Wahl \u003cronald.wahl@raritan.com\u003e\nCc: LAK \u003clinux-arm-kernel@lists.infradead.org\u003e\nCc: Ludovic Desroches \u003cludovic.desroches@atmel.com\u003e\nLink: http://lkml.kernel.org/r/1380052223-24139-1-git-send-email-u.kleine-koenig@pengutronix.de\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "60a0c1a6129d06f1f6bc71acd50c8d289484c7ea", "tree": "ce74c210c62dc509861027b92c1923e44c504f50", "parents": [ "8899476bd4758c47c2e4e4b92bb64fb9177b0c28" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Jul 01 22:14:10 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jul 28 16:25:44 2013 -0700" }, "message": "tick: Prevent uncontrolled switch to oneshot mode\n\ncommit 1f73a9806bdd07a5106409bbcab3884078bd34fe upstream.\n\nWhen the system switches from periodic to oneshot mode, the broadcast\nlogic causes a possibility that a CPU which has not yet switched to\noneshot mode puts its own clock event device into oneshot mode without\nupdating the state and the timer handler.\n\nCPU0\t\t\t\tCPU1\n\t\t\t\tper cpu tickdev is in periodic mode\n\t\t\t\tand switched to broadcast\n\nSwitch to oneshot mode\n tick_broadcast_switch_to_oneshot()\n cpumask_copy(tick_oneshot_broacast_mask,\n\t tick_broadcast_mask);\n\n broadcast device mode \u003d oneshot\n\n\t\t\t\tTimer interrupt\n\n\t\t\t\tirq_enter()\n\t\t\t\t tick_check_oneshot_broadcast()\n\t\t\t\t dev-\u003eset_mode(ONESHOT);\n\n\t\t\t\ttick_handle_periodic()\n\t\t\t\t if (dev-\u003emode \u003d\u003d ONESHOT)\n\t\t\t\t dev-\u003enext_event +\u003d period;\n\t\t\t\t FAIL.\n\nWe fail, because dev-\u003enext_event contains KTIME_MAX, if the device was\nin periodic mode before the uncontrolled switch to oneshot happened.\n\nWe must copy the broadcast bits over to the oneshot mask, because\notherwise a CPU which relies on the broadcast would not been woken up\nanymore after the broadcast device switched to oneshot mode.\n\nSo we need to verify in tick_check_oneshot_broadcast() whether the CPU\nhas already switched to oneshot mode. If not, leave the device\nuntouched and let the CPU switch controlled into oneshot mode.\n\nThis is a long standing bug, which was never noticed, because the main\nuser of the broadcast x86 cannot run into that scenario, AFAICT. The\nnonarchitected timer mess of ARM creates a gazillion of differently\nbroken abominations which trigger the shortcomings of that broadcast\ncode, which better had never been necessary in the first place.\n\nReported-and-tested-by: Stehle Vincent-B46079 \u003cB46079@freescale.com\u003e\nReviewed-by: Stephen Boyd \u003csboyd@codeaurora.org\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e,\nCc: Mark Rutland \u003cmark.rutland@arm.com\u003e\nLink: http://lkml.kernel.org/r/alpine.DEB.2.02.1307012153060.4013@ionos.tec.linutronix.de\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "6d96e9394365dfddf5d418d8178ce2a503448c29", "tree": "356dfe3055d85c2198b9351f5c8d3d410000a3ed", "parents": [ "36c982c1c71b5bb35d06d46ffb82593bf8dbe8c7" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 11 14:04:48 2013 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sat Jul 13 11:03:41 2013 -0700" }, "message": "Revert \"sched: Add missing call to calc_load_exit_idle()\"\n\nThis reverts commit 48f0f14ffb6ff4852922994d11fbda418d40100e which was\ncommit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream.\n\nIt seems to be misapplied, and not needed for 3.4-stable\n\nReported-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nCc: Charles Wang \u003cmuming.wq@taobao.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "dde448d95d8698ee4c8373bb48fe08a22f41052f", "tree": "7fe87fa93bfa5b81e6f87b147e32512d2e8198e3", "parents": [ "ac4f6190fae02a3dc30133f90488b996f726bf7a", "f95b978981a7d154ba40d14c18e8ed5c694e6124" ], "author": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Thu Jun 20 11:32:42 2013 -0700" }, "committer": { "name": "Ethan Chen", "email": "intervigil@gmail.com", "time": "Thu Jun 20 11:32:42 2013 -0700" }, "message": "Merge tag \u0027v3.4.10\u0027 into cm-10.1\n\nThis is the 3.4.10 stable release\n\nConflicts:\n\tarch/arm/mm/tlb-v7.S\n\tarch/arm/vfp/entry.S\n\tdrivers/base/power/main.c\n\tdrivers/mmc/host/sdhci.c\n\tdrivers/net/tun.c\n\tdrivers/usb/core/hub.c\n\tdrivers/usb/host/xhci.h\n\tinclude/linux/sched.h\n\tkernel/power/suspend.c\n\nChange-Id: Ia2477ec93ceb64b13dd1a2d8aa646cb233387d14\n" }, { "commit": "33b7cfcb34b4ae37cde7a8a1c97c9be27677e931", "tree": "79d2091b2bcdfe3fda377633dc0322d0ce903781", "parents": [ "ed032fd4d81041e4002fc55ff1832ee588f103da" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri May 03 15:02:50 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun May 19 10:54:40 2013 -0700" }, "message": "tick: Cleanup NOHZ per cpu data on cpu down\n\ncommit 4b0c0f294f60abcdd20994a8341a95c8ac5eeb96 upstream.\n\nPrarit reported a crash on CPU offline/online. The reason is that on\nCPU down the NOHZ related per cpu data of the dead cpu is not cleaned\nup. If at cpu online an interrupt happens before the per cpu tick\ndevice is registered the irq_enter() check potentially sees stale data\nand dereferences a NULL pointer.\n\nCleanup the data after the cpu is dead.\n\nReported-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Mike Galbraith \u003cbitbucket@online.de\u003e\nLink: http://lkml.kernel.org/r/alpine.LFD.2.02.1305031451561.2886@ionos\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "357093a8b82c10e6fff37d3c772ccc0e3b0549c4", "tree": "7dd7440413bebabe4173b2e34574582b28b07e32", "parents": [ "97630ecdbda8138baf35a66b6e59dee940da05e1" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Apr 25 11:45:53 2013 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue May 07 19:51:56 2013 -0700" }, "message": "clockevents: Set dummy handler on CPU_DEAD shutdown\n\ncommit 6f7a05d7018de222e40ca003721037a530979974 upstream.\n\nVitaliy reported that a per cpu HPET timer interrupt crashes the\nsystem during hibernation. What happens is that the per cpu HPET timer\ngets shut down when the nonboot cpus are stopped. When the nonboot\ncpus are onlined again the HPET code sets up the MSI interrupt which\nfires before the clock event device is registered. The event handler\nis still set to hrtimer_interrupt, which then crashes the machine due\nto highres mode not being active.\n\nSee http://bugs.debian.org/cgi-bin/bugreport.cgi?bug\u003d700333\n\nThere is no real good way to avoid that in the HPET code. The HPET\ncode alrady has a mechanism to detect spurious interrupts when event\nhandler \u003d\u003d NULL for a similar reason.\n\nWe can handle that in the clockevent/tick layer and replace the\nprevious functional handler with a dummy handler like we do in\ntick_setup_new_device().\n\nThe original clockevents code did this in clockevents_exchange_device(),\nbut that got removed by commit 7c1e76897 (clockevents: prevent\nclockevent event_handler ending up handler_noop) which forgot to fix\nit up in tick_shutdown(). Same issue with the broadcast device.\n\nReported-by: Vitaliy Fillipov \u003cvitalif@yourcmc.ru\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: 700333@bugs.debian.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "5899ef0b272b58f2927eb3376afaad2b02559180", "tree": "e74731ea62cd7ba183152d23eef8e39a536f207e", "parents": [ "cbff2b6d371dbbae19de1dcfd09051683eca02ca" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Wed Feb 20 16:15:36 2013 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 28 12:12:27 2013 -0700" }, "message": "nohz: Make tick_nohz_irq_exit() irq safe\n\ncommit e5ab012c3271990e8457055c25cafddc1ae8aa6b upstream.\n\nAs it stands, irq_exit() may or may not be called with\nirqs disabled, depending on __ARCH_IRQ_EXIT_IRQS_DISABLED\nthat the arch can define.\n\nIt makes tick_nohz_irq_exit() unsafe. For example two\ninterrupts can race in tick_nohz_stop_sched_tick(): the inner\nmost one computes the expiring time on top of the timer list,\nthen it\u0027s interrupted right before reprogramming the\nclock. The new interrupt enqueues a new timer list timer,\nit reprogram the clock to take it into account and it exits.\nThe CPUs resumes the inner most interrupt and performs the clock\nreprogramming without considering the new timer list timer.\n\nThis regression has been introduced by:\n 280f06774afedf849f0b34248ed6aff57d0f6908\n (\"nohz: Separate out irq exit and idle loop dyntick logic\")\n\nLet\u0027s fix it right now with the appropriate protections.\n\nA saner long term solution will be to remove\n__ARCH_IRQ_EXIT_IRQS_DISABLED and mandate that irq_exit() is called\nwith interrupts disabled.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linuxfoundation.org\u003e\nLink: http://lkml.kernel.org/r/1361373336-11337-1-git-send-email-fweisbec@gmail.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Lingzhu Xiang \u003clxiang@redhat.com\u003e\nReviewed-by: CAI Qian \u003ccaiqian@redhat.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "8d96fcec68c30196fca01a75a911835c7b89a50d", "tree": "1a5524de1f2dda9b4426e941f7955eb854d8bc22", "parents": [ "3d2e7424b3e18dc851a4b0efdc6676c09573f55f" ], "author": { "name": "Mark Rutland", "email": "mark.rutland@arm.com", "time": "Thu Mar 07 15:09:24 2013 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Mar 28 12:12:26 2013 -0700" }, "message": "clockevents: Don\u0027t allow dummy broadcast timers\n\ncommit a7dc19b8652c862d5b7c4d2339bd3c428bd29c4a upstream.\n\nCurrently tick_check_broadcast_device doesn\u0027t reject clock_event_devices\nwith CLOCK_EVT_FEAT_DUMMY, and may select them in preference to real\nhardware if they have a higher rating value. In this situation, the\ndummy timer is responsible for broadcasting to itself, and the core\nclockevents code may attempt to call non-existent callbacks for\nprogramming the dummy, eventually leading to a panic.\n\nThis patch makes tick_check_broadcast_device always reject dummy timers,\npreventing this problem.\n\nSigned-off-by: Mark Rutland \u003cmark.rutland@arm.com\u003e\nCc: linux-arm-kernel@lists.infradead.org\nCc: Jon Medhurst (Tixy) \u003ctixy@linaro.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "1103ef8e70a1725b7fd9e0cb18a8b1edb6e5c42d", "tree": "b8380d301e5608d6151d24adb89948b1e972c6e5", "parents": [ "e84ad739d8a2143e5cd284a4c0462278587e4aa3" ], "author": { "name": "Dan Carpenter", "email": "dan.carpenter@oracle.com", "time": "Tue Oct 09 10:18:23 2012 +0300" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Mon Dec 03 11:47:23 2012 -0800" }, "message": "timekeeping: Cast raw_interval to u64 to avoid shift overflow\n\ncommit 5b3900cd409466c0070b234d941650685ad0c791 upstream.\n\nWe fixed a bunch of integer overflows in timekeeping code during the 3.6\ncycle. I did an audit based on that and found this potential overflow.\n\nSigned-off-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20121009071823.GA19159@elgon.mountain\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ben Hutchings \u003cben@decadent.org.uk\u003e\n[ herton: adapt for 3.5, timekeeper instead of tk pointer ]\nSigned-off-by: Herton Ronaldo Krzesinski \u003cherton.krzesinski@canonical.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "9a227fcb842a03fce5b8a6da0da40f5601ec6908", "tree": "d186f0f90e021d9fc9a35ab009cdcab3e315c8a2", "parents": [ "80257cbe62ea0919153c43421746269ab68473bf" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Sep 11 15:04:19 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Oct 02 10:30:36 2012 -0700" }, "message": "time: Move ktime_t overflow checking into timespec_valid_strict\n\ncommit cee58483cf56e0ba355fdd97ff5e8925329aa936 upstream\n\nAndreas Bombe reported that the added ktime_t overflow checking added to\ntimespec_valid in commit 4e8b14526ca7 (\"time: Improve sanity checking of\ntimekeeping inputs\") was causing problems with X.org because it caused\ntimeouts larger then KTIME_T to be invalid.\n\nPreviously, these large timeouts would be clamped to KTIME_MAX and would\nnever expire, which is valid.\n\nThis patch splits the ktime_t overflow checking into a new\ntimespec_valid_strict function, and converts the timekeeping codes\ninternal checking to use this more strict function.\n\nReported-and-tested-by: Andreas Bombe \u003caeb@debian.org\u003e\nCc: Zhouping Liu \u003czliu@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "80257cbe62ea0919153c43421746269ab68473bf", "tree": "8d1286bedf3fee0cbca60ca8c2029a71577401e9", "parents": [ "8e878154f5658ba93cf9bb2b491a930ec195de3d" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Sep 11 15:04:18 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Oct 02 10:30:36 2012 -0700" }, "message": "time: Avoid making adjustments if we haven\u0027t accumulated anything\n\ncommit bf2ac312195155511a0f79325515cbb61929898a upstream.\n\nIf update_wall_time() is called and the current offset isn\u0027t large\nenough to accumulate, avoid re-calling timekeeping_adjust which may\nchange the clock freq and can cause 1ns inconsistencies with\nCLOCK_REALTIME_COARSE/CLOCK_MONOTONIC_COARSE.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1345595449-34965-5-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "8e878154f5658ba93cf9bb2b491a930ec195de3d", "tree": "7c90f9cafce87cdf0b5629933a35144ee3d11d44", "parents": [ "504471eb5044e4a1dd10950d1a3efab39ba2083a" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Tue Sep 11 15:04:17 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Oct 02 10:30:36 2012 -0700" }, "message": "time: Improve sanity checking of timekeeping inputs\n\ncommit 4e8b14526ca7fb046a81c94002c1c43b6fdf0e9b upstream.\n\nUnexpected behavior could occur if the time is set to a value large\nenough to overflow a 64bit ktime_t (which is something larger then the\nyear 2262).\n\nAlso unexpected behavior could occur if large negative offsets are\ninjected via adjtimex.\n\nSo this patch improves the sanity check timekeeping inputs by\nimproving the timespec_valid() check, and then makes better use of\ntimespec_valid() to make sure we don\u0027t set the time to an invalid\nnegative value or one that overflows ktime_t.\n\nNote: This does not protect from setting the time close to overflowing\nktime_t and then letting natural accumulation cause the overflow.\n\nReported-by: CAI Qian \u003ccaiqian@redhat.com\u003e\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Zhouping Liu \u003czliu@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1344454580-17031-1-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "48f0f14ffb6ff4852922994d11fbda418d40100e", "tree": "c1889eaa22a13909c8790013e22852e8e4f7610f", "parents": [ "a95bb54b6345874159a82b93c67c49244d2433f2" ], "author": { "name": "Charles Wang", "email": "muming.wq@taobao.com", "time": "Mon Aug 20 16:02:33 2012 +0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Tue Oct 02 10:30:05 2012 -0700" }, "message": "sched: Add missing call to calc_load_exit_idle()\n\ncommit 749c8814f08f12baa4a9c2812a7c6ede7d69507d upstream.\n\nAzat Khuzhin reported high loadavg in Linux v3.6\n\nAfter checking the upstream scheduler code, I found Peter\u0027s commit:\n\n 5167e8d5417b sched/nohz: Rewrite and fix load-avg computation -- again\n\nnot fully applied, missing the call to calc_load_exit_idle().\n\nAfter that idle exit in sampling window will always be calculated\nto non-idle, and the load will be higher than normal.\n\nThis patch adds the missing call to calc_load_exit_idle().\n\nSigned-off-by: Charles Wang \u003cmuming.wq@taobao.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1345449754-27130-1-git-send-email-muming.wq@gmail.com\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "fd25080998d00a94a87bf7fc9f843291db7250a6", "tree": "ea5131b2e070fda20aa647ca9c74b34829958409", "parents": [ "5c8c9e57270fc5f54aa02144f7280f91ee2e3334" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Fri Jul 13 01:21:50 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jul 29 08:04:18 2012 -0700" }, "message": "ntp: Fix STA_INS/DEL clearing bug\n\ncommit 6b1859dba01c7d512b72d77e3fd7da8354235189 upstream.\n\nIn commit 6b43ae8a619d17c4935c3320d2ef9e92bdeed05d, I\nintroduced a bug that kept the STA_INS or STA_DEL bit\nfrom being cleared from time_status via adjtimex()\nwithout forcing STA_PLL first.\n\nUsually once the STA_INS is set, it isn\u0027t cleared\nuntil the leap second is applied, so its unlikely this\naffected anyone. However during testing I noticed it\ntook some effort to cancel a leap second once STA_INS\nwas set.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Richard Cochran \u003crichardcochran@gmail.com\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1342156917-25092-2-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "3cdeda1e763ccb2287c6ee76ece14145027653a9", "tree": "c871a197eb48e9f4cf862e68bfaa43b86bd21007", "parents": [ "6321a0a1a3a9d6c9cbd73d9a4159a97ac3bc0919" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 17 02:39:56 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 19 08:59:00 2012 -0700" }, "message": "timekeeping: Add missing update call in timekeeping_resume()\n\nThis is a backport of 3e997130bd2e8c6f5aaa49d6e3161d4d29b43ab0\n\nThe leap second rework unearthed another issue of inconsistent data.\n\nOn timekeeping_resume() the timekeeper data is updated, but nothing\ncalls timekeeping_update(), so now the update code in the timer\ninterrupt sees stale values.\n\nThis has been the case before those changes, but then the timer\ninterrupt was using stale data as well so this went unnoticed for quite\nsome time.\n\nAdd the missing update call, so all the data is consistent everywhere.\n\nReported-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nReported-and-tested-by: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nReported-and-tested-by: Martin Steigerwald \u003cMartin@lichtvoll.de\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@kernel.org\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e,\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "765bdc4d82fadcddfec19222a545e904633c7816", "tree": "1086773f08d9e4727c1cb6f90543258372db5673", "parents": [ "dd3cded0f516201d3b72999e588a6d67e00cb82f" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 17 02:39:54 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 19 08:59:00 2012 -0700" }, "message": "timekeeping: Provide hrtimer update function\n\nThis is a backport of f6c06abfb3972ad4914cef57d8348fcb2932bc3b\n\nTo finally fix the infamous leap second issue and other race windows\ncaused by functions which change the offsets between the various time\nbases (CLOCK_MONOTONIC, CLOCK_REALTIME and CLOCK_BOOTTIME) we need a\nfunction which atomically gets the current monotonic time and updates\nthe offsets of CLOCK_REALTIME and CLOCK_BOOTTIME with minimalistic\noverhead. The previous patch which provides ktime_t offsets allows us\nto make this function almost as cheap as ktime_get() which is going to\nbe replaced in hrtimer_interrupt().\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReviewed-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/1341960205-56738-7-git-send-email-johnstul@us.ibm.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7d1f07113b1b32da1eabce0dc74d9f96bbb7b90a", "tree": "6bdc4407079c57126f96c0409eda6e031d618695", "parents": [ "2e947d469fba2c2036ff50a2e58a1875ab2ea6b6" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 17 02:39:52 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 19 08:58:59 2012 -0700" }, "message": "timekeeping: Maintain ktime_t based offsets for hrtimers\n\nThis is a backport of 5b9fe759a678e05be4937ddf03d50e950207c1c0\n\nWe need to update the hrtimer clock offsets from the hrtimer interrupt\ncontext. To avoid conversions from timespec to ktime_t maintain a\nktime_t based representation of those offsets in the timekeeper. This\nputs the conversion overhead into the code which updates the\nunderlying offsets and provides fast accessible values in the hrtimer\ninterrupt.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nReviewed-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1341960205-56738-4-git-send-email-johnstul@us.ibm.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "2e947d469fba2c2036ff50a2e58a1875ab2ea6b6", "tree": "7f9a44c90974ff3c380b8a798c82f55c9215248f", "parents": [ "5e5006e64cae9603841405af9febb67064869d83" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 17 02:39:51 2012 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 19 08:58:59 2012 -0700" }, "message": "timekeeping: Fix leapsecond triggered load spike issue\n\nThis is a backport of 4873fa070ae84a4115f0b3c9dfabc224f1bc7c51\n\nThe timekeeping code misses an update of the hrtimer subsystem after a\nleap second happened. Due to that timers based on CLOCK_REALTIME are\neither expiring a second early or late depending on whether a leap\nsecond has been inserted or deleted until an operation is initiated\nwhich causes that update. Unless the update happens by some other\nmeans this discrepancy between the timekeeping and the hrtimer data\nstays forever and timers are expired either early or late.\n\nThe reported immediate workaround - $ data -s \"`date`\" - is causing a\ncall to clock_was_set() which updates the hrtimer data structures.\nSee: http://www.sheeri.com/content/mysql-and-leap-second-high-cpu-and-fix\n\nAdd the missing clock_was_set() call to update_wall_time() in case of\na leap second event. The actual update is deferred to softirq context\nas the necessary smp function call cannot be invoked from hard\ninterrupt context.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nReported-by: Jan Engelhardt \u003cjengelh@inai.de\u003e\nReviewed-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Prarit Bhargava \u003cprarit@redhat.com\u003e\nLink: http://lkml.kernel.org/r/1341960205-56738-3-git-send-email-johnstul@us.ibm.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Prarit Bhargava \u003cprarit@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "7490d0a4cfefa16f9d8ce636eb5b2e13d2432db3", "tree": "70ee2418549bd1af674a7bda391140a45a5e11ce", "parents": [ "667fb5508900340d657645e0bfc9bf210a1fc363" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jun 22 15:52:09 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Jul 19 08:58:56 2012 -0700" }, "message": "sched/nohz: Rewrite and fix load-avg computation -- again\n\ncommit 5167e8d5417bf5c322a703d2927daec727ea40dd upstream.\n\nThanks to Charles Wang for spotting the defects in the current code:\n\n - If we go idle during the sample window -- after sampling, we get a\n negative bias because we can negate our own sample.\n\n - If we wake up during the sample window we get a positive bias\n because we push the sample to a known active period.\n\nSo rewrite the entire nohz load-avg muck once again, now adding\ncopious documentation to the code.\n\nReported-and-tested-by: Doug Smythies \u003cdsmythies@telus.net\u003e\nReported-and-tested-by: Charles Wang \u003cmuming.wq@gmail.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1340373782.18025.74.camel@twins\n[ minor edits ]\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "9feb87d70208e2236d24ef0ac2fa4d0e28e7d335", "tree": "81e28ee19f740efbe184e66fdec8f3e2e97f3f00", "parents": [ "945ff3d84e4f899dd7eeb311878d4dbbcc19e3e1" ], "author": { "name": "Jeff Ohlstein", "email": "johlstei@codeaurora.org", "time": "Tue Jul 17 16:45:19 2012 -0700" }, "committer": { "name": "Jeff Ohlstein", "email": "johlstei@codeaurora.org", "time": "Tue Jul 17 16:50:23 2012 -0700" }, "message": "tick-sched: recalculate sleep length each time it is requested\n\nRecalculating the sleep length each time its called allows us to account\nfor the fact that the amount of time we can sleep for might change after\ntick_nohz_stop_sched_tick is called in idle. The prime example of this\nis an idle notifier that cancels timers as we are entering idle.\n\nChange-Id: I92871efc7befb3fee2a816da16145ba9da334a9e\nSigned-off-by: Jeff Ohlstein \u003cjohlstei@codeaurora.org\u003e\n" }, { "commit": "c17f648b6e8adb8379b2d2972e24953285332f44", "tree": "7b5bf4065b4a8cdeaf3d34bcb86fc621eb5960ea", "parents": [ "e60a87bab7ce339c034b7d7dd365d687bbffd091" ], "author": { "name": "Richard Cochran", "email": "richardcochran@gmail.com", "time": "Thu Apr 26 14:11:32 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Jun 22 11:37:16 2012 -0700" }, "message": "ntp: Correct TAI offset during leap second\n\ncommit dd48d708ff3e917f6d6b6c2b696c3f18c019feed upstream.\n\nWhen repeating a UTC time value during a leap second (when the UTC\ntime should be 23:59:60), the TAI timescale should not stop. The kernel\nNTP code increments the TAI offset one second too late. This patch fixes\nthe issue by incrementing the offset during the leap second itself.\n\nSigned-off-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "d913c02b0a172d5dca6280da5b17a407d69bbce4", "tree": "d1efd41f5bb0214b30f04f29c6b4672c6017d40b", "parents": [ "3410afedcda2f504e8fbe02a7f4c49912ce688c8" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed May 30 10:54:57 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Sun Jun 17 11:21:23 2012 -0700" }, "message": "timekeeping: Fix CLOCK_MONOTONIC inconsistency during leapsecond\n\ncommit fad0c66c4bb836d57a5f125ecd38bed653ca863a upstream.\n\nCommit 6b43ae8a61 (ntp: Fix leap-second hrtimer livelock) broke the\nleapsecond update of CLOCK_MONOTONIC. The missing leapsecond update to\nwall_to_monotonic causes discontinuities in CLOCK_MONOTONIC.\n\nAdjust wall_to_monotonic when NTP inserted a leapsecond.\n\nReported-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nTested-by: Richard Cochran \u003crichardcochran@gmail.com\u003e\nLink: http://lkml.kernel.org/r/1338400497-12420-1-git-send-email-john.stultz@linaro.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n\n" }, { "commit": "f132c6cf77251e011e1dad0ec88c0b1fda16d5aa", "tree": "f04b469a3547a19b7bdbe110adc571eb71c93328", "parents": [ "23016defd7db701a01dc49f972ad6b1bae9651c2", "3f6240f3e4e2608caf1a70d614ada658cbcbe7be" ], "author": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:30:57 2012 -0700" }, "committer": { "name": "Steve Muckle", "email": "smuckle@codeaurora.org", "time": "Wed Jun 06 18:45:28 2012 -0700" }, "message": "Merge commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027 into msm-3.4\n\nAU_LINUX_ANDROID_ICS.04.00.04.00.126 from msm-3.0.\nFirst parent is from google/android-3.4.\n\n* commit \u0027AU_LINUX_ANDROID_ICS.04.00.04.00.126\u0027: (8712 commits)\n PRNG: Device tree entry for qrng device.\n vidc:1080p: Set video core timeout value for Thumbnail mode\n msm: sps: improve the debugging support in SPS driver\n board-8064 msm: Overlap secure and non secure video firmware heaps.\n msm: clock: Add handoff ops for 7x30 and copper XO clocks\n msm_fb: display: Wait for external vsync before DTV IOMMU unmap\n msm: Fix ciruclar dependency in debug UART settings\n msm: gdsc: Add GDSC regulator driver for msm-copper\n defconfig: Enable Mobicore Driver.\n mobicore: Add mobicore driver.\n mobicore: rename variable to lower case.\n mobicore: rename folder.\n mobicore: add makefiles\n mobicore: initial import of kernel driver\n ASoC: msm: Add SLIMBUS_2_RX CPU DAI\n board-8064-gpio: Update FUNC for EPM SPI CS\n msm_fb: display: Remove chicken bit config during video playback\n mmc: msm_sdcc: enable the sanitize capability\n msm-fb: display: lm2 writeback support on mpq platfroms\n msm_fb: display: Disable LVDS phy \u0026 pll during panel off\n ...\n\nSigned-off-by: Steve Muckle \u003csmuckle@codeaurora.org\u003e\n" }, { "commit": "aadf030d84352a91cdadf50f947da739c5611450", "tree": "5f22ec57ee257776b4c157f0c91f3612f05ed6c5", "parents": [ "aad2732ba0dddcf3446a4e3c4843496759c1c305", "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue May 01 15:47:09 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc5\u0027 into android-3.4\n" }, { "commit": "ab2965eefef95a2eecfd54c12b0eb243162862e9", "tree": "c947fdc158e144c2d060486b65d10ee67d254039", "parents": [ "a0ec4361e4539e30cf1c5de7ddfd2dadcd8e1595", "e816b57a337ea3b755de72bec38c10c864f23015" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Apr 19 14:42:22 2012 -0700" }, "message": "Merge commit \u0027v3.4-rc3\u0027 into android-3.4\n\nConflicts:\n\tdrivers/staging/android/lowmemorykiller.c\n\nChange-Id: Ia3ffcfc702e28c4fce0e91b363f4afd5f1c40306\n" }, { "commit": "a6371f80230eaaafd7eef7efeedaa9509bdc982d", "tree": "bb2d800c95cde553e126c28cb58133189b015a47", "parents": [ "b9a6a23566960d0dd3f51e2e68b472cd61911078" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Wed Apr 18 19:27:39 2012 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Apr 19 21:27:50 2012 +0200" }, "message": "tick: Fix the spurious broadcast timer ticks after resume\n\nDuring resume, tick_resume_broadcast() programs the broadcast timer in\noneshot mode unconditionally. On the platforms where broadcast timer\nis not really required, this will generate spurious broadcast timer\nticks upon resume. For example, on the always running apic timer\nplatforms with HPET, I see spurious hpet tick once every ~5minutes\n(which is the 32-bit hpet counter wraparound time).\n\nSimilar to boot time, during resume make the oneshot mode setting of\nthe broadcast clock event device conditional on the state of active\nbroadcast users.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nTested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nTested-by: svenjoac@gmx.de\nCc: torvalds@linux-foundation.org\nCc: rjw@sisk.pl\nLink: http://lkml.kernel.org/r/1334802459.28674.209.camel@sbsiddha-desk.sc.intel.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "b9a6a23566960d0dd3f51e2e68b472cd61911078", "tree": "d9da5fb202a21b9036e961a5f4d3190e57343a6c", "parents": [ "b435092f70ec5ebbfb6d075d5bf3c631b49a51de" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Apr 18 17:31:58 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Apr 19 21:27:35 2012 +0200" }, "message": "tick: Ensure that the broadcast device is initialized\n\nSantosh found another trap when we avoid to initialize the broadcast\ndevice in the switch_to_oneshot code. The broadcast device might be\nstill in SHUTDOWN state when we actually need to use it. That\nobviously breaks, as set_next_event() is called on a shutdown\ndevice. This did not break on x86, but Suresh analyzed it:\n\nFrom the review, most likely on Sven\u0027s system we are force enabling\nthe hpet using the pci quirk\u0027s method very late. And in this case,\nhpet_clockevent (which will be global_clock_event) handler can be\nnull, specifically as this platform might not be using deeper c-states\nand using the reliable APIC timer.\n\nPrior to commit \u0027fa4da365bc7772c\u0027, that handler will be set to\n\u0027tick_handle_oneshot_broadcast\u0027 when we switch the broadcast timer to\noneshot mode, even though we don\u0027t use it. Post commit\n\u0027fa4da365bc7772c\u0027, we stopped switching the broadcast mode to oneshot\nas this is not really needed and his platform\u0027s global_clock_event\u0027s\nhandler will remain null. While on my SNB laptop, same is set to\n\u0027clockevents_handle_noop\u0027 because hpet gets enabled very early. (noop\nhandler on my platform set when the early enabled hpet timer gets\nreplaced by the lapic timer).\n\nBut the commit \u0027fa4da365bc7772c\u0027 tracked the broadcast timer mode in\nthe SW as oneshot, even though it didn\u0027t touch the HW timer. During\nresume however, tick_resume_broadcast() saw the SW broadcast mode as\noneshot and actually programmed the broadcast device also into oneshot\nmode. So this triggered the null pointer de-reference after the hpet\nwraps around and depending on what the hpet counter is set to. On the\nnormal platforms where hpet gets enabled early we should be seeing a\nspurious interrupt (in my SNB laptop I see one spurious interrupt\nafter around 5 minutes ;) which is 32-bit hpet counter wraparound\ntime), but that\u0027s a separate issue.\n\nEnforce the mode setting when trying to set an event.\n\nReported-and-tested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: torvalds@linux-foundation.org\nCc: svenjoac@gmx.de\nCc: rjw@sisk.pl\nLink: http://lkml.kernel.org/r/alpine.LFD.2.02.1204181723350.2542@ionos\n\n" }, { "commit": "b435092f70ec5ebbfb6d075d5bf3c631b49a51de", "tree": "c9cfd15c405dd218003fd84585196b5bffcc9bbd", "parents": [ "592fe8980688e7cba46897685d014c7fb3018a67" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Apr 18 12:08:23 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Apr 18 14:00:56 2012 +0200" }, "message": "tick: Fix oneshot broadcast setup really\n\nSven Joachim reported, that suspend/resume on rc3 trips over a NULL\npointer dereference. Linus spotted the clockevent handler being NULL.\n\ncommit fa4da365b(clockevents: tTack broadcast device mode change in\ntick_broadcast_switch_to_oneshot()) tried to fix a problem with the\nbroadcast device setup, which was introduced in commit 77b0d60c5(\nclockevents: Leave the broadcast device in shutdown mode when not\nneeded).\n\nThe initial commit avoided to set up the broadcast device when no\nbroadcast request bits were set, but that left the broadcast device\ndisfunctional. In consequence deep idle states which need the\nbroadcast device were not woken up.\n\ncommit fa4da365b tried to fix that by initializing the state of the\nbroadcast facility, but that missed the fact, that nothing initializes\nthe event handler and some other state of the underlying clock event\ndevice.\n\nThe fix is to revert both commits and make only the mode setting of\nthe clock event device conditional on the state of active broadcast\nusers. \n\nThat initializes everything except the low level device mode, but this\nhappens when the broadcast functionality is invoked by deep idle.\n\nReported-and-tested-by: Sven Joachim \u003csvenjoac@gmx.de\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nLink: http://lkml.kernel.org/r/alpine.LFD.2.02.1204181205540.2542@ionos\n\n" }, { "commit": "fa4da365bc7772c2cd6d5405bdf151612455f957", "tree": "a688173e5ba7428e934dee1ea2905c2bbe92ef50", "parents": [ "9886f444129171569461d8c39983e16f4871e3b4" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Mon Apr 09 15:41:44 2012 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Apr 10 11:42:07 2012 +0200" }, "message": "clockevents: tTack broadcast device mode change in tick_broadcast_switch_to_oneshot()\n\nIn the commit 77b0d60c5adf39c74039e2142a1d3cd1e4d53799,\n\"clockevents: Leave the broadcast device in shutdown mode when not needed\",\nwe were bailing out too quickly in tick_broadcast_switch_to_oneshot(),\nwith out tracking the broadcast device mode change to \u0027TICKDEV_MODE_ONESHOT\u0027.\n\nThis breaks the platforms which need broadcast device oneshot services during\ndeep idle states. tick_broadcast_oneshot_control() thinks that it is\nin periodic mode and fails to take proper decisions based on the\nCLOCK_EVT_NOTIFY_BROADCAST_[ENTER, EXIT] notifications during deep\nidle entry/exit.\n\nFix this by tracking the broadcast device mode as \u0027TICKDEV_MODE_ONESHOT\u0027,\nbefore leaving the broadcast HW device in shutdown mode if there are no active\nrequests for the moment.\n\nReported-and-tested-by: Santosh Shilimkar \u003csantosh.shilimkar@ti.com\u003e\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: johnstul@us.ibm.com\nLink: http://lkml.kernel.org/r/1334011304.12400.81.camel@sbsiddha-desk.sc.intel.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "bec4ab42f9d12aab2849aca47908e1aabb930987", "tree": "f8b91a97358ab1b388dddd661aa5bcb083f369a3", "parents": [ "1b16062778209fc584b65fd8601b152f99528873" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Dec 09 18:44:02 2011 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Apr 09 13:58:00 2012 -0700" }, "message": "alarmtimer: Provide accessor to alarmtimer rtc device\n\nThe Android alarm interface provides a settime call that sets both\nthe alarmtimer RTC device and CLOCK_REALTIME to the same value.\n\nSince there may be multiple rtc devices, provide a hook to access the\none the alarmtimer infrastructure is using.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "6f103929f8979d2638e58d7f7fda0beefcb8ee7e", "tree": "e1ef3fc388c177e8e8ca4b6daa797fe7f9306d84", "parents": [ "3872c48b14259d8c0a00c9fff06a4a4123f7f4eb" ], "author": { "name": "Neal Cardwell", "email": "ncardwell@google.com", "time": "Tue Mar 27 15:09:37 2012 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Fri Apr 06 13:24:17 2012 +0200" }, "message": "nohz: Fix stale jiffies update in tick_nohz_restart()\n\nFix tick_nohz_restart() to not use a stale ktime_t \"now\" value when\ncalling tick_do_update_jiffies64(now).\n\nIf we reach this point in the loop it means that we crossed a tick\nboundary since we grabbed the \"now\" timestamp, so at this point \"now\"\nrefers to a time in the old jiffy, so using the old value for \"now\" is\nincorrect, and is likely to give us a stale jiffies value.\n\nIn particular, the first time through the loop the\ntick_do_update_jiffies64(now) call is always a no-op, since the\ncaller, tick_nohz_restart_sched_tick(), will have already called\ntick_do_update_jiffies64(now) with that \"now\" value.\n\nNote that tick_nohz_stop_sched_tick() already uses the correct\napproach: when we notice we cross a jiffy boundary, grab a new\ntimestamp with ktime_get(), and *then* update jiffies.\n\nSigned-off-by: Neal Cardwell \u003cncardwell@google.com\u003e\nCc: Ben Segall \u003cbsegall@google.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: stable@vger.kernel.org\nLink: http://lkml.kernel.org/r/1332875377-23014-1-git-send-email-ncardwell@google.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "3872c48b14259d8c0a00c9fff06a4a4123f7f4eb", "tree": "94e5f5c1898896436e9534aa182d8c3aef255826", "parents": [ "cb85a6ed67e979c59a29b7b4e8217e755b951cf4" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 31 12:45:43 2012 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 31 12:45:43 2012 +0200" }, "message": "tick: Document TICK_ONESHOT config option\n\nThis option has been selected from arch code as it was assumed that\nit\u0027s necessary to support oneshot mode clockevent devices. But it\u0027s\njust a core internal helper to compile tick-oneshot.c if NOHZ or\nHIG_RES_TIMERS are selected.\n\nReported-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "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": "bcd550745fc54f789c14e7526e0633222c505faa", "tree": "c3fe11a6503b7ffdd4406a9fece5c40b3e2a3f6d", "parents": [ "93f378883cecb9dcb2cf5b51d9d24175906659da", "646783a389828e76e813f50791f7999429c821bc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:16:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 29 14:16:48 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer core updates from Thomas Gleixner.\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n ia64: vsyscall: Add missing paranthesis\n alarmtimer: Don\u0027t call rtc_timer_init() when CONFIG_RTC_CLASS\u003dn\n x86: vdso: Put declaration before code\n x86-64: Inline vdso clock_gettime helpers\n x86-64: Simplify and optimize vdso clock_gettime monotonic variants\n kernel-time: fix s/then/than/ spelling errors\n time: remove no_sync_cmos_clock\n time: Avoid scary backtraces when warning of \u003e 11% adj\n alarmtimer: Make sure we initialize the rtctimer\n ntp: Fix leap-second hrtimer livelock\n x86, tsc: Skip refined tsc calibration on systems with reliable TSC\n rtc: Provide flag for rtc devices that don\u0027t support UIE\n ia64: vsyscall: Use seqcount instead of seqlock\n x86: vdso: Use seqcount instead of seqlock\n x86: vdso: Remove bogus locking in update_vsyscall_tz()\n time: Remove bogus comments\n time: Fix change_clocksource locking\n time: x86: Fix race switching from vsyscall to non-vsyscall clock\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": "c5e14e763046b11dd8bf57b5dc9f3ab444af8e60", "tree": "8f3c68218ef4ffadeb5c0620b9d2fe6e1fd17281", "parents": [ "68fe7b23d559763a2e19e5fc1cf7036e4aaecb10" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 24 12:46:23 2012 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 24 12:46:23 2012 +0100" }, "message": "alarmtimer: Don\u0027t call rtc_timer_init() when CONFIG_RTC_CLASS\u003dn\n\nrtc_timer_init() is not available when CONFIG_RTC_CLASS\u003dn. Provide a\nproper wrapper in the RTC section of alarmtimer.c\n\nReported-by: Ingo Molnar \u003cmingo@kernel.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "88b28adf6fcdd6d10a1cfc7765bb200d7366a265", "tree": "2a5e792dbd6e3a8971e8c163dac7f6a85f52f101", "parents": [ "335dd85895abeca1957d5eaa3013dfe8dc60c7d7" ], "author": { "name": "Jim Cromie", "email": "jim.cromie@gmail.com", "time": "Wed Mar 14 21:28:56 2012 -0600" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Mar 23 16:49:21 2012 -0700" }, "message": "kernel-time: fix s/then/than/ spelling errors\n\nUse than for comparisons, like more than.\n\nCC: John Stultz \u003cjohn.stultz@linaro.org\u003e\nSigned-off-by: Jim Cromie \u003cjim.cromie@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "335dd85895abeca1957d5eaa3013dfe8dc60c7d7", "tree": "7ab7ae63376047f6b9fb05b98db6d8ef252c1b5e", "parents": [ "e919cfd42da54d400e7e0385f22cae3672dcf874" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Sat Feb 11 17:54:59 2012 -0200" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Mar 23 16:25:20 2012 -0700" }, "message": "time: remove no_sync_cmos_clock\n\nCommit 9863c90f682fba34cdc26c3437e8c00da6c83fa4 (x86, vmware: Remove\ndeprecated VMI kernel support) removed the only place which set\nno_sync_cmos_clock. Since that commit, this variable is never set.\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "e919cfd42da54d400e7e0385f22cae3672dcf874", "tree": "2fad9b552439188e2e48b0d3b0cacce52dc71b95", "parents": [ "ad30dfa94c5cc23931c822922a50bd163ab293a5" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Mar 22 19:14:46 2012 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Mar 23 16:25:16 2012 -0700" }, "message": "time: Avoid scary backtraces when warning of \u003e 11% adj\n\nFolks have been getting a number of warnings about time\nadjustments \u003e 11%. The WARN_ON leaves a big useless backtrace\nso this patch removes it for a printk_once().\n\nI\u0027m still working to narrow down the cause of the \u003e 11% adjustment.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "ad30dfa94c5cc23931c822922a50bd163ab293a5", "tree": "574daa8c88b38161fe6139ba2b3fcda42538f32d", "parents": [ "6b43ae8a619d17c4935c3320d2ef9e92bdeed05d" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Mar 23 15:52:25 2012 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Mar 23 16:23:12 2012 -0700" }, "message": "alarmtimer: Make sure we initialize the rtctimer\n\njonghwan Choi reported seeing warnings with the alarmtimer\ncode at suspend/resume time, and pointed out that the\nrtctimer isn\u0027t being properly initialized.\n\nThis patch corrects this issue.\n\nReported-by: jonghwan Choi \u003cjhbird.choi@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "7bfe0e66d5da32961f0060fc5d96b739b1ed64b9", "tree": "6d5dcf77248b574bb0c50930bbf9030aafb99fce", "parents": [ "6a76a6992341faab0ef31e7d97000e0cf336d0ba", "10ce3cc919f50c2043b41ca968b43c26a3672600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input subsystem updates from Dmitry Torokhov:\n \"- we finally merged driver for USB version of Synaptics touchpads\n (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);\n\n - a bunch of new drivers for embedded platforms (Cypress\n touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x\n touchscreens, TI touchscreen);\n\n - input core allows clients to specify desired clock source for\n timestamps on input events (EVIOCSCLOCKID ioctl);\n\n - input core allows querying state of all MT slots for given event\n code via EVIOCGMTSLOTS ioctl;\n\n - various driver fixes and improvements.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)\n Input: ili210x - add support for Ilitek ILI210x based touchscreens\n Input: altera_ps2 - use of_match_ptr()\n Input: synaptics_usb - switch to module_usb_driver()\n Input: convert I2C drivers to use module_i2c_driver()\n Input: convert SPI drivers to use module_spi_driver()\n Input: omap4-keypad - move platform_data to \u003clinux/platform_data\u003e\n Input: kxtj9 - who_am_i check value and initial data rate fixes\n Input: add driver support for MAX8997-haptic\n Input: tegra-kbc - revise device tree support\n Input: of_keymap - add device tree bindings for simple key matrices\n Input: wacom - fix physical size calculation for 3rd-gen Bamboo\n Input: twl4030-vibra - really switch from #if to #ifdef\n Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible\n Input: max8925_onkey - avoid accessing input device too early\n Input: max8925_onkey - allow to be used as a wakeup source\n Input: atmel-wm97xx - convert to dev_pm_ops\n Input: atmel-wm97xx - set driver owner\n Input: add cyttsp touchscreen maintainer entry\n Input: cyttsp - remove useless checks in cyttsp_probe()\n Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037\n ...\n" }, { "commit": "6b43ae8a619d17c4935c3320d2ef9e92bdeed05d", "tree": "007df06a9cf0d4d2b72ed7dd8d646e853de80e9b", "parents": [ "57779dc2b3b75bee05ef5d1ada47f615f7a13932" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Mar 15 13:04:03 2012 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Mar 22 19:43:43 2012 -0700" }, "message": "ntp: Fix leap-second hrtimer livelock\n\nSince commit 7dffa3c673fbcf835cd7be80bb4aec8ad3f51168 the ntp\nsubsystem has used an hrtimer for triggering the leapsecond\nadjustment. However, this can cause a potential livelock.\n\nThomas diagnosed this as the following pattern:\nCPU 0 CPU 1\ndo_adjtimex()\n spin_lock_irq(\u0026ntp_lock);\n process_adjtimex_modes();\t\t\t\t timer_interrupt()\n process_adj_status(); do_timer()\n ntp_start_leap_timer(); write_lock(\u0026xtime_lock);\n hrtimer_start(); update_wall_time();\n hrtimer_reprogram(); ntp_tick_length()\n tick_program_event() spin_lock(\u0026ntp_lock);\n clockevents_program_event()\n\t\t ktime_get()\n seq \u003d req_seqbegin(xtime_lock);\n\nThis patch tries to avoid the problem by reverting back to not using\nan hrtimer to inject leapseconds, and instead we handle the leapsecond\nprocessing in the second_overflow() function.\n\nThe downside to this change is that on systems that support highres\ntimers, the leap second processing will occur on a HZ tick boundary,\n(ie: ~1-10ms, depending on HZ) after the leap second instead of\npossibly sooner (~34us in my tests w/ x86_64 lapic).\n\nThis patch applies on top of tip/timers/core.\n\nCC: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nReported-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nDiagnoised-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nTested-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "f695cf94837de53864180400cbac42cfa370426f", "tree": "9bb91a9b8c5a1291a083a37e790da00d477b18f8", "parents": [ "a939e817aa7e199d2fff05a67cb745be32dd5c2d" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Wed Mar 14 16:38:15 2012 -0700" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Mar 15 18:17:54 2012 -0700" }, "message": "time: Fix change_clocksource locking\n\nchange_clocksource() fails to grab locks or call timekeeping_update(),\nwhich leaves a race window for time inconsistencies.\n\nThis adds proper locking and a call to timekeeping_update() to fix this.\n\nCC: Andy Lutomirski \u003cluto@amacapital.net\u003e\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33", "tree": "473eb7484d966e65c51487c72d47502096ab7b99", "parents": [ "f910381a55cdaa097030291f272f6e6e4380c39a" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Thu Mar 15 12:36:14 2012 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Mar 15 21:41:34 2012 +0100" }, "message": "ntp: Fix integer overflow when setting time\n\n\u0027long secs\u0027 is passed as divisor to div_s64, which accepts a 32bit\ndivisor. On 64bit machines that value is trimmed back from 8 bytes\nback to 4, causing a divide by zero when the number is bigger than\n(1 \u003c\u003c 32) - 1 and all 32 lower bits are 0.\n\nUse div64_long() instead.\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCc: johnstul@us.ibm.com\nLink: http://lkml.kernel.org/r/1331829374-31543-2-git-send-email-levinsasha928@gmail.com\nCc: stable@vger.kernel.org\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "b675b3667f6729dcd1036a2a129b35445947f905", "tree": "0d58791e9063d3ca2c352da6f3e7df2bdb876f9d", "parents": [ "104a5f3cad8f2f27cadbdf0029400ecd9e17ccc0", "192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Mar 09 10:55:17 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Mar 09 10:55:17 2012 -0800" }, "message": "Merge commit \u0027v3.3-rc6\u0027 into next\n" }, { "commit": "97ac984d2feec885d10f900591431088eab42021", "tree": "e66e4e2ecb428d6ea45a6495b0675e3531ba23d1", "parents": [ "8682df25ca9afd3aac30f2c72d00bd98de2118e8", "cc06268c6a87db156af2daed6e96a936b955cc82" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 15 20:29:18 2012 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 15 20:29:18 2012 +0100" }, "message": "Merge branch \u0027fortglx/3.4/time\u0027 of git://git.linaro.org/people/jstultz/linux into timers/core\n" }, { "commit": "15f827be93928890bba965bc175caee50c4406d2", "tree": "f858d834563a8f47327fbd4792dcf3b5499901b9", "parents": [ "430ee8819553f66fe00e36f676a45886d76e7e8b" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jan 24 18:59:43 2012 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 15 15:23:09 2012 +0100" }, "message": "nohz: Remove ts-\u003eEinidle checks before restarting the tick\n\nts-\u003einidle is set by tick_nohz_idle_enter() and unset by\ntick_nohz_idle_exit(). However these two calls are assumed\nto be always paired. This means that by the time we call\ntick_nohz_idle_exit(), ts-\u003einidle is supposed to be always\nset to 1.\n\nRemove the checks for ts-\u003einidle in tick_nohz_idle_exit().\nThis simplifies a bit the code and improves its debuggability\n(ie: ensure the call is paired with a tick_nohz_idle_enter()\ncall).\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nReviewed-by: Yong Zhang \u003cyong.zhang0@gmail.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: John Stultz \u003cjohn.stultz@linaro.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nLink: http://lkml.kernel.org/r/1327427984-23282-2-git-send-email-fweisbec@gmail.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "430ee8819553f66fe00e36f676a45886d76e7e8b", "tree": "e45859ba70d207635a21a27fffa438ecb3a60155", "parents": [ "77b0d60c5adf39c74039e2142a1d3cd1e4d53799" ], "author": { "name": "Michal Hocko", "email": "mhocko@suse.cz", "time": "Thu Dec 01 17:00:22 2011 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 15 15:23:09 2012 +0100" }, "message": "nohz: Remove update_ts_time_stat from tick_nohz_start_idle\n\nThere is no reason to call update_ts_time_stat from tick_nohz_start_idle\nanymore (after e0e37c20 sched: Eliminate the ts-\u003eidle_lastupdate field)\nwhen we updated idle_lastupdate unconditionally.\n\nWe haven\u0027t set idle_active yet and do not provide last_update_time so\nthe whole call end up being just 2 wasted branches.\n\nSigned-off-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nLink: http://lkml.kernel.org/r/1322755222-6951-1-git-send-email-mhocko@suse.cz\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "77b0d60c5adf39c74039e2142a1d3cd1e4d53799", "tree": "9c009072825bedc6423df543b6b8e12a342cfeb7", "parents": [ "7ada1dd62804ca9ce1cb8666c6e563cd92fa50c1" ], "author": { "name": "Suresh Siddha", "email": "suresh.b.siddha@intel.com", "time": "Fri Nov 04 17:18:21 2011 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Feb 15 15:23:09 2012 +0100" }, "message": "clockevents: Leave the broadcast device in shutdown mode when not needed\n\nPlatforms with Always Running APIC Timer doesn\u0027t use the broadcast timer\nbut the kernel is leaving the broadcast timer (HPET in this case)\nin oneshot mode.\n\nOn these platforms, before the switch to oneshot mode, broadcast device is\nactually in shutdown mode. Code checks for empty tick_broadcast_mask and\navoids going into the periodic mode.\n\nDuring switch to oneshot mode, add the same tick_broadcast_mask checks in the\ntick_broadcast_switch_to_oneshot() and avoid the broadcast device going into\nthe oneshot mode.\n\nSigned-off-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: john stultz \u003cjohnstul@us.ibm.com\u003e\nCc: venki@google.com\nLink: http://lkml.kernel.org/r/1320452301.15071.16.camel@sbsiddha-desk.sc.intel.com\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "a80b83b7b8456e9b475346c2e01d7e210883208c", "tree": "fb05acce28923e0e62b1b13cd39b9e1eee9bd0ae", "parents": [ "4065d1e7b2164cff4af57b58fac887df2fe75d2a" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Fri Feb 03 00:19:07 2012 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Fri Feb 03 00:24:58 2012 -0800" }, "message": "Input: add infrastructure for selecting clockid for event time stamps\n\nAs noted by Arve and others, since wall time can jump backwards, it is\ndifficult to use for input because one cannot determine if one event\noccurred before another or for how long a key was pressed.\n\nHowever, the timestamp field is part of the kernel ABI, and cannot be\nchanged without possibly breaking existing users.\n\nThis patch adds a new IOCTL that allows a clockid to be set in the\nevdev_client struct that will specify which time base to use for event\ntimestamps (ie: CLOCK_MONOTONIC instead of CLOCK_REALTIME).\n\nFor now we only support CLOCK_MONOTONIC and CLOCK_REALTIME, but\nin the future we could support other clockids if appropriate.\n\nThe default remains CLOCK_REALTIME, so we don\u0027t change the ABI.\n\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\nReviewed-by: Daniel Kurtz \u003cdjkurtz@google.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "cc06268c6a87db156af2daed6e96a936b955cc82", "tree": "7edfb767cf3a58b82c8ee299d3689943b87d1d3d", "parents": [ "058892e632aa53be8255c2f0a42f9ace7bed66bb" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sun Nov 13 23:19:49 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:31 2012 -0800" }, "message": "time: Move common updates to a function\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "058892e632aa53be8255c2f0a42f9ace7bed66bb", "tree": "3528cc45b80245fc8d3eba00d3cda80f782d0fe1", "parents": [ "92c1d3ed4dc0b8cfb10e85ed0c9934db41efc027" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sun Nov 13 23:19:48 2011 +0000" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:29 2012 -0800" }, "message": "time: Reorder so the hot data is together\n\nKeep all the interesting data in a single cache line.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "92c1d3ed4dc0b8cfb10e85ed0c9934db41efc027", "tree": "233556d74e7bd062d8e174bc0a33fdc2dc7f95b1", "parents": [ "bd3312681f69207a40431981c1bce1afdc9b7975" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 14:05:44 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:27 2012 -0800" }, "message": "time: Remove most of xtime_lock usage in timekeeping.c\n\nNow that ntp.c\u0027s locking is reworked, we can remove most\nof the xtime_lock usage in timekeeping.c\n\nThe remaining xtime_lock presence is really for jiffies access\nand the global load calculation.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "bd3312681f69207a40431981c1bce1afdc9b7975", "tree": "ad95aba265a7e6033e81cbc9b3054fac176ab6ce", "parents": [ "ea7cf49a7633c2b70125f59b4e3553d9181cb15d" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 13:48:36 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:25 2012 -0800" }, "message": "ntp: Add ntp_lock to replace xtime_locking\n\nUse a ntp_lock spin lock to replace xtime_lock locking in ntp.c\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "ea7cf49a7633c2b70125f59b4e3553d9181cb15d", "tree": "877bca59752e387e93fc030079afc28515c86edf", "parents": [ "8357929e6ae3661d5a3a7378a717f29873ea18c6" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 13:18:07 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:23 2012 -0800" }, "message": "ntp: Access tick_length variable via ntp_tick_length()\n\nCurrently the NTP managed tick_length value is accessed globally,\nin preparations for locking cleanups, make sure it is accessed via\na function and mark it as static.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "8357929e6ae3661d5a3a7378a717f29873ea18c6", "tree": "49cee3ead7619a7a7a8ae2dd01c4a8b1f9e8add9", "parents": [ "70471f2f061d59375e959b4e7d47ee62121babb1" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 13:06:21 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:20 2012 -0800" }, "message": "ntp: Cleanup timex.h\n\nMove ntp_sycned to ntp.c and mark time_status as static.\nAlso yank function declaration for non-existant function.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "70471f2f061d59375e959b4e7d47ee62121babb1", "tree": "f2799ccaaed2d976748d6ecd8708c0886c142bf5", "parents": [ "8fcce546be16130865550136831f71097d7fc228" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 12:48:10 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:18 2012 -0800" }, "message": "time: Add timekeeper lock\n\nNow that all the timekeeping variables are stored in\nthe timekeeper structure, add a new lock to protect the\nstructure.\n\nFor now, this lock nests under the xtime_lock for writes.\n\nFor readers, we don\u0027t need to take xtime_lock anymore.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "8fcce546be16130865550136831f71097d7fc228", "tree": "a7670612d8196da348842c7c8d83336aa7922e90", "parents": [ "01f71b47e08f2a062c4e77c94dfa9a7e0ae65fcb" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 11:46:39 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:16 2012 -0800" }, "message": "time: Cleanup global variables and move them to the top\n\nMove global xtime_lock and timekeeping_suspended values up\nto the top of timekeeping.c\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "01f71b47e08f2a062c4e77c94dfa9a7e0ae65fcb", "tree": "bad9a642d8f55def709d71ecc9affe78ecc59e42", "parents": [ "8ff2cb92dd1afcf23e7b5287c43a900b16f40bad" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 11:43:49 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:14 2012 -0800" }, "message": "time: Move raw_time into timekeeper structure\n\nIn preparation for locking cleanups, move raw_time into\ntimekeeper structure.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "8ff2cb92dd1afcf23e7b5287c43a900b16f40bad", "tree": "52c3e19533e4f44a491603f5842595c4e2630da0", "parents": [ "d9f7217aac6833cc634741f2f771a87fd1518fee" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 11:40:54 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:12 2012 -0800" }, "message": "time: Move xtime into timekeeeper structure\n\nIn preparation for locking cleanups, move xtime into\ntimekeeper structure.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "d9f7217aac6833cc634741f2f771a87fd1518fee", "tree": "284a9a1597ec2166a0d2b43d108f1262be1f6b88", "parents": [ "00c5fb774e3fa8c9d082c62eac7e3d178c006f56" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 11:29:32 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:09 2012 -0800" }, "message": "time: Move wall_to_monotonic into the timekeeper structure\n\nIn preparation for locking cleanups, move wall_to_monotonic\ninto the timekeeper structure.\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "00c5fb774e3fa8c9d082c62eac7e3d178c006f56", "tree": "986ae7cd7c10f7668d2c140093ebbc1591999ae1", "parents": [ "a99cbf6b43a7b3b15f6139b2d9ac4ecceccd3c99" ], "author": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Mon Nov 14 11:23:15 2011 -0800" }, "committer": { "name": "John Stultz", "email": "john.stultz@linaro.org", "time": "Thu Jan 26 19:44:07 2012 -0800" }, "message": "time: Move total_sleep_time into the timekeeper structure\n\nMove total_sleep_time into the timekeeper structure in preparation\nfor locking cleanups\n\nCC: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nCC: Richard Cochran \u003crichardcochran@gmail.com\u003e\nSigned-off-by: John Stultz \u003cjohn.stultz@linaro.org\u003e\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "376613e81ddc68f545fd5c87ffc3ad222b7abe5f", "tree": "e1cb1cd43d05f57e4584dd5f9ce3eb965d0ddff1", "parents": [ "0db49b72bce26341274b74fd968501489a361ae3", "0518469d0a32be1e6dd8850ff274d52d72cdb52d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:57:44 2012 -0800" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, tsc: Skip TSC synchronization checks for tsc\u003dreliable\n clocksource: Convert tcb_clksrc to use clocksource_register_hz/khz\n clocksource: cris: Convert to clocksource_register_khz\n clocksource: xtensa: Convert to clocksource_register_hz/khz\n clocksource: um: Convert to clocksource_register_hz/khz\n clocksource: parisc: Convert to clocksource_register_hz/khz\n clocksource: m86k: Convert to clocksource_register_hz/khz\n time: x86: Replace LATCH with PIT_LATCH in i8253 clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from acpi_pm clocksource driver\n time: x86: Remove CLOCK_TICK_RATE from mach_timer.h\n time: x86: Remove CLOCK_TICK_RATE from tsc code\n time: Fix spelling mistakes in new comments\n time: fix bogus comment in timekeeping_get_ns_raw\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "0db49b72bce26341274b74fd968501489a361ae3", "tree": "cdb076827aefb38d719d4c42f8ef291c36072fa8", "parents": [ "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "1ac9bc6943edf7d181b4b1cc734981350d4f6bae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:33:28 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:44:54 2012 -0800" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (40 commits)\n sched/tracing: Add a new tracepoint for sleeptime\n sched: Disable scheduler warnings during oopses\n sched: Fix cgroup movement of waking process\n sched: Fix cgroup movement of newly created process\n sched: Fix cgroup movement of forking process\n sched: Remove cfs bandwidth period check in tg_set_cfs_period()\n sched: Fix load-balance lock-breaking\n sched: Replace all_pinned with a generic flags field\n sched: Only queue remote wakeups when crossing cache boundaries\n sched: Add missing rcu_dereference() around -\u003ereal_parent usage\n [S390] fix cputime overflow in uptime_proc_show\n [S390] cputime: add sparse checking and cleanup\n sched: Mark parent and real_parent as __rcu\n sched, nohz: Fix missing RCU read lock\n sched, nohz: Set the NOHZ_BALANCE_KICK flag for idle load balancer\n sched, nohz: Fix the idle cpu check in nohz_idle_balance\n sched: Use jump_labels for sched_feat\n sched/accounting: Fix parameter passing in task_group_account_field\n sched/accounting: Fix user/system tick double accounting\n sched/accounting: Re-use scheduler statistics for the root cgroup\n ...\n\nFix up conflicts in\n - arch/ia64/include/asm/cputime.h, include/asm-generic/cputime.h\n\tusecs_to_cputime64() vs the sparse cleanups\n - kernel/sched/fair.c, kernel/time/tick-sched.c\n\tscheduler changes in multiple branches\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\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": "3b87487ac5008072f138953b07505a7e3493327f", "tree": "b70e9422c1abe7ce0e771a52202572dbb0ee25aa", "parents": [ "995b4103a78b9bef0ff834f9ecac42b2b56e01a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 30 13:24:40 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 30 13:24:40 2011 -0800" }, "message": "Revert \"clockevents: Set noop handler in clockevents_exchange_device()\"\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\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: stable@kernel.org # for stable kernels that applied the original\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7239f65cf364180cdb100a4ed211b2a9f9a72119", "tree": "a23b2abe177b890303aa02c58ce964eacf2166df", "parents": [ "4a858cfc9af87cc60b3113c3b7b377a4305eac6a" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 21 16:12:37 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 21 16:12:37 2011 -0800" }, "message": "clockevents: remove sysdev.h\n\nThis isn\u0027t needed in the clockevents.c file, and the header file is\ngoing away soon, so just remove the #include\n\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.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": "b1b73d095084e754562961c443aa8f6587a55f8e", "tree": "f2927ab364b329175442b6abece86cba3528f969", "parents": [ "c3b79770e51ab1fd4201f3b54edf30113b9ce74f" ], "author": { "name": "Kusanagi Kouichi", "email": "slash@ac.auone-net.jp", "time": "Mon Dec 19 18:13:19 2011 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Dec 19 11:41:40 2011 +0100" }, "message": "time/clocksource: Fix kernel-doc warnings\n\nFix various KernelDoc build warnings.\n\nSigned-off-by: Kusanagi Kouichi \u003cslash@ac.auone-net.jp\u003e\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLink: http://lkml.kernel.org/r/20111219091320.0D5AF6FC03D@msa105.auone-net.jp\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6a54aebf6978e9f296a4d3da3e40af425163c22e", "tree": "8217c7114db02d8b69c22fc44880749426949bc3", "parents": [ "067491b7313c41f49607fce782d29344d1472587", "dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Dec 15 08:21:21 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Dec 15 08:21:30 2011 +0100" }, "message": "Merge commit \u0027v3.2-rc5\u0027 into sched/core\n\nMerge reason: Pick up the latest fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d369a5d8fc70710236ae2d06a0e42dce483712df", "tree": "5f52ec10e01f46e575e358ec21302b3cc56693e2", "parents": [ "15916a123e59b84d2fdfcccac84c99d1777f2a45" ], "author": { "name": "Kay Sievers", "email": "kay.sievers@vrfy.org", "time": "Wed Dec 14 15:28:51 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Dec 14 15:28:51 2011 -0800" }, "message": "clocksource: convert sysdev_class to a regular subsystem\n\nAfter all sysdev classes are ported to regular driver core entities, the\nsysdev implementation will be entirely removed from the kernel.\n\nCc: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nSigned-off-by: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "1268fbc746ea1cd279886a740dcbad4ba5232225", "tree": "dc0ff36b4114992a3f67479e25132f5e99f36b9e", "parents": [ "b58bdccaa8d908e0f71dae396468a0d3f7bb3125" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Nov 17 18:48:14 2011 +0100" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:57 2011 -0800" }, "message": "nohz: Remove tick_nohz_idle_enter_norcu() / tick_nohz_idle_exit_norcu()\n\nThose two APIs were provided to optimize the calls of\ntick_nohz_idle_enter() and rcu_idle_enter() into a single\nirq disabled section. This way no interrupt happening in-between would\nneedlessly process any RCU job.\n\nNow we are talking about an optimization for which benefits\nhave yet to be measured. Let\u0027s start simple and completely decouple\nidle rcu and dyntick idle logics to simplify.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "2bbb6817c0ac1b5f2a68d720f364f98eeb1ac4fd", "tree": "05bb5ba54671a8eaeca4fe4406a75e820317e473", "parents": [ "280f06774afedf849f0b34248ed6aff57d0f6908" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Sat Oct 08 16:01:00 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:36 2011 -0800" }, "message": "nohz: Allow rcu extended quiescent state handling seperately from tick stop\n\nIt is assumed that rcu won\u0027t be used once we switch to tickless\nmode and until we restart the tick. However this is not always\ntrue, as in x86-64 where we dereference the idle notifiers after\nthe tick is stopped.\n\nTo prepare for fixing this, add two new APIs:\ntick_nohz_idle_enter_norcu() and tick_nohz_idle_exit_norcu().\n\nIf no use of RCU is made in the idle loop between\ntick_nohz_enter_idle() and tick_nohz_exit_idle() calls, the arch\nmust instead call the new *_norcu() version such that the arch doesn\u0027t\nneed to call rcu_idle_enter() and rcu_idle_exit().\n\nOtherwise the arch must call tick_nohz_enter_idle() and\ntick_nohz_exit_idle() and also call explicitly:\n\n- rcu_idle_enter() after its last use of RCU before the CPU is put\nto sleep.\n- rcu_idle_exit() before the first use of RCU after the CPU is woken\nup.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\n" }, { "commit": "280f06774afedf849f0b34248ed6aff57d0f6908", "tree": "62ef683226d0569c0e6c3ba34ab2e6d85b2e047f", "parents": [ "867f236bd12f5091df6dc7cc75f94d7fd982d78a" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Oct 07 18:22:06 2011 +0200" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:35 2011 -0800" }, "message": "nohz: Separate out irq exit and idle loop dyntick logic\n\nThe tick_nohz_stop_sched_tick() function, which tries to delay\nthe next timer tick as long as possible, can be called from two\nplaces:\n\n- From the idle loop to start the dytick idle mode\n- From interrupt exit if we have interrupted the dyntick\nidle mode, so that we reprogram the next tick event in\ncase the irq changed some internal state that requires this\naction.\n\nThere are only few minor differences between both that\nare handled by that function, driven by the ts-\u003einidle\ncpu variable and the inidle parameter. The whole guarantees\nthat we only update the dyntick mode on irq exit if we actually\ninterrupted the dyntick idle mode, and that we enter in RCU extended\nquiescent state from idle loop entry only.\n\nSplit this function into:\n\n- tick_nohz_idle_enter(), which sets ts-\u003einidle to 1, enters\ndynticks idle mode unconditionally if it can, and enters into RCU\nextended quiescent state.\n\n- tick_nohz_irq_exit() which only updates the dynticks idle mode\nwhen ts-\u003einidle is set (ie: if tick_nohz_idle_enter() has been called).\n\nTo maintain symmetry, tick_nohz_restart_sched_tick() has been renamed\ninto tick_nohz_idle_exit().\n\nThis simplifies the code and micro-optimize the irq exit path (no need\nfor local_irq_save there). This also prepares for the split between\ndynticks and rcu extended quiescent state logics. We\u0027ll need this split to\nfurther fix illegal uses of RCU in extended quiescent states in the idle\nloop.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Guan Xuetao \u003cgxt@mprc.pku.edu.cn\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Hans-Christian Egtvedt \u003chans-christian.egtvedt@atmel.com\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\n" }, { "commit": "9b2e4f1880b789be1f24f9684f7a54b90310b5c0", "tree": "1fa922e0616e298837a7079cb49118188a58186c", "parents": [ "b804cb9e91c6c304959c69d4f9daeef4ffdba71c" ], "author": { "name": "Paul E. McKenney", "email": "paul.mckenney@linaro.org", "time": "Fri Sep 30 12:10:22 2011 -0700" }, "committer": { "name": "Paul E. McKenney", "email": "paulmck@linux.vnet.ibm.com", "time": "Sun Dec 11 10:31:24 2011 -0800" }, "message": "rcu: Track idleness independent of idle tasks\n\nEarlier versions of RCU used the scheduling-clock tick to detect idleness\nby checking for the idle task, but handled idleness differently for\nCONFIG_NO_HZ\u003dy. But there are now a number of uses of RCU read-side\ncritical sections in the idle task, for example, for tracing. A more\nfine-grained detection of idleness is therefore required.\n\nThis commit presses the old dyntick-idle code into full-time service,\nso that rcu_idle_enter(), previously known as rcu_enter_nohz(), is\nalways invoked at the beginning of an idle loop iteration. Similarly,\nrcu_idle_exit(), previously known as rcu_exit_nohz(), is always invoked\nat the end of an idle-loop iteration. This allows the idle task to\nuse RCU everywhere except between consecutive rcu_idle_enter() and\nrcu_idle_exit() calls, in turn allowing architecture maintainers to\nspecify exactly where in the idle loop that RCU may be used.\n\nBecause some of the userspace upcall uses can result in what looks\nto RCU like half of an interrupt, it is not possible to expect that\nthe irq_enter() and irq_exit() hooks will give exact counts. This\npatch therefore expands the -\u003edynticks_nesting counter to 64 bits\nand uses two separate bitfields to count process/idle transitions\nand interrupt entry/exit transitions. It is presumed that userspace\nupcalls do not happen in the idle loop or from usermode execution\n(though usermode might do a system call that results in an upcall).\nThe counter is hard-reset on each process/idle transition, which\navoids the interrupt entry/exit error from accumulating. Overflow\nis avoided by the 64-bitness of the -\u003edyntick_nesting counter.\n\nThis commit also adds warnings if a non-idle task asks RCU to enter\nidle state (and these checks will need some adjustment before applying\nFrederic\u0027s OS-jitter patches (http://lkml.org/lkml/2011/10/7/246).\nIn addition, validation of -\u003edynticks and -\u003edynticks_nesting is added.\n\nSigned-off-by: Paul E. McKenney \u003cpaul.mckenney@linaro.org\u003e\nSigned-off-by: Paul E. McKenney \u003cpaulmck@linux.vnet.ibm.com\u003e\nReviewed-by: Josh Triplett \u003cjosh@joshtriplett.org\u003e\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" } ], "next": "d80dee54533aa4bfe29def921edb31715fdba214" }