commit 989d873fc5b6a96695b97738dea8d9f02a60f8ab Merge: d9a1abe 0422846 Author: Linus Torvalds Date: Mon Jan 3 16:37:01 2011 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: ARM: pxa: fix page table corruption on resume ARM: it8152: add IT8152_LAST_IRQ definition to fix build error ARM: pxa: PXA_ESERIES depends on FB_W100. ARM: 6605/1: Add missing include "asm/memory.h" ARM: 6540/1: Stop irqsoff trace on return to user ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers ARM: 6536/1: Add missing SZ_{32,64,128} ARM: fix cache-feroceon-l2 after stack based kmap_atomic() ARM: fix cache-xsc3l2 after stack based kmap_atomic() ARM: get rid of kmap_high_l1_vipt() ARM: smp: avoid incrementing mm_users on CPU startup ARM: pxa: PXA_ESERIES depends on FB_W100. commit d9a1abe4844e7591cd82e167a1a09e6546f6c45e Author: Andrew Morton Date: Mon Jan 3 14:59:11 2011 -0800 arch/mn10300/kernel/irq.c: fix build Addresses https://bugzilla.kernel.org/show_bug.cgi?id=25702 Reported-by: Martin Ettl Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 867c20265459d30a01b021a9c1e81fb4c5832aa9 Author: Mimi Zohar Date: Mon Jan 3 14:59:10 2011 -0800 ima: fix add LSM rule bug If security_filter_rule_init() doesn't return a rule, then not everything is as fine as the return code implies. This bug only occurs when the LSM (eg. SELinux) is disabled at runtime. Adding an empty LSM rule causes ima_match_rules() to always succeed, ignoring any remaining rules. default IMA TCB policy: # PROC_SUPER_MAGIC dont_measure fsmagic=0x9fa0 # SYSFS_MAGIC dont_measure fsmagic=0x62656572 # DEBUGFS_MAGIC dont_measure fsmagic=0x64626720 # TMPFS_MAGIC dont_measure fsmagic=0x01021994 # SECURITYFS_MAGIC dont_measure fsmagic=0x73636673 < LSM specific rule > dont_measure obj_type=var_log_t measure func=BPRM_CHECK measure func=FILE_MMAP mask=MAY_EXEC measure func=FILE_CHECK mask=MAY_READ uid=0 Thus without the patch, with the boot parameters 'tcb selinux=0', adding the above 'dont_measure obj_type=var_log_t' rule to the default IMA TCB measurement policy, would result in nothing being measured. The patch prevents the default TCB policy from being replaced. Signed-off-by: Mimi Zohar Cc: James Morris Acked-by: Serge Hallyn Cc: David Safford Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 04228460a3ded723b2da09141c76c45ddd712caf Merge: 7c0ab43 24c7855 Author: Russell King Date: Mon Jan 3 22:55:21 2011 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 03ed6a3aa600c48593c3984812fda2d5945ddb46 Merge: 4c37a4b a0a2b71 Author: Linus Torvalds Date: Mon Jan 3 11:51:22 2011 -0800 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: Fix callchain hit bad cast on ascii display arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU watchdog: Improve initialisation error message and documentation commit 4c37a4b53de2d08c469a6e4304cf2a17178200aa Merge: d45fa56 8fd0bda Author: Linus Torvalds Date: Mon Jan 3 11:50:26 2011 -0800 Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] em28xx: radio_fops should also use unlocked_ioctl [media] wm8775: Revert changeset fcb9757333 to avoid a regression [media] cx25840: Prevent device probe failure due to volume control ERANGE error commit d45fa563a62c908d0e9a581d4f091fed6371ebd0 Merge: a1cf11d 8f33d52 Author: Linus Torvalds Date: Mon Jan 3 11:48:54 2011 -0800 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx * 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: dmaengine: provide dummy functions for DMA_ENGINE=n mv_xor: fix race in tasklet function commit a1cf11d8f673a3ad91012c5da96beed06ecefde1 Author: Jan Beulich Date: Mon Jan 3 15:07:02 2011 +0000 name_to_dev_t() must not call __init code The function can't be __init itself (being called from some sysfs handler), and hence none of the functions it calls can be either. Signed-off-by: Jan Beulich Acked-by: Randy Dunlap Signed-off-by: Linus Torvalds commit a0a2b71bb750ffe9b3faa317cb6317f4ad109383 Merge: c7c2580 d425de5 Author: Ingo Molnar Date: Mon Jan 3 19:59:24 2011 +0100 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent commit 24c78557741395e038e83f25367cf2bfd7f582b8 Author: Aric D. Blumer Date: Wed Dec 29 11:18:29 2010 -0500 ARM: pxa: fix page table corruption on resume Before this patch, the following error would sometimes occur after a resume on pxa3xx: /path/to/mm/memory.c:144: bad pmd 8040542e. The problem was that a temporary page table mapping was being improperly restored. The PXA3xx resume code creates a temporary mapping of resume_turn_on_mmu to avoid a prefetch abort. The pxa3xx_resume_after_mmu code requires that the r1 register holding the address of this mapping not be modified, however, resume_turn_on_mmu does modify it. It is mostly correct in that r1 receives the base table address, but it may also get other bits in 13:0. This results in pxa3xx_resume_after_mmu restoring the original mapping to the wrong place, corrupting memory and leaving the temporary mapping in place. Signed-off-by: Matt Reimer Signed-off-by: Eric Miao commit 823a2df258627b80df2e75056b850424a8eb5fed Author: Mike Rapoport Date: Wed Dec 29 09:06:26 2010 +0200 ARM: it8152: add IT8152_LAST_IRQ definition to fix build error The commit 6ac6b817f3f4c23c5febd960d8deb343e13af5f3 (ARM: pxa: encode IRQ number into .nr_irqs) removed definition of ITE_LAST_IRQ which caused the following build error: CC arch/arm/common/it8152.o arch/arm/common/it8152.c: In function 'it8152_init_irq': arch/arm/common/it8152.c:86: error: 'IT8152_LAST_IRQ' undeclared (first use in this function) arch/arm/common/it8152.c:86: error: (Each undeclared identifier is reported only once arch/arm/common/it8152.c:86: error: for each function it appears in.) make[2]: *** [arch/arm/common/it8152.o] Error 1 Defining the IT8152_LAST_IRQ in the arch/arm/include/hardware/it8152.c fixes the build. Signed-off-by: Mike Rapoport Signed-off-by: Eric Miao commit 82427de2c7c39ee7bcaa4cb0260b4e9b9ab19eb8 Author: Lennert Buytenhek Date: Wed Dec 15 07:20:16 2010 +0800 ARM: pxa: PXA_ESERIES depends on FB_W100. As arch/arm/mach-pxa/eseries.c references w100fb_gpio_{read,write}() directly. Signed-off-by: Lennert Buytenhek Signed-off-by: Eric Miao commit d425de5436a620de506f9e4119bf8daa1cb93718 Author: Frederic Weisbecker Date: Mon Jan 3 16:13:11 2011 +0100 perf: Fix callchain hit bad cast on ascii display ipchain__fprintf_graph() casts the number of hits in a branch as an int, which means we lose its highests bits. This results in meaningless number of callchain hits in perf.data that have a high number of hits recorded, typically those that have callchain branches hits appearing more than INT_MAX. This happens easily as those are pondered by the event period. Reported-by: Nick Piggin Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras commit c7c25802b39c443b3745cfa973dc49a97a3491f8 Author: Robert Richter Date: Mon Jan 3 12:15:14 2011 +0100 arch/x86/oprofile/op_model_amd.c: Perform initialisation on a single CPU Disable preemption in init_ibs(). The function only checks the ibs capabilities and sets up pci devices (if necessary). It runs only on one cpu but operates with the local APIC and some MSRs, thus it is better to disable preemption. [ 7.034377] BUG: using smp_processor_id() in preemptible [00000000] code: modprobe/483 [ 7.034385] caller is setup_APIC_eilvt+0x155/0x180 [ 7.034389] Pid: 483, comm: modprobe Not tainted 2.6.37-rc1-20101110+ #1 [ 7.034392] Call Trace: [ 7.034400] [] debug_smp_processor_id+0xd2/0xf0 [ 7.034404] [] setup_APIC_eilvt+0x155/0x180 [ ... ] Addresses https://bugzilla.kernel.org/show_bug.cgi?id=22812 Reported-by: Signed-off-by: Robert Richter Cc: oprofile-list@lists.sourceforge.net Cc: Peter Zijlstra Cc: Frederic Weisbecker Cc: Rafael J. Wysocki Cc: Dan Carpenter Cc: Andrew Morton Cc: [2.6.37.x] LKML-Reference: <20110103111514.GM4739@erda.amd.com> [ small cleanups ] Signed-off-by: Ingo Molnar commit 8fd0bda511406ef0e9dcce9be055d7ab931e92ba Author: Hans Verkuil Date: Sat Dec 18 09:59:51 2010 -0300 [media] em28xx: radio_fops should also use unlocked_ioctl em28xx uses core assisted locking, so it shouldn't use .ioctl. The .ioctl callback was replaced by .unlocked_ioctl for video nodes, but not for radio nodes. This is now corrected. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 46e67acd5d4cacda758e871eebd15cef4e2c2665 Author: Mauro Carvalho Chehab Date: Mon Jan 3 09:09:56 2011 -0200 [media] wm8775: Revert changeset fcb9757333 to avoid a regression It seems that cx88 and ivtv use wm8775 on some different modes. The patch that added support for a board with wm8775 broke ivtv boards with this device. As we're too close to release 2.6.37, let's just revert it. Reported-by: Andy Walls Reported-by: Eric Sharkey Reported-by: Auric Reported by: David Gesswein Signed-off-by: Mauro Carvalho Chehab commit f23b7952d37c69c0caa6c8dfb85dbf2eb9e5fcaa Author: Andy Walls Date: Sun Dec 5 19:42:30 2010 -0300 [media] cx25840: Prevent device probe failure due to volume control ERANGE error This patch fixes a regression that crept into 2.6.36. The volume control scale in the cx25840 driver has an unusual mapping from register values to v4l2 volume control values. Enforce the mapping limits, so that the default volume control setting does not fall out of bounds to prevent the cx25840 module device probe from failing. Signed-off-by: Andy Walls Cc: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 8f33d5277fada0291ea495f7fd44a3e7b7aa41d3 Author: Guennadi Liakhovetski Date: Wed Dec 22 14:46:46 2010 +0100 dmaengine: provide dummy functions for DMA_ENGINE=n This lets drivers, optionally using the dmaengine, build with DMA_ENGINE unselected. Signed-off-by: Guennadi Liakhovetski Signed-off-by: Dan Williams commit 8333f65ef094e47020cd01452b4637e7daf5a77f Author: Saeed Bishara Date: Tue Dec 21 16:53:39 2010 +0200 mv_xor: fix race in tasklet function use mv_xor_slot_cleanup() instead of __mv_xor_slot_cleanup() as the former function aquires the spin lock that needed to protect the drivers data. Cc: Signed-off-by: Saeed Bishara Signed-off-by: Dan Williams commit 7c0ab43e6ab09d72dc8dbac2521b2f819ccc4026 Author: Axel Lin Date: Mon Jan 3 02:26:53 2011 +0100 ARM: 6605/1: Add missing include "asm/memory.h" This patch fixes below build error by adding the missing asm/memory.h, which is needed for arch_is_coherent(). $ make pxa3xx_defconfig; make CC init/do_mounts_rd.o In file included from include/linux/list_bl.h:5, from include/linux/rculist_bl.h:7, from include/linux/dcache.h:7, from include/linux/fs.h:381, from init/do_mounts_rd.c:3: include/linux/bit_spinlock.h: In function 'bit_spin_unlock': include/linux/bit_spinlock.h:61: error: implicit declaration of function 'arch_is_coherent' make[1]: *** [init/do_mounts_rd.o] Error 1 make: *** [init] Error 2 Signed-off-by: Axel Lin Acked-by: Peter Huewe Signed-off-by: Russell King commit 551423748a4eba55f2eb0fc250d757986471f187 Author: Ben Hutchings Date: Sun Jan 2 23:02:42 2011 +0000 watchdog: Improve initialisation error message and documentation The error message 'NMI watchdog failed to create perf event...' does not make it clear that this is a fatal error for the watchdog. It also currently prints the error value as a pointer, rather than extracting the error code with PTR_ERR(). Fix that. Add a note to the description of the 'nowatchdog' kernel parameter to associate it with this message. Reported-by: Cesare Leonardi Signed-off-by: Ben Hutchings Cc: 599368@bugs.debian.org Cc: 608138@bugs.debian.org Cc: Don Zickus Cc: Frederic Weisbecker Cc: # .37.x and later LKML-Reference: <1294009362.3167.126.camel@localhost> Signed-off-by: Ingo Molnar commit b518a64983cbf2ff31aed530898de2d80e4573d5 Author: Maurus Cuelenaere Date: Sun Jan 2 14:48:16 2011 -0500 hwmon: (s3c-hwmon) Fix compilation The owner field was removed from struct attribute in 6fd69dc578fa0b1bbc3aad70ae3af9a137211707, so don't assign it anymore. Signed-off-by: Maurus Cuelenaere Signed-off-by: Guenter Roeck commit 9109f4eb847b7c0be61ae25fb21b1ce2acc9c2d6 Merge: a1a5430 d0dfc6b Author: Linus Torvalds Date: Sun Jan 2 10:44:21 2011 -0800 Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: i8259: initialize isr_ack KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow commit a1a54303d1c58709a0c16402942d6dede2f69f43 Merge: d864b7b ea78484 Author: Linus Torvalds Date: Sun Jan 2 10:43:51 2011 -0800 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: hda: Use LPIB quirk for Dell Inspiron m101z/1120 sound: Prevent buffer overflow in OSS load_mixer_volumes ASoC: codecs: wm8753: Fix register cache incoherency ASoC: codecs: wm9090: Fix register cache incoherency ASoC: codecs: wm8962: Fix register cache incoherency ASoC: codecs: wm8955: Fix register cache incoherency ASoC: codecs: wm8904: Fix register cache incoherency ASoC: codecs: wm8741: Fix register cache incoherency ASoC: codecs: wm8523: Fix register cache incoherency ASoC: codecs: max98088: Fix register cache incoherency ASoC: codecs: Add missing control_type initialization commit d864b7b4d69d2fd5a3f129d27ad0bb4fc81cc32b Merge: 3643e0e 7ad1227 Author: Linus Torvalds Date: Sun Jan 2 10:37:19 2011 -0800 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kconfig: fix undesirable side effect of adding "visible" menu attribute commit ea78484bd508d582f543ff727c9a53a381c15895 Merge: e03fa05 776065e Author: Takashi Iwai Date: Sun Jan 2 11:01:55 2011 +0100 Merge branch 'fix/asoc' into for-linus commit d0dfc6b74a0c6e9ee46b62713256e2b025244d3c Author: Avi Kivity Date: Fri Dec 31 10:52:15 2010 +0200 KVM: i8259: initialize isr_ack isr_ack is never initialized. So, until the first PIC reset, interrupts may fail to be injected. This can cause Windows XP to fail to boot, as reported in the fallout from the fix to https://bugzilla.kernel.org/show_bug.cgi?id=21962. Reported-and-tested-by: Nicolas Prochazka Signed-off-by: Avi Kivity commit 3643e0e87c13c670a0fdcd0c34401b38b36ff021 Merge: e983dc2 cc6455f Author: Linus Torvalds Date: Thu Dec 30 12:09:26 2010 -0800 Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915/dvo: Report LVDS attached to ch701x as connected Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks" drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. drm/i915/sdvo: Add hdmi connector properties after initing the connector drm/i915: Set the required VFMUNIT clock gating disable on Ironlake. commit e983dc2428164698571e1dd1b25c4322181adbac Author: Nitin Gupta Date: Thu Dec 30 04:07:58 2010 -0500 Revert "Staging: zram: work around oops due to startup ordering snafu" This reverts commit 7e24cce38a99f373450db67bf576fe73e8168d66 because it was never appropriate for mainline. Do not check for init flag before starting I/O - zram module is unusable without this fix. The oops mentioned in the reverted commit message was actually a problem only with the zram version as present in project's own repository where we allocate struct zram_stats_cpu upon device initialization. OTOH, In mainline/staging version of zram, we allocate struct stats upfront, so this oops cannot happen in mainline version. Checking for init_done flag in zram_make_request() results in a *no-op* for any I/O operation since we simply always return success. This flag is actually set when the first write occurs on a zram disk which triggers its initialization. Bug report: https://bugzilla.kernel.org/show_bug.cgi?id=25722 Reported-by: Dennis Jansen Signed-off-by: Nitin Gupta Cc: Anton Blanchard Cc: Andrew Morton Cc: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ff20f1779b7f60a9682aa8d62f8ca3b650e4c360 Merge: ebb76ce 0bc4634 Author: Linus Torvalds Date: Thu Dec 30 10:07:44 2010 -0800 Merge branch 'merge-spi' of git://git.secretlab.ca/git/linux-2.6 * 'merge-spi' of git://git.secretlab.ca/git/linux-2.6: spi/m68knommu: Coldfire QSPI platform support spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition commit ebb76ce16daf6908dc030dec1c00827d37129fe5 Author: KAMEZAWA Hiroyuki Date: Wed Dec 29 14:07:11 2010 -0800 memcg: fix wrong VM_BUG_ON() in try_charge()'s mm->owner check At __mem_cgroup_try_charge(), VM_BUG_ON(!mm->owner) is checked. But as commented in mem_cgroup_from_task(), mm->owner can be NULL in some racy case. This check of VM_BUG_ON() is bad. A possible story to hit this is at swapoff()->try_to_unuse(). It passes mm_struct to mem_cgroup_try_charge_swapin() while mm->owner is NULL. If we can't get proper mem_cgroup from swap_cgroup information, mm->owner is used as charge target and we see NULL. Cc: Daisuke Nishimura Cc: KOSAKI Motohiro Reported-by: Hugh Dickins Reported-by: Thomas Meyer Signed-off-by: KAMEZAWA Hiroyuki Reviewed-by: Balbir Singh Signed-off-by: Hugh Dickins Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit b83be6f20a0e468f715b14225c9f897538dfe5ad Author: Christoph Hellwig Date: Thu Dec 16 12:04:54 2010 +0100 update Documentation/filesystems/Locking Mostly inspired by all the recent BKL removal changes, but a lot of older updates also weren't properly recorded. Signed-off-by: Christoph Hellwig Signed-off-by: Linus Torvalds commit cc6455f82edd3f9da3b03870d41cde3cb22ad40d Author: Chris Wilson Date: Thu Dec 30 12:54:00 2010 +0000 drm/i915/dvo: Report LVDS attached to ch701x as connected As we have already detected something attached to the chip during initialisation, always report the LVDS connector status as connected during probing. Signed-off-by: Chris Wilson commit bcfbbce822d219eb587acaba8a6e062bbeae4761 Author: Chris Wilson Date: Thu Dec 30 09:07:15 2010 +0000 Revert "drm/i915/bios: Reverse order of 100/120 Mhz SSC clocks" As I feared, whilst this fixed the clocks for the Lenovo U160, it broke many other machines. So lets reverts commit 448f53a1ede54eb854d036abf and search for the real bug. Reported-and-tested-by: Travis Hume [et al] Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25842 Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=32698 Signed-off-by: Chris Wilson commit e03fa055bc126e536c7f65862e08a9b143138ea9 Author: Daniel T Chen Date: Tue Dec 28 17:20:02 2010 -0500 ALSA: hda: Use LPIB quirk for Dell Inspiron m101z/1120 Sjoerd Simons reports that, without using position_fix=1, recording experiences overruns. Work around that by applying the LPIB quirk for his hardware. Reported-and-tested-by: Sjoerd Simons Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit d81a12bc29ae4038770e05dce4ab7f26fd5880fb Author: Dan Rosenberg Date: Sat Dec 25 16:23:40 2010 -0500 sound: Prevent buffer overflow in OSS load_mixer_volumes The load_mixer_volumes() function, which can be triggered by unprivileged users via the SOUND_MIXER_SETLEVELS ioctl, is vulnerable to a buffer overflow. Because the provided "name" argument isn't guaranteed to be NULL terminated at the expected 32 bytes, it's possible to overflow past the end of the last element in the mixer_vols array. Further exploitation can result in an arbitrary kernel write (via subsequent calls to load_mixer_volumes()) leading to privilege escalation, or arbitrary kernel reads via get_mixer_levels(). In addition, the strcmp() may leak bytes beyond the mixer_vols array. Signed-off-by: Dan Rosenberg Cc: stable Signed-off-by: Takashi Iwai commit 0bc463426ab5eb39e76df637b29a4f191d01b8a0 Author: Jate Sujjavanich Date: Wed Sep 29 09:44:32 2010 -0400 spi/m68knommu: Coldfire QSPI platform support After grabbing a msg from the msgq, the mcfqspi_work function calls list_del_init on the mcfqspi->msgq which unintentionally deletes the rest of the list before it can be processed. If qspi call was made using spi_sync, this can result in a process hang. Signed-off-by: Jate Sujjavanich Acked-by: Steven King Signed-off-by: Grant Likely commit 7ad1227818f09242cfe9bf1845fd24211f5f99bd Author: Jan Beulich Date: Thu Dec 9 08:11:38 2010 +0000 kconfig: fix undesirable side effect of adding "visible" menu attribute This lead to non-selected, non-user-selectable options to be written out to .config. This is not only pointless, but also preventing the user to be prompted should any of those options eventually become visible (e.g. by de-selecting the *_AUTO options the "visible" attribute was added for. Furthermore it is quite logical for the "visible" attribute of a menu to control the visibility of all contained prompts, which is what the patch does. Signed-off-by: Jan Beulich Signed-off-by: Michal Marek commit 42ce7fd6319bed8ecb26d656c476365da46b29e9 Author: Gregory CLEMENT Date: Wed Dec 29 11:52:53 2010 +0100 spi/omap2_mcspi.c: Force CS to be in inactive state after off-mode transition When SPI wake up from OFF mode, CS is in the wrong state: force it to the inactive state. During the system life, I monitored the CS behavior using a oscilloscope. I also activated debug in omap2_mcspi, so I saw when driver disable the clocks and restore context when device is not used.Each time the CS was in the correct state. It was only when system was put suspend to ram with off-mode activated that on resume the CS was in wrong state( ie activated). Changelog: * Change from v1 to v2: - Rebase on linus/master (after 2.6.37-rc1) - Do some clean-up and fix indentation on both patches - Add more explanations for patch 2 * Change from v2 to v3: - Use directly resume function of spi_master instead of using function - from spi_device as Grant Likely pointed it out. - Force this transition explicitly for each CS used by a device. * Change from v3 to v4: - Patch clean-up according to Kevin Hilman and checkpatch. - Now force CS to be in inactive state only if it was inactive when it was suspended. * Change from v4 to v5: - Rebase on linus/master (after 2.6.37-rc3) - Collapse some lines as pointed by Grant Likely - Fix a spelling * Change from v5 to v6: - Rebase on linus/master (after 2.6.37-rc7) - Use CONFIG_SUSPEND instead of CONFIG_PM - Didn't use legacy PM methods anymore. Instead, add a struct dev_pm_ops and add the resume method there. - Fix multi-line comment style * Change from v6 to v7: - Rebase on linus/master (after 2.6.37-rc8) - Drop an extra line Signed-off-by: Gregory CLEMENT Acked-by: David Brownell Reviewed-by: Kevin Hilman Signed-off-by: Grant Likely commit 4ef9e11d6867f88951e30db910fa015300e31871 Author: Hillf Danton Date: Wed Dec 29 21:55:28 2010 +0800 fix freeing user_struct in user cache When racing on adding into user cache, the new allocated from mm slab is freed without putting user namespace. Since the user namespace is already operated by getting, putting has to be issued. Signed-off-by: Hillf Danton Acked-by: Serge Hallyn Cc: stable@kernel.org Signed-off-by: Linus Torvalds commit 649497d1a3676020802ebba04a3d9bb31253adb5 Author: Avi Kivity Date: Tue Dec 28 12:09:07 2010 +0200 KVM: MMU: Fix incorrect direct gfn for unpaged mode shadow We use the physical address instead of the base gfn for the four PAE page directories we use in unpaged mode. When the guest accesses an address above 1GB that is backed by a large host page, a BUG_ON() in kvm_mmu_set_gfn() triggers. Resolves: https://bugzilla.kernel.org/show_bug.cgi?id=21962 Reported-and-tested-by: Nicolas Prochazka KVM-Stable-Tag. Signed-off-by: Avi Kivity commit 776065e36de1d5eb9e33ff908352fef4050ab38d Author: Lars-Peter Clausen Date: Tue Dec 28 21:38:03 2010 +0100 ASoC: codecs: wm8753: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8753 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Furthermore the generic cache uses zero-based numbering while the wm8753 cache uses one-based numbering. Thus we end up with two from each other incoherent caches, which leads to undefined behaviour and crashes. This patch fixes the issue by changing the wm8753 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown commit da280f51d0b341282b4181eb3235f774b0446584 Author: Lars-Peter Clausen Date: Tue Dec 28 21:38:02 2010 +0100 ASoC: codecs: wm9090: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm9090 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm9090 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit 7f87e30ef29951f4509a7f86acf00e1ba48af54a Author: Lars-Peter Clausen Date: Tue Dec 28 21:38:01 2010 +0100 ASoC: codecs: wm8962: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8962 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm8962 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit 715920d04c787ed718327da53cf51689e51ef3ce Author: Lars-Peter Clausen Date: Tue Dec 28 21:38:00 2010 +0100 ASoC: codecs: wm8955: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8955 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm8955 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit f578a188e8b21be623b48bb0eb3a92174c2e5b82 Author: Lars-Peter Clausen Date: Tue Dec 28 21:37:59 2010 +0100 ASoC: codecs: wm8904: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8904 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm8904 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Cc: Ian Lartey Cc: Dimitris Papastamos Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit 52ca353bc8597dcc1d6d7abc03eecc1b452d79c9 Author: Lars-Peter Clausen Date: Tue Dec 28 21:37:58 2010 +0100 ASoC: codecs: wm8741: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8741 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm8741 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Cc: Ian Lartey Cc: Dimitris Papastamos Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit beebca312009e9567d5e0229ea6b82bdf9a864cf Author: Lars-Peter Clausen Date: Tue Dec 28 21:37:57 2010 +0100 ASoC: codecs: wm8523: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the wm8523 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the wm8523 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Cc: Ian Lartey Cc: Dimitris Papastamos Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit d24eb0db9c8a7ceecae860bdc636ed1e8a86943a Author: Lars-Peter Clausen Date: Tue Dec 28 21:37:56 2010 +0100 ASoC: codecs: max98088: Fix register cache incoherency The multi-component patch(commit f0fba2ad1) moved the allocation of the register cache from the driver to the ASoC core. Most drivers where adjusted to this, but the max98088 driver still uses its own register cache for its private functions, while functions from the ASoC core use the generic cache. Thus we end up with two from each other incoherent caches, which can lead to undefined behaviour. This patch fixes the issue by changing the max98088 driver to use the generic register cache in its private functions. Signed-off-by: Lars-Peter Clausen Cc: Peter Hsiang Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit 7f984b55acb6530bf854bfcac13104228f3336c1 Author: Lars-Peter Clausen Date: Tue Dec 28 21:08:57 2010 +0100 ASoC: codecs: Add missing control_type initialization Some codec drivers do not initialize the control_type field in their private device struct, but still use it when calling snd_soc_codec_set_cache_io. This patch fixes the issue by properly initializing it in the drivers probe functions. Signed-off-by: Lars-Peter Clausen Signed-off-by: Mark Brown Cc: stable@kernel.org (for 2.6.37 only) commit d13e5edd7284bedcf5952e1b6490e39ad843cb91 Author: Todd Android Poynor Date: Thu Dec 23 01:52:44 2010 +0100 ARM: 6540/1: Stop irqsoff trace on return to user If the irqsoff tracer is in use, stop tracing the interrupt disable interval when returning to userspace. Tracing userspace execution time as interrupts disabled time is not helpful for kernel performance analysis purposes. Only do so if the irqsoff tracer is enabled, to avoid overhead for lockdep, which doesn't care. Signed-off-by: Todd Poynor Signed-off-by: Russell King commit 875728807ff001b67a1e0535de5ad2cd3c41d47c Author: Linus Walleij Date: Wed Dec 22 09:18:29 2010 +0100 ARM: 6537/1: update Nomadik, U300 and Ux500 maintainers Adding in self as maintainer for Nomadik and Ux500, I'm running an active -next tree for that stuff now. Extend file matchers to cover a few more relevant drivers and add git references. Cc: Alessandro Rubini Acked-by: Srinidhi Kasagar Signed-off-by: Linus Walleij Signed-off-by: Russell King commit 537de3a67c0c86586eacffde40673b727242dc3a Author: Stephen Warren Date: Wed Dec 22 04:52:05 2010 +0100 ARM: 6536/1: Add missing SZ_{32,64,128} ... and also remove misleading comment stating that this header is auto-generated. Signed-off-by: Stephen Warren Acked-by: Uwe Kleine-Knig Signed-off-by: Russell King commit 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1 Author: Chris Wilson Date: Tue Dec 14 19:21:29 2010 +0000 drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse Signed-off-by: Chris Wilson commit 63ee41d794d9c555f84205517a68509848988760 Author: Eric Anholt Date: Mon Dec 20 18:40:06 2010 -0800 drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. The IPS driver is designed to be able to run detached from i915 and just not enable GPU turbo in that case, in order to avoid module dependencies between the two drivers. This means that we don't know what the load order between the two is going to be, and we had previously only supported IPS after (optionally) i915, but not i915 after IPS. If the wrong order was chosen, you'd get no GPU turbo, and something like half the possible graphics performance. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson Cc: stable@kernel.org commit f797d22121404eac7b63f1291409f96bcab51c11 Author: Chris Wilson Date: Thu Dec 23 09:43:48 2010 +0000 drm/i915/sdvo: Add hdmi connector properties after initing the connector Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=25012 Reported-by: Tõnu Raitviir Signed-off-by: Chris Wilson commit 06f37751af77192b424b2b0ff17dc08de65faba0 Author: Eric Anholt Date: Tue Dec 14 10:06:46 2010 -0800 drm/i915: Set the required VFMUNIT clock gating disable on Ironlake. It's required by the specs, but we don't know why. Let's not find out why. Signed-off-by: Eric Anholt Signed-off-by: Chris Wilson commit 09c85a440d113a8e6f32bc616423d7684970c37c Merge: ee81e7a a74b74a Author: Russell King Date: Wed Dec 22 22:45:48 2010 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit ee81e7a0a86a3b40837de4a5f514c2d3758af20e Merge: 1ae1b5f 6d3e6d3 Author: Russell King Date: Mon Dec 20 11:03:35 2010 +0000 Merge branch 'kmap_atomic_fixes' of git://git.linaro.org/people/nico/linux commit 6d3e6d3640052cac958d61c44597cc216f6ee09f Author: Nicolas Pitre Date: Thu Dec 16 14:56:34 2010 -0500 ARM: fix cache-feroceon-l2 after stack based kmap_atomic() Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is actively wrong to rely on fixed kmap type indices (namely KM_L2_CACHE) as kmap_atomic() totally ignores them and a concurrent instance of it may happily reuse any slot for any purpose. Because kmap_atomic() is now able to deal with reentrancy, we can get rid of the ad hoc mapping here. While the code is made much simpler, there is a needless cache flush introduced by the usage of __kunmap_atomic(). It is not clear if the performance difference to remove that is worth the cost in code maintenance (I don't think there are that many highmem users on that platform anyway) but that should be reconsidered when/if someone cares enough to do some measurements. Signed-off-by: Nicolas Pitre commit 25cbe45440ea89a3b0f6f7ed326d3d476d53068b Author: Nicolas Pitre Date: Wed Dec 15 23:29:04 2010 -0500 ARM: fix cache-xsc3l2 after stack based kmap_atomic() Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is actively wrong to rely on fixed kmap type indices (namely KM_L2_CACHE) as kmap_atomic() totally ignores them and a concurrent instance of it may happily reuse any slot for any purpose. Because kmap_atomic() is now able to deal with reentrancy, we can get rid of the ad hoc mapping here, and we even don't have to disable IRQs anymore (highmem case). While the code is made much simpler, there is a needless cache flush introduced by the usage of __kunmap_atomic(). It is not clear if the performance difference to remove that is worth the cost in code maintenance (I don't think there are that many highmem users on that platform if at all anyway). Signed-off-by: Nicolas Pitre commit 39af22a79232373764904576f31572f1db76af10 Author: Nicolas Pitre Date: Wed Dec 15 15:14:45 2010 -0500 ARM: get rid of kmap_high_l1_vipt() Since commit 3e4d3af501 "mm: stack based kmap_atomic()", it is no longer necessary to carry an ad hoc version of kmap_atomic() added in commit 7e5a69e83b "ARM: 6007/1: fix highmem with VIPT cache and DMA" to cope with reentrancy. In fact, it is now actively wrong to rely on fixed kmap type indices (namely KM_L1_CACHE) as kmap_atomic() totally ignores them now and a concurrent instance of it may reuse any slot for any purpose. Signed-off-by: Nicolas Pitre commit 1ae1b5f053cf36bd0f913e83f3b136fec8152d4d Author: Russell King Date: Sat Dec 18 13:57:00 2010 +0000 ARM: smp: avoid incrementing mm_users on CPU startup We should not be incrementing mm_users when we startup a secondary CPU - doing so results in mm_users incrementing by one each time we hotplug a CPU, which will eventually wrap, and will cause problems. Other architectures such as x86 do not increment mm_users, but only mm_count, so we follow that pattern. Signed-off-by: Russell King commit a74b74a5555c741ed3df896096e33b853995631e Author: Lennert Buytenhek Date: Wed Dec 15 07:20:16 2010 +0800 ARM: pxa: PXA_ESERIES depends on FB_W100. As arch/arm/mach-pxa/eseries.c references w100fb_gpio_{read,write}() directly. Signed-off-by: Lennert Buytenhek Signed-off-by: Eric Miao