commit 36a07902c2134649c4af7f07980413ffb1a56085 Merge: f579bbc 7affb32 Author: Linus Torvalds Date: Thu Oct 8 12:22:45 2009 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: pata_atp867x: add Power Management support pata_atp867x: PIO support fixes pata_atp867x: clarifications in timings calculations and cable detection pata_atp867x: fix it to not claim MWDMA support libata: fix incorrect link online check during probe ahci: filter FPDMA non-zero offset enable for Aspire 3810T libata: make gtf_filter per-dev libata: implement more acpi filtering options libata: cosmetic updates ahci: display all AHCI 1.3 HBA capability flags (v2) pata_ali: trivial fix of a very frequent spelling mistake ahci: disable 64bit DMA by default on SB600s commit f579bbcd9bb8b688df03191b92c56ab8af4d6322 Merge: e80fb7e5 da08568 Author: Linus Torvalds Date: Thu Oct 8 12:16:35 2009 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: futex: fix requeue_pi key imbalance futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions rcu: Place root rcu_node structure in separate lockdep class rcu: Make hot-unplugged CPU relinquish its own RCU callbacks rcu: Move rcu_barrier() to rcutree futex: Move exit_pi_state() call to release_mm() futex: Nullify robust lists after cleanup futex: Fix locking imbalance panic: Fix panic message visibility by calling bust_spinlocks(0) before dying rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function rcu: Clean up code based on review feedback from Josh Triplett, part 4 rcu: Clean up code based on review feedback from Josh Triplett, part 3 rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y rcu: Clean up code to address Ingo's checkpatch feedback rcu: Clean up code based on review feedback from Josh Triplett, part 2 rcu: Clean up code based on review feedback from Josh Triplett commit e80fb7e52fd305b916a671755ca31ecf8f92e94e Merge: 624235c f83f9ac Author: Linus Torvalds Date: Thu Oct 8 12:07:24 2009 -0700 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Set correct normal_prio and prio values in sched_fork() commit 624235c5b3a62639136b7823c2c88e4aeb5c5a8d Merge: f17f36b e3be785 Author: Linus Torvalds Date: Thu Oct 8 12:06:36 2009 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pci: Correct spelling in a comment x86: Simplify bound checks in the MTRR code x86: EDAC: carve out AMD MCE decoding logic initcalls: Add early_initcall() for modules x86: EDAC: MCE: Fix MCE decoding callback logic commit f17f36bb1c006818441b84cf65a6decf3e59942b Merge: b924f95 8f6e8a3 Author: Linus Torvalds Date: Thu Oct 8 12:06:09 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: user local buffer variable for trace branch tracer tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c ftrace: check for failure for all conversions tracing: correct module boundaries for ftrace_release tracing: fix transposed numbers of lock_depth and preempt_count trace: Fix missing assignment in trace_ctxwake_* tracing: Use free_percpu instead of kfree tracing: Check total refcount before releasing bufs in profile_enable failure commit b924f9599dfd4a604761e84b1e920e480fb57f66 Merge: b9d40b7 2dca699 Author: Linus Torvalds Date: Thu Oct 8 12:05:50 2009 -0700 Merge branch 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sparc-perf-events-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA perf_event: Provide vmalloc() based mmap() backing commit b9d40b7b1e349bdc5c174b4ef1a333e62f7d749c Merge: 7c1632b e13dbd7 Author: Linus Torvalds Date: Thu Oct 8 12:05:00 2009 -0700 Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf_events: Make ABI definitions available to userspace perf tools: elf_sym__is_function() should accept "zero" sized functions tracing/syscalls: Use long for syscall ret format and field definitions perf trace: Update eval_flag() flags array to match interrupt.h perf trace: Remove unused code in builtin-trace.c perf: Propagate term signal to child commit 7c1632ba76d94b4847fde79f67faa91ef8571fe9 Merge: a888f96 9bcbdd9 Author: Linus Torvalds Date: Thu Oct 8 12:04:04 2009 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, timers: Check for pending timers after (device) interrupts NOHZ: update idle state also when NOHZ is inactive commit a888f96a154b70804c5b29ee02e4d3bda6d55e56 Merge: 1c6e6d9 378e869 Author: Linus Torvalds Date: Thu Oct 8 12:03:21 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ice1724: increase SPDIF and independent stereo buffer sizes ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off() ALSA: ICE1712/24 - Change the Multi Track Peak control (level meters) from MIXER to PCM type ALSA: hda - Fix yet another auto-mic bug in ALC268 ASoC: WM8350 capture PGA mutes are inverted ASoC: Remove absent SYNC and TDM DAI format options from i.MX SSI sound: via82xx: move DXS volume controls to PCM interface ALSA: hda - Don't pick up invalid HP pins in alc_subsystem_id() ALSA: hda - Add a workaround for ASUS A7K ALSA: hda - Fix invalid initializations for ALC861 auto mode ASoC: wm8940: Fix check on error code form snd_soc_codec_set_cache_io ASoC: Fix SND_SOC_DAPM_LINE handling commit 1c6e6d91b22c4271e8a5dab559a08cb005a77073 Merge: d8e7b2b c1176d6 Author: Linus Torvalds Date: Thu Oct 8 12:02:06 2009 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits) drm/radeon/kms: fix vline register for second head. drm/r600: avoid assigning vb twice in blit code drm/radeon: use list_for_each_entry instead of list_for_each drm/radeon/kms: Fix AGP support for R600/RV770 family (v2) drm/radeon/kms: Fallback to non AGP when acceleration fails to initialize (v2) drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ drm/radeon: Fix setting of bits drm/ttm: fix refcounting in ttm global code. drm/fb: add more correct 8/16/24/32 bpp fb support. drm/fb: add setcmap and fix 8-bit support. drm/radeon/kms: respect single crtc cards, only create one crtc. (v2) drm: Delete the DRM_DEBUG_KMS in drm_mode_cursor_ioctl drm/radeon/kms: add support for "Surround View" drm/radeon/kms: Fix irq handling on AVIVO hw drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS drm/radeon/kms: Fix R600/RV770 disable acceleration path drm/radeon/kms: Fix R600/RV770 startup path & reset drm/radeon/kms: Fix R600 write back buffer drm/radeon/kms: Remove old init path as no hw use it anymore drm/radeon/kms: Convert RS600 to new init path ... commit d8e7b2b3ac5319fcee616488c628c2bbe7e2937b Merge: 1bfd16a ab8d64d Author: Linus Torvalds Date: Thu Oct 8 12:01:01 2009 -0700 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omapfb: Blizzard: constify register address tables omapfb: Blizzard: fix pointer to be const omapfb: Condition mutex acquisition omap: iovmm: Add missing mutex_unlock omap: iovmm: Fix incorrect spelling omap: SRAM: flush the right address after memcpy in omap_sram_push omap: Lock DPLL5 at boot omap: Fix incorrect 730 vs 850 detection OMAP3: PM: introduce a new powerdomain walk helper OMAP3: PM: Enable GPIO module-level wakeups OMAP3: PM: USBHOST: clear wakeup events on both hosts OMAP3: PM: PRCM interrupt: only handle selected PRCM interrupts OMAP3: PM: PRCM interrupt: check MPUGRPSEL register OMAP3: PM: Prevent hang in prcm_interrupt_handler commit 1bfd16a6571db105d7d57acf768c1df297781f07 Merge: 5587481 94baaee Author: Linus Torvalds Date: Thu Oct 8 12:00:39 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: beef up DRAM error injection amd64_edac: fix DRAM base and limit extraction amd64_edac: fix chip select handling amd64_edac: simple fix to allow reporting of CECC errors amd64_edac: fix K8 intlv_sel check amd64_edac: fix interleave enable tests amd64_edac: fix DRAM base and limit address extraction amd64_edac: fix driver instance lookup table allocation commit 5587481e92105734e8e45a24fd8603228ec02449 Merge: df87f34 a4d63a9 Author: Linus Torvalds Date: Thu Oct 8 11:59:30 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (40 commits) ethoc: limit the number of buffers to 128 ethoc: use system memory as buffer ethoc: align received packet to make IP header at word boundary ethoc: fix buffer address mapping ethoc: fix typo to compute number of tx descriptors au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() netxen: Fix Unlikely(x) > y pasemi_mac: ethtool get settings fix add maintainer for network drop monitor kernel service tg3: Fix phylib locking strategy rndis_host: support ETHTOOL_GPERMADDR ipv4: arp_notify address list bug gigaset: add kerneldoc comments gigaset: correct debugging output selection gigaset: improve error recovery gigaset: fix device ERROR response handling gigaset: announce if built with debugging gigaset: handle isoc frame errors more gracefully gigaset: linearize skb gigaset: fix reject/hangup handling ... commit df87f344efac96cb9f9367e82509208216f1e0fa Merge: 385c51d 032665a Author: Linus Torvalds Date: Thu Oct 8 11:59:06 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" sis5513: fix PIO setup for ATAPI devices commit 9bcbdd9c58617f1301dd4f17c738bb9bc73aca70 Author: Arjan van de Ven Date: Thu Oct 8 06:40:41 2009 -0700 x86, timers: Check for pending timers after (device) interrupts Now that range timers and deferred timers are common, I found a problem with these using the "perf timechart" tool. Frans Pop also reported high scheduler latencies via LatencyTop, when using iwlagn. It turns out that on x86, these two 'opportunistic' timers only get checked when another "real" timer happens. These opportunistic timers have the objective to save power by hitchhiking on other wakeups, as to avoid CPU wakeups by themselves as much as possible. The change in this patch runs this check not only at timer interrupts, but at all (device) interrupts. The effect is that: 1) the deferred timers/range timers get delayed less 2) the range timers cause less wakeups by themselves because the percentage of hitchhiking on existing wakeup events goes up. I've verified the working of the patch using "perf timechart", the original exposed bug is gone with this patch. Frans also reported success - the latencies are now down in the expected ~10 msec range. Signed-off-by: Arjan van de Ven Tested-by: Frans Pop Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20091008064041.67219b13@infradead.org> Signed-off-by: Ingo Molnar commit 2dca6999eed58d44b67e9de7d6ec230f6250553d Author: David Miller Date: Mon Sep 21 12:22:34 2009 -0700 mm, perf_event: Make vmalloc_user() align base kernel virtual address to SHMLBA When a vmalloc'd area is mmap'd into userspace, some kind of co-ordination is necessary for this to work on platforms with cpu D-caches which can have aliases. Otherwise kernel side writes won't be seen properly in userspace and vice versa. If the kernel side mapping and the user side one have the same alignment, modulo SHMLBA, this can work as long as VM_SHARED is shared of VMA and for all current users this is true. VM_SHARED will force SHMLBA alignment of the user side mmap on platforms with D-cache aliasing matters. The bulk of this patch is just making it so that a specific alignment can be passed down into __get_vm_area_node(). All existing callers pass in '1' which preserves existing behavior. vmalloc_user() gives SHMLBA for the alignment. As a side effect this should get the video media drivers and other vmalloc_user() users into more working shape on such systems. Signed-off-by: David S. Miller Acked-by: Peter Zijlstra Cc: Jens Axboe Cc: Nick Piggin Signed-off-by: Andrew Morton LKML-Reference: <200909211922.n8LJMYjw029425@imap1.linux-foundation.org> Signed-off-by: Ingo Molnar commit 385c51d6b1dc7cdbbb1b189d18bb4680d0714a37 Merge: d82e23d 4ef8774 Author: Linus Torvalds Date: Thu Oct 8 07:40:19 2009 -0700 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6: agp: parisc-agp.c - use correct page_mask function parisc: Fix linker script breakage. parisc: convert to asm-generic/hardirq.h parisc: Make THREAD_SIZE available to assembly files and linker scripts. parisc: correct use of SHF_ALLOC parisc: rename parisc's vmalloc_start to parisc_vmalloc_start parisc: add me to Maintainers parisc: includecheck fix: signal.c parisc: HAVE_ARCH_TRACEHOOK parisc: add skeleton syscall.h parisc: stop using task->ptrace for {single,block}step flags parisc: split syscall_trace into two halves parisc: add missing TI_TASK macro in syscall.S parisc: tracehook_signal_handler parisc: tracehook_report_syscall commit d82e23dcaeb083e520fd1ec87d014d0c4a31d79c Author: Samu Onkalo Date: Wed Oct 7 16:32:35 2009 -0700 lis3lv02d_spi: module unload didn't remove sysfs entry In module unload, lis3lv02d core driver sysfs clean up was not called. Signed-off-by: Samu Onkalo Acked-by: Daniel Mack Cc: Éric Piel Cc: "Trisal, Kalhan" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1125b1e41228bc2e5b4f023004a4280282d1dab Author: David Vrabel Date: Wed Oct 7 16:32:33 2009 -0700 mmc: sdio: don't require CISTPL_VERS_1 to contain 4 strings The PC Card 8.0 specification (vol. 4, section 3.2.10) says the TPLLV1_INFO field of the CISTPL_VERS_1 tuple must contain 4 strings. Some cards don't have all 4 so just parse as many as we can. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: David Vrabel Tested-by: Jonathan Cameron Tested-by: Bing Zhao Cc: Roel Kluin Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a54fed9f70a2765f4476e1ce3d691a2f31df258f Author: Wu Fengguang Date: Wed Oct 7 16:32:32 2009 -0700 page-types: add hwpoison/unpoison feature For hwpoison stress testing. The debugfs mount point is assumed to be /debug/. Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48640d69f5f06fe951a4de065a7f374cb9ee6040 Author: Wu Fengguang Date: Wed Oct 7 16:32:31 2009 -0700 page-types: introduce kpageflags_flags() Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e577ebde9fb161bdc87511763c75dfad291059e2 Author: Wu Fengguang Date: Wed Oct 7 16:32:30 2009 -0700 page-types: make voffset local variables Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a1b6726feee3132905996ae4cd1c7dc2104e721 Author: Wu Fengguang Date: Wed Oct 7 16:32:30 2009 -0700 page-types: make standalone pagemap/kpageflags read routines Refactor the code to be more modular and easier to reuse. Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 31bbf66eaaaf50ba79e50ab7d3c89531b31c0614 Author: Wu Fengguang Date: Wed Oct 7 16:32:29 2009 -0700 page-types: introduce checked_open() This helps merge duplicate code (now and future) and outstand the main logic. Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c57effe27eb6544eb44d5fac563b7334e3bc771 Author: Wu Fengguang Date: Wed Oct 7 16:32:28 2009 -0700 page-types: add GPL note Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1bbb5ec39042fb762e7f4bcc634da0d87834193 Author: Wu Fengguang Date: Wed Oct 7 16:32:28 2009 -0700 pagemap: document KPF_KSM and show it in page-types It indicates to the system admin that processes mapping such pages may be eating less physical memory than the reported numbers by legacy tools. Signed-off-by: Wu Fengguang Cc: Hugh Dickins Cc: Izik Eidus Acked-by: Chris Wright Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 253fb02d62571e5455eedc9e39b9d660e86a40f0 Author: Wu Fengguang Date: Wed Oct 7 16:32:27 2009 -0700 pagemap: export KPF_HWPOISON This flag indicates a hardware detected memory corruption on the page. Any future access of the page data may bring down the machine. Signed-off-by: Wu Fengguang Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7823da36ce8e42d66941887eb922768d259763f2 Author: Paul Menage Date: Wed Oct 7 16:32:26 2009 -0700 cgroups: update documentation of cgroups tasks and procs files Update documentation of cgroups tasks and procs files Document the cgroup.procs file. Clarify the semantics of the cgroup.procs and tasks files. Although the current cgroup.procs interface returns a sorted and uniqified list of pids, potential future performance enhancements could result in those properties being removed - explicitly document this aspect of the API. There are no existing users of cgroup.procs, so compatibility isn't an issue. There are users of the "tasks" file, but none that would appear to break in the event of the sorted property being broken. The standard "libcpuset" explicitly sorts the results of reading from the tasks file, and "libcg" and other users don't appear to care about ordering. Signed-off-by: Paul Menage Reviewed-by: Li Zefan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06d1baa683c58bd8e7fe4c950c1159808d445047 Author: Jaswinder Singh Rajput Date: Wed Oct 7 16:32:25 2009 -0700 video: includecheck fix: da8xx-fb.c fix the following 'make includecheck' warning: drivers/video/da8xx-fb.c: linux/device.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit caf88aeb2235e10a8c8bbfbb0ec6ff706200c7dd Author: Jaswinder Singh Rajput Date: Wed Oct 7 16:32:24 2009 -0700 video: includecheck fix: msm, mddi.c fix the following 'make includecheck' warning: drivers/video/msm/mddi.c: linux/delay.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4055e97318809638a57fbe1746b93bc7a90ef0d3 Author: Jaswinder Singh Rajput Date: Wed Oct 7 16:32:24 2009 -0700 fs: includecheck fix: proc, kcore.c fix the following 'make includecheck' warning: fs/proc/kcore.c: linux/mm.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3700c155af56b54adfc737ba3164a41de2c59d41 Author: Jaswinder Singh Rajput Date: Wed Oct 7 16:32:23 2009 -0700 mm: includecheck fix: vmalloc.c fix the following 'make includecheck' warning: mm/vmalloc.c: linux/highmem.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c73602ad31cdcf7e6651f43d12f65b5b9b825b6f Author: Hugh Dickins Date: Wed Oct 7 16:32:22 2009 -0700 ksm: more on default values Adjust the max_kernel_pages default to a quarter of totalram_pages, instead of nr_free_buffer_pages() / 4: the KSM pages themselves come from highmem, and even on a 16GB PAE machine, 4GB of KSM pages would only be pinning 32MB of lowmem with their rmap_items, so no need for the more obscure calculation (nor for its own special init function). There is no way for the user to switch KSM on if CONFIG_SYSFS is not enabled, so in that case default run to KSM_RUN_MERGE. Update KSM Documentation and Kconfig to reflect the new defaults. Signed-off-by: Hugh Dickins Cc: Izik Eidus Cc: Andrea Arcangeli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378e869fd0ef75fa85a5e3df56a58e74e77d04c9 Merge: d2a764d 1d4efa6 Author: Takashi Iwai Date: Thu Oct 8 13:00:02 2009 +0200 Merge branch 'fix/misc' into for-linus commit d2a764dd8e2c70254bf78d5e2d3e9cbe8b34e470 Merge: 6f775ba defb5ab Author: Takashi Iwai Date: Thu Oct 8 12:59:58 2009 +0200 Merge branch 'fix/hda' into for-linus commit 1d4efa6650454177afe30ad97283ff78572d0442 Author: Robert Hancock Date: Wed Oct 7 20:19:21 2009 -0600 ALSA: ice1724: increase SPDIF and independent stereo buffer sizes Increase the default and maximum PCM buffer prellocation size for ice1724's SPDIF and independent stereo pair outputs to 256K, which is the hardware's maximum supported size. This allows a reduction in interrupt rate and potentially power usage when an application is not latency-critical. Signed-off-by: Robert Hancock Signed-off-by: Takashi Iwai commit 8dce39b8955be6164172cb6204ef8fc21de27431 Author: Krzysztof Helt Date: Wed Oct 7 22:51:34 2009 +0200 ALSA: opl3: circular locking in the snd_opl3_note_on() and snd_opl3_note_off() Fix following circular locking in the opl3 driver. ======================================================= [ INFO: possible circular locking dependency detected ] 2.6.32-rc3 #87 ------------------------------------------------------- swapper/0 is trying to acquire lock: (&opl3->voice_lock){..-...}, at: [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth] but task is already holding lock: (&opl3->sys_timer_lock){..-...}, at: [] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&opl3->sys_timer_lock){..-...}: [] validate_chain+0xa25/0x1040 [] __lock_acquire+0x2da/0xab0 [] lock_acquire+0x7a/0xa0 [] _spin_lock_irqsave+0x40/0x60 [] snd_opl3_note_on+0x686/0x790 [snd_opl3_synth] [] snd_midi_process_event+0x322/0x590 [snd_seq_midi_emul] [] snd_opl3_synth_event_input+0x15/0x20 [snd_opl3_synth] [] snd_seq_deliver_single_event+0x100/0x200 [snd_seq] [] snd_seq_deliver_event+0x47/0x1f0 [snd_seq] [] snd_seq_dispatch_event+0x3b/0x140 [snd_seq] [] snd_seq_check_queue+0x10c/0x120 [snd_seq] [] snd_seq_enqueue_event+0x6b/0xe0 [snd_seq] [] snd_seq_client_enqueue_event+0xdd/0x100 [snd_seq] [] snd_seq_write+0xea/0x190 [snd_seq] [] vfs_write+0x96/0x160 [] sys_write+0x3d/0x70 [] syscall_call+0x7/0xb -> #0 (&opl3->voice_lock){..-...}: [] validate_chain+0x1036/0x1040 [] __lock_acquire+0x2da/0xab0 [] lock_acquire+0x7a/0xa0 [] _spin_lock_irqsave+0x40/0x60 [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth] [] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth] [] run_timer_softirq+0x166/0x1e0 [] __do_softirq+0x78/0x110 [] do_softirq+0x46/0x50 [] irq_exit+0x36/0x40 [] do_IRQ+0x42/0xb0 [] common_interrupt+0x2e/0x40 [] apm_cpu_idle+0x10f/0x290 [] cpu_idle+0x21/0x40 [] rest_init+0x4d/0x60 [] start_kernel+0x235/0x280 [] i386_start_kernel+0x66/0x70 other info that might help us debug this: 2 locks held by swapper/0: #0: (&opl3->tlist){+.-...}, at: [] run_timer_softirq+0xf0/0x1e0 #1: (&opl3->sys_timer_lock){..-...}, at: [] snd_opl3_timer_func+0x19/0xc0 [snd_opl3_synth] stack backtrace: Pid: 0, comm: swapper Not tainted 2.6.32-rc3 #87 Call Trace: [] print_circular_bug+0xc8/0xd0 [] validate_chain+0x1036/0x1040 [] ? check_usage_forwards+0x54/0xd0 [] __lock_acquire+0x2da/0xab0 [] lock_acquire+0x7a/0xa0 [] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth] [] _spin_lock_irqsave+0x40/0x60 [] ? snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth] [] snd_opl3_note_off+0x1e/0xe0 [snd_opl3_synth] [] ? _spin_lock_irqsave+0x47/0x60 [] snd_opl3_timer_func+0xa0/0xc0 [snd_opl3_synth] [] run_timer_softirq+0x166/0x1e0 [] ? run_timer_softirq+0xf0/0x1e0 [] ? snd_opl3_timer_func+0x0/0xc0 [snd_opl3_synth] [] __do_softirq+0x78/0x110 [] ? _spin_unlock+0x1d/0x20 [] ? handle_level_irq+0xaf/0xe0 [] do_softirq+0x46/0x50 [] irq_exit+0x36/0x40 [] do_IRQ+0x42/0xb0 [] ? trace_hardirqs_on_caller+0x12c/0x180 [] common_interrupt+0x2e/0x40 [] ? default_idle+0x38/0x50 [] apm_cpu_idle+0x10f/0x290 [] cpu_idle+0x21/0x40 [] rest_init+0x4d/0x60 [] start_kernel+0x235/0x280 [] ? unknown_bootoption+0x0/0x210 [] i386_start_kernel+0x66/0x70 Signed-off-by: Krzysztof Helt Signed-off-by: Takashi Iwai commit 2bdf66331c3ff8d564efe7a054f1099133d520cd Author: Pavel Hofman Date: Tue Oct 6 16:04:11 2009 +0200 ALSA: ICE1712/24 - Change the Multi Track Peak control (level meters) from MIXER to PCM type * PLEASE NOTE - this change requires the corresponding update of envy24control for ice1712 - kind of an ABI change. * The "Multi Track Peak" control is read-only level meters indicator. * The control is VERY confusing to most users since it is currently displayed in regular mixers. E.g. alsamixer ignores its read-only status and allows changing the levels with keys which makes no sense. Signed-off-by: Pavel Hofman Acked-by: Jaroslav Kysela Signed-off-by: Takashi Iwai commit c1176d6f03e1085797ce83648a2c76ae15a2b515 Merge: 0eca52a d4ac6a0 Author: Dave Airlie Date: Thu Oct 8 14:03:05 2009 +1000 Merge branch 'drm-next' of ../drm-next into drm-linus conflict in radeon since new init path merged with vga arb code. Conflicts: drivers/gpu/drm/radeon/radeon.h drivers/gpu/drm/radeon/radeon_asic.h drivers/gpu/drm/radeon/radeon_device.c commit 8f6e8a314ab37cadd72da5ace9027f2d04aba854 Author: Steven Rostedt Date: Wed Oct 7 21:53:41 2009 -0400 tracing: user local buffer variable for trace branch tracer Just using the tr->buffer for the API to trace_buffer_lock_reserve is not good enough. This is because the tr->buffer may change, and we do not want to commit with a different buffer that we reserved from. This patch uses a local variable to hold the buffer that was used to reserve and commit with. Signed-off-by: Steven Rostedt commit c8647b28726b09b087155417bb698e7b3789f8a0 Author: Zhenwen Xu Date: Thu Oct 8 09:21:46 2009 +0800 tracing: fix warning on kernel/trace/trace_branch.c andtrace_hw_branches.c fix warnings that caused the API change of trace_buffer_lock_reserve() change files: kernel/trace/trace_hw_branch.c kernel/trace/trace_branch.c Signed-off-by: Zhenwen Xu LKML-Reference: <20091008012146.GA4170@helight> Signed-off-by: Steven Rostedt commit d4ac6a05d51357e31028cc9076874a58dd197b83 Author: Dave Airlie Date: Thu Oct 8 11:32:49 2009 +1000 drm/radeon/kms: fix vline register for second head. Both r100/r600 had this wrong, use the macro to extract the register to relocate. Signed-off-by: Dave Airlie commit 49c458e544ae14514209ed80ea6829ca1b18ddf0 Author: Robert Noland Date: Mon Oct 5 11:56:44 2009 -0400 drm/r600: avoid assigning vb twice in blit code There is no need to assign vb before you know that space is available. [agd5f: adapted for kernel tree.] Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9d8401fcbb8c8a390b649b9c1b18dab113a918d6 Author: Dave Airlie Date: Thu Oct 8 09:28:19 2009 +1000 drm/radeon: use list_for_each_entry instead of list_for_each This is just a cleanup of the list macro usage. Signed-off-by: Dave Airlie commit 1a029b768f9d4a001501bd18d6ba08297ae912fd Author: Jerome Glisse Date: Tue Oct 6 19:04:30 2009 +0200 drm/radeon/kms: Fix AGP support for R600/RV770 family (v2) For AGP to work unmapped access must cover VRAM & AGP as AGP is treated like VRAM by the GPU (ie physical address). This patch properly setup the virtual memory system aperture to cover AGP if AGP is enabled. It seems that there is memory corruption after resume when using AGP (RV770 seems unaffected thought). Version 2 just fix merge issue with updated AGP fallback patch. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit b574f251f787c5b163da5ea345525569e51775bc Author: Jerome Glisse Date: Tue Oct 6 19:04:29 2009 +0200 drm/radeon/kms: Fallback to non AGP when acceleration fails to initialize (v2) When GPU acceleration is not working with AGP try to fallback to non AGP GART (either PCI or PCIE GART). This should make KMS failure on AGP less painfull. We still need to find out what is wrong when AGP fails but at least user have a lot of more chances to get a working configuration with acceleration. This patch also cleanup R600/RV770 fallback path so they use same code as others asics. Version 2 factorize agp disabling logic to avoid code duplication and bugs. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 01ceae8edd7a0a6d8588dc103ad9f55e2c52cae9 Author: Jerome Glisse Date: Wed Oct 7 11:08:22 2009 +0200 drm/radeon/kms: Fix RS600/RV515/R520/RS690 IRQ Bad generated header file leaded to use wrong register to check IRQ status and acknowledge them. Fix the header and use proper registers. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 3279ba37db5d65c4ab0dcdee3b211ccb85bb563f Author: Steven Rostedt Date: Wed Oct 7 16:57:56 2009 -0400 ftrace: check for failure for all conversions Due to legacy code from back when the dynamic tracer used a daemon, only core kernel code was checking for failures. This is no longer the case. We must check for failures any time we perform text modifications. Cc: stable@kernel.org Signed-off-by: Steven Rostedt commit e7247a15ff3bbdab0a8b402dffa1171e5c05a8e0 Author: jolsa@redhat.com Date: Wed Oct 7 19:00:35 2009 +0200 tracing: correct module boundaries for ftrace_release When the module is about the unload we release its call records. The ftrace_release function was given wrong values representing the module core boundaries, thus not releasing its call records. Plus making ftrace_release function module specific. Signed-off-by: Jiri Olsa LKML-Reference: <1254934835-363-3-git-send-email-jolsa@redhat.com> Cc: stable@kernel.org Signed-off-by: Steven Rostedt commit da085681014fb43d67d9bf6d14bc068e9254bd49 Author: Darren Hart Date: Wed Oct 7 11:46:54 2009 -0700 futex: fix requeue_pi key imbalance If futex_wait_requeue_pi() wakes prior to requeue, we drop the reference to the source futex_key twice, once in handle_early_requeue_pi_wakeup() and once on our way out. Remove the drop from the handle_early_requeue_pi_wakeup() and keep the get/drops together in futex_wait_requeue_pi(). Reported-by: Helge Bahmann Signed-off-by: Darren Hart Cc: Helge Bahmann Cc: Peter Zijlstra Cc: Eric Dumazet Cc: Dinakar Guniguntala Cc: John Stultz Cc: stable-2.6.31 LKML-Reference: <4ACCE21E.5030805@us.ibm.com> Signed-off-by: Thomas Gleixner commit 829b876dfc94ea8be3a47e200d06f1f217bb104f Author: Steven Rostedt Date: Sun Sep 27 07:02:07 2009 -0400 tracing: fix transposed numbers of lock_depth and preempt_count The lock_depth and preempt_count numbers in the latency format is transposed. Signed-off-by: Steven Rostedt commit 94baaee4947d84809b289d5ca03677525ffc6da9 Author: Borislav Petkov Date: Thu Sep 24 11:05:30 2009 +0200 amd64_edac: beef up DRAM error injection When injecting DRAM ECC errors (F3xBC_x8), EccVector[15:0] is a bitmask of which bits should be error injected when written to and holds the payload of 16-bit DRAM word when read, respectively. Add /sysfs members to show the DRAM ECC section/word/vector. Fail wrong injection values entered over /sysfs instead of truncating them. Signed-off-by: Borislav Petkov commit 66216a7a15e75d517dddd0ac6514924b15071e4c Author: Borislav Petkov Date: Tue Sep 22 16:48:37 2009 +0200 amd64_edac: fix DRAM base and limit extraction On Fam10h and above, F1x[1, 0][7C:40] are DRAM Base/Limit registers which specify the destination node of a DRAM address. Those address boundaries are being extracted into ->dram_base[] and ->dram_limit[]. Correct the extraction masks to match the respective address bits. Signed-off-by: Borislav Petkov commit 9d858bb10a9907bbbaffbb4a80a31718d548868c Author: Borislav Petkov Date: Mon Sep 21 14:35:51 2009 +0200 amd64_edac: fix chip select handling Different processor families support a different number of chip selects. Handle this in a family-dependent way with the proper values assigned at init time (see amd64_set_dct_base_and_mask). Remove _DCSM_COUNT defines since they're used at one place and originate from public documentation. CC: Keith Mannthey Signed-off-by: Borislav Petkov commit 2cff18c22cfaa88216a5d8c62ea64d1fb575c145 Author: Keith Mannthey Date: Fri Sep 18 14:35:23 2009 +0200 amd64_edac: simple fix to allow reporting of CECC errors This allows the errors to be further decoded and mapped to csrows. Tested with ECC debug dimms and an Rev F cpu based system. Signed-off-by: Keith Mannthey Signed-off-by: Borislav Petkov commit 8edc5445895dbcf050d6e8ac5488f70a3937753a Author: Borislav Petkov Date: Fri Sep 18 12:39:19 2009 +0200 amd64_edac: fix K8 intlv_sel check The check when DRAM interleaving is enabled should be done against the pvt->dram_IntlvSel field and not against the ->dram_limit. Simplify first loop and fixup printk formatting while at it. Signed-off-by: Borislav Petkov commit 72f158fe6fc2033ceb0f3e0e9e5c2aa356fed6da Author: Borislav Petkov Date: Fri Sep 18 12:27:27 2009 +0200 amd64_edac: fix interleave enable tests The pvt->dram_IntlvEn saves the 3 "Interleave Enable" bits already right-shifted by 8 so the check in find_mc_by_sys_addr() by shifting the values to the left 8 bits is wrong. Signed-off-by: Borislav Petkov commit 916d11b2b52430576fd4e96138c974cd64f9cfd6 Author: Borislav Petkov Date: Fri Sep 18 12:12:46 2009 +0200 amd64_edac: fix DRAM base and limit address extraction K8 DRAM base and limit addresses from F1x40 +8*i and F1x44 + 8*i, where i in (0..7) are both bits 39-24 and therefore the shifting should be done by 24 and not by 8. Signed-off-by: Borislav Petkov commit 3011b20da9d60b8168ead403e6aa860d0d8d11e4 Author: Borislav Petkov Date: Mon Sep 21 13:23:34 2009 +0200 amd64_edac: fix driver instance lookup table allocation Allocate memory statically for 8-node machines max for simplicity instead of relying on MAX_NUMNODES which is 0 on !CONFIG_NUMA builds. Spotted by Jan Beulich. Signed-off-by: Borislav Petkov commit defb5ab2e0ff08ff9a942e2bb7e14c21a55ec26b Author: Takashi Iwai Date: Wed Oct 7 15:12:27 2009 +0200 ALSA: hda - Fix yet another auto-mic bug in ALC268 Since patch_alc268() doesn't call set_capture_mixer() (due to its h/w design different from other siblings), it needs to call fixup_automic_adc() explicitly to set up the auto-mic routing. Otherwise the indices for int/ext mics aren't set properly. Reference: Novell bnc#544899 http://bugzilla.novell.com/show_bug.cgi?id=544899 Signed-off-by: Takashi Iwai commit 032665a26f5fe230509c4d35bd53f69fb6aa45b0 Author: Bartlomiej Zolnierkiewicz Date: Tue Oct 6 12:27:45 2009 +0000 Revert "Revert "ide: try to use PIO Mode 0 during probe if possible"" This reverts commit 24df31acaff8465d797f0006437b45ad0f2a5cb1. The root cause of reported system hangs was (now fixed) sis5513 bug and not "ide: try to use PIO Mode 0 during probe if possible" change (commit 6029336426a2b43e4bc6f4a84be8789a047d139e) so the revert was incorrect (it simply replaced one regression with the other one). Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: David S. Miller commit e13ee546bb06453939014c7b854e77fb643fd6f1 Author: Bartlomiej Zolnierkiewicz Date: Tue Oct 6 14:46:05 2009 +0000 sis5513: fix PIO setup for ATAPI devices Clear prefetch setting before potentially (re-)enabling it in config_drive_art_rwp() so the transition of the device type on the port from ATA to ATAPI (i.e. during warm-plug operation) is handled correctly. This is a really old bug (it probably goes back to very early days of the driver) but it was only affecting warm-plug operation until the recent "ide: try to use PIO Mode 0 during probe if possible" change (commit 6029336426a2b43e4bc6f4a84be8789a047d139e). Signed-off-by: Bartlomiej Zolnierkiewicz Tested-by: David Fries Signed-off-by: David S. Miller commit fdc6f192e7e1ae80565af23cc33dc88e3dcdf184 Author: Eero Nurkkala Date: Wed Oct 7 11:54:26 2009 +0300 NOHZ: update idle state also when NOHZ is inactive Commit f2e21c9610991e95621a81407cdbab881226419b had unfortunate side effects with cpufreq governors on some systems. If the system did not switch into NOHZ mode ts->inidle is not set when tick_nohz_stop_sched_tick() is called from the idle routine. Therefor all subsequent calls from irq_exit() to tick_nohz_stop_sched_tick() fail to call tick_nohz_start_idle(). This results in bogus idle accounting information which is passed to cpufreq governors. Set the inidle flag unconditionally of the NOHZ active state to keep the idle time accounting correct in any case. [ tglx: Added comment and tweaked the changelog ] Reported-by: Steven Noonan Signed-off-by: Eero Nurkkala Cc: Rik van Riel Cc: Venkatesh Pallipadi Cc: Greg KH Cc: Steven Noonan Cc: stable@kernel.org LKML-Reference: <1254907901.30157.93.camel@eenurkka-desktop> Signed-off-by: Thomas Gleixner commit a4d63a943735efa30270ce70716d43323fd40f02 Author: Thomas Chou Date: Tue Oct 6 03:25:25 2009 +0000 ethoc: limit the number of buffers to 128 Only 128 buffer descriptors are supported in the core. Limit the number in case we have more memory. Signed-off-by: Thomas Chou Signed-off-by: David S. Miller commit 0baa080c75cea6357bfba9b93ba598d747457cbd Author: Thomas Chou Date: Sun Oct 4 23:33:20 2009 +0000 ethoc: use system memory as buffer This patch enabled the ethoc to allocate system memory as buffer when there is no dedicated buffer memory. Some hardware designs may not have dedicated buffer memory such as on chip or off chip SRAM. In this case, only one memory resource is supplied in the platform data instead of two. Then a DMA buffer can be allocated from system memory and used for the transfer. Signed-off-by: Thomas Chou Signed-off-by: David S. Miller commit 050f91dcd9a45a14449dded5180f633692b588d2 Author: Thomas Chou Date: Sun Oct 4 23:33:19 2009 +0000 ethoc: align received packet to make IP header at word boundary The packet buffer is allocated at 4 bytes boundary, but the IP header length and version bits is located at byte 14. These bit fields access as 32 bits word and caused exception on processors that do not support unaligned access. The patch adds 2 bytes offset to make the bit fields word aligned. Signed-off-by: Thomas Chou Signed-off-by: David S. Miller commit 3ee19a85bb428b8363699dff9e1c4041c107d46a Author: Thomas Chou Date: Sun Oct 4 23:33:18 2009 +0000 ethoc: fix buffer address mapping The pointer address in buffer descriptors is physical address. The pointer that processor used to access packet is virtual address. Though the higher bits of pointer address used by the MAC may be truncated to zero in special case, it is not always true in larger designs. Signed-off-by: Thomas Chou Signed-off-by: David S. Miller commit 639b62a5284fab27122ec607fe341eb8e29411f4 Author: Thomas Chou Date: Sun Oct 4 23:33:17 2009 +0000 ethoc: fix typo to compute number of tx descriptors It should be max() instead of min(). Use 1/4 of available descriptors for tx, and there should be at least 2 tx descriptors. Signed-off-by: Thomas Chou Signed-off-by: David S. Miller commit 4989ccb25cc2a6d03d3503a2c852644f9a750948 Author: roel kluin Date: Tue Oct 6 09:54:18 2009 +0000 au1000_eth: Duplicate test of RX_OVERLEN bit in update_rx_stats() in update_rx_stats() the RX_OVERLEN bit is set twice, replace it by RX_RUNT. in au1000_rx() the RX_MISSED_FRAME bit was tested a few lines earlier already Signed-off-by: Roel Kluin Acked-by: Manuel Lauss Signed-off-by: David S. Miller commit fa9859ef2bb56d876db53c258001af115f38a272 Author: Roel Kluin Date: Tue Oct 6 19:34:39 2009 +0000 netxen: Fix Unlikely(x) > y The closing parenthesis was not on the right location. Signed-off-by: Roel Kluin Acked-by: Dhananjay Phadke Signed-off-by: David S. Miller commit 49682864b0270a0578b8321ed2686dc471ec37f1 Author: Valentine Barshak Date: Mon Oct 5 03:27:56 2009 +0000 pasemi_mac: ethtool get settings fix Not all pasemi mac interfaces can have a phy attached. For example, XAUI has no phy and phydev is NULL for it. In this case ethtool get settings causes kernel crash. Fix it by returning -EOPNOTSUPP if there's no PHY attached. Signed-off-by: Valentine Barshak Acked-by: Olof Johansson Signed-off-by: David S. Miller commit 6e43650cee644b5d7957ecd50f1e41ff71f87734 Author: Neil Horman Date: Mon Oct 5 03:56:55 2009 +0000 add maintainer for network drop monitor kernel service I was getting ribbed about this earlier, so I figured I'd make it official. Add myself as the maintainer of the drop monitor bits, so people don't just gripe at Dave when it breaks (I'm sure it will never break, but just in case :) ). Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit 24bb4fb6dac59f220f42fb375ba0e0f19365a227 Author: Matt Carlson Date: Mon Oct 5 17:55:29 2009 +0000 tg3: Fix phylib locking strategy Felix Radensky noted that chip resets were generating stack trace dumps. This is because the driver is attempting to acquire the mdio bus mutex while holding the tp->lock spinlock. The fix is to change the code such that every phy access takes the tp->lock spinlock instead. Signed-off-by: Matt Carlson Signed-off-by: David S. Miller commit 083925d5432d910025e84d445d1243dd260d4afb Author: John W. Linville Date: Tue Oct 6 11:05:42 2009 +0000 rndis_host: support ETHTOOL_GPERMADDR Signed-off-by: John W. Linville Signed-off-by: David S. Miller commit f8d1e548931cfa5ea9a082e020c2a47d27e5d793 Author: Anton Blanchard Date: Wed Oct 7 11:13:58 2009 +1100 futex: Fix typo in FUTEX_WAIT/WAKE_BITSET_PRIVATE definitions Looks like a typo, FUTEX_WAKE_BITS should be FUTEX_WAIT_BITSET. Signed-off-by: Anton Blanchard LKML-Reference: <20091007001358.GE16073@kryten> Signed-off-by: Thomas Gleixner commit a21090cff296eb82b6de09304d64de466bdcaefc Author: Stephen Hemminger Date: Wed Oct 7 03:18:17 2009 -0700 ipv4: arp_notify address list bug This fixes a bug with arp_notify. If arp_notify is enabled, kernel will crash if address is changed and no IP address is assigned. http://bugzilla.kernel.org/show_bug.cgi?id=14330 Reported-by: Hannes Frederic Sowa Signed-off-by: Stephen Hemminger Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 978c0b88146a7f9b364b71b5b83c5b12e7b413d7 Author: Paul E. McKenney Date: Tue Oct 6 21:48:18 2009 -0700 rcu: Place root rcu_node structure in separate lockdep class Before this patch, all of the rcu_node structures were in the same lockdep class, so that lockdep would complain when rcu_preempt_offline_tasks() acquired the root rcu_node structure's lock while holding one of the leaf rcu_nodes' locks. This patch changes rcu_init_one() to use a separate spin_lock_init() for the root rcu_node structure's lock than is used for that of all of the rest of the rcu_node structures, which puts the root rcu_node structure's lock in its own lockdep class. Suggested-by: Peter Zijlstra Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12548908983277-git-send-email-> Signed-off-by: Ingo Molnar commit e74f4c4564455c91a3b4075bb1721993c2a95dda Author: Paul E. McKenney Date: Tue Oct 6 21:48:17 2009 -0700 rcu: Make hot-unplugged CPU relinquish its own RCU callbacks The current interaction between RCU and CPU hotplug requires that RCU block in CPU notifiers waiting for callbacks to drain. This can be greatly simplified by having each CPU relinquish its own callbacks, and for both _rcu_barrier() and CPU_DEAD notifiers to adopt all callbacks that were previously relinquished. This change also eliminates the possibility of certain types of hangs due to the previous practice of waiting for callbacks to be invoked from within CPU notifiers. If you don't every wait, you cannot hang. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1254890898456-git-send-email-> Signed-off-by: Ingo Molnar commit d0ec774cb2599c858be9d923bb873cf6697520d8 Author: Paul E. McKenney Date: Tue Oct 6 21:48:16 2009 -0700 rcu: Move rcu_barrier() to rcutree Move the existing rcu_barrier() implementation to rcutree.c, consistent with the fact that the rcu_barrier() implementation is tied quite tightly to the RCU implementation. This opens the way to simplify and fix rcutree.c's rcu_barrier() implementation in a later patch. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12548908982563-git-send-email-> Signed-off-by: Ingo Molnar commit 1cec9727fbfd7baff2034796154be1a0297bcedd Author: Tilman Schmidt Date: Tue Oct 6 12:19:01 2009 +0000 gigaset: add kerneldoc comments Add kerneldoc comments to some functions in the Gigaset driver. Impact: documentation Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit cd7f50e25156711f16ce253c49c91adc4368849c Author: Tilman Schmidt Date: Tue Oct 6 12:18:56 2009 +0000 gigaset: correct debugging output selection Dump payload data consistently only when DEBUG_STREAM_DUMP debug bit is set. Impact: debugging aid Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit b5f581d55f7fef8d18773386faaa4304dbc2454b Author: Tilman Schmidt Date: Tue Oct 6 12:18:51 2009 +0000 gigaset: improve error recovery When the Gigaset base stops responding, try resetting the USB connection to recover. Impact: error handling improvement Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 05eae94f2a2b6a05f10495c77162d0fecae67264 Author: Tilman Schmidt Date: Tue Oct 6 12:18:46 2009 +0000 gigaset: fix device ERROR response handling Clear out pending command that got rejected with 'ERROR' response. This fixes the bug where unloading the driver module would hang with the message: "gigaset: not searching scheduled commands: busy" after a device communication error. Impact: error handling bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 2038724cc785b3b186f0dfb0f8bfcea6468d9c4f Author: Tilman Schmidt Date: Tue Oct 6 12:18:41 2009 +0000 gigaset: announce if built with debugging Mention in the driver load announcement whether the driver was built with debugging messages enabled, to facilitate support. Impact: informational message Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit eb4459ff3a3bdedb7a4da03fb9da2ba800b19f74 Author: Tilman Schmidt Date: Tue Oct 6 12:18:36 2009 +0000 gigaset: handle isoc frame errors more gracefully Don't drop the remainder of an URB if an isochronous frame has an error. Impact: error handling improvement Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit ee239d9901c13040598f6c46d5017869c6d14e2e Author: Tilman Schmidt Date: Tue Oct 6 12:18:31 2009 +0000 gigaset: linearize skb The code of the Gigaset driver assumes that sk_buff-s coming from the ISDN4Linux subsystem are always linear. Explicitly calling skb_linearize() is cheap if they are, but much more robust in case they ever aren't. Impact: robustness improvement Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 3305adffc556f7998b40c31afcef4c8755ce919a Author: Tilman Schmidt Date: Tue Oct 6 12:18:26 2009 +0000 gigaset: fix reject/hangup handling Signal D channel disconnect in a few cases where it was missed, including when an incoming call is disconnected before it was accepted. Impact: error handling improvement Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 9803f79695f552265d5c70f148876b5e2a77dd6a Author: Tilman Schmidt Date: Tue Oct 6 12:18:15 2009 +0000 isdn: make capidrv module parameter "debugmode" writeable Being able to change the debugmode module parameter of capidrv on the fly is quite useful for debugging and doesn't do any harm. Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit e48470217d1822e3566b657002c6f79bd7a77345 Author: Tilman Schmidt Date: Tue Oct 6 12:18:10 2009 +0000 isdn: avoid races in capidrv In several places, capidrv sends a CAPI message to the ISDN device and then updates its internal state accordingly. If the response message from the device arrives before the state is updated, it may be rejected or processed incorrectly. Avoid these races by updating the state before emitting the message. Impact: bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: David S. Miller commit 812d73473af23dd738afa83ab77cd6c733b3721f Author: Tilman Schmidt Date: Tue Oct 6 12:18:05 2009 +0000 isdn: accept CAPI Informational Info values as success Info values in the 0x00xx range are defined in the CAPI standard as "Informational, message processed successfully". Therefore a CONNECT_B3_CONF message with an Info value in that range should open an NCCI just as with Info==0. Impact: minor bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil Signed-off-by: David S. Miller commit f1af9f58546e2d98ef078fa30b2ef80a9042131e Author: Tilman Schmidt Date: Tue Oct 6 12:18:00 2009 +0000 Documentation: expand isdn/INTERFACE.CAPI document - Note that send_message() may be called in interrupt context. - Describe the storage of CAPI messages and payload data in SKBs. - Add more details to the description of the _cmsg structure. - Describe kernelcapi debugging output. Impact: documentation Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit aa96e341c2a14d6bec114c933bd813ecb972605f Author: Roel Kluin Date: Tue Oct 6 21:48:40 2009 +0200 drm/radeon: Fix setting of bits Duplicate bits set Signed-off-by: Roel Kluin Signed-off-by: Dave Airlie commit 7affb32a32eabbbe42d6746923ec1d0bf7327234 Author: Bartlomiej Zolnierkiewicz Date: Wed Oct 7 00:27:25 2009 +0200 pata_atp867x: add Power Management support Cc: Jung-Ik (John) Lee Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit c59bcc37cb56e00ae0582339bea948853d600436 Author: Bartlomiej Zolnierkiewicz Date: Wed Oct 7 00:27:19 2009 +0200 pata_atp867x: PIO support fixes * use 8 clk setting for active clocks == 7 (was 12 clk) * use 12 clk setting for active clocks > 12 (was 8 clk) * do 66MHz bus fixup before mapping active clocks * fix setup of PIO command timings Acked-by: Jung-Ik (John) Lee Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 64207f59137fd300a869e35b14c15f775c64c6fc Author: John(Jung-Ik) Lee Date: Wed Oct 7 00:27:03 2009 +0200 pata_atp867x: clarifications in timings calculations and cable detection Signed-off-by: John(Jung-Ik) Lee Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 566b54c8a491654b145b6ae246039e5b4a56e587 Author: Bartlomiej Zolnierkiewicz Date: Wed Oct 7 00:26:57 2009 +0200 pata_atp867x: fix it to not claim MWDMA support MWDMA modes are not supported by this driver currently. Acked-by: Jung-Ik (John) Lee Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Jeff Garzik commit 3b761d3d437cffcaf160a5d37eb6b3b186e491d5 Author: Tejun Heo Date: Tue Oct 6 17:08:40 2009 +0900 libata: fix incorrect link online check during probe While trying to work around spurious detection retries for non-existent devices on slave links, commit 816ab89782ac139a8b65147cca990822bb7e8675 incorrectly added link offline check logic before ata_eh_thaw() was called. This means that if an occupied link goes down briefly at the time that offline check was performed, device class will be cleared to ATA_DEV_NONE and libata wouldn't retry thus failing detection of the device. The offline check should be done after the port is thawed together with online check so that such link glitches can be detected by the interrupt handler and handled properly. Signed-off-by: Tejun Heo Reported-by: Tim Blechmann Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit 583e3f34ebf421e51bf15beb9df84ef70f7dd3f9 Author: Ajit Khaparde Date: Mon Oct 5 02:22:19 2009 +0000 be2net: Bug fix to properly update ethtool tx-checksumming after ethtool -K tx off This is a fix for a bug which was a result of wrong use of checksum offload flag. The status of tx-checksumming was not changed from on to off after a 'ethtool -K tx off' operation. Use the proper checksum offload flag NETIF_F_HW_CSUM instead of NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM. Patch is against net-2.6 tree. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 49643848f9ec8182cf04a83115f58d43854bbdc6 Author: Ajit Khaparde Date: Mon Oct 5 02:22:05 2009 +0000 be2net: Fix a typo in be_cmds.h MCC_STATUS_NOT_SUPPORTED should be decimal 66 not hex 66. This patch fixes this typo. Patch against net-2.6 tree. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit c5b9b92e07e4973b299537c5c684037349dc7e5c Author: Ajit Khaparde Date: Mon Oct 5 02:21:51 2009 +0000 be2net: Bug Fix while accounting of multicast frames during netdev stats update While updating the statistics to be passed via the get_stats, tx multicast frames were being accounted instead of rx multicast frames. This patch fixes the bug. This patch is against the net-2.6 tree. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 86aaf9ad8276160312c09771c0f8e64646996e4c Author: Ron Mercer Date: Mon Oct 5 11:46:49 2009 +0000 qlge: Fix lock/mutex warnings. Get rid of spinlock and private mutex usage for exclusive access to the HW semaphore register. rtnl_lock already creates exclusive access to this register in all driver API. Add rtnl to firmware worker threads that also use the HW semaphore register. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 5ee22a5aa9cd85527b93b24402db9ae2567d5aa6 Author: Ron Mercer Date: Mon Oct 5 11:46:48 2009 +0000 qlge: Fix queueing of firmware handler in ISR. Check that we are not already polling firmware events before we queue the firmware event worker, then disable firmware interrupts. Otherwise we can queue the same event multiple times. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit d799bbfbe2dc94b95ad5735c99769892675c3ada Author: Ron Mercer Date: Mon Oct 5 11:46:47 2009 +0000 qlge: Fix some bit definitions for reset register. Signed-off-by: Ron Mercer Signed-off-by: David S. Miller commit 6f775ba0154cdf10108071acc71f26c4efdb8d57 Merge: b266002 5b7dde3 Author: Mark Brown Date: Tue Oct 6 19:29:47 2009 +0100 Merge branch 'upstream/wm8350' into for-2.6.32 commit 5b7dde346881b12246669ae97b3a2793c27b32b6 Author: Mark Brown Date: Mon Jun 29 11:17:10 2009 +0100 ASoC: WM8350 capture PGA mutes are inverted Signed-off-by: Mark Brown Cc: stable@kernel.org commit b266002abf6dfa4b358fdb5495f09e350b296552 Author: Mark Brown Date: Tue Oct 6 19:25:02 2009 +0100 ASoC: Remove absent SYNC and TDM DAI format options from i.MX SSI These should be handled via set_tdm_slot() now and cause build failures as-is. Signed-off-by: Mark Brown commit ab8d64d7d4ea49cf664ca5562263a8ba78f4541e Merge: 82e8650 ee894b1 Author: Tony Lindgren Date: Tue Oct 6 08:32:28 2009 -0700 Merge branch 'pm-fixes-32' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-fixes-for-linus commit 82e865011accc9fd1e048961da7cefc4d08f3292 Author: Tommi Rantala Date: Mon Oct 5 13:31:47 2009 -0700 omapfb: Blizzard: constify register address tables Constify register address tables Cc: Tomi Valkeinen Cc: Imre Deak Signed-off-by: Tommi Rantala Signed-off-by: Tony Lindgren commit 7999cad0e3d59f3430173288048c971bef3ec492 Author: Tommi Rantala Date: Mon Oct 5 13:31:46 2009 -0700 omapfb: Blizzard: fix pointer to be const Fixes a compiler warning: warning: assignment discards qualifiers from pointer target type Cc: Tomi Valkeinen Cc: Imre Deak Signed-off-by: Tommi Rantala Signed-off-by: Tony Lindgren commit 03bb2b493cf58edf11e5966f8469534259d2fffe Author: Sergio Aguirre Date: Mon Oct 5 13:31:46 2009 -0700 omapfb: Condition mutex acquisition This fixes a bug introduced by this commit ID: commit 537a1bf059fa312355696fa6db80726e655e7f17 Author: Krzysztof Helt Date: Tue Jun 30 11:41:29 2009 -0700 fbdev: add mutex for fb_mmap locking In which a mutex was added when changing smem_start and smem_len fields, so the mutex inside the fb_mmap() call is actually used. The problem was that set_fb_fix, which modifies the above 2 fields, was called before and after registering the framebuffer, which when used before registration, lead to a failed attempt to use an uninitialized mutex. Solution: Don't use mutex before framebuffer registration. Signed-off-by: Sergio Aguirre Acked-by: Tomi Valkeinen Acked-by: Imre Deak Tested-by: Cory Maccarrone Signed-off-by: Tony Lindgren commit 265489003c463f3d78d622fba60d56d16b3009dd Author: Daniel Walker Date: Mon Oct 5 13:31:45 2009 -0700 omap: iovmm: Add missing mutex_unlock I was using Coccinelle with the mutex_unlock semantic patch, and it unconvered this problem. It appears to be a valid missing unlock issue. This change should correct it by moving the unlock below the label. This patch is against the mainline kernel. Cc: Julia Lawall Cc: Hiroshi DOYU Signed-off-by: Daniel Walker Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit ba6a117944f958a5b3fb6631b9ac7eaed3a4cb2a Author: Hiroshi DOYU Date: Mon Oct 5 13:31:45 2009 -0700 omap: iovmm: Fix incorrect spelling Fix incorrect spelling Signed-off-by: Hiroshi DOYU Signed-off-by: Tony Lindgren commit 913b143ffac8ade63e576c4cb48908a257106bdc Author: ye janboe Date: Mon Oct 5 13:31:44 2009 -0700 omap: SRAM: flush the right address after memcpy in omap_sram_push the original flush operation is to flush the function address which is copied from. But we do not change the function code and it is not necessary to flush it. Signed-off-by: janboe Acked-by: Paul Walmsley Signed-off-by: Tony Lindgren commit 322a2c100a8998158445599ea437fb556aa95b11 Author: Thomas Gleixner Date: Mon Oct 5 18:18:03 2009 +0200 futex: Move exit_pi_state() call to release_mm() exit_pi_state() is called from do_exit() but not from do_execve(). Move it to release_mm() so it gets called from do_execve() as well. Signed-off-by: Thomas Gleixner LKML-Reference: Cc: stable@kernel.org Cc: Anirban Sinha Cc: Peter Zijlstra commit fc6b177dee33365ccb29fe6d2092223cf8d679f9 Author: Peter Zijlstra Date: Mon Oct 5 18:17:32 2009 +0200 futex: Nullify robust lists after cleanup The robust list pointers of user space held futexes are kept intact over an exec() call. When the exec'ed task exits exit_robust_list() is called with the stale pointer. The risk of corruption is minimal, but still it is incorrect to keep the pointers valid. Actually glibc should uninstall the robust list before calling exec() but we have to deal with it anyway. Nullify the pointers after [compat_]exit_robust_list() has been called. Reported-by: Anirban Sinha Signed-off-by: Peter Zijlstra Signed-off-by: Thomas Gleixner LKML-Reference: Cc: stable@kernel.org commit 2fb930b53f513cbc4c102d415d2923a8a7091337 Author: Clemens Ladisch Date: Tue Oct 6 08:21:04 2009 +0200 sound: via82xx: move DXS volume controls to PCM interface The "VIA DXS" controls are actually volume controls that apply to the four PCM substreams, so we better indicate this connection by moving the controls to the PCM interface. Commit b452e08e73c0e3dbb0be82130217be4b7084299e in 2.6.30 broke the restoring of these volumes by "alsactl restore" that most distributions use; the renaming in this patch cures that regression by preventing alsactl from applying the old, wrong volume levels to the new controls. http://bugzilla.kernel.org/show_bug.cgi?id=14151 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532613 Signed-off-by: Clemens Ladisch Cc: Signed-off-by: Takashi Iwai commit b0f56f1a63b7b968e6feeeefeace24bc8e0a4a65 Author: Hiroshi Shimamoto Date: Thu Oct 1 13:33:28 2009 +0900 trace: Fix missing assignment in trace_ctxwake_* The state char variable S should be reassigned, if S == 0. We are missing the state of the task that is going to sleep for the context switch events (in the raw mode). Fortunately the problem arises with the sched_switch/wake_up tracers, not the sched trace events. The formers are legacy now. But still, that was buggy. Signed-off-by: Hiroshi Shimamoto Cc: Steven Rostedt Acked-by: Frederic Weisbecker LKML-Reference: <4AC43118.6050409@ct.jp.nec.com> Signed-off-by: Ingo Molnar commit 906010b2134e14a2e377decbadd357b3d0ab9c6a Author: Peter Zijlstra Date: Mon Sep 21 16:08:49 2009 +0200 perf_event: Provide vmalloc() based mmap() backing Some architectures such as Sparc, ARM and MIPS (basically everything with flush_dcache_page()) need to deal with dcache aliases by carefully placing pages in both kernel and user maps. These architectures typically have to use vmalloc_user() for this. However, on other architectures, vmalloc() is not needed and has the downsides of being more restricted and slower than regular allocations. Signed-off-by: Peter Zijlstra Acked-by: David Miller Cc: Andrew Morton Cc: Jens Axboe Cc: Paul Mackerras LKML-Reference: <1254830228.21044.272.camel@laptop> Signed-off-by: Ingo Molnar commit e13dbd7d75d1ecc315c6e3071b3c4e8fba4f6bec Author: Chuck Ebbert Date: Tue Oct 6 07:38:51 2009 -0400 perf_events: Make ABI definitions available to userspace Signed-off-by: Chuck Ebbert LKML-Reference: <200910061138.n96BcqkJ004709@int-mx03.intmail.prod.int.phx2.redhat.com> Signed-off-by: Ingo Molnar commit 01d4825df62d1d405035b90294bf38616d3f380b Author: Takashi Iwai Date: Tue Oct 6 13:21:54 2009 +0200 ALSA: hda - Don't pick up invalid HP pins in alc_subsystem_id() alc_subsystem_id() tries to pick up a headphone pin if not configured, but this caused side-effects as the problem in commit 15870f05e90a365f8022da416e713be0c5024e2f. This patch fixes the driver behavior to pick up invalid HP pins; at least, the pins that are listed as the primary outputs aren't taken any more. Signed-off-by: Takashi Iwai commit 2a0f5cb32772e9a9560209e241a80bfbbc31dbc3 Merge: 374576a e655a43 Author: Mark Brown Date: Tue Oct 6 12:11:09 2009 +0100 Merge branch 'for-2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into for-2.6.32 commit 818331303bc7cb914351c992d3da00aae957eba7 Author: Arnaldo Carvalho de Melo Date: Mon Oct 5 23:35:03 2009 -0300 perf tools: elf_sym__is_function() should accept "zero" sized functions Asm routines that end up having size equal to zero are not really zero sized, and as now we do kernel_maps__fixup_sym_end, at least for kernel routines this gets fixed. A similar fixup needs to be done for the userspace bits as well, but as this fixup started only because in /proc/kallsyms we don't have the end address nor the function size, it appeared here first. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <1254796503-27203-1-git-send-email-acme@redhat.com> Signed-off-by: Ingo Molnar commit ee949a86b3aef15845ea677aa60231008de62672 Author: Tom Zanussi Date: Tue Oct 6 01:00:49 2009 -0500 tracing/syscalls: Use long for syscall ret format and field definitions The syscall event definitions use long for the syscall exit ret value, but unsigned long for the same thing in the format and field definitions. Change them all to long. Signed-off-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: rostedt@goodmis.org Cc: lizf@cn.fujitsu.com Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1254808849-7829-4-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit b934cdd55f2ac38c825f3d46cfa87a1654f1c849 Author: Tom Zanussi Date: Tue Oct 6 01:00:48 2009 -0500 perf trace: Update eval_flag() flags array to match interrupt.h Add missing BLOCK_IOPOLL_SOFTIRQ entry. Signed-off-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: rostedt@goodmis.org Cc: lizf@cn.fujitsu.com Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1254808849-7829-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit d4c3768faaae70cdcffc3a5e296bd99edfa7ddb2 Author: Tom Zanussi Date: Tue Oct 6 01:00:47 2009 -0500 perf trace: Remove unused code in builtin-trace.c And some minor whitespace cleanup. Signed-off-by: Tom Zanussi Acked-by: Frederic Weisbecker Cc: rostedt@goodmis.org Cc: lizf@cn.fujitsu.com Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1254808849-7829-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit f0b25932b8e60e96f5f371b27442e560803ac6f5 Author: Stephen Boyd Date: Tue Oct 6 01:39:51 2009 -0700 connector: Fix incompatible pointer type warning Commit 7069331 (connector: Provide the sender's credentials to the callback, 2009-10-02) changed callbacks to take two arguments but missed this one. drivers/connector/cn_proc.c: In function ‘cn_proc_init’: drivers/connector/cn_proc.c:263: warning: passing argument 3 of ‘cn_add_callback’ from incompatible pointer type Signed-off-by: Stephen Boyd Signed-off-by: David S. Miller commit f8f25ba3563dab14b1c3ea4d829642b8a61ca5d7 Author: Takashi Iwai Date: Tue Oct 6 08:31:29 2009 +0200 ALSA: hda - Add a workaround for ASUS A7K ASUS A7K needs additional GPIO1 bit setup; it has to be cleared. Added a new fixup hook for this laptop so that it works as is. Refernece: Novell bnc#494309 http://bugzilla.novell.com/show_bug.cgi?id=494309 Signed-off-by: Takashi Iwai commit df748b025d1357c2b9659e16a6040596e60e4257 Author: Dave Airlie Date: Tue Sep 29 13:56:38 2009 +1000 drm/ttm: fix refcounting in ttm global code. the global refcount wasn't being increased after the first reference. this caused an oops on unload on a multi-gpu card. Signed-off-by: Dave Airlie commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a Author: Tejun Heo Date: Wed Sep 16 04:18:03 2009 +0900 ahci: filter FPDMA non-zero offset enable for Aspire 3810T Curiously, Aspire 3810T issues many SATA feature enable commands via _GTF, of which one is invalid and another is not supported by the drive. In the process, it also enables FPDMA non-zero offset. However, the feature also needs to be supported and enabled from the controller and it's wrong to enable it from _GTF unless the controller can do it by default. Currently, this ends up enabling FPDMA non-zero offset only on the drive side leading to NCQ command failures and eventual disabling of NCQ. This patch makes libata filter out FPDMA non-zero offset enable for the machine. This was reported by Marcus Meissner in bnc#522790. https://bugzilla.novell.com/show_bug.cgi?id=522790 Reported-by: Marcus Meissner Signed-off-by: Jeff Garzik commit 110f66d25c33c2259b1125255fa7063ab07b8340 Author: Tejun Heo Date: Wed Sep 16 04:17:28 2009 +0900 libata: make gtf_filter per-dev Add ->gtf_filter to ata_device and set it to ata_acpi_gtf_filter when initializing ata_link. This is to allow quirks which apply different gtf filters. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit fa5b561c4ea170caf9759109acc2e961a7e83bea Author: Tejun Heo Date: Wed Sep 16 04:17:02 2009 +0900 libata: implement more acpi filtering options Currently libata-acpi can only filter DIPM among SATA feature enables via _GTF. This patch adds the capability to filter out FPDMA non-zero offset, in-order guarantee and auto-activation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit f1bce7f80e3b400cf29787b0afa9c3042b959017 Author: Tejun Heo Date: Wed Sep 16 04:16:04 2009 +0900 libata: cosmetic updates We're about to add more SATA_* and ATA_ACPI_FILTER_* constants. Reformat them in preparation. Signed-off-by: Tejun Heo Signed-off-by: Jeff Garzik commit 4c521c8ef0e802f88f1d80352dd1b3d6a6aa1cc8 Author: Robert Hancock Date: Sun Sep 20 17:02:31 2009 -0600 ahci: display all AHCI 1.3 HBA capability flags (v2) Update the AHCI driver to display all of the HBA capabilities defined in the AHCI 1.3 specification. Some of these are in a new CAP2 (HBA Capabilities Extended) register which is only defined on AHCI 1.2 or later. The spec says that undefined registers should always return 0 on read, but to be safe we assume a value of 0 unless the controller reports AHCI version 1.2 or later. The value can also be retrieved through sysfs as with the existing capability field. For example, on an Intel Ibex Peak (PCH) controller: ahci 0000:00:1f.2: flags: 64bit ncq sntf stag pm led clo pmp pio slum part ems sxs apst We don't do anything special with the new flags yet. Also, change the code that displays the flags to use the same bit enumerations that are used to control actual operation. Signed-off-by: Robert Hancock Signed-off-by: Jeff Garzik commit c21c8066be5a2870b3e047616e03e9e56a4701a4 Author: Dirk Hohndel Date: Mon Sep 28 21:56:07 2009 -0400 pata_ali: trivial fix of a very frequent spelling mistake something-bility is spelled as something-blity so a grep for 'blit' would find these lines I broke this one out from the rest as it actually changes the output of a kernel message - so it could in theory change the behavior of tools that parse that ouput Signed-off-by: Dirk Hohndel Signed-off-by: Jeff Garzik commit 2fcad9d27168b287e3db61f6694254e0afa32f8c Author: Tejun Heo Date: Sat Oct 3 18:27:29 2009 +0900 ahci: disable 64bit DMA by default on SB600s Till now only one board, ASUS M2A-VM, can do 64bit dma with recent BIOSen. Enabling 64bit DMA by default already broke three boards. Enabling 64bit DMA isn't worth these regressions. Disable 64bit DMA by default and enable it only on boards which are known to work. Signed-off-by: Tejun Heo Reported-by: Gabriele Balducci Reported-by: maierp@informatik.tu-muenchen.de Cc: Shane Huang Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit b8c00ac5b50b54491657f8b6740db1df50149944 Author: Dave Airlie Date: Tue Oct 6 13:54:01 2009 +1000 drm/fb: add more correct 8/16/24/32 bpp fb support. The previous patches had some unwanted side effects, I've fixed the lack of 32bpp working, and fixed up 16bpp so it should also work. this also adds the interface to allow the driver to set a preferred console depth so for example low memory rn50 can set it to 8bpp. It also catches 24bpp on cards that can't do it and forces 32bpp. Tested on r100/r600/i945. Signed-off-by: Dave Airlie commit 0eca52a92735f43462165efe00a7e394345fb38e Merge: 19d031e 24df31a Author: Linus Torvalds Date: Mon Oct 5 14:39:22 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6: Revert "ide: try to use PIO Mode 0 during probe if possible" ide: use printk_once commit 7a66a39b8599e09c82e2e95fec55f414ad015282 Author: Rajendra Nayak Date: Mon Oct 5 13:31:44 2009 -0700 omap: Lock DPLL5 at boot Lock DPLL5 at 120MHz at boot. The USBHOST 120MHz f-clock and USBTLL f-clock are the only users of this DPLL, and 120MHz is is the only recommended rate for these clocks. With this patch, the 60 MHz ULPI clock is generated correctly. Tested on an OMAP3430 SDP. Signed-off-by: Rajendra Nayak Signed-off-by: Anand Gadiyar Signed-off-by: Paul Walmsley Signed-off-by: Tony Lindgren commit a9f82d10d1c20b433a12b08e6e78bced6f596c5f Author: Tony Lindgren Date: Mon Oct 5 13:31:43 2009 -0700 omap: Fix incorrect 730 vs 850 detection Commit cd92204924fafbd5c7241dfd12ca3176d542e0c5 added support for omap850. However, the patch accidentally removed the wrong ifdef: # define cpu_is_omap730() 1 # endif #endif +#else +# if defined(CONFIG_ARCH_OMAP850) +# undef cpu_is_omap850 +# define cpu_is_omap850() 1 +# endif +#endif ... void omap2_check_revision(void); #endif /* defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) */ - -#endif Instead of removing removing the #endif at the end of the file, the #endif before #else should have been removed. But we cannot have multiple #else statements as pointed out by Alistair Buxton . So the fix is to: - remove the non-multi-omap special handling, as we need to detect between omap730 and omap850 anyways. - add the missing #endif back to the end of the file Reported-by: Sanjeev Premi Signed-off-by: Tony Lindgren commit eaaea8036d0261d87d7072c5bc88c7ea730c18ac Author: Thomas Gleixner Date: Sun Oct 4 09:34:17 2009 +0200 futex: Fix locking imbalance Rich reported a lock imbalance in the futex code: http://bugzilla.kernel.org/show_bug.cgi?id=14288 It's caused by the displacement of the retry_private label in futex_wake_op(). The code unlocks the hash bucket locks in the error handling path and retries without locking them again which makes the next unlock fail. Move retry_private so we lock the hash bucket locks when we retry. Reported-by: Rich Ercolany Signed-off-by: Thomas Gleixner Cc: Peter Zijlstra Cc: Darren Hart Cc: stable-2.6.31 LKML-Reference: Signed-off-by: Ingo Molnar commit d014e8894dfc523dd9d2f2a17b6dcb94facea810 Author: Aaro Koskinen Date: Fri Oct 2 14:41:20 2009 +0300 panic: Fix panic message visibility by calling bust_spinlocks(0) before dying Commit ffd71da4e3f ("panic: decrease oops_in_progress only after having done the panic") moved bust_spinlocks(0) to the end of the function, which in practice is never reached. As a result console_unblank() is not called, and on some systems the user may not see the panic message. Move it back up to before the unblanking. Signed-off-by: Aaro Koskinen Reviewed-by: Frederic Weisbecker LKML-Reference: <1254483680-25578-1-git-send-email-aaro.koskinen@nokia.com> Signed-off-by: Ingo Molnar commit 19d031e052bc213cdcbee70696d476136994b8c1 Merge: e8d809c 3da0dd4 Author: Linus Torvalds Date: Mon Oct 5 12:07:39 2009 -0700 Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: add support for change_pte mmu notifiers KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes KVM: MMU: dont hold pagecount reference for mapped sptes pages KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID KVM: VMX: flush TLB with INVEPT on cpu migration KVM: fix LAPIC timer period overflow KVM: s390: fix memsize >= 4G KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly KVM: SVM: Fix tsc offset adjustment when running nested commit e8d809c61325a2f799dc753b0ac72ace6958b92c Merge: ef790fe 131e4e9 Author: Linus Torvalds Date: Mon Oct 5 12:06:59 2009 -0700 Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Clear sticky FSR register after saving it to func parametr microblaze: UMS is used only for MMU kernel commit ef790fe022916a225f7ba7fc565ffc51404655f7 Merge: ed3c661 c4a5743 Author: Linus Torvalds Date: Mon Oct 5 12:06:40 2009 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: using HZ needs an include of linux/param.h sparc32: convert to asm-generic/hardirq.h sparc64: Cache per-cpu %pcr register value in perf code. sparc64: Fix comment typo in perf_event.c sparc64: Minor coding style fixups in perf code. sparc64: Add a basic conflict engine in preparation for multi-counter support. sparc64: Increase vmalloc size to fix percpu regressions. sparc64: Add initial perf event conflict resolution and checks. sparc: Niagara1 perf event support. sparc: Add Niagara2 HW cache event support. sparc: Support all ultra3 and ultra4 derivatives. sparc: Support HW cache events. commit ed3c661448a1b4b0b07c0a0d3c6e8a19c7d0ffd7 Author: Jan Beulich Date: Fri Oct 2 16:12:39 2009 +0100 iSCSI/iBFT: use proper address translation In virtual environments (namely, Xen Dom0) virt <-> phys and virt <-> isa-bus translations cannot be freely interchanged (and even outside such environments it is not really correct to do so). When looking at memory below 1M, the latter translations should always be used. iscsi_ibft_find.c part from: Martin Wilck . Signed-off-by: Jan Beulich Signed-off-by: Peter Jones Signed-off-by: Konrad Rzeszutek Wilk Signed-off-by: Linus Torvalds commit 41cb6654eb2cf01476223a3742946b9f65bd1bbd Merge: e69a9ac 1ad0560 Author: Linus Torvalds Date: Mon Oct 5 12:04:41 2009 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf tools: Run generate-cmdlist.sh properly perf_event: Clean up perf_event_init_task() perf_event: Fix event group handling in __perf_event_sched_*() perf timechart: Add a power-only mode perf top: Add poll_idle to the skip list commit e69a9ac59629db81971a9e03048f9a107712947a Merge: 0f26ec6 d3f6302 Author: Linus Torvalds Date: Mon Oct 5 12:04:16 2009 -0700 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: hrtimer: Remove overly verbose "switch to high res mode" message commit 0f26ec69f0c4071a8dfa3c2ac8e180a79355f81a Merge: 46302b4 f9ac5a6 Author: Linus Torvalds Date: Mon Oct 5 12:03:43 2009 -0700 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: kmemtrace: Fix up tracer registration tracing: Fix infinite recursion in ftrace_update_pid_func() commit 46302b46e5cf9e23859360e38c540be6e3465c6b Merge: 5b1755f 24e3580 Author: Linus Torvalds Date: Mon Oct 5 12:02:18 2009 -0700 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Don't leak 64-bit kernel register values to 32-bit processes x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y x86: Fix csum_ipv6_magic asm memory clobber x86: Optimize cmpxchg64() at build-time some more commit 135c8aea557cf53abe6c8847e286d01442124193 Author: Paul E. McKenney Date: Mon Sep 28 21:50:21 2009 -0700 rcu: Replace the rcu_barrier enum with pointer to call_rcu*() function The rcu_barrier enum causes several problems: (1) you have to define the enum somewhere, and there is no convenient place, (2) the difference between TREE_RCU and TREE_PREEMPT_RCU causes problems when you need to map from rcu_barrier enum to struct rcu_state, (3) the switch statement are large, and (4) TINY_RCU really needs a different rcu_barrier() than do the treercu implementations. So replace it with a functionally equivalent but cleaner function pointer abstraction. Signed-off-by: Paul E. McKenney Acked-by: Mathieu Desnoyers Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12541998232366-git-send-email-> Signed-off-by: Ingo Molnar commit a0b6c9a78c41dc36732d6e1e90f0f2f57b29816f Author: Paul E. McKenney Date: Mon Sep 28 07:46:33 2009 -0700 rcu: Clean up code based on review feedback from Josh Triplett, part 4 These issues identified during an old-fashioned face-to-face code review extending over many hours. This group improves an existing abstraction and introduces two new ones. It also fixes an RCU stall-warning bug found while making the other changes. o Make RCU_INIT_FLAVOR() declare its own variables, removing the need to declare them at each call site. o Create an rcu_for_each_leaf() macro that scans the leaf nodes of the rcu_node tree. o Create an rcu_for_each_node_breadth_first() macro that does a breadth-first traversal of the rcu_node tree, AKA stepping through the array in index-number order. o If all CPUs corresponding to a given leaf rcu_node structure go offline, then any tasks queued on that leaf will be moved to the root rcu_node structure. Therefore, the stall-warning code must dump out tasks queued on the root rcu_node structure as well as those queued on the leaf rcu_node structures. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12541491934126-git-send-email-> Signed-off-by: Ingo Molnar commit 3d76c082907e8f83c5d5c4572f38d53ad8f00c4b Author: Paul E. McKenney Date: Mon Sep 28 07:46:32 2009 -0700 rcu: Clean up code based on review feedback from Josh Triplett, part 3 Whitespace fixes, updated comments, and trivial code movement. o Fix whitespace error in RCU_HEAD_INIT() o Move "So where is rcu_write_lock()" comment so that it does not come between the rcu_read_unlock() header comment and the rcu_read_unlock() definition. o Move the module_param statements for blimit, qhimark, and qlowmark to immediately follow the corresponding definitions. o In __rcu_offline_cpu(), move the assignment to rdp_me inside the "if" statement, given that rdp_me is not used outside of that "if" statement. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12541491931164-git-send-email-> Signed-off-by: Ingo Molnar commit 162cc2794df37662beb7f97ddd1dd5bffaf85e9a Author: Paul E. McKenney Date: Wed Sep 23 16:18:13 2009 -0700 rcu: Fix rcu_lock_map build failure on CONFIG_PROVE_LOCKING=y Move the rcu_lock_map definition from rcutree.c to rcupdate.c so that TINY_RCU can use lockdep. Reported-by: Ingo Molnar Signed-off-by: Paul E. McKenney Signed-off-by: Ingo Molnar commit 5b1755f23b98e0afaedaec8344002ab184646286 Merge: 374576a c84b564 Author: Linus Torvalds Date: Mon Oct 5 11:56:55 2009 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68knommu: fix rename of pt_regs offset defines breakage m68knommu: remove duplicated #include m68knommu: show KiB rather than pages in "Freeing initrd memory:" message commit ee894b18e064447f86019af38a90ccb091880942 Author: Artem Bityutskiy Date: Thu Oct 1 10:01:55 2009 +0300 OMAP3: PM: introduce a new powerdomain walk helper The 'pwrdm_for_each()' function walks powerdomains with a spinlock locked, so the the callbacks cannot do anything which may sleep. This patch introduces a 'pwrdm_for_each_nolock()' helper which does the same, but without the spinlock locked. This fixes the following lockdep warning: [ 0.000000] WARNING: at kernel/lockdep.c:2460 lockdep_trace_alloc+0xac/0xec() [ 0.000000] Modules linked in: (unwind_backtrace+0x0/0xdc) from [] (warn_slowpath_common+0x48/0x60) (warn_slowpath_common+0x48/0x60) from [] (lockdep_trace_alloc+0xac/0xec) (lockdep_trace_alloc+0xac/0xec) from [] (kmem_cache_alloc+0x1c/0xd0) (kmem_cache_alloc+0x1c/0xd0) from [] (d_alloc+0x1c/0x1a4) (d_alloc+0x1c/0x1a4) from [] (__lookup_hash+0xd8/0x118) (__lookup_hash+0xd8/0x118) from [] (lookup_one_len+0x84/0x94) (lookup_one_len+0x84/0x94) from [] (debugfs_create_file+0x8c/0x20c) (debugfs_create_file+0x8c/0x20c) from [] (debugfs_create_dir+0x1c/0x20) (debugfs_create_dir+0x1c/0x20) from [] (pwrdms_setup+0x60/0x90) (pwrdms_setup+0x60/0x90) from [] (pwrdm_for_each+0x30/0x80) (pwrdm_for_each+0x30/0x80) from [] (pm_dbg_init+0x7c/0x14c) (pm_dbg_init+0x7c/0x14c) from [] (do_one_initcall+0x5c/0x1b8) (do_one_initcall+0x5c/0x1b8) from [] (kernel_init+0x90/0x10c) (kernel_init+0x90/0x10c) from [] (kernel_thread_exit+0x0/0x8) Signed-off-by: Artem Bityutskiy Signed-off-by: Kevin Hilman commit eb350f74ebff9573641c5fb689fb071b695ef35b Author: Kevin Hilman Date: Thu Sep 10 15:53:08 2009 +0000 OMAP3: PM: Enable GPIO module-level wakeups Currently, only GPIOs in the wakeup domain (GPIOs in bank 0) are enabled as wakups. This patch also enables GPIOs in the PER powerdomain (banks 2-6) to be used as possible wakeup sources. In addition, this patch ensures that all GPIO wakeups can wakeup the MPU using the PM_MPUGRPSEL_ registers. NOTE: this doesn't enable the individual GPIOs as wakeups, this simply enables the per-bank wakeups at the powerdomain level. This problem was discovered by Mike Chan when preventing the CORE powerdomain from going into retention/off. When CORE was allowed to hit retention, GPIO wakeups via IO pad were working fine, but when CORE remained on, GPIO module-level wakeups were not working properly. To test, prevent CORE from going inactive/retention/off, thus preventing the IO chain from being armed: # echo 3 > /debug/pm_debug/core_pwrdm/suspend This ensures that GPIO wakeups happen via module-level wakeups and not via IO pad. Tested on 3430SDP using the touchscreen GPIO (gpio 2, in WKUP) Tested on Zoom2 using the QUART interrup GPIO (gpio 102, in PER) Also, c.f. OMAP PM wiki for troubleshooting GPIO wakeup issues: http://elinux.org/OMAP_Power_Management Reported-by: Mike Chan Signed-off-by: Kevin Hilman commit 71a807757394205cdb1465d68a4f0be50fd6f04b Author: Vikram Pandita Date: Fri Jul 17 19:33:09 2009 -0500 OMAP3: PM: USBHOST: clear wakeup events on both hosts USBHOST module has 2 fclocks (for HOST1 and HOST2), only one iclock and only a single bit in the WKST register to indicate a wakeup event. Because of the single WKST bit, we cannot know whether a wakeup event was on HOST1 or HOST2, so enable both fclocks before clearing the wakeup event to ensure both hosts can properly clear the event. Signed-off-by: Vikram Pandita Signed-off-by: Kevin Hilman commit 8cb0ac999f253212bb01cd3c0d686489ec5911ad Author: Paul Walmsley Date: Wed Jul 22 10:29:02 2009 -0700 OMAP3: PM: PRCM interrupt: only handle selected PRCM interrupts Clearing wakeup sources is now only done when the PRM indicates a wakeup source interrupt. Since we don't handle any other types of PRCM interrupts right now, warn if we get any other type of PRCM interrupt. Either code needs to be added to the PRCM interrupt handler to react to these, or these other interrupts should be masked off at init. Updated after Jon Hunter's PRCM IRQ rework by Kevin Hilman. Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman commit 5d80597801ff0d7e6b184504c04e9c1b3b61d16d Author: Paul Walmsley Date: Wed Jul 22 10:18:07 2009 -0700 OMAP3: PM: PRCM interrupt: check MPUGRPSEL register PM_WKST register contents should be ANDed with the contents of the MPUGRPSEL registers. Otherwise the MPU PRCM interrupt handler could wind up clearing wakeup events meant for the IVA PRCM interrupt handler. A future revision to this code should be to read a cached version of MPUGRPSEL from the powerdomain code, since PRM reads are relatively slow. Updated after Jon Hunter's PRCM IRQ change by Kevin Hilman Signed-off-by: Paul Walmsley Signed-off-by: Kevin Hilman commit 77da2d910a17e1e6a7e949578723d5aab58568d5 Author: Jon Hunter Date: Sat Jun 27 00:07:25 2009 -0500 OMAP3: PM: Prevent hang in prcm_interrupt_handler There are two scenarios where a race condition could result in a hang in the prcm_interrupt handler. These are: 1). Waiting for PRM_IRQSTATUS_MPU register to clear. Bit 0 of the PRM_IRQSTATUS_MPU register indicates that a wake-up event is pending for the MPU. This bit can only be cleared if the all the wake-up events latched in the various PM_WKST_x registers have been cleared. If a wake-up event occurred during the processing of the prcm interrupt handler, after the corresponding PM_WKST_x register was checked but before the PRM_IRQSTATUS_MPU was cleared, then the CPU would be stuck forever waiting for bit 0 in PRM_IRQSTATUS_MPU to be cleared. 2). Waiting for the PM_WKST_x register to clear. Some power domains have more than one wake-up source. The PM_WKST_x registers indicate the source of a wake-up event and need to be cleared after a wake-up event occurs. When the PM_WKST_x registers are read and before they are cleared, it is possible that another wake-up event could occur causing another bit to be set in one of the PM_WKST_x registers. If this did occur after reading a PM_WKST_x register then the CPU would miss this event and get stuck forever in a loop waiting for that PM_WKST_x register to clear. This patch address the above race conditions that would result in a hang. Signed-off-by: Jon Hunter Reviewed-by: Paul Walmsley Signed-off-by: Kevin Hilman commit f83f9ac2632732bd1678150b5a03d152f912fe72 Author: Peter Williams Date: Thu Sep 24 06:47:10 2009 +0000 sched: Set correct normal_prio and prio values in sched_fork() normal_prio should be updated if policy changes from RT to SCHED_MORMAL or if static_prio/nice is changed. Some paths through sched_fork() ignore this requirement and may result in normal_prio having an invalid value. Fixing this issue allows the call to effective_prio() in wake_up_new_task() to be removed. Signed-off-by: Peter Williams Acked-by: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: Signed-off-by: Ingo Molnar commit 131e4e97bfee809dc64febe8accef2f042a92722 Author: Michal Simek Date: Mon Sep 28 08:50:53 2009 +0200 microblaze: Clear sticky FSR register after saving it to func parametr Previous patch d63678d607d0e37ec7abe5ceb545d7e8aab956a4 clear it for noMMU kernel. This one do it for MMU. Correct noMMU version Signed-off-by: Michal Simek commit f1ae3f6918ee4a437b4166a4deab4bd79629bc09 Author: Michal Simek Date: Fri Sep 25 11:52:50 2009 +0200 microblaze: UMS is used only for MMU kernel Signed-off-by: Michal Simek commit a160ee69c6a4622ed30c377a978554015e9931cb Author: Johannes Berg Date: Mon Oct 5 02:22:23 2009 -0700 wext: let get_wireless_stats() sleep A number of drivers (recently including cfg80211-based ones) assume that all wireless handlers, including statistics, can sleep and they often also implicitly assume that the rtnl is held around their invocation. This is almost always true now except when reading from sysfs: BUG: sleeping function called from invalid context at kernel/mutex.c:280 in_atomic(): 1, irqs_disabled(): 0, pid: 10450, name: head 2 locks held by head/10450: #0: (&buffer->mutex){+.+.+.}, at: [] sysfs_read_file+0x24/0xf4 #1: (dev_base_lock){++.?..}, at: [] wireless_show+0x1a/0x4c Pid: 10450, comm: head Not tainted 2.6.32-rc3 #1 Call Trace: [] __might_sleep+0xf0/0xf7 [] mutex_lock_nested+0x1a/0x33 [] wdev_lock+0xd/0xf [cfg80211] [] cfg80211_wireless_stats+0x45/0x12d [cfg80211] [] get_wireless_stats+0x16/0x1c [] wireless_show+0x2a/0x4c Fix this by using the rtnl instead of dev_base_lock. Reported-by: Miles Lane Signed-off-by: Johannes Berg Signed-off-by: David S. Miller commit 5c6ae5b880b3d19cff6d14f0dcff3362e6f7ffdf Author: Ajit Khaparde Date: Mon Oct 5 02:09:40 2009 -0700 be2net: Fix a bug in preparation of mcc wrb which was causing flash operation to fail This patch fixes a bug that got introduced in commit 76998bc7. During preparation of mcc wrb, req was being wrongly overwritten and the flash operation was failing. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 75fb4090b39a3d7bf9ac77a28665c991ec5eaadc Author: Frederic Weisbecker Date: Sat Oct 3 15:08:54 2009 +0200 tracing: Use free_percpu instead of kfree In the event->profile_enable() failure path, we release the per cpu buffers using kfree which is wrong because they are per cpu pointers. Although free_percpu only wraps kfree for now, that may change in the future so lets use the correct way. Reported-by: Paul Mackerras Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Li Zefan commit fe8e5b5a60f8427940d33b205e127aecfb0bca10 Author: Frederic Weisbecker Date: Sat Oct 3 14:55:18 2009 +0200 tracing: Check total refcount before releasing bufs in profile_enable failure When we call the profile_enable() callback of an event, we release the shared perf event tracing buffers unconditionnaly in the failure path. This is wrong because there may be other users of these. Then check the total refcount before doing this. Reported-by: Paul Mackerras Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Li Zefan commit c4a57435db67c4522c2e688c357051f35e36d6d6 Author: Stephen Rothwell Date: Mon Oct 5 00:46:08 2009 -0700 sparc: using HZ needs an include of linux/param.h Signed-off-by: Stephen Rothwell Signed-off-by: David S. Miller commit bf6fda63c452205f0e240ed8c511db5693857e93 Author: Ken Kawasaki Date: Mon Oct 5 00:40:03 2009 -0700 pcnet_cs: add cis of National Semicondoctor's multifunction pcmcia card pcnet_cs,serial_cs: add cis of National Semicondoctor's lan&modem mulitifunction pcmcia card, NE2K, tamarack ethernet card, and some serial card(COMpad2, COMpad4). Signed-off-by: Ken Kawasaki Signed-off-by: David S. Miller commit 9c501935a3cdcf6b1d35aaee3aa11c7a7051a305 Author: Ben Hutchings Date: Mon Oct 5 00:24:36 2009 -0700 net: Support inclusion of before The following user-space program fails to compile: #include #include int main() { return 0; } The reason is that tests __GLIBC__ to decide whether it should define various structures and macros that are now defined for user-space by , but __GLIBC__ is not defined if no libc headers have yet been included. It seems safe to drop support for libc 5 now. Signed-off-by: Ben Hutchings Signed-off-by: Bastian Blank Signed-off-by: David S. Miller commit 15870f05e90a365f8022da416e713be0c5024e2f Author: Takashi Iwai Date: Mon Oct 5 08:25:13 2009 +0200 ALSA: hda - Fix invalid initializations for ALC861 auto mode The recent auto-parser doesn't work for machines with a single output with ALC861, such as Toshiba laptops, because alc_subsystem_id() sets the hp_pins[0] while it's listed in line_outs[0]. This ends up with the doubled initialization of the same mixer widget, and it mutes the DAC route because hp_pins has no DAC assigned. To fix this problem, just check spec->autocfg.hp_outs and speaker_outs so that they are really detected pins. Reference: Novell bnc#544161 http://bugzilla.novell.com/show_bug.cgi?id=544161 Signed-off-by: Takashi Iwai commit 9240d7154e766ce6f3b615e81ed28f7562f509a5 Author: Eric Dumazet Date: Sat Oct 3 01:39:18 2009 +0000 pktgen: restore nanosec delays Commit fd29cf72 (pktgen: convert to use ktime_t) inadvertantly converted "delay" parameter from nanosec to microsec. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 896a7cf8d846a9e86fb823be16f4f14ffeb7f074 Author: Eric Dumazet Date: Fri Oct 2 20:24:59 2009 +0000 pktgen: Fix multiqueue handling It is not currently possible to instruct pktgen to use one selected tx queue. When Robert added multiqueue support in commit 45b270f8, he added an interval (queue_map_min, queue_map_max), and his code doesnt take into account the case of min = max, to select one tx queue exactly. I suspect a high performance setup on a eight txqueue device wants to use exactly eight cpus, and assign one tx queue to each sender. This patchs makes pktgen select the right tx queue, not the first one. Also updates Documentation to reflect Robert changes. Signed-off-by: Eric Dumazet Signed-off-by: Robert Olsson Signed-off-by: David S. Miller commit a825e00c98a2ee37eb2a0ad93b352e79d2bc1593 Author: Alexander Duyck Date: Fri Oct 2 12:30:42 2009 +0000 e1000e: swap max hw supported frame size between 82574 and 82583 There appears to have been a mixup in the max supported jumbo frame size between 82574 and 82583 which ended up disabling jumbo frames on the 82574 as a result. This patch swaps the two so that this issue is resolved. This patch fixes http://bugzilla.kernel.org/show_bug.cgi?id=14261 Signed-off-by: Alexander Duyck Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit dbfec662f2aaf640f4a59242bd233206c3905bb8 Author: Don Skidmore Date: Fri Oct 2 08:58:25 2009 +0000 ixgbe: add support for 82599 based X520 10G Dual KX4 Mezz card This patch adds device support for the 82599 based X520 10GbE Dual Port KX4 Mezzanine card. Signed-off-by: Don Skidmore Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 312eb9316fe2673100769e4028af2c1ee33cc40d Author: Don Skidmore Date: Fri Oct 2 08:58:04 2009 +0000 ixgbe: add support for 82599 Combined Backplane This patch will add support for the 82599 Dual port Backplane device (0x10f8). This device has the ability to link in serial (KR) and parallel (KX4/KX) modes, depending on what the switch capabilities are in the blade chassis. Signed-off-by: Don Skidmore Acked-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 24df31acaff8465d797f0006437b45ad0f2a5cb1 Author: David S. Miller Date: Sun Oct 4 21:00:17 2009 -0700 Revert "ide: try to use PIO Mode 0 during probe if possible" This reverts commit 6029336426a2b43e4bc6f4a84be8789a047d139e. Based upon a report by David Fries, wherein his system hangs on bootup with sis5513 controller, right after the CDROM is registered by ide-cd.c and the TOC is first read. Signed-off-by: David S. Miller commit 068143d38804825d59d951a192cfadd2e22f457d Author: Dave Airlie Date: Mon Oct 5 09:58:02 2009 +1000 drm/fb: add setcmap and fix 8-bit support. This adds support for the setcmap api and fixes the 8bpp support at least on radeon hardware. It adds a new load_lut hook which can be called once the color map is setup. Signed-off-by: Dave Airlie commit dfee5614e4d83a32cef9193a8b19bc1d8900f93d Author: Dave Airlie Date: Fri Oct 2 09:19:09 2009 +1000 drm/radeon/kms: respect single crtc cards, only create one crtc. (v2) Also add single crtc for RN50 chips. changes in v2: fix vblank init to respect single crtc flag fix r100 mode bandwidth to respect single crtc flag Signed-off-by: Dave Airlie commit 185974dd596e67e73906790c2a4a4579d75911e6 Author: Zhao Yakui Date: Wed Sep 30 15:21:43 2009 +0800 drm: Delete the DRM_DEBUG_KMS in drm_mode_cursor_ioctl We can get the corresponding info by adding the boot option of "drm.debug= 0x07". But On some boxes it will print the following message many times in course of moving mouse. In such case the useful DRM debug info will be flushed. >[drm:drm_mode_cursor_ioctl], Avoid using the DRM_DEBUG_KMS in drm_mode_cursor_ioctl. Signed-off-by: Zhao Yakui Signed-off-by: Dave Airlie commit b442962a9e826e6d408886b3e52c88b774201983 Author: Alex Deucher Date: Fri Oct 2 17:36:41 2009 -0400 drm/radeon/kms: add support for "Surround View" "Surround View" is an option in the system bios that enables the AMD IGP chip in conjunction with a discrete AMD card. However, since the IGP vbios is part of the system bios it is not accessible via the rom bar or the legacy vga location. When "Surround View" is enabled in the system bios, the system bios puts a copy of the IGP vbios image at the start of vram. This patch adds support for reading the vbios image out of vram on IGP cards. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 933da83aa17939a78d59708321c0b27d0ec8c6ce Author: Chris Wilson Date: Sun Oct 4 01:35:01 2009 +0100 perf: Propagate term signal to child If we launch the child on behalf of the user, ensure that it dies along with ourselves when we are interrupted. Signed-off-by: Chris Wilson Cc: Chris Wilson LKML-Reference: <1254616502-4728-1-git-send-email-chris@chris-wilson.co.uk> Signed-off-by: Ingo Molnar commit 3da0dd433dc399a8c0124d0614d82a09b6a49bce Author: Izik Eidus Date: Wed Sep 23 21:47:18 2009 +0300 KVM: add support for change_pte mmu notifiers this is needed for kvm if it want ksm to directly map pages into its shadow page tables. [marcelo: cast pfn assignment to u64] Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit 1403283acca398e244ece35741ad251c1feb5972 Author: Izik Eidus Date: Wed Sep 23 21:47:17 2009 +0300 KVM: MMU: add SPTE_HOST_WRITEABLE flag to the shadow ptes this flag notify that the host physical page we are pointing to from the spte is write protected, and therefore we cant change its access to be write unless we run get_user_pages(write = 1). (this is needed for change_pte support in kvm) Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit acb66dd051d0834c8b36d147ff83a8d39da0fe0b Author: Izik Eidus Date: Wed Sep 23 21:47:16 2009 +0300 KVM: MMU: dont hold pagecount reference for mapped sptes pages When using mmu notifiers, we are allowed to remove the page count reference tooken by get_user_pages to a specific page that is mapped inside the shadow page tables. This is needed so we can balance the pagecount against mapcount checking. (Right now kvm increase the pagecount and does not increase the mapcount when mapping page into shadow page table entry, so when comparing pagecount against mapcount, you have no reliable result.) Signed-off-by: Izik Eidus Signed-off-by: Marcelo Tosatti commit 6a54435560efdab1a08f429a954df4d6c740bddf Author: Avi Kivity Date: Sun Oct 4 16:45:13 2009 +0200 KVM: Prevent overflow in KVM_GET_SUPPORTED_CPUID The number of entries is multiplied by the entry size, which can overflow on 32-bit hosts. Bound the entry count instead. Reported-by: David Wagner Cc: stable@kernel.org Signed-off-by: Avi Kivity commit eb5109e311b5152c0614a28d7d615d087f268f19 Author: Marcelo Tosatti Date: Thu Oct 1 19:16:58 2009 -0300 KVM: VMX: flush TLB with INVEPT on cpu migration It is possible that stale EPTP-tagged mappings are used, if a vcpu migrates to a different pcpu. Set KVM_REQ_TLB_FLUSH in vmx_vcpu_load, when switching pcpus, which will invalidate both VPID and EPT mappings on the next vm-entry. Cc: stable@kernel.org Signed-off-by: Marcelo Tosatti commit b2d83cfa3fdefe5c6573d443d099a18dc3a93c5f Author: Aurelien Jarno Date: Fri Sep 25 11:09:37 2009 +0200 KVM: fix LAPIC timer period overflow Don't overflow when computing the 64-bit period from 32-bit registers. Fixes sourceforge bug #2826486. Signed-off-by: Aurelien Jarno Cc: stable@kernel.org Signed-off-by: Marcelo Tosatti commit 8feda6f786fc44f5f8b5cf88e3b6c03514f5be93 Author: Christian Borntraeger Date: Mon Sep 21 10:45:18 2009 +0200 KVM: s390: fix memsize >= 4G commit 628eb9b8a8f3 KVM: s390: streamline memslot handling introduced kvm_s390_vcpu_get_memsize. This broke guests >=4G, since this function returned an int. This patch changes the return value to a long. Signed-off-by: Christian Borntraeger Signed-off-by: Avi Kivity commit 20824f30bb0b8ae0a4099895fd4509f54cf2e1e2 Author: Joerg Roedel Date: Wed Sep 16 15:24:18 2009 +0200 KVM: SVM: Handle tsc in svm_get_msr/svm_set_msr correctly When running nested we need to touch the l1 guests tsc_offset. Otherwise changes will be lost or a wrong value be read. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit 77b1ab1732feb5e3dcbaf31d2f7547c5229f5f3a Author: Joerg Roedel Date: Wed Sep 16 15:24:17 2009 +0200 KVM: SVM: Fix tsc offset adjustment when running nested When svm_vcpu_load is called while the vcpu is running in guest mode the tsc adjustment made there is lost on the next emulated #vmexit. This causes the tsc running backwards in the guest. This patch fixes the issue by also adjusting the tsc_offset in the emulated hsave area so that it will not get lost. Cc: stable@kernel.org Signed-off-by: Joerg Roedel Signed-off-by: Marcelo Tosatti commit e3be785fb59f92c0df685037062d041619653b7a Author: Marin Mitov Date: Sat Oct 3 20:45:02 2009 +0300 x86, pci: Correct spelling in a comment Signed-off-by: Marin Mitov Cc: Joerg Roedel Cc: Jesse Brandeburg LKML-Reference: <200910032045.02523.mitov@issp.bas.bg> Signed-off-by: Ingo Molnar ====================================================== commit 4ef8774cb45c3cf78c7a2d7a1a42f6aee7eda3b2 Author: Helge Deller Date: Sun Sep 27 21:13:04 2009 +0000 agp: parisc-agp.c - use correct page_mask function This commit: Commit 2a4ceb6d3e6a566cb4a9dc8f974177f031d27cd7 Author: David Woodhouse Date: Mon Jul 27 10:27:29 2009 +0100 agp: Switch mask_memory() method to take address argument again, not page broke the parisc AGP driver (again). This patch fixes it. Signed-off-by: Helge Deller Acked-by: Dave Airlie Signed-off-by: Kyle McMartin commit 11879ba5d9ab8174af9b9cefbb2396a54dfbf8c1 Author: Arjan van de Ven Date: Sat Sep 26 20:51:50 2009 +0200 x86: Simplify bound checks in the MTRR code The current bound checks for copy_from_user in the MTRR driver are not as obvious as they could be, and gcc agrees with that. This patch simplifies the boundary checks to the point that gcc can now prove to itself that the copy_from_user() is never going past its bounds. Signed-off-by: Arjan van de Ven Cc: Yinghai Lu Cc: Linus Torvalds LKML-Reference: <20090926205150.30797709@infradead.org> Signed-off-by: Ingo Molnar commit e655a43544bd3c45a83da93b00a4b115b4fa758e Author: Jonathan Cameron Date: Fri Oct 2 16:09:49 2009 +0100 ASoC: wm8940: Fix check on error code form snd_soc_codec_set_cache_io Fix for typo in commit 8d50e447d19fec64adebeef55f2b60d695435412 ASoC: Factor out I/O for Wolfson 8 bit data 16 bit register CODECs Signed-off-by: Jonathan Cameron Signed-off-by: Mark Brown commit 0d18b2e34bd1ad8f5bd3f3a17b5e7df132e511a9 Author: Borislav Petkov Date: Fri Oct 2 15:31:48 2009 +0200 x86: EDAC: carve out AMD MCE decoding logic This converts the MCE decoding logic into a standalone config option which can be built-in or a module, the first one being the default for MCEs happening early on in the boot process. This, beyond being separated in a cleaner way, also saves RAM by making the decoding logic modular. Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Andi Kleen LKML-Reference: <20091002133148.GD28682@aftab> Signed-off-by: Ingo Molnar commit 329bd4119c8a0afea95f9db6d6b402a2f2b40e84 Author: Borislav Petkov Date: Fri Oct 2 15:23:21 2009 +0200 initcalls: Add early_initcall() for modules Complete the early_initcall() API by making it available in modules too. To be used by the EDAC/MCE code. Signed-off-by: Borislav Petkov Acked-by: Linus Torvalds Cc: Andi Kleen LKML-Reference: <20091002132321.GC28682@aftab> Signed-off-by: Ingo Molnar commit f436f8bb73138bc74eb1c6527723e00988ad8a8a Author: Ingo Molnar Date: Thu Oct 1 16:14:32 2009 +0200 x86: EDAC: MCE: Fix MCE decoding callback logic Make decoding of MCEs happen only on AMD hardware by registering a non-default callback only on CPU families which support it. While looking at the interaction of decode_mce() with the other MCE code i also noticed a few other things and made the following cleanups/fixes: - Fixed the mce_decode() weak alias - a weak alias is really not good here, it should be a proper callback. A weak alias will be overriden if a piece of code is built into the kernel - not good, obviously. - The patch initializes the callback on AMD family 10h and 11h. - Added the more correct fallback printk of: No support for human readable MCE decoding on this CPU type. Transcribe the message and run it through 'mcelog --ascii' to decode. On CPUs that dont have a decoder. - Made the surrounding code more readable. Note that the callback allows us to have a default fallback - without having to check the CPU versions during the printout itself. When an EDAC module registers itself, it can install the decode-print function. (there's no unregister needed as this is core code.) version -v2 by Borislav Petkov: - add K8 to the set of supported CPUs - always build in edac_mce_amd since we use an early_initcall now - fix checkpatch warnings Signed-off-by: Borislav Petkov Cc: Linus Torvalds Cc: Andi Kleen LKML-Reference: <20091001141432.GA11410@aftab> Signed-off-by: Ingo Molnar commit eaeae5d9b783a62e435645122bed90561924a2d6 Author: Peter Ujfalusi Date: Wed Sep 30 09:27:24 2009 +0300 ASoC: Fix SND_SOC_DAPM_LINE handling Since the SND_SOC_DAPM_LINE can be input or output, additional check is needed in order to determine if the widget is connected as input or output. When checking for connected outputs, if the widget is line, than check if the sources list is not empty (line is connected as output) For input endpoint check, when the widget is line, also check if the sinks list is not empty (line is connected as input). Signed-off-by: Peter Ujfalusi Signed-off-by: Mark Brown commit ac447df4f2283a116a3fbbc28cbaabf05758b736 Author: Jerome Glisse Date: Wed Sep 30 22:18:43 2009 +0200 drm/radeon/kms: Fix irq handling on AVIVO hw Avivo hw have vblank interrupt in different place, fixes irq handling (especialy irq disabling while suspending or shuting down the module). Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit e7d40b9a0a7c857383ef50db9766354bd3be1bf3 Author: Jerome Glisse Date: Thu Oct 1 18:02:15 2009 +0200 drm/radeon/kms: R600/RV770 remove dead code and print message for wrong BIOS R600 & RV770 family are all using atombios so remove dead code and print an error message if we fail to find a valid atombios. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 75c8129893d78fd0cbe5c26580cadd6001d904fc Author: Jerome Glisse Date: Thu Oct 1 18:02:14 2009 +0200 drm/radeon/kms: Fix R600/RV770 disable acceleration path When acceleration doesn't work we should free associated memory and stop GPU block responsible for hardware acceleration so we don't waste resource or let think one component of the driver that a GPU feature is working/running while it doesn't actualy work. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit a3c1945aaf48a5893238d95139f202531994094d Author: Jerome Glisse Date: Thu Oct 1 18:02:13 2009 +0200 drm/radeon/kms: Fix R600/RV770 startup path & reset We were calling reset unconditionaly in the startup path this is bad we need to call GPU reset for a good reason as after reset the GPU is in unknown states. To avoid any more bad things to happen we now also unconditionaly reinitialize the GPU after reset. This patch fix few issues reported by different people regarding KMS & R6XX/RV7XX hw. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 81cc35bfc19ebe4b823396fe4fef67a923360916 Author: Jerome Glisse Date: Thu Oct 1 18:02:12 2009 +0200 drm/radeon/kms: Fix R600 write back buffer This split write back buffer handling into 3 functions, wb_fini for cleanup, wb_enable/wb_disable for enabling/disabling write back used for suspend/resume. This should fix potential issue of letting the write back active before suspending. We need to allocate memory in wb_enable because we can only allocate once GART is running. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 62a8ea3f7bb61e5f92db0a648b7cc566852c36ec Author: Jerome Glisse Date: Thu Oct 1 18:02:11 2009 +0200 drm/radeon/kms: Remove old init path as no hw use it anymore This remove old init path and allow code cleanup, now all hw use the new init path, see top of radeon.h for description of this. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit c010f8000a925e08d84d9391e13dd297b9fdc393 Author: Jerome Glisse Date: Wed Sep 30 22:09:06 2009 +0200 drm/radeon/kms: Convert RS600 to new init path New init path allow to simply asic initialization and make easier to trace what happen on each different asic. We are removing most callback. Do a massive RS600 register cleanup to clarify RS600 register, we are still bit fuzy on some register and waiting for more informations. I don't have hw to test, so this patch is a best effort to not break anythings and to try to improve things. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 3bc6853593bd4fba357dc252b3cf60cd86a1d2ec Author: Jerome Glisse Date: Thu Oct 1 09:39:24 2009 +0200 drm/radeon/kms: Convert RS690/RS740 to new init path (V2). Also cleanup register specific to RS690/RS740. Version 2 add missing header file for register, remove unecessary call to AGP function and fix an indentation bug. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit d4550907157d8b3d5286157c15f1200c44842269 Author: Jerome Glisse Date: Thu Oct 1 10:12:06 2009 +0200 drm/radeon/kms: Convert R100 to new init path (V2) New init path allow to simply asic initialization and make easier to trace what happen on each different asic. We are removing most callback. More cleanup should happen latter to remove even more callback. Also cleanup register specific to R100,RV200,RV250. Version 2 correct the placement on IGP of the VRAM inside GPU address space to match the stollen RAM placement of IGP. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit 207bf9e90cd40f91d4662127b8ae3b64e6b101c4 Author: Jerome Glisse Date: Wed Sep 30 15:35:32 2009 +0200 drm/radeon/kms: Convert R300 to new init path Also cleanup register specific to R300. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit ca6ffc64cba0cdd0a2b3fcad0e1d19edcf277ccc Author: Jerome Glisse Date: Thu Oct 1 10:20:52 2009 +0200 drm/radeon/kms: Convert RS400/RS480 to new init path & fix legacy VGA (V3) Also cleanup register specific to RS400/RS480. This patch also fix legacy VGA register used to disable VGA access we were programming wrong register. Now we should properly disable VGA on r100 up to rs400 asics. Note that RS400/RS480 resume is broken, it hangs the computer while reprogramming dynamic clock, doesn't work either without that patch. We need to spend more time investigating this issue. Version 2 of the patch remove dead code that was left commented out in the previous version. Version 3 correct the placement on IGP of the VRAM inside GPU address space to match the stollen RAM placement of IGP. Signed-off-by: Jerome Glisse Signed-off-by: Dave Airlie commit c416850580cbdcca7e601dda8a243f5cac35aa88 Author: Christoph Hellwig Date: Thu Oct 1 13:45:13 2009 -0700 sparc32: convert to asm-generic/hardirq.h From: Christoph Hellwig [akpm@linux-foundation.org: /arch/sparc/include/asm/irq_32.h: move NR_IRQS definition] Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit f9ac5a69edee0ee7e06a05727226e3f275306c8d Author: Paul Mundt Date: Mon Sep 28 16:55:40 2009 +0900 kmemtrace: Fix up tracer registration Commit ddc1637af217dbd8bc51f30e6d24e84476a869a6 ("kmemtrace: Print binary output only if 'bin' option is set") ended up inverting the error detection logic. register_tracer() returns 0 on success, which this change caused to treat as an error, resulting in: [ 0.132000] Warning: could not register the kmem tracer as well as bailing out of the initcall with an error value. This restores the old logic. Signed-off-by: Paul Mundt Acked-by: Pekka Enberg Acked-by: Frederic Weisbecker Cc: Eduard - Gabriel Munteanu Cc: Steven Rostedt Cc: Li Zefan LKML-Reference: <20090928075540.GD6668@linux-sh.org> Signed-off-by: Ingo Molnar commit 24e35800cdc4350fc34e2bed37b608a9e13ab3b6 Author: Jan Beulich Date: Wed Sep 30 11:22:11 2009 +0100 x86: Don't leak 64-bit kernel register values to 32-bit processes While 32-bit processes can't directly access R8...R15, they can gain access to these registers by temporarily switching themselves into 64-bit mode. Therefore, registers not preserved anyway by called C functions (i.e. R8...R11) must be cleared prior to returning to user mode. Signed-off-by: Jan Beulich Cc: LKML-Reference: <4AC34D73020000780001744A@vpn.id2.novell.com> Signed-off-by: Ingo Molnar commit 4701472e441e41be2549a25228f703bc9cd13b5b Author: Jaswinder Singh Rajput Date: Sat Sep 26 21:41:41 2009 +0530 x86, SLUB: Remove unused CONFIG FAST_CMPXCHG_LOCAL Remove unused CONFIG FAST_CMPXCHG_LOCAL from Kconfig. Reported-by: Robert P. J. Day Signed-off-by: Jaswinder Singh Rajput Acked-by: Christoph Lameter Cc: Pekka Enberg Cc: Matt Mackall Cc: Andrew Morton Cc: "Robert P. J. Day" Cc: linux-mm@kvack.org LKML-Reference: <1253981501.4568.61.camel@ht.satnam> Signed-off-by: Ingo Molnar commit ea3acb199a5d7e4da1de0a4288eba993b29f33b9 Author: Jason Wessel Date: Thu Sep 24 09:08:30 2009 -0500 x86: earlyprintk: Fix regression to handle serial,ttySn as 1 arg Commit c953094 ("early_printk: Allow more than one early console") introduced a regression in the parsing of the earlyprintk= kernel arguments. If you specify "earlyprintk=serial,ttyS0,115200" as a kernel argument, the "serial,ttyS" should be parsed as a single argument and not as "serial" and then "ttyS". Also update the documentation to reflect you can specify the ttyS directly without the "serial" argument. Signed-off-by: Jason Wessel Cc: Len Brown Cc: Greg KH Cc: Linus Torvalds Cc: Andrew Morton Cc: Johannes Weiner LKML-Reference: <4ABB7D5E.6000301@windriver.com> Signed-off-by: Ingo Molnar commit 1ad0560e8cdb6d5b381220dc2da187691b5ce124 Author: Mulyadi Santosa Date: Sat Sep 26 02:01:41 2009 +0700 perf tools: Run generate-cmdlist.sh properly Right now generate-cmdlist.sh is not executable, so we should call it as an argument ".". This fixes cases where due to different umask defaults the generate-cmdlist.sh script is not executable in a kernel tree checkout. Signed-off-by: Mulyadi Santosa Acked-by: Sam Ravnborg Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: Signed-off-by: Ingo Molnar commit 27f9994c50e95f3a5a81fe4c7491a9f9cffe6ec0 Author: Xiao Guangrong Date: Fri Sep 25 13:54:01 2009 +0800 perf_event: Clean up perf_event_init_task() While at it: we can traverse ctx->group_list to get all group leader, it should be safe since we hold ctx->mutex. Changlog v1->v2: - remove WARN_ON_ONCE() according to Peter Zijlstra's suggestion Signed-off-by: Xiao Guangrong Acked-by: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <4ABC5AF9.6060808@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 8c9ed8e14c342ec5e7f27e7e498f62409a10eb29 Author: Xiao Guangrong Date: Fri Sep 25 13:51:17 2009 +0800 perf_event: Fix event group handling in __perf_event_sched_*() Paul Mackerras says: "Actually, looking at this more closely, it has to be a group leader anyway since it's at the top level of ctx->group_list. In fact I see four places where we do: list_for_each_entry(event, &ctx->group_list, group_entry) { if (event == event->group_leader) ... or the equivalent, three of which appear to have been introduced by afedadf2 ("perf_counter: Optimize sched in/out of counters") back in May by Peter Z. As far as I can see the if () is superfluous in each case (a singleton event will be a group of 1 and will have its group_leader pointing to itself)." [ See: http://marc.info/?l=linux-kernel&m=125361238901442&w=2 ] And Peter Zijlstra points out this is a bugfix: "The intent was to call event_sched_{in,out}() for single event groups because that's cheaper than group_sched_{in,out}(), however.. - as you noticed, I got the condition wrong, it should have read: list_empty(&event->sibling_list) - it failed to call group_can_go_on() which deals with ->exclusive. - it also doesn't call hw_perf_group_sched_in() which might break power." [ See: http://marc.info/?l=linux-kernel&m=125369523318583&w=2 ] Changelog v1->v2: - Fix the title name according to Peter Zijlstra's suggestion - Remove the comments and WARN_ON_ONCE() as Peter Zijlstra's suggestion Signed-off-by: Xiao Guangrong Acked-by: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <4ABC5A55.7000208@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 39a90a8ef17fe6fbf4b45e46e3c10d3b8b4a3dea Author: Arjan van de Ven Date: Thu Sep 24 15:40:13 2009 +0200 perf timechart: Add a power-only mode For doing work on the Linux power management components, I need to make long (30+ seconds) traces. Currently, this then results in a HUGE svg file, with mostly process data that isn't interesting. This patch adds a --power-only mode to perf timechart that only outputs the CPU power section of the SVG; this significantly reduces the size of the SVG file, making even 30+ second traces viewable with inkscape. As a minor tweak for the same effect, the minimum text size is decreased; current inkscape cannot zoom in deep enough to show text this small, but it reduces inkscape compute time. Signed-off-by: Arjan van de Ven Cc: peterz@infradead.org LKML-Reference: <20090924154013.0675ab71@infradead.org> Signed-off-by: Ingo Molnar commit 04edbdef02ec4386a2ae38cab7ae7d166e17a756 Author: Eric Dumazet Date: Thu Oct 1 07:30:38 2009 +0200 x86: Don't generate cmpxchg8b_emu if CONFIG_X86_CMPXCHG64=y Conditionaly compile cmpxchg8b_emu.o and EXPORT_SYMBOL(cmpxchg8b_emu). This reduces the kernel size a bit. Signed-off-by: Eric Dumazet Cc: Arjan van de Ven Cc: Martin Schwidefsky Cc: John Stultz Cc: Peter Zijlstra Cc: Linus Torvalds LKML-Reference: <4AC43E7E.1000600@gmail.com> Signed-off-by: Ingo Molnar commit 33974093c024f08caadd2fc71a83bd811ed1831d Author: Matt Fleming Date: Mon Sep 28 16:43:01 2009 +0100 tracing: Fix infinite recursion in ftrace_update_pid_func() When CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST is enabled __ftrace_trace_function contains the current trace function, not ftrace_trace_function. In ftrace_update_pid_func() we currently incorrectly assign the value of ftrace_trace_function to __ftrace_trace_funcion before returning. Without this patch it is possible to execute an infinite recursion whereby ftrace_test_stop_func() calls __ftrace_trace_function, which was assigned ftrace_test_stop_func() in ftrace_update_pid_func(). Signed-off-by: Matt Fleming Acked-by: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <1254152581-18347-1-git-send-email-matt@console-pimps.org> Signed-off-by: Ingo Molnar commit d1716a60a8ea90788d24aa22d7eec83fbdd2d88a Author: Samuel Thibault Date: Wed Sep 30 16:19:39 2009 -0700 x86: Fix csum_ipv6_magic asm memory clobber Just like ip_fast_csum, the assembly snippet in csum_ipv6_magic needs a memory clobber, as it is only passed the address of the buffer, not a memory reference to the buffer itself. This caused failures in Hurd's pfinetv4 when we tried to compile it with gcc-4.3 (bogus checksums). Signed-off-by: Samuel Thibault Acked-by: David S. Miller Cc: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: H. Peter Anvin Signed-off-by: Ingo Molnar commit 982d007a6eec4a0abb404d2355eeec2c041c61ea Author: Linus Torvalds Date: Wed Sep 30 17:57:27 2009 -0700 x86: Optimize cmpxchg64() at build-time some more Try to avoid the 'alternates()' code when we can statically determine that cmpxchg8b is fine. We already have that CONFIG_x86_CMPXCHG64 (enabled by PAE support), and we could easily also enable it for some of the CPU cases. Note, this patch only adds CMPXCHG8B for the obvious Intel CPU's, not for others. (There was something really messy about cmpxchg8b and clone CPU's, so if you enable it on other CPUs later, do it carefully.) If we avoid that asm-alternative thing when we can assume the instruction exists, we'll generate less support crud, and we'll avoid the whole issue with that extra 'nop' for padding instruction sizes etc. LKML-Reference: Signed-off-by: Ingo Molnar commit 8357275bb919d91093bc5a959932ef7b1ea816e8 Author: Arnaldo Carvalho de Melo Date: Fri Sep 25 15:02:39 2009 -0700 perf top: Add poll_idle to the skip list Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Eric Dumazet Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Mike Galbraith LKML-Reference: <20090925220239.GA5488@ghostprotocols.net> Signed-off-by: Ingo Molnar commit d17513889a8b754c5872b6b46e6f7822338a0b79 Author: David S. Miller Date: Tue Sep 29 21:27:06 2009 -0700 sparc64: Cache per-cpu %pcr register value in perf code. Signed-off-by: David S. Miller commit c84b564e82777b00ab48178a88bc533ba62b9922 Author: Greg Ungerer Date: Sun Sep 20 21:32:32 2009 +1000 m68knommu: fix rename of pt_regs offset defines breakage Commit f159ee782990aacb5494738c98f13a2aa61dbb4a ("locking, m68k/asm-offsets: Rename pt_regs offset defines") breaks the m68knommu entry code that relies on these define names. Fix the files to match the new define names. Signed-off-by: Greg Ungerer commit 63335138334e5ae40bf485a07b46be59397e50da Author: Huang Weiyi Date: Fri Sep 18 06:18:56 2009 +0800 m68knommu: remove duplicated #include Signed-off-by: Huang Weiyi Signed-off-by: Greg Ungerer commit cd15e8c3313f2831d2d6c7951a93eb5de9621e5a Author: Lennart Sorensen Date: Thu Sep 17 11:49:41 2009 -0400 m68knommu: show KiB rather than pages in "Freeing initrd memory:" message Fix "Freeing initrd memory:" message m68knommu to show kilobytes as claimed rather than number of pages. Signed-off-by: Lennart Sorensen Signed-off-by: Greg Ungerer commit 6e804251d119bbd5522d76bdb0f48f5c9a7abf51 Author: David S. Miller Date: Tue Sep 29 15:10:23 2009 -0700 sparc64: Fix comment typo in perf_event.c Signed-off-by: David S. Miller commit d29862f03575cdfa8819f78b0f3f78eec3b44629 Author: David S. Miller Date: Mon Sep 28 17:37:12 2009 -0700 sparc64: Minor coding style fixups in perf code. These got introduced during the counter --> event tree-wide renaming. Signed-off-by: David S. Miller commit a72a8a5f2ea32074e98803d4b15d0e093c5a9e4d Author: David S. Miller Date: Mon Sep 28 17:35:20 2009 -0700 sparc64: Add a basic conflict engine in preparation for multi-counter support. The hardware counter ->event_base state records and encoding of the "struct perf_event_map" entry used for the event. We use this to make sure that when we have more than 1 event, both can be scheduled into the hardware at the same time. As usual, structure of code is largely cribbed from powerpc. Signed-off-by: David S. Miller commit 1b6b9d62475bdea00b366cb80b0fadba446f176d Author: David S. Miller Date: Mon Sep 28 14:39:58 2009 -0700 sparc64: Increase vmalloc size to fix percpu regressions. Since we now use the embedding percpu allocator we have to make the vmalloc area at least as large as the stretch can be between nodes. Besides some minor asm adjustments, this turned out to be pretty trivial. Signed-off-by: David S. Miller commit 8cf06fc9bd660c28afea4115fd91a2cc4978eb54 Author: Helge Deller Date: Mon Sep 28 00:39:47 2009 +0200 parisc: Fix linker script breakage. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit 9609bfec6d869bc0d82ccfb909d5e72b7002d813 Author: Christoph Hellwig Date: Tue Aug 4 14:54:41 2009 +0200 parisc: convert to asm-generic/hardirq.h Signed-off-by: Christoph Hellwig Signed-off-by: Kyle McMartin commit 01552f765cae873d0ea3cca1e64e41dfd62659e6 Author: David S. Miller Date: Sun Sep 27 20:43:07 2009 -0700 sparc64: Add initial perf event conflict resolution and checks. Cribbed from powerpc code, as usual. :-) Currently it is only used to validate that all counters have the same user/kernel/hv attributes. Signed-off-by: David S. Miller commit f32ed3954c5e365907738b1206e849b6bbe9bcef Author: Tim Abbott Date: Sun Sep 27 17:25:08 2009 -0400 parisc: Make THREAD_SIZE available to assembly files and linker scripts. Signed-off-by: Tim Abbott Acked-by: Helge Deller Signed-off-by: Kyle McMartin commit fe579c69c6d437009460feeb4d748c2f2020a5f2 Author: Julia Lawall Date: Tue Aug 4 22:27:07 2009 +0200 parisc: correct use of SHF_ALLOC SHF_ALLOC is suitable for testing against the sh_flags field, not the sh_type field. Signed-off-by: Julia Lawall Signed-off-by: Kyle McMartin commit 4255f0d2a132fb38dbe5b5ad74e27ba472507415 Author: Helge Deller Date: Sun Sep 27 23:26:01 2009 -0400 parisc: rename parisc's vmalloc_start to parisc_vmalloc_start building kernel 2.6.32(pre), gives this compiler warning: /linus-linux-2.6/mm/vmalloc.c: In function 'pcpu_get_vm_areas': /linus-linux-2.6/mm/vmalloc.c:2104: warning: 'vmalloc_start' is used uninitialized in this function The reason is, that the code in mm/vmalloc defines a local variable called vmalloc_start, which is already defined as global variable in parisc's code. To avoid this kind of problems in future, I suggest to rename the parisc variable to parisc_vmalloc_start. Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin commit b882877082602bd2d9444069bae1926bf10ebe0d Author: James Bottomley Date: Tue Aug 4 23:59:55 2009 +0000 parisc: add me to Maintainers It has been suggested that given my proficiency with less popular architectures, I should be officially listed as willing to see to the care and feeding of this one. Signed-off-by: James Bottomley Signed-off-by: Kyle McMartin commit 530e949cc99ec6afba5207cbcd5f45c8cc8accc6 Author: Jaswinder Singh Rajput Date: Tue Sep 22 13:35:32 2009 +0000 parisc: includecheck fix: signal.c fix the following 'make includecheck' warning: arch/parisc/kernel/signal.c: linux/compat.h is included more than once. Signed-off-by: Jaswinder Singh Rajput Signed-off-by: Kyle McMartin commit 81bf550d9cdfe0325eb1504b06c9f6511b442c1a Author: Kyle McMartin Date: Sun Sep 27 23:04:47 2009 -0400 parisc: HAVE_ARCH_TRACEHOOK Let 'er rip. Signed-off-by: Kyle McMartin commit 40e03b6857051ea61ebdb4a53e65485acfb1d98e Author: Kyle McMartin Date: Sun Jul 5 15:59:56 2009 -0400 parisc: add skeleton syscall.h Needed for lib/syscall.c when HAVE_ARCH_TRACEHOOK. Signed-off-by: Kyle McMartin commit ecd3d4bc06e48357d12e730482577c756a9f2dbc Author: Kyle McMartin Date: Sun Sep 27 23:03:02 2009 -0400 parisc: stop using task->ptrace for {single,block}step flags task->ptrace flags belong to generic code, so instead thief some TIF_ bits to use. Somewhat risky conversion of code to test TASK_FLAGS instead of TASK_PTRACE in assembly, but it looks alright in the end. Signed-off-by: Kyle McMartin commit 2798af1abb5d560b926fd07ec58c5dcc6d3484d8 Author: Kyle McMartin Date: Sun Jul 5 14:36:16 2009 -0400 parisc: split syscall_trace into two halves Instead of fiddling with gr[20], restructure code to return whether or not to -ENOSYS. (Also do a bit of fiddling to let them take pt_regs directly instead of re-computing it.) Signed-off-by: Kyle McMartin commit 5837d42f8ae9874fd93928c6784b2224f0edd4c9 Author: Kyle McMartin Date: Sun Jul 5 14:39:58 2009 -0400 parisc: add missing TI_TASK macro in syscall.S LDREG 0(%r1),%r1 really wants to be accessing thread_info.task, instead of hardcoding the 0. Signed-off-by: Kyle McMartin commit ecf02de5a1491592d1b68d8095ff62ea3aaee67e Author: Kyle McMartin Date: Mon Apr 27 00:29:53 2009 -0400 parisc: tracehook_signal_handler This makes parisc call the standard tracehook_signal_handler hook in after setting up a signal handler. Signed-off-by: Kyle McMartin commit d6b58772dc39262629708e5f3c30ef06de290894 Author: Kyle McMartin Date: Sun Apr 26 23:53:34 2009 -0400 parisc: tracehook_report_syscall This makes parisc use the standard tracehook_report_syscall_entry and tracehook_report_syscall_exit hooks in . To do this, we need to access current->thread.regs, and to know whether we're entering or exiting the syscall, so add this to syscall_trace. Signed-off-by: Kyle McMartin commit 7eebda60d57a0862a410f45122c73b8bbe6e260c Author: David S. Miller Date: Sat Sep 26 21:23:41 2009 -0700 sparc: Niagara1 perf event support. This chip is extremely limited, and many of the events supported are approximations at best. Signed-off-by: David S. Miller commit d0b86480f5b33f4a86d7c106706d6e0dcd1935ce Author: David S. Miller Date: Sat Sep 26 21:04:16 2009 -0700 sparc: Add Niagara2 HW cache event support. Signed-off-by: David S. Miller commit 28e8f9bead060aafc630a4256d23e2a55fb8b97d Author: David S. Miller Date: Sat Sep 26 20:54:22 2009 -0700 sparc: Support all ultra3 and ultra4 derivatives. For the generic events we support, all of these chips have the same encodings as ultra3i. Signed-off-by: David S. Miller commit 2ce4da2efcaca0dcbfed7a1f24177f18e75e0e89 Author: David S. Miller Date: Sat Sep 26 20:42:10 2009 -0700 sparc: Support HW cache events. First supported chip for HW cache events is Ultra-IIIi. Signed-off-by: David S. Miller commit d3f6302e7e51b41af86c6496ffb2f95e8f2179df Author: Roland Dreier Date: Thu Sep 24 14:07:55 2009 -0700 hrtimer: Remove overly verbose "switch to high res mode" message On big systems, printing copies of Switched to high resolution mode on CPU nnn clutters up the kernel log for minimal gain. Just get rid of them. Signed-off-by: Roland Dreier LKML-Reference: Signed-off-by: Ingo Molnar commit 9b2619aff0332e95ea5eb7a0d75b0208818d871c Author: Paul E. McKenney Date: Wed Sep 23 09:50:43 2009 -0700 rcu: Clean up code to address Ingo's checkpatch feedback Move declarations and update storage classes to make checkpatch happy. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12537246441701-git-send-email-> Signed-off-by: Ingo Molnar commit 1eba8f84380bede3c602bd7758dea96925cead01 Author: Paul E. McKenney Date: Wed Sep 23 09:50:42 2009 -0700 rcu: Clean up code based on review feedback from Josh Triplett, part 2 These issues identified during an old-fashioned face-to-face code review extending over many hours. o Add comments for tricky parts of code, and correct comments that have passed their sell-by date. o Get rid of the vestiges of rcu_init_sched(), which is no longer needed now that PREEMPT_RCU is gone. o Move the #include of rcutree_plugin.h to the end of rcutree.c, which means that, rather than having a random collection of forward declarations, the new set of forward declarations document the set of plugins. The new home for this #include also allows __rcu_init_preempt() to move into rcutree_plugin.h. o Fix rcu_preempt_check_callbacks() to be static. Suggested-by: Josh Triplett Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12537246443924-git-send-email-> Signed-off-by: Ingo Molnar Peter Zijlstra commit fc2219d49ef1606e7fd2c88af2b423b01ff3d319 Author: Paul E. McKenney Date: Wed Sep 23 09:50:41 2009 -0700 rcu: Clean up code based on review feedback from Josh Triplett These issues identified during an old-fashioned face-to-face code review extended over many hours. o Bury various forms of the "rsp->completed == rsp->gpnum" comparison into an rcu_gp_in_progress() function, which has the beneficial side-effect of forcing consistent use of ACCESS_ONCE(). o Replace hand-coded arithmetic with DIV_ROUND_UP(). o Bury several "!list_empty(&rnp->blocked_tasks[rnp->gpnum & 0x01])" instances into an rcu_preempted_readers() function, as this expression indicates that there are no readers blocked within RCU read-side critical sections blocking the current grace period. (Though there might well be similar readers blocking the next grace period.) o Remove a dangling rcu_restart_cpu() declaration that has been dangling for almost 20 minor releases of the kernel. Signed-off-by: Paul E. McKenney Acked-by: Peter Zijlstra Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: akpm@linux-foundation.org Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <12537246442687-git-send-email-> Signed-off-by: Ingo Molnar commit 01f1afaf7b77a16198e65e909e3c410c036eb0d0 Author: Marcin Slusarz Date: Tue Sep 22 16:29:00 2009 -0700 ide: use printk_once Signed-off-by: Marcin Slusarz Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: David S. Miller