commit 6221f222c0ebf1acdf7abcf927178f40e1a65e2a Author: Linus Torvalds Date: Tue Apr 5 18:30:43 2011 -0700 Linux 2.6.39-rc2 commit 44148a667d3715f3a1c37eeff7e954c946cc1efe Merge: d0de4dc584ec 782b86e26567 Author: Linus Torvalds Date: Tue Apr 5 15:29:01 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-2.6-block: ide: always ensure that blk_delay_queue() is called if we have pending IO block: fix request sorting at unplug dm: improve block integrity support fs: export empty_aops ide: ide_requeue_and_plug() reinstate "always plug" behaviour blk-throttle: don't call xchg on bool ufs: remove unessecary blk_flush_plug block: make the flush insertion use the tail of the dispatch list block: get rid of elv_insert() interface block: dump request state on seeing a corrupted request completion commit d0de4dc584ec6aa3b26fffea320a8457827768fc Author: Eric Paris Date: Tue Apr 5 17:20:50 2011 -0400 inotify: fix double free/corruption of stuct user On an error path in inotify_init1 a normal user can trigger a double free of struct user. This is a regression introduced by a2ae4cc9a16e ("inotify: stop kernel memory leak on file creation failure"). We fix this by making sure that if a group exists the user reference is dropped when the group is cleaned up. We should not explictly drop the reference on error and also drop the reference when the group is cleaned up. The new lifetime rules are that an inotify group lives from inotify_new_group to the last fsnotify_put_group. Since the struct user and inotify_devs are directly tied to this lifetime they are only changed/updated in those two locations. We get rid of all special casing of struct user or user->inotify_devs. Signed-off-by: Eric Paris Cc: stable@kernel.org (2.6.37 and up) Signed-off-by: Linus Torvalds commit 782b86e2656762382ae1c2686d8d5c91f7d5eacf Author: Jens Axboe Date: Tue Apr 5 03:29:57 2011 +0200 ide: always ensure that blk_delay_queue() is called if we have pending IO Just because we are not requeuing a request does not mean that some aren't pending. So always issue a blk_delay_queue() if either we are requeueing OR there's pending IO. This fixes a boot problem for some IDE boxes. Signed-off-by: Jens Axboe commit f83e826181f7f8fb152e4190d03854fc3a5dd040 Author: Konstantin Khlebnikov Date: Mon Apr 4 00:15:02 2011 +0200 block: fix request sorting at unplug Comparison function for list_sort() must be anticommutative, otherwise it is not sorting in ordinary meaning. But fortunately list_sort() always check ((*cmp)(priv, a, b) <= 0) it not distinguish negative and zero, so comparison function can implement only less-or-equal instead of full three-way comparison. Signed-off-by: Konstantin Khlebnikov Signed-off-by: Jens Axboe commit a63a5cf84dac7a23a57c800eea5734701e7d3c04 Author: Mike Snitzer Date: Fri Apr 1 21:02:31 2011 +0200 dm: improve block integrity support The current block integrity (DIF/DIX) support in DM is verifying that all devices' integrity profiles match during DM device resume (which is past the point of no return). To some degree that is unavoidable (stacked DM devices force this late checking). But for most DM devices (which aren't stacking on other DM devices) the ideal time to verify all integrity profiles match is during table load. Introduce the notion of an "initialized" integrity profile: a profile that was blk_integrity_register()'d with a non-NULL 'blk_integrity' template. Add blk_integrity_is_initialized() to allow checking if a profile was initialized. Update DM integrity support to: - check all devices with _initialized_ integrity profiles match during table load; uninitialized profiles (e.g. for underlying DM device(s) of a stacked DM device) are ignored. - disallow a table load that would result in an integrity profile that conflicts with a DM device's existing (in-use) integrity profile - avoid clearing an existing integrity profile - validate all integrity profiles match during resume; but if they don't all we can do is report the mismatch (during resume we're past the point of no return) Signed-off-by: Mike Snitzer Cc: Martin K. Petersen Signed-off-by: Jens Axboe commit 7dcda1c96d7c643101d4a05579ef4512a4baa7ef Author: Jens Axboe Date: Tue Apr 5 23:51:48 2011 +0200 fs: export empty_aops With the ->sync_page() hook gone, we have a few users that add their own static address_space_operations without any functions defined. fs/inode.c already has an empty_aops that it uses for init purposes. Lets export that and use it in the places where an otherwise empty aops was defined. Signed-off-by: Jens Axboe commit 929e27252e8ca69363f81f26af5eaba62cb4c572 Author: Jens Axboe Date: Wed Mar 30 12:22:23 2011 +0200 ide: ide_requeue_and_plug() reinstate "always plug" behaviour We see stalls if we don't always ensure that the queue gets run again. Even if rq == NULL, we could have other pending requests in the queue. Signed-off-by: Jens Axboe commit 6f0379377047b18103b88ce33c03e5b19747ae57 Author: Andreas Schwab Date: Wed Mar 30 12:21:56 2011 +0200 blk-throttle: don't call xchg on bool xchg does not work portably with smaller than 32bit types. Signed-off-by: Andreas Schwab Signed-off-by: Jens Axboe commit ee3dea3549444e6e76d27af48b4929983e6f023c Author: Christoph Hellwig Date: Wed Mar 30 12:17:43 2011 +0200 ufs: remove unessecary blk_flush_plug We already flush the per-process plugging list when context switching, so a blk_flush_plug call just before a yield() is not needed. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe commit 53d63e6b0dfb95882ec0219ba6bbd50cde423794 Author: Jens Axboe Date: Wed Mar 30 13:27:09 2011 +0200 block: make the flush insertion use the tail of the dispatch list It's not a preempt type request, in fact we have to insert it behind requests that do specify INSERT_FRONT. Signed-off-by: Jens Axboe commit b710a480554f2be682bac3cb59b0e085ba3d644b Author: Jens Axboe Date: Wed Mar 30 09:52:30 2011 +0200 block: get rid of elv_insert() interface Merge it with __elv_add_request(), it's pretty pointless to have a function with only two callers. The main interface is elv_add_request()/__elv_add_request(). Signed-off-by: Jens Axboe commit 8182924bc5850281985d73c312876746acd390b5 Author: Jens Axboe Date: Wed Mar 30 09:51:33 2011 +0200 block: dump request state on seeing a corrupted request completion Currently we just dump a non-informative 'request botched' message. Lets actually try and print something sane to help debug issues around this. Signed-off-by: Jens Axboe commit 623dda65b6f71e6474f3f156dbed2acf6ff43584 Merge: 899631c7916b a6737ad15b4a Author: Linus Torvalds Date: Tue Apr 5 13:39:49 2011 -0700 Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915/lvds: Remove 0xa0 DDC probe for LVDS drm/i915/crt: Remove 0xa0 probe for VGA commit 899631c7916b231ba6509c90dbc33221e9194029 Merge: 47e89798e7cd e28e1d93e959 Author: Linus Torvalds Date: Tue Apr 5 12:35:29 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: Input: rpckbd - fix a leak of the IRQ during init failure Input: wacom - add support for Lenovo tablet ID (0xE6) Input: i8042 - downgrade selftest error message to dbg() Input: synaptics - fix crash in synaptics_module_init() Input: spear-keyboard - fix inverted condition in interrupt handler Input: uinput - allow for 0/0 min/max on absolute axes. Input: sparse-keymap - report KEY_UNKNOWN for unknown scan codes Input: sparse-keymap - report scancodes with key events Input: h3600_ts_input - fix a spelling error Input: wacom - report resolution for pen devices Input: wacom - constify wacom_features for a new missed Bamboo models commit 47e89798e7cd9390b74a173006afafcb12e8bc89 Merge: 884b8267d5f1 c60e65d78636 Author: Linus Torvalds Date: Tue Apr 5 12:29:43 2011 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU powerpc: Set nr_cpu_ids early and use it to free PACAs powerpc/pseries: Don't register global initcall powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP. edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB commit 884b8267d5f13bdcdc7e675ecbd0dbb0257689bb Merge: d14f5b810b49 c9ddec74aa95 Author: Linus Torvalds Date: Tue Apr 5 12:29:25 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: don't warn in btrfs_add_orphan Btrfs: fix free space cache when there are pinned extents and clusters V2 Btrfs: Fix uninitialized root flags for subvolumes btrfs: clear __GFP_FS flag in the space cache inode Btrfs: fix memory leak in start_transaction() Btrfs: fix memory leak in btrfs_ioctl_start_sync() Btrfs: fix subvol_sem leak in btrfs_rename() Btrfs: Fix oops for defrag with compression turned on Btrfs: fix /proc/mounts info. Btrfs: fix compiler warning in file.c commit d14f5b810b49c7dbd1a01be1c6d3641d46090080 Merge: b2a8b4b81966 738faca34335 Author: Linus Torvalds Date: Tue Apr 5 12:26:57 2011 -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: (27 commits) ipv6: Don't pass invalid dst_entry pointer to dst_release(). mlx4: fix kfree on error path in new_steering_entry() tcp: len check is unnecessarily devastating, change to WARN_ON sctp: malloc enough room for asconf-ack chunk sctp: fix auth_hmacs field's length of struct sctp_cookie net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM usbnet: use eth%d name for known ethernet devices starfire: clean up dma_addr_t size test iwlegacy: fix bugs in change_interface carl9170: Fix tx aggregation problems with some clients iwl3945: disable hw scan by default wireless: rt2x00: rt2800usb.c add and identify ids iwl3945: do not deprecate software scan mac80211: fix aggregation frame release during timeout cfg80211: fix BSS double-unlinking (continued) cfg80211:: fix possible NULL pointer dereference mac80211: fix possible NULL pointer dereference mac80211: fix NULL pointer dereference in ieee80211_key_alloc() ath9k: fix a chip wakeup related crash in ath9k_start mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS rates ... commit a6737ad15b4acf88bbf7753e929faf215adeaa3a Author: Chris Wilson Date: Tue Apr 5 16:04:40 2011 +0100 drm/i915/lvds: Remove 0xa0 DDC probe for LVDS This is a revert of 428d2e828c0a68206e5158a42451487601dc9194. This is broken in the same manner as for VGA: trying to write to an invalid address on the (currently 7-bit) i2c bus. One notable failure appears to be for MacBooks. The scary part was that it gave the appearance of working (i.e. reporting the absence of the panel) on various all-in-one machines with ghost LVDS panels and not failing for laptops. Signed-off-by: Chris Wilson Acked-by: Dave Airlie Signed-off-by: Keith Packard commit 0de009c900e7ebd21097797f723a40813e953879 Author: Chris Wilson Date: Tue Apr 5 16:04:39 2011 +0100 drm/i915/crt: Remove 0xa0 probe for VGA This is a moral revert of 6ec3d0c0e9c0c605696e91048eebaca7b0c36695. Following the fix to reset the GMBUS controller after a NAK, we finally utilize the 0xa0 probe for a CRT connection. And discover that the code is broken. Shock. There are a number of issues, but following a key insight from Dave Airlie, that 0xA0 is an invalid address on a 7-bit bus (though not if we were to enable 10-bit addressing), and would look like the EDID port 0x50, it is possible to see where the confusion starts. In short, a write to 0xA0 is accepted by the GMBUS controller which we interpreted as meaning the existence of a connection (a slave on the other end of the wire ACKing the write). That was false. During testing with a broken GMBUS implementation, which never reset an earlier NAK, this test always reported a NAK and so we proceeded on to the next test. Reported-and-tested-by: Sitsofe Wheeler Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35904 Reported-and-tested-by: Riccardo Magliocchetti Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=32612 Signed-off-by: Chris Wilson Acked-by: Dave Airlie Signed-off-by: Keith Packard commit c60e65d7863620945d498a8ac60181077879599c Author: Matt Evans Date: Thu Mar 31 19:33:08 2011 +0000 powerpc/pseries: Fix build without CONFIG_HOTPLUG_CPU Signed-off-by: Matt Evans Signed-off-by: Benjamin Herrenschmidt commit c1854e00727f50f7ac99e98d26ece04c087ef785 Author: Ryan Grimm Date: Thu Mar 31 19:33:02 2011 +0000 powerpc: Set nr_cpu_ids early and use it to free PACAs Without this, "holes" in the CPU numbering can cause us to free too many PACAs Signed-off-by: Benjamin Herrenschmidt commit f86d6b9b36a5d0923fa2abaacd425e328668fe16 Author: Benjamin Herrenschmidt Date: Thu Mar 31 18:49:45 2011 +0000 powerpc/pseries: Don't register global initcall Signed-off-by: Benjamin Herrenschmidt commit b987812b3fcaf70fdf0037589e5d2f5f2453e6ce Author: Paul Gortmaker Date: Thu Mar 31 07:27:20 2011 +0000 powerpc/kexec: Fix mismatched ifdefs for PPC64/SMP. Commit b3df895aebe091b1657 "powerpc/kexec: Add support for FSL-BookE" introduced the original PPC_STD_MMU_64 checks around the function crash_kexec_wait_realmode(). Then commit c2be05481f61252 "powerpc: Fix default_machine_crash_shutdown #ifdef botch" changed the ifdef around the calling site to add a check on SMP, but the ifdef around the function itself was left unchanged, leaving an unused function for PPC_STD_MMU_64=y and SMP=n Rather than have two ifdefs that can get out of sync like this, simply put the corrected conditional around the function and use a stub to get rid of one set of ifdefs completely. Signed-off-by: Paul Gortmaker Signed-off-by: Benjamin Herrenschmidt commit 83ebb3e3441d370409072139c4e264101e106417 Merge: b2a8b4b81966 a94d7b35067a Author: Benjamin Herrenschmidt Date: Tue Apr 5 16:20:22 2011 +1000 Merge remote branch 'kumar/merge' into merge commit c9ddec74aa950a220cc4caa5215cfc5d886050b7 Author: Josef Bacik Date: Mon Mar 28 13:43:25 2011 +0000 Btrfs: don't warn in btrfs_add_orphan When I moved the orphan adding to btrfs_truncate I missed the fact that during orphan cleanup we just add the orphan items to the orphan list without going through btrfs_orphan_add, which results in lots of warnings on mount if you have any orphan items that need to be truncated. Just remove this warning since it's ok, this will allow all of the normal space accounting take place. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 43be21462d8c263e2449b52b23326232fd710bee Author: Josef Bacik Date: Fri Apr 1 14:55:00 2011 +0000 Btrfs: fix free space cache when there are pinned extents and clusters V2 I noticed a huge problem with the free space cache that was presenting as an early ENOSPC. Turns out when writing the free space cache out I forgot to take into account pinned extents and more importantly clusters. This would result in us leaking free space everytime we unmounted the filesystem and remounted it. I fix this by making sure to check and see if the current block group has a cluster and writing out any entries that are in the cluster to the cache, as well as writing any pinned extents we currently have to the cache since those will be available for us to use the next time the fs mounts. This patch also adds a check to the end of load_free_space_cache to make sure we got the right amount of free space cache, and if not make sure to clear the cache and re-cache the old fashioned way. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 08fe4db170b4193603d9d31f40ebaf652d07ac9c Author: Li Zefan Date: Mon Mar 28 02:01:25 2011 +0000 Btrfs: Fix uninitialized root flags for subvolumes root_item->flags and root_item->byte_limit are not initialized when a subvolume is created. This bug is not revealed until we added readonly snapshot support - now you mount a btrfs filesystem and you may find the subvolumes in it are readonly. To work around this problem, we steal a bit from root_item->inode_item->flags, and use it to indicate if those fields have been properly initialized. When we read a tree root from disk, we check if the bit is set, and if not we'll set the flag and initialize the two fields of the root item. Reported-by: Andreas Philipp Signed-off-by: Li Zefan Tested-by: Andreas Philipp cc: stable@kernel.org Signed-off-by: Chris Mason commit adae52b94e18afa1f84fab67df2a8a872c2f5533 Author: Miao Xie Date: Thu Mar 31 09:43:23 2011 +0000 btrfs: clear __GFP_FS flag in the space cache inode the object id of the space cache inode's key is allocated from the relative root, just like the regular file. So we can't identify space cache inode by checking the object id of the inode's key, and we have to clear __GFP_FS flag at the time we look up the space cache inode. Signed-off-by: Miao Xie Signed-off-by: Liu Bo Signed-off-by: Chris Mason commit 6e8df2ae89ab37730c0062782f844c66ecfc97a7 Author: Yoshinori Sano Date: Sun Apr 3 12:31:28 2011 +0000 Btrfs: fix memory leak in start_transaction() Free btrfs_trans_handle when join_transaction() fails in start_transaction() Signed-off-by: Yoshinori Sano Signed-off-by: Chris Mason commit 8b2b2d3cbefb605501342adaf64d601b545ed154 Author: Tsutomu Itoh Date: Mon Apr 4 01:52:13 2011 +0000 Btrfs: fix memory leak in btrfs_ioctl_start_sync() Call btrfs_end_transaction() if btrfs_commit_transaction_async() fails. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit b44c59a80ded004e1a82712e5f9e17b131c03221 Author: Johann Lombardi Date: Thu Mar 31 13:23:47 2011 +0000 Btrfs: fix subvol_sem leak in btrfs_rename() btrfs_rename() does not release the subvol_sem if the transaction failed to start. Signed-off-by: Johann Lombardi Signed-off-by: Chris Mason commit fe3f566cd19bb6d787c92b2e202c85f929abf3ac Author: Li Zefan Date: Mon Mar 28 08:30:38 2011 +0000 Btrfs: Fix oops for defrag with compression turned on When we defrag a file, whose size can be fit into an inline extent, with compression enabled, the compress type is set to be fs_info->compress_type, which is 0 if the btrfs filesystem is mounted without compress option. This leads to oops. Reported-by: Daniel Blueman Signed-off-by: Li Zefan Signed-off-by: Chris Mason commit 200da64e0b039f873f0f20481e6a7d056e7cc6c9 Author: Tsutomu Itoh Date: Thu Mar 31 00:44:29 2011 +0000 Btrfs: fix /proc/mounts info. Some mount options are not displayed by /proc/mounts. This patch displays the option such as compress_type by /proc/mounts. Ex. [before] $ mount | grep sdc2 /dev/sdc2 on /test12 type btrfs (rw,space_cache,compress=lzo) $ cat /proc/mounts | grep sdc2 /dev/sdc2 /test12 btrfs rw,relatime,compress 0 0 [after] $ mount | grep sdc2 /dev/sdc2 on /test12 type btrfs (rw,space_cache,compress=lzo) $ cat /proc/mounts | grep sdc2 /dev/sdc2 /test12 btrfs rw,relatime,compress=lzo,space_cache 0 0 Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit c9149235a42ab93914434fff45c44b45023363f3 Author: Tsutomu Itoh Date: Wed Mar 30 00:57:23 2011 +0000 Btrfs: fix compiler warning in file.c While compiling Btrfs, I got following messages: CC [M] fs/btrfs/file.o fs/btrfs/file.c: In function '__btrfs_buffered_write': fs/btrfs/file.c:909: warning: 'ret' may be used uninitialized in this function CC [M] fs/btrfs/tree-defrag.o This patch fixes compiler warning. Signed-off-by: Tsutomu Itoh Signed-off-by: Chris Mason commit b2a8b4b81966094703088a7bc76a313af841924d Merge: bdfd6b7d761c 5df23979bc62 Author: Linus Torvalds Date: Mon Apr 4 17:56:07 2011 -0700 Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: fix "persistant" typo drm/radeon/kms: add some new ontario pci ids drm/radeon/kms: pageflipping cleanup for avivo+ drm/radeon/kms: Add support for tv-out dongle on G5 9600 drm: export drm_find_cea_extension to drivers drm/radeon/kms: add some sanity checks to obj info record parsingi (v2) drm/i915: Reset GMBUS controller after NAK drm/i915: Busy-spin wait_for condition in atomic contexts drm/i915/lvds: Always return connected in the absence of better information commit bdfd6b7d761c7bb8bc93055dac5040ece7d58e10 Merge: 6ad85239da45 9e1491de5197 Author: Linus Torvalds Date: Mon Apr 4 17:54:46 2011 -0700 Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze * 'next' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix ftrace microblaze: Wire up new syscalls microblaze: Fix level/edge irq sensibility commit 6ad85239da45d035b2c786f73ec3c2798352c820 Author: Geunsik Lim Date: Mon Apr 4 15:10:45 2011 -0700 Documentation: update cgroups info user groups names Update suitable words to explain / understand cgroups contents. Signed-off-by: Geunsik Lim Cc: Paul Menage Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 9a684e19afc630e0763246ee79c0578c1a8eaee8 Author: Antonio Ospite Date: Mon Apr 4 15:08:46 2011 -0700 Documentation: consolidate leds files to leds/ subdir leds: move leds-class documentation under the leds/ subdir. Add also a leds/00-INDEX file describing the files under leds/ Signed-off-by: Antonio Ospite Acked-by: Richard Purdie Cc: Andrew Morton Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 9718269a7f5f6f3d723dd34e05269579a3ccfc1e Author: Daniel Baluta Date: Mon Apr 4 15:06:44 2011 -0700 kemleak-test: build as module only mm/kmemleak-test.c is used to provide an example of how kmemleak tool works. Memory is leaked at module unload-time, so building the test in kernel (Y) makes the leaks impossible and the test useless. Qualify DEBUG_KMEMLEAK_TEST config symbol with "depends on m", to restrict module-only building. Signed-off-by: Daniel Baluta Acked-by: Pekka Enberg Acked-by: Catalin Marinas Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit f65e51d740688b8a0ad15cbde34974e6c4559972 Author: Sylvestre Ledru Date: Mon Apr 4 15:04:46 2011 -0700 Documentation: fix minor typos/spelling Fix some minor typos: * informations => information * there own => their own * these => this Signed-off-by: Sylvestre Ledru Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 44a4dcf75c58157a5d036ff783dfb2254703b93e Author: Randy Dunlap Date: Mon Apr 4 15:02:24 2011 -0700 Documentation: update panic parameter info Add a little more info for some of the panic-related kernel parameters. Fix "oops=panic" to fit in 80 columns. Signed-off-by: Randy Dunlap Reviewed-by: Jesper Juhl Signed-off-by: Linus Torvalds commit 41c57892a2895865afc89ff1a21f91a0f1506f66 Author: Randy Dunlap Date: Mon Apr 4 15:00:26 2011 -0700 kernel/signal.c: add kernel-doc notation to syscalls Add kernel-doc to syscalls in signal.c. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 5aba085ededa6c5a1ff465e2aebc3e8eb00a7567 Author: Randy Dunlap Date: Mon Apr 4 14:59:31 2011 -0700 kernel/signal.c: fix typos and coding style General coding style and comment fixes; no code changes: - Use multi-line-comment coding style. - Put some function signatures completely on one line. - Hyphenate some words. - Spell Posix as POSIX. - Correct typos & spellos in some comments. - Drop trailing whitespace. - End sentences with periods. Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 21b86bd5a838ee882d36d354185e29650b0757dd Author: Daniel Baluta Date: Mon Apr 4 14:58:03 2011 -0700 Documentation: update kmemleak arch. info Besides x86 and arm, kmemleak now supports powerpc, sparc, sh, microblaze and tile. Signed-off-by: Daniel Baluta Acked-by: Catalin Marinas Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 5df23979bc628934febe02e80f9644ec67603ee8 Author: Jan Engelhardt Date: Mon Apr 4 01:25:18 2011 +0200 drm: fix "persistant" typo Signed-off-by: Jan Engelhardt Signed-off-by: Dave Airlie commit 758f231ea280d0e5f01d537f26ad8f5c0e3de1cc Author: Alex Deucher Date: Mon Apr 4 11:03:16 2011 -0400 drm/radeon/kms: add some new ontario pci ids Signed-off-by: Alex Deucher Cc:stable@kernel.org Signed-off-by: Dave Airlie commit a5660b41af6a28f8004e70eb261e1202ad55c5e3 Author: Linus Torvalds Date: Mon Apr 4 14:26:54 2011 -0700 tty: fix endless work loop when the buffer fills up Commit f23eb2b2b285 ('tty: stop using "delayed_work" in the tty layer') ended up causing hung machines on UP with no preemption, because the work routine to flip the buffer data to the ldisc would endlessly re-arm itself if the destination buffer had filled up. With the delayed work, that only caused a timer-driving polling of the tty state every timer tick, but without the delay we just ended up with basically a busy loop instead. Stop the insane polling, and instead make the code that opens up the receive room re-schedule the buffer flip work. That's what we should have been doing anyway. This same "poll for tty room" issue is almost certainly also the cause of excessive kworker activity when idle reported by Dave Jones, who also reported "flush_to_ldisc executing 2500 times a second" back in Nov 2010: http://lkml.org/lkml/2010/11/30/592 which is that silly flushing done every timer tick. Wasting both power and CPU for no good reason. Reported-and-tested-by: Alexander Beregalov Reported-and-tested-by: Sitsofe Wheeler Cc: Greg KH Cc: Alan Cox Cc: Dave Jones Signed-off-by: Linus Torvalds commit 738faca34335cd1d5d87fa7c58703139c7fa15bd Author: Boris Ostrovsky Date: Mon Apr 4 13:07:26 2011 -0700 ipv6: Don't pass invalid dst_entry pointer to dst_release(). Make sure dst_release() is not called with error pointer. This is similar to commit 4910ac6c526d2868adcb5893e0c428473de862b5 ("ipv4: Don't ip_rt_put() an error pointer in RAW sockets."). Signed-off-by: Boris Ostrovsky Signed-off-by: David S. Miller commit d7c764c4c7b782c660b4600b0bff2e3509892a4d Merge: 148086bb6469 818987e9a19c Author: Linus Torvalds Date: Mon Apr 4 08:37:45 2011 -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, UV: Fix kdump reboot x86, amd-nb: Rename CPU PCI id define for F4 sound: Add delay.h to sound/soc/codecs/sn95031.c x86, mtrr, pat: Fix one cpu getting out of sync during resume x86, microcode: Unregister syscore_ops after microcode unloaded x86: Stop including in two asm header files commit 148086bb64694cc91624bab2a550d50f800eb4b7 Merge: 4da7e90e653d 3436ae1298cb Author: Linus Torvalds Date: Mon Apr 4 08:36:58 2011 -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: Fix rebalance interval calculation sched, doc: Beef up load balancing description sched: Leave sched_setscheduler() earlier if possible, do not disturb SCHED_FIFO tasks commit 4da7e90e653d67dfd405868246d316b04852e2d5 Merge: fb9a7d76da10 fd1edb3aa2c1 Author: Linus Torvalds Date: Mon Apr 4 08:36:40 2011 -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: Fix task_struct reference leak perf: Fix task context scheduling perf: mmap 512 kiB by default perf: Rebase max unprivileged mlock threshold on top of page size perf tools: Fix NO_NEWT=1 python build error perf symbols: Properly align symbol_conf.priv_size perf tools: Emit clearer message for sys_perf_event_open ENOENT return perf tools: Fixup exit path when not able to open events perf symbols: Fix vsyscall symbol lookup oprofile, x86: Allow setting EDGE/INV/CMASK for counter events commit fb9a7d76da108d120efb2258ea83b18dbbb2ecdd Merge: 4acfaf829dac 5679027e7412 Author: Linus Torvalds Date: Mon Apr 4 08:36:15 2011 -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: rcu: create new rcu_access_index() and use in mce WARN_ON_SMP(): Add comment to explain ({0;}) commit 4acfaf829dacb8f8170b439d30065e8d2cfdaac9 Author: Randy Dunlap Date: Sun Apr 3 11:42:00 2011 -0700 usb/serial: fix function args warnings, dropping *filp Fix build warnings caused by removal of *filp arg in struct usb_serial_driver. These changes were missed somehow in commits 00a0d0d65b61 ("tty: remove filp from the USB tty ioctls") and 60b33c133ca0b ("tiocmget: kill off the passing of the struct file") drivers/usb/serial/mct_u232.c:159: warning: initialization from incompatible pointer type drivers/usb/serial/opticon.c:627: warning: initialization from incompatible pointer type Signed-off-by: Randy Dunlap Cc: Alan Cox Signed-off-by: Linus Torvalds commit 3e858759f72931683cb4a938871bac7a87d0de56 Merge: 3230ca9dc656 6705a9cc5273 Author: Linus Torvalds Date: Mon Apr 4 08:33:53 2011 -0700 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] radio: wl128x: Update registration process with ST [media] staging: altera-jtag needs delay.h commit 3230ca9dc656a2354b679e2e62ee7740485563a9 Merge: 7dbb25a579fe 6b794743b2c5 Author: Linus Torvalds Date: Mon Apr 4 08:33:21 2011 -0700 Merge branch 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32 * 'unicore32' of git://git.kernel.org/pub/scm/linux/kernel/git/epip/linux-2.6-unicore32: unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable unicore32 core architecture: remove duplicated #include unicore32 rtc driver fix: cleanup irq_set_freq and irq_set_state unicore32 fix: remove arch-specific futex support unicore32 ldscript fix: add cacheline parameter to PERCPU() macro commit 7dbb25a579fe1f068358a19928ada4f9be62e60d Merge: 4352d9d44b93 c4757ee58ae0 Author: Linus Torvalds Date: Mon Apr 4 08:32:56 2011 -0700 Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging: hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modalias commit 4352d9d44b935e4d000be6ec89ddb55c2bf35f24 Author: Richard Cochran Date: Mon Apr 4 08:31:23 2011 -0700 ntp: fix non privileged system time shifting The ADJ_SETOFFSET bit added in commit 094aa188 ("ntp: Add ADJ_SETOFFSET mode bit") also introduced a way for any user to change the system time. Sneaky or buggy calls to adjtimex() could set ADJ_OFFSET_SS_READ | ADJ_SETOFFSET which would result in a successful call to timekeeping_inject_offset(). This patch fixes the issue by adding the capability check. Signed-off-by: Richard Cochran Signed-off-by: Linus Torvalds commit b3b896c73b4b04b506816a09994192e3a54f0fef Author: Major Lee Date: Mon Apr 4 11:32:12 2011 +0100 rtc-mrst: Fix section types Fix the following section mismatch warning. WARNING: drivers/rtc/built-in.o(.data+0xa0): Section mismatch in reference from the variable vrtc_mrst_platform_driver to the function .init.text:vrtc_mrst_platform_probe() The variable vrtc_mrst_platform_driver references the function __init vrtc_mrst_platform_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Major Lee Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit a94d7b35067ab403485a1ea06b7a3d0172d1a1ba Author: Kumar Gala Date: Thu Mar 31 17:11:39 2011 -0500 edac/mpc85xx: Limit setting/clearing of HID1[RFXE] to e500v1/v2 cores Only the e500v1/v2 cores have HID1[RXFE] so we should attempt to set or clear this register bit on them. Otherwise we get crashes like: NIP: c0579f84 LR: c006d550 CTR: c0579f84 REGS: ef857ec0 TRAP: 0700 Not tainted (2.6.38.2-00072-gf15ba3c) MSR: 00021002 CR: 22044022 XER: 00000000 TASK = ef8559c0[1] 'swapper' THREAD: ef856000 CPU: 0 GPR00: c006d538 ef857f70 ef8559c0 00000000 00000004 00000000 00000000 00000000 GPR08: c0590000 c30170a8 00000000 c30170a8 00000001 0fffe000 00000000 00000000 GPR16: 00000000 7ffa0e60 00000000 00000000 7ffb0bd8 7ff3b844 c05be000 00000000 GPR24: 00000000 00000000 c05c28b0 c0579fac 00000000 00029002 00000000 c0579f84 NIP [c0579f84] mpc85xx_mc_clear_rfxe+0x0/0x28 LR [c006d550] on_each_cpu+0x34/0x50 Call Trace: [ef857f70] [c006d538] on_each_cpu+0x1c/0x50 (unreliable) [ef857f90] [c057a070] mpc85xx_mc_init+0xc4/0xdc [ef857fa0] [c0001cd4] do_one_initcall+0x34/0x1a8 [ef857fd0] [c055d9d8] kernel_init+0x17c/0x218 [ef857ff0] [c000cda4] kernel_thread+0x4c/0x68 Instruction dump: 40be0018 3c60c052 3863c70c 4be9baad 3be0ffed 4bd7c99d 80010014 7fe3fb78 83e1000c 38210010 7c0803a6 4e800020 <7c11faa6> 54290024 81290008 3d60c06e Oops: Exception in kernel mode, sig: 4 [#2] ---[ end trace 49ff3b8f93efde1a ]--- Also use the HID1_RFXE define rather than a magic number. Signed-off-by: Kumar Gala commit d2f989262ee713b9a8a9a1baedc2445ed958d986 Author: Prabhakar Kushwaha Date: Fri Mar 25 10:17:45 2011 +0530 powerpc/85xx: Update dts for PCIe memory maps to match u-boot of Px020RDB PCIe memory address space is 1:1 mapped with u-boot. Update dts of Px020RDB i.e. P1020RDB and P2020RDB to match the address map changes in u-boot. Signed-off-by: Prabhakar Kushwaha Signed-off-by: Kumar Gala commit a14b289d4614bb3b25d0455d68f72f3c7b4cc8e8 Author: Mariusz Kozlowski Date: Sun Apr 3 22:04:01 2011 -0700 mlx4: fix kfree on error path in new_steering_entry() On error path kfree() should get pointer to memory allocated by kmalloc() not the address of variable holding it (which is on stack). Signed-off-by: Mariusz Kozlowski Signed-off-by: David S. Miller commit fb9674bd2cd3c18f6c756ee123967e43be501263 Author: Alex Deucher Date: Sat Apr 2 09:15:50 2011 -0400 drm/radeon/kms: pageflipping cleanup for avivo+ Avoid touching the flip setup regs while acceleration is running. Set them at modeset rather than during pageflip. Touching these regs while acceleration is active caused hangs on pre-avivo chips. These chips do not seem to be affected, but better safe than sorry, plus it avoids repeatedly reprogramming the regs every flip. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit beb47274116b36e17cf52869a2004e7d12a4ef1d Author: Alex Deucher Date: Sat Apr 2 09:09:08 2011 -0400 drm/radeon/kms: Add support for tv-out dongle on G5 9600 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit e28e1d93e9591d21e440f5210a9b4317c59445df Author: Axel Lin Date: Sat Apr 2 21:20:24 2011 -0700 Input: rpckbd - fix a leak of the IRQ during init failure In rpckbd_open prror path, free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched. Signed-off-by: Axel Lin Signed-off-by: Dmitry Torokhov commit 6b794743b2c5e21825d35b5d5dd57d6fcc388198 Author: Guan Xuetao Date: Fri Apr 1 16:38:59 2011 +0800 unicore32 framebuffer fix: get videomemory by __get_free_pages() and make it floatable 1. get videomemory by __get_free_pages() in fb-puv3.c 2. remove resource reservation for old fixed UNIGFX_MMAP & UVC_MMAP space 3. remove unused macros: PKUNTIY_UNIGFX_MMAP_BASE, PKUNITY_UNIGFX_MMAP_SIZE, PKUNITY_UVC_MMAP_BASE, PKUNITY_UVC_MMAP_SIZE and KUSER_UNIGFX_BASE 4. remove unused header linux/vmalloc.h in fb-puv3.h Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 28e58cc9586ab3f4dbc79c55110955ad192e4c29 Author: Huang Weiyi Date: Sun Mar 20 16:56:55 2011 +0800 unicore32 core architecture: remove duplicated #include Remove duplicated #include('s) in arch/unicore32/kernel/traps.c Signed-off-by: Huang Weiyi Acked-by: Guan Xuetao commit 858e4f4ba14441c2d43eed55dcd660c09bae38df Author: Guan Xuetao Date: Tue Mar 29 20:38:51 2011 +0800 unicore32 rtc driver fix: cleanup irq_set_freq and irq_set_state Signed-off-by: Guan Xuetao commit 0bfdc8e121fd61adbc03848af3ca15fcbef2d1d8 Author: Guan Xuetao Date: Tue Mar 29 22:17:42 2011 +0800 unicore32 fix: remove arch-specific futex support The futex functions in unicore32 are not used and verified, so just replaced by asm-generic version. Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit df93878c9623146de8050308d65bcfeea4fb0aca Author: Guan Xuetao Date: Tue Mar 29 21:30:04 2011 +0800 unicore32 ldscript fix: add cacheline parameter to PERCPU() macro Also, adjust cacheline parameter of RW_DATA_SECTION and EXCEPTION_TABLE Signed-off-by: Guan Xuetao Acked-by: Arnd Bergmann commit 2fceec13375e5d98ef033c6b0ee03943fc460950 Author: Ilpo Järvinen Date: Fri Apr 1 21:47:41 2011 -0700 tcp: len check is unnecessarily devastating, change to WARN_ON All callers are prepared for alloc failures anyway, so this error can safely be boomeranged to the callers domain without super bad consequences. ...At worst the connection might go into a state where each RTO tries to (unsuccessfully) re-fragment with such a mis-sized value and eventually dies. Signed-off-by: Ilpo Järvinen Signed-off-by: David S. Miller commit 2cab86bee8e7f353e6ac8c15b3eb906643497644 Author: Wei Yongjun Date: Thu Mar 31 23:42:55 2011 +0000 sctp: malloc enough room for asconf-ack chunk Sometime the ASCONF_ACK parameters can equal to the fourfold of ASCONF parameters, this only happend in some special case: ASCONF parameter is : Unrecognized Parameter (4 bytes) ASCONF_ACK parameter should be: Error Cause Indication parameter (8 bytes header) + Error Cause (4 bytes header) + Unrecognized Parameter (4bytes) Four 4bytes Unrecognized Parameters in ASCONF chunk will cause panic. Pid: 0, comm: swapper Not tainted 2.6.38-next+ #22 Bochs Bochs EIP: 0060:[] EFLAGS: 00010246 CPU: 0 EIP is at skb_put+0x60/0x70 EAX: 00000077 EBX: c09060e2 ECX: dec1dc30 EDX: c09469c0 ESI: 00000000 EDI: de3c8d40 EBP: dec1dc58 ESP: dec1dc2c DS: 007b ES: 007b FS: 00d8 GS: 00e0 SS: 0068 Process swapper (pid: 0, ti=dec1c000 task=c09aef20 task.ti=c0980000) Stack: c09469c0 e1894fa4 00000044 00000004 de3c8d00 de3c8d00 de3c8d44 de3c8d40 c09060e2 de25dd80 de3c8d40 dec1dc7c e1894fa4 dec1dcb0 00000040 00000004 00000000 00000800 00000004 00000004 dec1dce0 e1895a2b dec1dcb4 de25d960 Call Trace: [] ? sctp_addto_chunk+0x4e/0x89 [sctp] [] sctp_addto_chunk+0x4e/0x89 [sctp] [] sctp_process_asconf+0x32f/0x3d1 [sctp] [] sctp_sf_do_asconf+0xf8/0x173 [sctp] [] sctp_do_sm+0xb8/0x159 [sctp] [] ? sctp_cname+0x0/0x52 [sctp] [] sctp_assoc_bh_rcv+0xac/0xe3 [sctp] [] sctp_inq_push+0x2d/0x30 [sctp] [] sctp_rcv+0x7a7/0x83d [sctp] [] ? ipv4_confirm+0x118/0x125 [] ? nf_iterate+0x34/0x62 [] ? ip_local_deliver_finish+0x0/0x194 [] ? ip_local_deliver_finish+0x0/0x194 [] ip_local_deliver_finish+0xf5/0x194 [] ? ip_local_deliver_finish+0x0/0x194 [] NF_HOOK.clone.1+0x3d/0x44 [] ip_local_deliver+0x3e/0x44 [] ? ip_local_deliver_finish+0x0/0x194 [] ip_rcv_finish+0x29f/0x2c7 [] ? ip_rcv_finish+0x0/0x2c7 [] NF_HOOK.clone.1+0x3d/0x44 [] ip_rcv+0x1f5/0x233 [] ? ip_rcv_finish+0x0/0x2c7 [] __netif_receive_skb+0x310/0x336 [] netif_receive_skb+0x4b/0x51 [] cp_rx_poll+0x1e7/0x29c [8139cp] [] net_rx_action+0x65/0x13a [] __do_softirq+0xa1/0x149 [] ? __do_softirq+0x0/0x149 [] ? irq_exit+0x37/0x72 [] ? do_IRQ+0x81/0x95 [] ? common_interrupt+0x30/0x38 [] ? native_safe_halt+0xa/0xc [] ? default_idle+0x58/0x92 [] ? cpu_idle+0x96/0xb2 [] ? rest_init+0x5d/0x5f [] ? start_kernel+0x34b/0x350 [] ? i386_start_kernel+0xba/0xc1 Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 028dba0ac3fc3c82da06110b011fce22a5ffad00 Author: Wei Yongjun Date: Thu Mar 31 23:38:54 2011 +0000 sctp: fix auth_hmacs field's length of struct sctp_cookie auth_hmacs field of struct sctp_cookie is used for store Requested HMAC Algorithm Parameter, and each HMAC Identifier is 2 bytes, so the length should be: SCTP_AUTH_NUM_HMACS * sizeof(__u16) + 2 Signed-off-by: Wei Yongjun Signed-off-by: David S. Miller commit 4dd5ffe4fc36128dc86568ddeaeae359e6037762 Author: Michał Mirosław Date: Wed Mar 30 23:58:08 2011 +0000 net: Fix dev dev_ethtool_get_rx_csum() for forced NETIF_F_RXCSUM dev_ethtool_get_rx_csum() won't report rx checksumming when it's not changeable and driver is converted to hw_features and friends. Fix this. (dev->hw_features & NETIF_F_RXCSUM) check is dropped - if the ethtool_ops->get_rx_csum is set, then driver is not coverted, yet. Signed-off-by: Michał Mirosław Signed-off-by: David S. Miller commit c261344d3ce3edac781f9d3c7eabe2e96d8e8fe8 Author: Arnd Bergmann Date: Fri Apr 1 20:12:02 2011 -0700 usbnet: use eth%d name for known ethernet devices The documentation for the USB ethernet devices suggests that only some devices are supposed to use usb0 as the network interface name instead of eth0. The logic used there, and documented in Kconfig for CDC is that eth0 will be used when the mac address is a globally assigned one, but usb0 is used for the locally managed range that is typically used on point-to-point links. Unfortunately, this has caused a lot of pain on the smsc95xx device that is used on the popular pandaboard without an EEPROM to store the MAC address, which causes the driver to call random_ether_address(). Obviously, there should be a proper MAC addressed assigned to the device, and discussions are ongoing about how to solve this, but this patch at least makes sure that the default interface naming gets a little saner and matches what the user can expect based on the documentation, including for new devices. The approach taken here is to flag whether a device might be a point-to-point link with the new FLAG_POINTTOPOINT setting in the usbnet driver_info. A driver can set both FLAG_POINTTOPOINT and FLAG_ETHER if it is not sure (e.g. cdc_ether), or just one of the two. The usbnet framework only looks at the MAC address for device naming if both flags are set, otherwise it trusts the flag. Signed-off-by: Arnd Bergmann Tested-by: Andy Green Signed-off-by: David S. Miller commit 1591cb60838603c8cc2c540192c8244962436539 Author: FUJITA Tomonori Date: Fri Apr 1 05:27:51 2011 +0000 starfire: clean up dma_addr_t size test Now we have CONFIG_ARCH_DMA_ADDR_T_64BIT. We can fix the hacky dma_addr_t size test cleanly. Signed-off-by: FUJITA Tomonori Signed-off-by: David S. Miller commit 5e58e5283a0a0a99ee970e7e5c80c6541693376e Merge: c100c8f4c3c6 ffd8c746fbef Author: David S. Miller Date: Fri Apr 1 17:15:25 2011 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 78fca1b95837a44983608302e89c7258981be9b3 Merge: 720e87efe21b 4275f4c8f758 Author: Linus Torvalds Date: Fri Apr 1 13:29:22 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix build warning: argument 1 of 'irqd_irq_disabled' commit 5679027e74126e0dfc860869b0e7ceab1dd06318 Merge: ccd0d44fad38 a4dd99250dc4 Author: Ingo Molnar Date: Fri Apr 1 21:14:04 2011 +0200 Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent commit 4275f4c8f7589bcac55d880529f58dac39815c95 Author: Tony Luck Date: Fri Apr 1 10:56:03 2011 -0700 [IA64] fix build warning: argument 1 of 'irqd_irq_disabled' In commit f5e5bf088bd3d30990efb7429aaf9f1e5134ffd6 ia64: Use irqd_irq_disabled() instead of desc->status access Thomas forgot to convert from irq to *irq_data. Add a call to irq_get_irq_data() to fix that. Signed-off-by: Tony Luck commit 720e87efe21b43c89093c1f04ec9ecba2f0213b8 Merge: ccd00d1091fa a0334c50bf0b Author: Linus Torvalds Date: Fri Apr 1 09:14:52 2011 -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: pcm: fix infinite loop in snd_pcm_update_hw_ptr0() ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220 ALSA: ens1371: fix Creative Ectiva support ALSA: firewire-speakers: fix hang when unplugging a running device ASoC: Fix CODEC device name for Corgi ALSA: hda - Fix pin-config of Gigabyte mobo ASoC: imx: fix burstsize for DMA ASoC: imx: set watermarks for mx2-dma ASoC: twl6040: Return -ENOMEM if create_singlethread_workqueue fails ASoC: tlv320dac33: Restore L/R DAC power control register ASoC: Explicitly say registerless widgets have no register ASoC: tlv320dac33: Fix inconsistent spinlock usage commit a0334c50bf0ba7c720ed00f931e721c989efd233 Merge: 12ff414e2e45 f8852b12200d Author: Takashi Iwai Date: Fri Apr 1 18:02:23 2011 +0200 Merge branch 'fix/asoc' into for-linus commit 12ff414e2e4512f59fe191dc18e856e2939a1c79 Author: Kelly Anderson Date: Fri Apr 1 11:58:25 2011 +0200 ALSA: pcm: fix infinite loop in snd_pcm_update_hw_ptr0() When period interrupts are disabled, snd_pcm_update_hw_ptr0() compares the current time against the time estimated for the current hardware pointer to detect xruns. The somewhat fuzzy threshold in the while loop makes it possible that hdelta becomes negative; the comparison being done with unsigned types then makes the loop go through the entire 263 negative range, and, depending on the value, never reach an unsigned value that is small enough to stop the loop. Doing this with interrupts disabled results in the machine locking up. To prevent this, ensure that the loop condition uses signed types for both operands so that the comparison is correctly done. Many thanks to Kelly Anderson for debugging this. Reported-by: Nix Reported-by: "Christopher K." Reported-and-tested-by: Kelly Anderson Signed-off-by: Kelly Anderson [cl: remove unneeded casts; use a temp variable] Signed-off-by: Clemens Ladisch Cc: 2.6.38 Signed-off-by: Takashi Iwai commit ccd00d1091fa7fff151127f26f6900be2ac8cc10 Merge: afdef69c7ff7 c0bb9e45f3a7 Author: Linus Torvalds Date: Fri Apr 1 08:57:02 2011 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: kdump: Allow shrinking of kdump region to be overridden powerpc/pmac/smp: Remove no-longer needed preempt workaround powerpc/smp: Increase vdso_data->processorCount, not just decrease it powerpc/smp: Create idle threads on demand and properly reset them powerpc/smp: Don't expose per-cpu "cpu_state" array powerpc/pmac/smp: Fix CPU hotplug crashes on some machines powerpc/smp: Add a smp_ops->bringup_up() done callback powerpc/pmac: Rename cpu_state in therm_pm72 to avoid collision powerpc/pmac/smp: Properly NAP offlined CPU on G5 powerpc/pmac/smp: Remove HMT changes for PowerMac offline code powerpc/pmac/smp: Consolidate 32-bit and 64-bit PowerMac cpu_die in one file powerpc/pmac/smp: Fixup smp_core99_cpu_disable() and use it on 64-bit powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32 powerpc/pmac/smp: Fix 32-bit PowerMac cpu_die powerpc/smp: Remove unused smp_ops->cpu_enable() powerpc/smp: Remove unused generic_cpu_enable() powerpc/smp: Fix generic_mach_cpu_die() powerpc/smp: soft-replugged CPUs must go back to start_secondary powerpc: Make decrementer interrupt robust against offlined CPUs commit afdef69c7ff7d0bf59e3cafc187aefb12878dbe3 Merge: 84daeb09ef2b 47c7c97a93a5 Author: Linus Torvalds Date: Fri Apr 1 08:54:14 2011 -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: sparc32: Pass task_struct to schedule_tail() in ret_from_fork apbuart: Depend upon sparc. sparc64: Fix section mis-match errors. sparc32,leon: Fixed APBUART frequency detection sparc32, leon: APBUART driver must use archdata to get IRQ number sparc: Hook up syncfs system call. commit 84daeb09ef2b11cb0b29e100766e38e206c8bc47 Merge: ecb78ab6f301 c100c8f4c3c6 Author: Linus Torvalds Date: Fri Apr 1 08:53:50 2011 -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: appletalk: Fix OOPS in atalk_release(). mlx4: Fixing bad size of event queue buffer mlx4: Fixing use after free bonding:typo in comment sctp: Pass __GFP_NOWARN to hash table allocation attempts. connector: convert to synchronous netlink message processing fib: add rtnl locking in ip_fib_net_exit atm/solos-pci: Don't flap VCs when carrier state changes atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump atm/solos-pci: Use VPI.VCI notation uniformly. Atheros, atl2: Fix mem leaks in error paths of atl2_set_eeprom netdev: fix mtu check when TSO is enabled net/usb: Ethernet quirks for the LG-VL600 4G modem phylib: phy_attach_direct: phy_init_hw can fail, add cleanup bridge: mcast snooping, fix length check of snooped MLDv1/2 via-ircc: Pass PCI device pointer to dma_{alloc, free}_coherent() via-ircc: Use pci_{get, set}_drvdata() instead of static pointer variable net: gre: provide multicast mappings for ipv4 and ipv6 bridge: Fix compilation warning in function br_stp_recalculate_bridge_id() net: Fix warnings caused by MAX_SKB_FRAGS change. commit a4dd99250dc49031e6a92a895dbcc230a4832083 Author: Paul E. McKenney Date: Fri Apr 1 07:15:14 2011 -0700 rcu: create new rcu_access_index() and use in mce The MCE subsystem needs to sample an RCU-protected index outside of any protection for that index. If this was a pointer, we would use rcu_access_pointer(), but there is no corresponding rcu_access_index(). This commit therefore creates an rcu_access_index() and applies it to MCE. Signed-off-by: Paul E. McKenney Tested-by: Zdenek Kabelac commit 9e1491de519712c73ec621c4ef4872eca6f2bb57 Author: Michal Simek Date: Fri Mar 18 13:52:27 2011 +0100 microblaze: Fix ftrace - Do not trace idle loop which takes a lot time - Fix cache handling in generic ftrace code - Do not trace lib functions ashldi3, ashrdi3, lshrdi3 Functions are called from generic ftrace code which can't be traced Signed-off-by: Michal Simek commit 57bd35d414c453fea2b08e9dad6067ee7e6c188a Author: Michal Simek Date: Thu Mar 31 08:11:47 2011 +0200 microblaze: Wire up new syscalls Hook up name_to_handle_at, open_by_handle_at, clock_adjtime, syncfs Signed-off-by: Michal Simek commit 56d448010f4cde5293fe3adfbc636ede827fdfb0 Author: Michal Simek Date: Wed Mar 30 13:13:38 2011 +0200 microblaze: Fix level/edge irq sensibility Patches: "microblaze: Convert to new irq function names" sha (4adc192ec7d977c74c750320f289af9d61c1caca) and "microblaze: Use generic show_interrupts()" sha(9d61c18b25726306c9231428c17db42e3ff29ba7) should also setup edge/level in irq_set_chip_and_handler_name name parameter. Error log: ~ # cat /proc/interrupts CPU0 2: 2 Xilinx INTC-Xilinx INTC eth0 3: 2 Xilinx INTC-Xilinx INTC eth0 4: 241 Xilinx INTC-Xilinx INTC timer 6: 108 Xilinx INTC-Xilinx INTC serial Fixed: ~ # cat /proc/interrupts CPU0 2: 2 Xilinx INTC-level eth0 3: 2 Xilinx INTC-level eth0 4: 238 Xilinx INTC-edge timer 6: 108 Xilinx INTC-level serial Signed-off-by: Michal Simek Acked-by: Thomas Gleixner --- v2: Fix exchanged edge and level commit 26fcd2a7618db6c16be6aa3e56c0f3c25381e5a3 Author: Manoj Iyer Date: Thu Mar 31 22:39:43 2011 -0700 Input: wacom - add support for Lenovo tablet ID (0xE6) Signed-off-by: Manoj Iyer Acked-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit c0bb9e45f3a7f67fc358946727bc3d5f23d0f55d Author: Anton Blanchard Date: Wed Aug 25 10:22:58 2010 +1000 kdump: Allow shrinking of kdump region to be overridden On ppc64 the crashkernel region almost always overlaps an area of firmware. This works fine except when using the sysfs interface to reduce the kdump region. If we free the firmware area we are guaranteed to crash. Rename free_reserved_phys_range to crash_free_reserved_phys_range and make it a weak function so we can override it. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 76d479a7caff58b1e5f31d80805f7f65f9177696 Author: Benjamin Herrenschmidt Date: Tue Mar 8 14:57:26 2011 +1100 powerpc/pmac/smp: Remove no-longer needed preempt workaround The generic code properly re-initializes the preempt count in the idle thread now Signed-off-by: Benjamin Herrenschmidt commit aeeafbfa7a5692c68d306043878aa2dd785e5230 Author: Benjamin Herrenschmidt Date: Tue Mar 8 14:49:33 2011 +1100 powerpc/smp: Increase vdso_data->processorCount, not just decrease it Signed-off-by: Benjamin Herrenschmidt commit c56e58537d504706954a06570b4034c04e5b7500 Author: Benjamin Herrenschmidt Date: Tue Mar 8 14:40:04 2011 +1100 powerpc/smp: Create idle threads on demand and properly reset them Instead of creating idle threads at boot for all possible CPUs, we create them on demand, like x86 or ARM, and we properly call init_idle to re-initialize an idle thread when a CPU was unplugged and is now re-plugged. Signed-off-by: Benjamin Herrenschmidt commit 105765f451d3ff007bb4ae3761e825686d9615db Author: Benjamin Herrenschmidt Date: Fri Apr 1 09:23:37 2011 +1100 powerpc/smp: Don't expose per-cpu "cpu_state" array Instead, keep it static, expose an accessor and use that from the PowerMac code. Avoids easy namespace collisions and will make it easier to consolidate with other implementations. Signed-off-by: Benjamin Herrenschmidt commit 734796f12351f9a0f38c47b981414f82d852f222 Author: Benjamin Herrenschmidt Date: Tue Mar 8 13:54:50 2011 +1100 powerpc/pmac/smp: Fix CPU hotplug crashes on some machines On some machines that use i2c to synchronize the timebases (such as PowerMac7,2/7,3 G5 machines), hotplug CPU would crash when putting back a new CPU online due to the underlying i2c bus being closed. This uses the newly added bringup_done() callback to move the close along with other housekeeping calls, and adds a CPU notifier to re-open the i2c bus around subsequent hotplug operations Signed-off-by: Benjamin Herrenschmidt commit d72944457bb7d5c4be43aa1b741cb93c69484c20 Author: Benjamin Herrenschmidt Date: Tue Mar 8 13:50:37 2011 +1100 powerpc/smp: Add a smp_ops->bringup_up() done callback This allows us to stop abusing smp_ops->setup_cpu() for cleanup tasks that have to take place after the initial boot time CPU bringup. Signed-off-by: Benjamin Herrenschmidt commit 65e646ac509ff45e9f35e7fc1fea0d2b6723679f Author: Benjamin Herrenschmidt Date: Mon Mar 7 17:02:49 2011 +1100 powerpc/pmac: Rename cpu_state in therm_pm72 to avoid collision This collides with the cpu_state in our SMP code, use processor_state instead. Signed-off-by: Benjamin Herrenschmidt commit 62cc67b9df273be18fcb09a071592dedf751c90a Author: Benjamin Herrenschmidt Date: Mon Feb 21 16:49:58 2011 +1100 powerpc/pmac/smp: Properly NAP offlined CPU on G5 The current code soft-disables, and then goes to NAP mode which turns interrupts on. That means that if an interrupt occurs, we will hit the masked interrupt code path which isn't what we want, as it will return with EE off, which will either get us out of NAP mode, or fail to enter it (according to spec). Instead, let's just rely on the fact that it is safe to take decrementer interrupts on an offline CPU and leave interrupts enabled. We can also get rid of the special case in asm for power4_cpu_offline_powersave() and just use power4_idle(). Signed-off-by: Benjamin Herrenschmidt commit e872e41b79f61dbc22f85577613925a4a7de1c1a Author: Benjamin Herrenschmidt Date: Fri Feb 11 14:55:42 2011 +1100 powerpc/pmac/smp: Remove HMT changes for PowerMac offline code Those instructions do nothing on non-threaded processors such as 970's used on those machines. Signed-off-by: Benjamin Herrenschmidt commit 4c6130d9bba78e7ac44584378660a1204c5297d1 Author: Benjamin Herrenschmidt Date: Fri Feb 11 14:03:20 2011 +1100 powerpc/pmac/smp: Consolidate 32-bit and 64-bit PowerMac cpu_die in one file Signed-off-by: Benjamin Herrenschmidt commit 45e07fd045153c0049c99b0cf6cf7254c164d37b Author: Benjamin Herrenschmidt Date: Mon Feb 21 16:31:49 2011 +1100 powerpc/pmac/smp: Fixup smp_core99_cpu_disable() and use it on 64-bit Use the generic code, just add the MPIC priority setting, I don't see any use in mucking around with the decrementer, as 32-bit will have EE off all along, and 64-bit will be able to deal with it. Signed-off-by: Benjamin Herrenschmidt commit 1c91cc570576dfd0f288d664c095d64d11aaace4 Author: Benjamin Herrenschmidt Date: Fri Feb 11 13:05:17 2011 +1100 powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32 Signed-off-by: Benjamin Herrenschmidt commit fb49f864c3c3f8ac5b68563774171fe43634ffeb Author: Benjamin Herrenschmidt Date: Fri Feb 11 14:09:32 2011 +1100 powerpc/pmac/smp: Fix 32-bit PowerMac cpu_die Use generic cpu_state, call idle_task_exit() properly, and remove smp_core99_cpu_die() which isn't useful, the generic function does the job just fine. commit 7a53a4fe707a93a33f6c5d42173bf213cb6ff71d Author: Benjamin Herrenschmidt Date: Fri Feb 11 12:49:01 2011 +1100 powerpc/smp: Remove unused smp_ops->cpu_enable() Remove the last remnants of cpu_enable(), everybody uses the normal __cpu_up() path now Signed-off-by: Benjamin Herrenschmidt commit b527d07114fdab83f39040c69b4b0a4b1b232c16 Author: Benjamin Herrenschmidt Date: Fri Feb 11 12:46:41 2011 +1100 powerpc/smp: Remove unused generic_cpu_enable() Nobody uses it, besides we should always use the normal __cpu_up path anyways Signed-off-by: Benjamin Herrenschmidt commit 4fcb8833af3355065bd8bffcd338eabc6f3a38a0 Author: Benjamin Herrenschmidt Date: Thu Feb 10 18:46:50 2011 +1100 powerpc/smp: Fix generic_mach_cpu_die() This is used by some "soft" hotplug implementations. I needs to call idle_task_exit() when the CPU is going away, and we remove the now no-longer needed set_cpu_online() and local_irq_enable() which are handled by the return to start_secondary Signed-off-by: Benjamin Herrenschmidt commit fa3f82c8bb7acbe049ea71f258b3ae0a33d9d40b Author: Benjamin Herrenschmidt Date: Thu Feb 10 18:45:24 2011 +1100 powerpc/smp: soft-replugged CPUs must go back to start_secondary Various thing are torn down when a CPU is hot-unplugged. That CPU is expected to go back to start_secondary when re-plugged to re initialize everything, such as clock sources, maps, ... Some implementations just return from cpu_die() callback in the idle loop when the CPU is "re-plugged". This is not enough. We fix it using a little asm trampoline which resets the stack and calls back into start_secondary as if we were all fresh from boot. The trampoline already existed on ppc64, but we add it for ppc32 Signed-off-by: Benjamin Herrenschmidt commit 963e5d3b76d657f1ebcf3561446d2ba1872bbfa2 Author: Benjamin Herrenschmidt Date: Tue Mar 29 14:51:10 2011 +1100 powerpc: Make decrementer interrupt robust against offlined CPUs With some implementations, it is possible that a timer interrupt occurs every few seconds on an offline CPU. In this case, just re-arm the decrementer and return immediately Signed-off-by: Benjamin Herrenschmidt commit c100c8f4c3c6f2a407bdbaaad2c4f1062e6a473a Author: David S. Miller Date: Thu Mar 31 18:59:10 2011 -0700 appletalk: Fix OOPS in atalk_release(). Commit 60d9f461a20ba59219fdcdc30cbf8e3a4ad3f625 ("appletalk: remove the BKL") added a dereference of "sk" before checking for NULL in atalk_release(). Guard the code block completely, rather than partially, with the NULL check. Reported-by: Dave Jones Signed-off-by: David S. Miller commit 61df611d5ed32ff785d1e4a0abc871b42a905c1e Merge: eccaca28e298 7f58aabc3690 Author: Dave Airlie Date: Fri Apr 1 10:55:26 2011 +1000 Merge remote branch 'keithp/drm-intel-fixes' of /ssd/git/drm-next into drm-fixes * 'keithp/drm-intel-fixes' of /ssd/git/drm-next: drm/i915: Reset GMBUS controller after NAK drm/i915: Busy-spin wait_for condition in atomic contexts drm/i915/lvds: Always return connected in the absence of better information commit eccaca28e29861a63ebc067bfff59c7efa427371 Author: Ben Skeggs Date: Wed Mar 30 05:03:47 2011 +0000 drm: export drm_find_cea_extension to drivers Nouveau needs access to this structure to build an ELD block for use by the HDA audio codec. Signed-off-by: Ben Skeggs Signed-off-by: Dave Airlie commit 97ea530f6fac1f9632b0c4792a2a56411454adbe Author: John Lindgren Date: Thu Mar 24 23:28:31 2011 +0000 drm/radeon/kms: add some sanity checks to obj info record parsingi (v2) Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=35502 agd5f: also add sanity check to connector records. v2: fix one more case. Signed-off-by: Alex Deucher Cc: stable@kernel.org Signed-off-by: Dave Airlie commit 6705a9cc52733cb5cbdbee72be66ab462d8fb46f Author: Manjunatha Halli Date: Wed Mar 23 07:44:30 2011 -0300 [media] radio: wl128x: Update registration process with ST As underlying ST driver registration API's have changed with latest 2.6.38-rc8 kernel this patch will update the FM driver accordingly. Signed-off-by: Manjunatha Halli Signed-off-by: Mauro Carvalho Chehab commit 92ce52695ccf2b6c4ef7eb02e1bee1bcbf5fde89 Author: Randy Dunlap Date: Mon Mar 28 12:23:05 2011 -0300 [media] staging: altera-jtag needs delay.h altera-jtag.c needs to include to fix a build error: drivers/staging/altera-stapl/altera-jtag.c:398: error: implicit declaration of function 'udelay' Signed-off-by: Randy Dunlap Cc: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 840126579da56edae8ecc4a0d85198f742982f10 Author: David Henningsson Date: Thu Mar 31 09:36:19 2011 +0200 ALSA: HDA: Add dock mic quirk for Lenovo Thinkpad X220 This quirk is needed for the docking station mic of Lenovo Thinkpad X220 to function correctly. BugLink: http://bugs.launchpad.net/bugs/746259 Cc: stable@kernel.org Tested-by: James Ferguson Signed-off-by: David Henningsson Signed-off-by: Takashi Iwai commit 818987e9a19c52240ba9b1c20f28f047eef76072 Author: Cliff Wickman Date: Thu Mar 31 09:32:02 2011 -0500 x86, UV: Fix kdump reboot After a crash dump on an SGI Altix UV system the crash kernel fails to cause a reboot. EFI mode is disabled in the kdump kernel, so only the reboot_type of BOOT_ACPI works. Signed-off-by: Cliff Wickman Cc: rja@sgi.com LKML-Reference: Signed-off-by: Ingo Molnar commit fd1edb3aa2c1d92618d8f0c6d15d44ea41fcac6a Author: Peter Zijlstra Date: Mon Mar 28 13:13:56 2011 +0200 perf: Fix task_struct reference leak sys_perf_event_open() had an imbalance in the number of task refs it took causing memory leakage Cc: Jiri Olsa Cc: Oleg Nesterov Cc: stable@kernel.org # .37+ Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit ab711fe08297de1485fff0a366e6db8828cafd6a Author: Peter Zijlstra Date: Thu Mar 31 10:29:26 2011 +0200 perf: Fix task context scheduling Jiri reported: | | - once an event is created by sys_perf_event_open, task context | is created and it stays even if the event is closed, until the | task is finished ... thats what I see in code and I assume it's | correct | | - when the task opens event, perf_sched_events jump label is | incremented and following callbacks are started from scheduler | | __perf_event_task_sched_in | __perf_event_task_sched_out | | These callback *in/out set/unset cpuctx->task_ctx value to the | task context. | | - close is called on event on CPU 0: | - the task is scheduled on CPU 0 | - __perf_event_task_sched_in is called | - cpuctx->task_ctx is set | - perf_sched_events jump label is decremented and == 0 | - __perf_event_task_sched_out is not called | - cpuctx->task_ctx on CPU 0 stays set | | - exit is called on CPU 1: | - the task is scheduled on CPU 1 | - perf_event_exit_task is called | - task_ctx_sched_out unsets cpuctx->task_ctx on CPU 1 | - put_ctx destroys the context | | - another call of perf_rotate_context on CPU 0 will use invalid | task_ctx pointer, and eventualy panic. | Cure this the simplest possibly way by partially reverting the jump_label optimization for the sched_out case. Reported-and-tested-by: Jiri Olsa Signed-off-by: Peter Zijlstra Cc: Oleg Nesterov Cc: # .37+ LKML-Reference: <1301520405.4859.213.camel@twins> Signed-off-by: Ingo Molnar commit 800cd25c12981c99e5401c3551ffffd99f1c6c85 Author: Frederic Weisbecker Date: Thu Mar 31 03:35:24 2011 +0200 perf: mmap 512 kiB by default The default setting of perf record is to mmap 128 pages if the user did not override with -m. However the page size may vary accross different architecture settings, giving different default size between each. Moreover the kernel side still has a default max number of mlocked pages of 512 kiB + 1 page for unprivileged users. 128 + 1 pages with page size > 4096 overlaps this threshold. Thus, better adapt to this limitation and set the default number of pages to fit those 512 kiB + 1 page. Signed-off-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian LKML-Reference: <1301535324-9735-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 20443384fe090c5f8aeb016e7e85659c5bbdd69f Author: Frederic Weisbecker Date: Thu Mar 31 03:33:29 2011 +0200 perf: Rebase max unprivileged mlock threshold on top of page size Ensure we allow 512 kiB + 1 page for user control without assuming a 4096 bytes page size. Reported-by: Peter Zijlstra Signed-off-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian Cc: LKML-Reference: <1301535209-9679-1-git-send-email-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 3436ae1298cb22d722a6520fc97f112dd767a9e1 Author: Sisir Koppaka Date: Sat Mar 26 18:22:55 2011 +0530 sched: Fix rebalance interval calculation The interval for checking scheduling domains if they are due to be balanced currently depends on boot state NR_CPUS, which may not accurately reflect the number of online CPUs at the time of check. Thus replace NR_CPUS with num_online_cpus(). (ed: Should only affect those who set NR_CPUS really high, such as 4096 or so :-) Signed-off-by: Sisir Koppaka Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit e2495b577324938f0209b4f895c5f205c7e47854 Author: Borislav Petkov Date: Sun Mar 27 17:57:13 2011 +0200 sched, doc: Beef up load balancing description Correct all function names pertaining to load balancing and explain shortly how load balancing is performed. Signed-off-by: Borislav Petkov Signed-off-by: Peter Zijlstra LKML-Reference: <1301241433-3790-1-git-send-email-bp@alien8.de> Signed-off-by: Ingo Molnar commit a51e91981870d013fcfcc08b0117997edbcbc7a7 Author: Dario Faggioli Date: Thu Mar 24 14:00:18 2011 +0100 sched: Leave sched_setscheduler() earlier if possible, do not disturb SCHED_FIFO tasks sched_setscheduler() (in sched.c) is called in order of changing the scheduling policy and/or the real-time priority of a task. Thus, if we find out that neither of those are actually being modified, it is possible to return earlier and save the overhead of a full deactivate+activate cycle of the task in question. Beside that, if we have more than one SCHED_FIFO task with the same priority on the same rq (which means they share the same priority queue) having one of them changing its position in the priority queue because of a sched_setscheduler (as it happens by means of the deactivate+activate) that does not actually change the priority violates POSIX which states, for SCHED_FIFO: "If a thread whose policy or priority has been modified by pthread_setschedprio() is a running thread or is runnable, the effect on its position in the thread list depends on the direction of the modification, as follows: a. <...> b. If the priority is unchanged, the thread does not change position in the thread list. c. <...>" http://pubs.opengroup.org/onlinepubs/009695399/functions/xsh_chap02_08.html (ed: And the POSIX specification here does, briefly and somewhat unexpectedly, match what common sense tells us as well. ) Signed-off-by: Dario Faggioli Signed-off-by: Peter Zijlstra LKML-Reference: <1300971618.3960.82.camel@Palantir> Signed-off-by: Ingo Molnar commit c37947459172a02691ccd48cb967e8b605d38c56 Author: Yevgeny Petrilin Date: Wed Mar 30 23:30:17 2011 +0000 mlx4: Fixing bad size of event queue buffer We should reduce the number of reserved completion queues from the total number of entries. Since the queue size is power of two, not reducing the reserved entries, caused a double queue size, which may lead to allocation failures in some cases. Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 53020092bd89b0d4ccc5368a3956f43cb43e5665 Author: Yevgeny Petrilin Date: Wed Mar 30 23:28:52 2011 +0000 mlx4: Fixing use after free In case of allocation failure, tried to use the promiscuous QP entry that was previously freed. Now freeing this entry only in case we will not put it back to the list of promiscuous entries. Reported-by: Dan Carpenter Signed-off-by: Yevgeny Petrilin Signed-off-by: David S. Miller commit 5e8996e72899847269ca36061ea33ea24bf6cb90 Author: Peter Pan(潘卫平) Date: Wed Mar 30 20:46:19 2011 +0000 bonding:typo in comment use accumulates instead of acumulates. Signed-off-by: Pan Weiping Signed-off-by: David S. Miller commit 7f58aabc369014fda3a4a33604ba0a1b63b941ac Author: Chris Wilson Date: Wed Mar 30 16:20:43 2011 +0100 drm/i915: Reset GMBUS controller after NAK Once a NAK has been asserted by the slave, we need to reset the GMBUS controller in order to continue. This is done by asserting the Software Clear Interrupt bit and then clearing it again to restore operations. If we don't clear the NAK, then all future GMBUS xfers will fail, including DDC probes and EDID retrieval. v2: Add some comments as suggested by Keith Packard. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=35781 Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Tested-by: Jesse Barnes Tested-by: "Mengmeng Meng" commit 9f01b25048ad12b5d71f4f7d3b62ef737639a08d Author: Chris Wilson Date: Thu Mar 24 11:37:03 2011 +0000 drm/i915: Busy-spin wait_for condition in atomic contexts During modesetting, we need to wait for the hardware to report readiness by polling the registers. Normally, we call msleep() between reads, because some state changes may take a whole vblank or more to complete. However during a panic, we are in an atomic context and cannot sleep. Instead, busy spin polling the termination condition. References: https://bugzilla.kernel.org/show_bug.cgi?id=31772 Signed-off-by: Chris Wilson Reviewed-by: Keith Packard Reviewed-by: Jesse Barnes commit 47c7c97a93a5b8f719093dbf83555090b3b8228b Author: Tkhai Kirill Date: Thu Mar 31 00:52:38 2011 -0700 sparc32: Pass task_struct to schedule_tail() in ret_from_fork We have to pass task_struct of previous process to function schedule_tail(). Currently in ret_from_fork previous thread_info is passed: switch_to: mov %g6, %g3 /* previous thread_info in g6 */ ret_from_fork: call schedule_tail mov %g3, %o0 /* previous thread_info is passed */ void schedule_tail(struct task_struct *prev); Signed-off-by: Tkhai Kirill Signed-off-by: David S. Miller commit a2a94e7323dad972f23b9000cab150026c929b9f Author: Paul Bolle Date: Thu Mar 31 00:11:48 2011 -0700 Input: i8042 - downgrade selftest error message to dbg() On a "really fragile" laptop I noticed a single i8042.c: i8042 controller selftest failed. (0x1 != 0x55) error in the log. But there's no reason to print this message at KERN_ERR level each time that loop fails, especially since the message telling about the overall selftest failure is printed at KERN_INFO level (on X86). Add an actual error message for non-X86 systems, where a selftest failure is (apparently) more serious. Remove a space in an another error message. Signed-off-by: Paul Bolle Signed-off-by: Dmitry Torokhov commit 708748670c7c6dd5bd3b141473086e6937e72737 Author: Jan Beulich Date: Thu Mar 31 00:01:58 2011 -0700 Input: synaptics - fix crash in synaptics_module_init() 'struct dmi_system_id' arrays must always have a terminator to keep dmi_check_system() from looking at data (and possibly crashing) it isn't supposed to look at. The issue went unnoticed until ef8313bb1a22e7d2125d9d758aa8a81f1de91d81, but was introduced about a year earlier with 7705d548cbe33f18ea7713b9a07aa11047aaeca4 (which also similarly changed lifebook.c, but the problem there got eliminated shortly afterwards). The first hunk therefore is a stable candidate back to 2.6.33, while the full change is needed only on 2.6.38. Signed-off-by: Jan Beulich Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit 799a2a215ed7f9398a8d528767e64b8e39904105 Author: Rajeev Kumar Date: Wed Mar 30 22:33:42 2011 -0700 Input: spear-keyboard - fix inverted condition in interrupt handler We should return IRQ_NONE from interrupt handler in case keyboard does not report DATA_AVAIL condition. Signed-off-by: Rajeev Kumar Signed-off-by: Dmitry Torokhov commit a718d79cc0e0c2f0aa82ba2c54383a18f15b7738 Author: Peter Hutterer Date: Wed Mar 30 22:25:34 2011 -0700 Input: uinput - allow for 0/0 min/max on absolute axes. Some devices provide absolute axes with min/max of 0/0 (e.g. wacom's ABS_MISC axis). Current uinput restrictions do not allow duplication of these devices and require hacks in userspace to work around this. If the kernel accepts physical devices with a min/max of 0/0, uinput shouldn't disallow the same range. Signed-off-by: Peter Hutterer Signed-off-by: Dmitry Torokhov commit cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6 Author: Borislav Petkov Date: Wed Mar 30 20:34:47 2011 +0200 x86, amd-nb: Rename CPU PCI id define for F4 With increasing number of PCI function ids, add the PCI function id in the define name instead of its symbolic name in the BKDG for more clarity. This renames function 4 define. Signed-off-by: Borislav Petkov Cc: Jesse Barnes LKML-Reference: <20110330183447.GA3668@aftab> Signed-off-by: Ingo Molnar commit 438008af63f8fb3a061c31d331e150fba6eaa103 Author: Ingo Molnar Date: Thu Nov 13 11:51:57 2008 +0100 sound: Add delay.h to sound/soc/codecs/sn95031.c This is further fallout from delay.h removal from asm/apic.h and asm/dma.h: ca444564a947: x86: Stop including in two asm header files Which caused this build failure: sound/soc/codecs/sn95031.c: In function ‘sn95031_get_mic_bias’: sound/soc/codecs/sn95031.c:153:2: error: implicit declaration of function ‘msleep’ [-Werror=implicit-function-declaration] Cc: Jean Delvare Cc: James E.J. Bottomley Cc: Geert Uytterhoeven Cc: Stephen Rothwell LKML-Reference: <20110325152014.297890ec@endymion.delvare> Signed-off-by: Ingo Molnar commit 6cd7a63756a68ad5e718b42aa108e27c19425743 Author: David S. Miller Date: Wed Mar 30 21:11:35 2011 -0700 apbuart: Depend upon sparc. It absolutely needs to be able to get at pdev_archdata members which are sparc specific. Signed-off-by: David S. Miller Reported-by: Stephen Rothwell commit a84b50ceb7d640437d0dc28a2bef0d0de054de89 Author: David S. Miller Date: Wed Mar 30 17:51:36 2011 -0700 sctp: Pass __GFP_NOWARN to hash table allocation attempts. Like DCCP and other similar pieces of code, there are mechanisms here to try allocating smaller hash tables if the allocation fails. So pass in __GFP_NOWARN like the others do instead of emitting a scary message. Reported-by: Dave Jones Signed-off-by: David S. Miller commit 3628aa0657e7bb3548a25fa3ea47510327d35efc Author: David S. Miller Date: Wed Mar 30 17:37:56 2011 -0700 sparc64: Fix section mis-match errors. Fix all of the problems spotted by CONFIG_DEBUG_SECTION_MISMATCH under arch/sparc during a 64-bit defconfig build. They fall into two categorites: 1) of_device_id is marked as __initdata, and we can never do this since these objects sit in the device core data structures way past boot. So even if a driver will never be reloaded, we have to keep the device ID table around. Mark such cases const instead. 2) The bootmem alloc/free handling code in mdesc.c was not fully marked __init as it should be, thus generating a reference to free_bootmem_late() (which is __init) from non-__init code. Signed-off-by: David S. Miller commit 04f482faf50535229a5a5c8d629cf963899f857c Author: Patrick McHardy Date: Mon Mar 28 08:39:36 2011 +0000 connector: convert to synchronous netlink message processing Commits 01a16b21 (netlink: kill eff_cap from struct netlink_skb_parms) and c53fa1ed (netlink: kill loginuid/sessionid/sid members from struct netlink_skb_parms) removed some members from struct netlink_skb_parms that depend on the current context, all netlink users are now required to do synchronous message processing. connector however queues received messages and processes them in a work queue, which is not valid anymore. This patch converts connector to do synchronous message processing by invoking the registered callback handler directly from the netlink receive function. In order to avoid invoking the callback with connector locks held, a reference count is added to struct cn_callback_entry, the reference is taken when finding a matching callback entry on the device's queue_list and released after the callback handler has been invoked. Signed-off-by: Patrick McHardy Acked-by: Evgeniy Polyakov Signed-off-by: David S. Miller commit e2666f84958adb3a034b98e99699b55705117e01 Author: Eric Dumazet Date: Wed Mar 30 16:57:46 2011 -0700 fib: add rtnl locking in ip_fib_net_exit Daniel J Blueman reported a lockdep splat in trie_firstleaf(), caused by RTNL being not locked before a call to fib_table_flush() Reported-by: Daniel J Blueman Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit c031235b395433350f25943b7580a5e343c7b7b2 Author: Philip A. Prindeville Date: Wed Mar 30 13:17:04 2011 +0000 atm/solos-pci: Don't flap VCs when carrier state changes Don't flap VCs when carrier state changes; higher-level protocols can detect loss of connectivity and act accordingly. This is more consistent with how other network interfaces work. We no longer use release_vccs() so we can delete it. release_vccs() was duplicated from net/atm/common.c; make the corresponding function exported, since other code duplicates it and could leverage it if it were public. Signed-off-by: Philip A. Prindeville Signed-off-by: David S. Miller commit 18b429e74eeafe42e947b1b0f9a760c7153a0b5c Author: Philip A. Prindeville Date: Wed Mar 30 12:59:26 2011 +0000 atm/solos-pci: Don't include frame pseudo-header on transmit hex-dump Omit pkt_hdr preamble when dumping transmitted packet as hex-dump; we can pull this up because the frame has already been sent, and dumping it is the last thing we do with it before freeing it. Also include the size, vpi, and vci in the debug as is done on receive. Use "port" consistently instead of "device" intermittently. Signed-off-by: Philip Prindeville Signed-off-by: David S. Miller commit 1e19e658567472c46c9b4d27acdb804de04dfdac Author: Philip A. Prindeville Date: Wed Mar 30 13:22:45 2011 +0000 atm/solos-pci: Use VPI.VCI notation uniformly. Use VPI.VCI notation consistently throughout the module. This is the one remaining place where the VCI is used before the VPI in any output. Signed-off-by: Philip Prindeville Signed-off-by: David S. Miller commit ecb78ab6f30106ab72a575a25b1cdfd1633b7ca2 Merge: 85cf0ac38c10 5e42d10adcf7 Author: Linus Torvalds Date: Wed Mar 30 12:22:15 2011 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build breakage - sn_force_interrupt_flag: undefined commit 85cf0ac38c10b1f19fb1682354df1f7d9380a973 Merge: 50f351582802 af71dda0b8e6 Author: Linus Torvalds Date: Wed Mar 30 09:46:36 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: fix whitespace coding style issues nilfs2: fix oops due to a bad aops initialization nilfs2: fix data loss in mmap page write for hole blocks commit 50f3515828024582402044bcced6804c070c491c Merge: 6aba74f27912 4b2a58abd1e1 Author: Linus Torvalds Date: Wed Mar 30 09:46:09 2011 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: libceph: Create a new key type "ceph". libceph: Get secret from the kernel keys api when mounting with key=NAME. ceph: Move secret key parsing earlier. libceph: fix null dereference when unregistering linger requests ceph: unlock on error in ceph_osdc_start_request() ceph: fix possible NULL pointer dereference ceph: flush msgr_wq during mds_client shutdown commit 6aba74f2791287ec407e0f92487a725a25908067 Merge: a8e498b768d9 dd8ea6af1b9f Author: Linus Torvalds Date: Wed Mar 30 09:35:52 2011 -0700 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: avr32: Fix missing irq namespace conversion powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip genirq: Remove the now obsolete config options and select statements arm: versatile : Fix typo introduced in irq namespace cleanup sound: Fixup the last user of the old irq functions genirq: Remove obsolete comment genirq: Remove now obsolete set_irq_wake() sh: Fix irq cleanup fallout x86: apb_timer: Fixup genirq fallout genirq: Fix misnamed label in handle_edge_eoi_irq Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h: - commit eead4d5c63ff ("powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip") made the helper functions use irq_desc_get_handler_data() instead of the legacy (and no longer existing) get_irq_desc_data. - commit d4db35e8dc96 ("powerpc/qe_ic: Fix another breakage from the irq_data conversion") used irq_desc_get_chip_data() instead. According to Thomas, the former is the correct direct conversion, but it does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c seems to initialize both to the same thing), and the chip data in some ways is the more logical. Somebody should really decide on one of the other. This merge picks irq_desc_get_handler_data() as the straightforward pure conversion to new names, as per Thomas. commit a8e498b768d912ad3e7069c86b86bdb821d43b5f Merge: a8a449213830 d4db35e8dc96 Author: Linus Torvalds Date: Wed Mar 30 07:53:17 2011 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/qe_ic: Fix another breakage from the irq_data conversion powerpc/8xx: Fix another breakage from the irq_data conversion powerpc/cell: Use handle_edge_eoi_irq for real powerpc/pseries: Enable Chelsio network and iWARP drivers powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory powerpc: Fix accounting of softirq time when idle powerpc/pseries/smp: query-cpu-stopped-state support won't change powerpc/xics: Use hwirq for xics domain irq number powerpc/xics: Fix numberspace mismatch from irq_desc conversion powerpc: Wire up new syscalls powerpc/booke: Correct the SPRN_MAS5 definition. powerpc: ARCH_PFN_OFFSET should be unsigned long powerpc: Implement dma_mmap_coherent() powerpc/nvram: Don't overwrite oops/panic report on normal shutdown powerpc: Restore some misc devices to our configs commit a8a44921383039bd5387020d035123d21660b309 Merge: 85eb1513c156 92a19d66a3cc Author: Linus Torvalds Date: Wed Mar 30 07:51:29 2011 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: bitops: fix include order after little endian inclusion Blackfin: defconfigs: update after misc devices defaulted to N Blackfin: use more standard pr_fmt in the module loader commit 85eb1513c15652cdaa9fd656345825bf55514a96 Merge: e122996ae1ed b43d151e9679 Author: Linus Torvalds Date: Wed Mar 30 07:50:45 2011 -0700 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (65 commits) ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support ARM: 6838/1: etm: fix section mismatch warning ARM: 6837/1: remove unused pci_fixup_prpmc1100 ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC Fix the broken build for Marvell Dove platform. ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency ARM: 6834/1: perf: reset counters on all CPUs during initialisation ARM: 6833/1: perf: add required isbs() to ARMv7 backend ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 eukrea_mbimxsd51: add SD Card detect eukrea_mbimxsd25-baseboard: add SD card detect mx3/eukrea_mbimxsd-baseboard: add SD card detect support mx3/eukrea_mbimxsd-baseboard: fix gpio request ARM: mxs/mx28evk: add mmc device ARM: mxs/mx23evk: add mmc device ARM: mxs: dynamically allocate mmc device ARM: mx51_efika: update platform data for new mfd changes mx2/iomux: Set direction for CSPI2 pins ... commit dd8ea6af1b9f4cedefb718dbfff60203c458d7ab Author: Thomas Gleixner Date: Wed Mar 30 15:33:51 2011 +0200 avr32: Fix missing irq namespace conversion Signed-off-by: Thomas Gleixner commit eead4d5c63ff9200a46d71345227f2b2f3eb86c0 Author: Richard Cochran Date: Wed Mar 30 15:25:04 2011 +0200 powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip These two functions disappeared in commit 0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1 "genirq: Remove compat code" but they still exist in qe_ic.h. This patch renames the function to their new names. Signed-off-by: Richard Cochran Cc: linuxppc-dev@lists.ozlabs.org Cc: Lennert Buytenhek Cc: Benjamin Herrenschmidt LKML-Reference: <20110330132504.GA31832@riccoc20.at.omicron.at> Signed-off-by: Thomas Gleixner commit 78c89825649a9a5ed526c507603196f467d781a5 Author: Thomas Gleixner Date: Wed Mar 30 14:13:23 2011 +0200 genirq: Remove the now obsolete config options and select statements Signed-off-by: Thomas Gleixner commit c897dcf6311ea9c8d24e96cc7f7fe9de58a0a6a2 Author: Daniel Hellstrom Date: Wed Mar 30 01:12:41 2011 +0000 sparc32,leon: Fixed APBUART frequency detection The UARTs may be located on different APB buses, thus have different UART clock frequency. The system frequency is not the same (but often) as the UART frequency, rather the APB bus frequency that the APBUART is located at has the same frequency, so this looks at the "freq" property instead. Signed-off-by: Daniel Hellstrom Signed-off-by: David S. Miller commit 10544f128c338aeb7f63c002ad7eee67aa0e6acf Author: Daniel Hellstrom Date: Wed Mar 30 01:12:40 2011 +0000 sparc32, leon: APBUART driver must use archdata to get IRQ number See Commit id 1636f8ac2b08410df4766449f7c86b912443cd99 (sparc/of: Move of_device fields into struct pdev_archdata), this patch is similar to 19e4875fb21a69fbf620e84769a74d189c69c58d (of/sparc: fix build regression from of_device changes) Signed-off-by: Daniel Hellstrom Acked-by: Sam Ravnborg Signed-off-by: David S. Miller commit e282326600f31ab38d8814fd6deb277a48850c35 Author: Grant Likely Date: Wed Mar 30 00:02:29 2011 -0600 arm: versatile : Fix typo introduced in irq namespace cleanup Commit 6845664(arm: Cleanup the irq namespace) introduces a typo causing a build failure for the versatile platform. [ tglx: Sorry, my bad. Have no idea how I fatfingered that ] Signed-off-by: Grant Likely Cc: Catalin Marinas Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org LKML-Reference: <20110330060229.27397.7628.stgit@ponder> Signed-off-by: Thomas Gleixner commit ad19031b5f6ede5b2df057e3e1b4f82a2ef7f75f Author: Jesper Juhl Date: Sun Mar 27 09:16:12 2011 +0000 Atheros, atl2: Fix mem leaks in error paths of atl2_set_eeprom We leak in some error paths of drivers/net/atlx/atl2.c:atl2_set_eeprom(). The memory allocated to 'eeprom_buff' is not freed when we return -EIO. This patch fixes that up and also removes a pointless explicit cast. Signed-off-by: Jesper Juhl Signed-off-by: David S. Miller commit 79b569f0ec53a14c4d71e79d93a8676d9a0fda6d Author: Daniel Lezcano Date: Wed Mar 30 02:42:17 2011 -0700 netdev: fix mtu check when TSO is enabled In case the device where is coming from the packet has TSO enabled, we should not check the mtu size value as this one could be bigger than the expected value. This is the case for the macvlan driver when the lower device has TSO enabled. The macvlan inherit this feature and forward the packets without fragmenting them. Then the packets go through dev_forward_skb and are dropped. This patch fix this by checking TSO is not enabled when we want to check the mtu size. Signed-off-by: Daniel Lezcano Acked-by: "Eric W. Biederman" Signed-off-by: David S. Miller commit 7a635ea989991d7f12d57a12f2ba7cb6d211e083 Author: Andrzej Zaborowski Date: Mon Mar 28 12:56:33 2011 +0000 net/usb: Ethernet quirks for the LG-VL600 4G modem This adds a driver for the CDC Ethernet part of this modem. The device's ID is blacklisted in cdc_ether.c and is white-listed in this new driver because of the quirks needed to make it useful. The modem's firmware exposes a CDC ACM port for modem control and a CDC Ethernet port for network data. The descriptors look fine but both ports actually are some sort of multiplexers requiring non- standard headers added/removed from every packet or they get ignored. All information is based on a usb traffic log from a Windows machine. On the Verizon 4G network I've seen speeds up to 1.1MB/s so far with this driver, a speed-o-meter site reports 16.2Mbps/10.5Mbps. Userspace scripts are required to talk to the CDC ACM port. Signed-off-by: Andrzej Zaborowski Signed-off-by: David S. Miller commit d005a09edf8b12dd1bec651b2cf94caa0e7bb1be Author: Marc Kleine-Budde Date: Mon Mar 28 14:54:08 2011 +0000 phylib: phy_attach_direct: phy_init_hw can fail, add cleanup The function phy_attach_direct attaches the phy and calls phy_init_hw. phy_init_hw can fail, but the phy is still marked as attached. Successive calls to phy_attach_direct will fail because the phy is busy. [ 1.020000] eth0: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr=1:00, irq=-1) [ 1.030000] eth1: Freescale FEC PHY driver [Generic PHY] (mii_bus:phy_addr=1:01, irq=-1) [ 2.050000] Sending DHCP requests . [ 3.020000] PHY: 1:00 - Link is Up - 100/Full [ 5.110000] ..... timed out! [ 87.660000] IP-Config: Reopening network devices... [ 88.190000] FEC: MDIO read timeout [ 88.190000] eth0: could not attach to PHY [ 88.190000] IP-Config: Failed to open eth0 [ 88.210000] FEC: MDIO read timeout [ 88.210000] eth1: could not attach to PHY [ 88.210000] IP-Config: Failed to open eth1 [ 88.220000] IP-Config: No network devices available. [ 88.220000] Freeing init memory: 6968K [...] starting network interfaces... ip: RTNETLINK answers: File exists [ 94.000000] net eth0: PHY already attached [ 94.010000] eth0: could not attach to PHY ip: SIOCSIFFLAGS: Device or resource busy This patch adds phy_detach to clean up if phy_init_hw fails. Signed-off-by: Marc Kleine-Budde Signed-off-by: David S. Miller commit ff9a57a62afbbe2d0f3a09af321f1fd7645f38a5 Author: Linus Lüssing Date: Sat Mar 26 20:27:24 2011 +0000 bridge: mcast snooping, fix length check of snooped MLDv1/2 "len = ntohs(ip6h->payload_len)" does not include the length of the ipv6 header itself, which the rest of this function assumes, though. This leads to a length check less restrictive as it should be in the following line for one thing. For another, it very likely leads to an integer underrun when substracting the offset and therefore to a very high new value of 'len' due to its unsignedness. This will ultimately lead to the pskb_trim_rcsum() practically never being called, even in the cases where it should. Signed-off-by: Linus Lüssing Signed-off-by: David S. Miller commit af71dda0b8e667d03eec21d25f90265eec5efea1 Author: Nicolas Kaiser Date: Sat Mar 19 16:47:54 2011 +0100 nilfs2: fix whitespace coding style issues Fixes whitespace coding style issues. Signed-off-by: Nicolas Kaiser Signed-off-by: Ryusuke Konishi commit d611b22f1a5ddd0823e9d6a30bac91219f800e41 Author: Ryusuke Konishi Date: Wed Mar 30 11:49:20 2011 +0900 nilfs2: fix oops due to a bad aops initialization Nilfs in 2.6.39-rc1 hit the following oops: BUG: unable to handle kernel NULL pointer dereference at 0000000000000048 IP: [] try_to_release_page+0x2a/0x3d PGD 234cb6067 PUD 234c72067 PMD 0 Oops: 0000 [#1] SMP Process truncate (pid: 10995, threadinfo ffff8802353c2000, task ffff880234cfa000) Stack: ffff8802333c77b8 ffffffff810b64b0 0000000000003802 ffffffffa0052cca 0000000000000000 ffff8802353c3b58 0000000000000000 ffff8802353c3b58 0000000000000001 0000000000000000 ffffea0007b92308 ffffea0007b92308 Call Trace: [] ? invalidate_inode_pages2_range+0x15f/0x273 [] ? nilfs_palloc_get_block+0x2d/0xaf [nilfs2] [] ? bit_waitqueue+0x14/0xa1 [] ? wake_up_bit+0x10/0x20 [] ? nilfs_forget_buffer+0x66/0x7a [nilfs2] [] ? nilfs_btree_concat_left+0x5c/0x77 [nilfs2] [] ? nilfs_btree_delete+0x395/0x3cf [nilfs2] [] ? nilfs_bmap_do_delete+0x6e/0x79 [nilfs2] [] ? nilfs_btree_last_key+0x14b/0x15e [nilfs2] [] ? nilfs_bmap_truncate+0x2f/0x83 [nilfs2] [] ? nilfs_bmap_last_key+0x35/0x62 [nilfs2] [] ? nilfs_truncate_bmap+0x6b/0xc7 [nilfs2] [] ? nilfs_truncate+0x79/0xe4 [nilfs2] [] ? vmtruncate+0x33/0x3b [] ? nilfs_setattr+0x4d/0x8c [nilfs2] [] ? do_page_fault+0x31b/0x356 [] ? notify_change+0x17d/0x262 [] ? do_truncate+0x65/0x80 [] ? sys_ftruncate+0xf1/0xf6 [] ? system_call_fastpath+0x16/0x1b Code: c3 48 83 ec 08 48 8b 17 48 8b 47 18 80 e2 01 75 04 0f 0b eb fe 48 8b 17 80 e6 20 74 05 31 c0 41 59 c3 48 85 c0 74 11 48 8b 40 58 8b 40 48 48 85 c0 74 04 41 58 ff e0 59 e9 b1 b5 05 00 41 54 RIP [] try_to_release_page+0x2a/0x3d RSP CR2: 0000000000000048 This oops was brought in by the change "block: remove per-queue plugging" (commit: 7eaceaccab5f40bb). It initializes mapping->a_ops with a NULL pointer for some pages in nilfs (e.g. btree node pages), but mm code doesn't NULL pointer checks against mapping->a_ops. (the check is done for each callback function) This corrects the aops initialization and fixes the oops. Signed-off-by: Ryusuke Konishi Acked-by: Jens Axboe commit fd1d9188f2cb81fe63c789d9f5463dca402ade12 Author: Ben Hutchings Date: Mon Mar 28 17:12:52 2011 +0000 via-ircc: Pass PCI device pointer to dma_{alloc, free}_coherent() via-ircc has been passing a NULL pointer to DMA allocation functions, which is completely invalid and results in a BUG on PowerPC. Now that we always have the device pointer available, pass it in. Reference: http://bugs.debian.org/619450 Reported-by: Andrew Buckeridge Signed-off-by: Ben Hutchings Tested-by: Andrew Buckeridge [against 2.6.32] Signed-off-by: David S. Miller commit abc45592bce8267a8e651c12ce94a1f83eaac7a6 Author: Ben Hutchings Date: Mon Mar 28 17:10:43 2011 +0000 via-ircc: Use pci_{get, set}_drvdata() instead of static pointer variable via-ircc still maintains its own array of device pointers in Linux 2.4 style. Worse, it always uses index 0, so it will crash if there are multiple suitable devices in the system. Signed-off-by: Ben Hutchings Signed-off-by: David S. Miller commit 93ca3bb5df9bc8b2c60485e1cc6507c3d7c8e1fa Author: Timo Teräs Date: Mon Mar 28 22:40:53 2011 +0000 net: gre: provide multicast mappings for ipv4 and ipv6 My commit 6d55cb91a0020ac0 (gre: fix hard header destination address checking) broke multicast. The reason is that ip_gre used to get ipgre_header() calls with zero destination if we have NOARP or multicast destination. Instead the actual target was decided at ipgre_tunnel_xmit() time based on per-protocol dissection. Instead of allowing the "abuse" of ->header() calls with invalid destination, this creates multicast mappings for ip_gre. This also fixes "ip neigh show nud noarp" to display the proper multicast mappings used by the gre device. Reported-by: Doug Kehn Signed-off-by: Timo Teräs Acked-by: Doug Kehn Signed-off-by: David S. Miller commit 652d78fd7a9ebd881290d6bbbc85925c06b907b4 Merge: 9f644c4ba86b ca6a42586fae Author: Ingo Molnar Date: Wed Mar 30 09:08:20 2011 +0200 Merge commits 'ca6a42586fae' and 'c286c419c784' into perf/urgent Pick up these two commits from Arnaldo's perf/core tree: ca6a42586fae: perf tools: Emit clearer message for sys_perf_event_open ENOENT return c286c419c784: perf tools: Fixup exit path when not able to open events As they are really fixes we want to have sooner than laer. Signed-off-by: Ingo Molnar commit 9f644c4ba86b76159d36747fda7da496f72a1872 Merge: 1b7155f7de11 0ce790e7d736 Author: Ingo Molnar Date: Wed Mar 30 09:07:39 2011 +0200 Merge commit 'v2.6.39-rc1' into perf/urgent Merge reason: use the post-merge-window tree. Signed-off-by: Ingo Molnar commit 6ebb8a4a43e34f999ab36f27f972f3cd751cda4f Author: Clemens Ladisch Date: Wed Mar 30 08:24:25 2011 +0200 ALSA: ens1371: fix Creative Ectiva support To make the EV1938 chip work, add a magic bit and an extra delay. Signed-off-by: Clemens Ladisch Tested-by: Tino Schmidt Cc: all 2.6.x Signed-off-by: Takashi Iwai commit 6ff674615c91d942e4cfb4880c14733b616c9032 Author: Clemens Ladisch Date: Wed Mar 30 08:24:00 2011 +0200 ALSA: firewire-speakers: fix hang when unplugging a running device When aborting a PCM stream, the xrun is signaled only if the stream is running. When disconnecting a PCM stream, calling snd_card_disconnect() too early would change the stream into a non-running state and thus prevent the xrun from being noticed by user space. To prevent this, move the snd_card_disconnect() call after the xrun. Signed-off-by: Clemens Ladisch Signed-off-by: Takashi Iwai commit 1459a3cc51d90d78027c7b5c1790e5d22751c8eb Author: Balaji G Date: Tue Mar 29 06:20:04 2011 +0000 bridge: Fix compilation warning in function br_stp_recalculate_bridge_id() net/bridge/br_stp_if.c: In function ‘br_stp_recalculate_bridge_id’: net/bridge/br_stp_if.c:216:3: warning: ‘return’ with no value, in function returning non-void Signed-off-by: G.Balaji Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit f8852b12200df393b0a4db1a7052454bbc335443 Merge: d454f39f3ff3 326b9bdc2a0e Author: Takashi Iwai Date: Wed Mar 30 08:35:18 2011 +0200 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc commit eec009548e98f6b6d514ff5bb8a8627b8dd17a49 Author: David S. Miller Date: Tue Mar 29 23:34:08 2011 -0700 net: Fix warnings caused by MAX_SKB_FRAGS change. After commit a715dea3c8e9ef2771c534e05ee1d36f65987e64 ("net: Always allocate at least 16 skb frags regardless of page size"), the value of MAX_SKB_FRAGS can now take on either an "unsigned long" or an "int" value. This causes warnings like: net/packet/af_packet.c: In function ‘tpacket_fill_skb’: net/packet/af_packet.c:948: warning: format ‘%lu’ expects type ‘long unsigned int’, but argument 2 has type ‘int’ Fix by forcing the constant to be unsigned long, otherwise we have a situation where the type of a system wide constant is variable. Signed-off-by: David S. Miller commit 97c278e31c7c3e10a3288b53f1b0a1733eacec5a Author: David S. Miller Date: Tue Mar 29 23:09:09 2011 -0700 sparc: Hook up syncfs system call. Signed-off-by: David S. Miller commit 34094537943113467faee98fe67c8a3d3f9a0a8b Author: Ryusuke Konishi Date: Sun Mar 27 22:50:49 2011 +0900 nilfs2: fix data loss in mmap page write for hole blocks From the result of a function test of mmap, mmap write to shared pages turned out to be broken for hole blocks. It doesn't write out filled blocks and the data will be lost after umount. This is due to a bug that the target file is not queued for log writer when filling hole blocks. Also, nilfs_page_mkwrite function exits normal code path even after successfully filled hole blocks due to a change of block_page_mkwrite function; just after nilfs was merged into the mainline, block_page_mkwrite() started to return VM_FAULT_LOCKED instead of zero by the patch "mm: close page_mkwrite races" (commit: b827e496c893de0c). The current nilfs_page_mkwrite() is not handling this value properly. This corrects nilfs_page_mkwrite() and will resolve the data loss problem in mmap write. [This should be applied to every kernel since 2.6.30 but a fix is needed for 2.6.37 and prior kernels] Signed-off-by: Ryusuke Konishi Tested-by: Ryusuke Konishi Cc: stable [2.6.38] commit c4757ee58ae08fa6eb4df6d5e0f417e11d40bc0e Author: Axel Lin Date: Mon Mar 7 11:05:33 2011 +0800 hwmon: twl4030-madc-hwmon: add "platform:" prefix for platform modalias Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS with "platform:"), the platform modalias is prefixed with "platform:". Signed-off-by: Axel Lin Cc: J Keerthy Cc: Samuel Ortiz Signed-off-by: Guenter Roeck commit 5e42d10adcf717e0cf10ae5da4998d5b74889db0 Author: Tony Luck Date: Tue Mar 29 17:22:23 2011 -0700 [IA64] Fix build breakage - sn_force_interrupt_flag: undefined Latest irq changes removed the need for this forcing flag, and the definition - but missed the code that allowed it to be tweaked via /proc. Delete accessor functions too. Signed-off-by: Tony Luck commit d4db35e8dc963cf2aca15fc22cc5e5a7d98f9255 Author: Benjamin Herrenschmidt Date: Wed Mar 30 11:17:15 2011 +1100 powerpc/qe_ic: Fix another breakage from the irq_data conversion Signed-off-by: Benjamin Herrenschmidt commit b3cf2bb3d5de306aebfd1dfbcb0c8d33c0214046 Author: Benjamin Herrenschmidt Date: Wed Mar 30 11:07:13 2011 +1100 powerpc/8xx: Fix another breakage from the irq_data conversion Signed-off-by: Benjamin Herrenschmidt commit e122996ae1edf2caf19643cb79366fc2117a6188 Author: Stephen Rothwell Date: Wed Mar 30 10:48:28 2011 +1100 powerpc/cell: fixup for removal of handle_iic_irq Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit ac0e0447be3b7a3dd583193b0230bfe3ddef0442 Author: Stephen Rothwell Date: Wed Mar 30 10:55:12 2011 +1100 genirq: fix CONFIG_IRQ_EDGE_EOI_HANDLER build Fixes these errors: kernel/irq/chip.c: In function 'handle_edge_eoi_irq': kernel/irq/chip.c:517: warning: label 'out_unlock' defined but not used kernel/irq/chip.c:503: error: label 'out_eoi' used but not defined Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 8987eccde8abce02a4fc765d81a4c5de3d110ab5 Author: Thomas Gleixner Date: Tue Mar 29 10:37:28 2011 +0000 powerpc/cell: Use handle_edge_eoi_irq for real Missed one instance when moving that to the core code. Signed-off-by: Thomas Gleixner Cc: linuxppc-dev@lists.ozlabs.org Cc: michael@ellerman.id.au Cc: mingo@elte.hu Signed-off-by: Benjamin Herrenschmidt commit 23c621104360b71fd6d713142a24e6583418c3e1 Author: Anton Blanchard Date: Sat Mar 5 02:00:26 2011 +0000 powerpc/pseries: Enable Chelsio network and iWARP drivers Ensure the Chelsio T3/T4 network drivers and iWARP drivers are enabled in the pseries config. Signed-off-by: Anton Blanchard Signed-off-by: Benjamin Herrenschmidt commit 84493804bbbc10291492661440728668b2b06abe Author: Benjamin Herrenschmidt Date: Sun Mar 6 18:09:07 2011 +0000 powerpc/mm: Move the STAB0 location to 0x8000 to make room in low memory Recent upstream builds with allmodconfig fail due to lack of space between 0x3000 and 0x6000. We have a hard block at 0x7000 but we can spare a page by moving the STAB0 from 0x6000 to 0x8000. Signed-off-by: Benjamin Herrenschmidt commit ad5d1c888e556bc00c4e86f452cad4a3a87d22c1 Author: Anton Blanchard Date: Sun Mar 20 15:28:03 2011 +0000 powerpc: Fix accounting of softirq time when idle commit cf9efce0ce31 (powerpc: Account time using timebase rather than PURR) used in_irq() to detect if the time was spent in interrupt processing. This only catches hardirq context so if we are in softirq context and in the idle loop we end up accounting it as idle time. If we instead use in_interrupt() we catch both softirq and hardirq time. The issue was found when running a network intensive workload. top showed the following: 0.0%us, 1.1%sy, 0.0%ni, 85.7%id, 0.0%wa, 9.9%hi, 3.3%si, 0.0%st 85.7% idle. But this was wildly different to the perf events data. To confirm the suspicion I ran something to keep the core busy: # yes > /dev/null & 8.2%us, 0.0%sy, 0.0%ni, 0.0%id, 0.0%wa, 10.3%hi, 81.4%si, 0.0%st We only got 8.2% of the CPU for the userspace task and softirq has shot up to 81.4%. With the patch below top shows the correct stats: 0.0%us, 0.0%sy, 0.0%ni, 5.3%id, 0.0%wa, 13.3%hi, 81.3%si, 0.0%st Signed-off-by: Anton Blanchard Cc: stable@kernel.org Signed-off-by: Benjamin Herrenschmidt commit 2d86938a4eacb4acf5c4466171ea577d7b8dc4d4 Author: Milton Miller Date: Mon Mar 21 08:12:13 2011 +0000 powerpc/pseries/smp: query-cpu-stopped-state support won't change If a given firmware doesn't have a token to support query-cpu-stopped-state, its not likely to change during the lifetime of the kernel. Only print this information once, not once per secondary thread. While here, make the line wrap grep friendly. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 943739fd59d3b77e1020ca788bc64439d679693f Author: Milton Miller Date: Mon Mar 21 08:12:13 2011 +0000 powerpc/xics: Use hwirq for xics domain irq number To try to avoid future confusion, rename irq to hwirq when it refers to a xics domain number instead of a linux irq number. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 4f1fc48a73a49a60b3e03e6d8fb363d1b328bd4e Author: Milton Miller Date: Mon Mar 21 11:38:02 2011 +0000 powerpc/xics: Fix numberspace mismatch from irq_desc conversion commit 79f26c268ebad29bd75d078cfc09d3d82b30ccbd (powerpc: platforms/pseries irq_data conversion) pushed irq_desc down into many functions, dererencing the descriptor irq field as late as possible. But it incorrectly passed a linix virtural irq number to RTAS, resulting in the interrupt not being disabled and possibly other bad things, such as another interrupt being disabled and/or a checkstop. In addition this missed the point of xics_mask_unknown_vec and the seperation of xics_mask_real_irq from xics_mask_irq. When xics_mask_unknown_vec is called it's because the hardware delivered an irq source for which we have no linux irq allocated, and thefore we can not have an irq_desc allocated. Revert xics_mask_real_irq to its prior version, naming the argument hwirq to highlight the difference. Signed-off-by: Milton Miller Signed-off-by: Benjamin Herrenschmidt commit 834796a8493809ae6667b65c4c044066f41d32c7 Author: Stephen Rothwell Date: Wed Mar 23 18:40:47 2011 +0000 powerpc: Wire up new syscalls These syscalls have been added recently: name_to_handle_at open_by_handle_at clock_adjtime syncfs Signed-off-by: Stephen Rothwell Signed-off-by: Benjamin Herrenschmidt commit 05e02d7f88a08b500f0a100733109e4b09ffbeb2 Author: Varun Sethi Date: Thu Mar 24 11:50:26 2011 +0000 powerpc/booke: Correct the SPRN_MAS5 definition. 339 is the SPR number for MAS5 documented by Power ISA 2.06, and implemented by e500mc. It is not yet used anywhere in the kernel, so nothing should be relying on the wrong number. Signed-off-by: Varun Sethi Signed-off-by: Scott Wood Signed-off-by: Benjamin Herrenschmidt commit 67eb54944bb9de5f568ea2c28d4f20a5b7d2611d Author: Scott Wood Date: Thu Mar 24 11:51:19 2011 +0000 powerpc: ARCH_PFN_OFFSET should be unsigned long pfns are unsigned long, but MEMORY_START is phys_addr_t. This leads to page_to_pfn() returning phys_addr_t, and thus type mismatches in a few print statements. Signed-off-by: Scott Wood Signed-off-by: Benjamin Herrenschmidt commit 6090912c4abcfc6c81b156cf2bb4cda23ae6e847 Author: Benjamin Herrenschmidt Date: Thu Mar 24 20:50:06 2011 +0000 powerpc: Implement dma_mmap_coherent() This is used by Alsa to mmap buffers allocated with dma_alloc_coherent() into userspace. We need a special variant to handle machines with non-coherent DMAs as those buffers have "special" virt addresses and require non-cachable mappings Signed-off-by: Benjamin Herrenschmidt commit 15d260b36facc1aa769fb39b0efc41f4c8c44729 Author: Jim Keniston Date: Fri Mar 25 12:47:58 2011 +0000 powerpc/nvram: Don't overwrite oops/panic report on normal shutdown For normal halt, reboot, and poweroff events, refrain from overwriting the lnx,oops-log partition. Also, don't save the dmesg buffer on an emergency-restart event if we've already saved it earlier in panic(). Signed-off-by: Jim Keniston Signed-off-by: Benjamin Herrenschmidt commit ff56535d294245b75fd8f79633b935a3b85993c8 Author: Stephen Rothwell Date: Fri Mar 25 21:11:29 2011 +0000 powerpc: Restore some misc devices to our configs Uwe Kleine-König reported: while working on an defconfig (arm/mx27) I noticed that just updating it[1] results in removing CONFIG_EEPROM_AT24=y. The reason is that since commit v2.6.36-5965-g5f2365d (misc devices: do not enable by default) MISC_DEVICES isn't enabled anymore by default. So all defconfigs that have CONFIG_SOME_SYMBOL=y (or =m) (with SOME_SYMBOL depending on MISC_DEVICES) but not CONFIG_MISC_DEVICES=y suffer from the same problem. This restores those misc devices to the powerpc defconfigs. Signed-off-by: Stephen Rothwell Cc: Uwe Kleine-König Acked-by: Uwe Kleine-König Signed-off-by: Benjamin Herrenschmidt commit 84ac7cdbdd0f04df6b96153f7a79127fd6e45467 Author: Suresh Siddha Date: Tue Mar 29 15:38:12 2011 -0700 x86, mtrr, pat: Fix one cpu getting out of sync during resume On laptops with core i5/i7, there were reports that after resume graphics workloads were performing poorly on a specific AP, while the other cpu's were ok. This was observed on a 32bit kernel specifically. Debug showed that the PAT init was not happening on that AP during resume and hence it contributing to the poor workload performance on that cpu. On this system, resume flow looked like this: 1. BP starts the resume sequence and we reinit BP's MTRR's/PAT early on using mtrr_bp_restore() 2. Resume sequence brings all AP's online 3. Resume sequence now kicks off the MTRR reinit on all the AP's. 4. For some reason, between point 2 and 3, we moved from BP to one of the AP's. My guess is that printk() during resume sequence is contributing to this. We don't see similar behavior with the 64bit kernel but there is no guarantee that at this point the remaining resume sequence (after AP's bringup) has to happen on BP. 5. set_mtrr() was assuming that we are still on BP and skipped the MTRR/PAT init on that cpu (because of 1 above) 6. But we were on an AP and this led to not reprogramming PAT on this cpu leading to bad performance. Fix this by doing unconditional mtrr_if->set_all() in set_mtrr() during MTRR/PAT init. This might be unnecessary if we are still running on BP. But it is of no harm and will guarantee that after resume, all the cpu's will be in sync with respect to the MTRR/PAT registers. Signed-off-by: Suresh Siddha LKML-Reference: <1301438292-28370-1-git-send-email-eric@anholt.net> Signed-off-by: Eric Anholt Tested-by: Keith Packard Cc: stable@kernel.org [v2.6.32+] Signed-off-by: H. Peter Anvin commit 458f7f8f819b63431f1098a086fafce4a503fb77 Author: Thomas Gleixner Date: Wed Mar 30 00:39:44 2011 +0200 sound: Fixup the last user of the old irq functions I had seen that before, but now that I removed set_irq_wake it broke. Signed-off-by: Thomas Gleixner commit 28959f268f910b2cd1c25e838b63c342062e28f2 Author: Thomas Gleixner Date: Wed Mar 30 00:37:41 2011 +0200 genirq: Remove obsolete comment Signed-off-by: Thomas Gleixner commit 380a26be7d5af83f3831c3b6697031dffbb1c8f3 Author: Thomas Gleixner Date: Wed Mar 30 00:35:34 2011 +0200 genirq: Remove now obsolete set_irq_wake() Missed that one in the big compat remval patch Signed-off-by: Thomas Gleixner commit 286b9bfe8ef6d97213c86bbaf30c250fd1f67568 Author: Thomas Gleixner Date: Wed Mar 30 00:15:49 2011 +0200 sh: Fix irq cleanup fallout I missed that coccinelle does not fix up header files by default. Reported-by: Rafael J. Wysocki Signed-off-by: Thomas Gleixner Cc: Paul Mundt Cc: commit 86cc8dfc211695193a060a240ac9c9287606e5d8 Author: Thomas Gleixner Date: Wed Mar 30 00:09:01 2011 +0200 x86: apb_timer: Fixup genirq fallout The lonely user of the internal interface was not in the coccinelle script. Reported-by: Randy Dunlap Signed-off-by: Thomas Gleixner commit 326b9bdc2a0e4d556a0f444085dca103bcd505de Author: Mark Brown Date: Sun Mar 27 14:40:01 2011 +0100 ASoC: Fix CODEC device name for Corgi Got typoed in the multi-component changes. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit b43d151e9679a06df896ac3db65a9dca80040fed Merge: dfad549d98b6 5f183860d500 Author: Russell King Date: Tue Mar 29 21:54:54 2011 +0100 Merge branches 'fixes' and 'devel-stable' into for-linus commit 353c8ed44f8f7414be614685ed29d1e23f5fa76b Author: Thomas Gleixner Date: Tue Mar 29 22:18:28 2011 +0200 genirq: Fix misnamed label in handle_edge_eoi_irq Reported-by: michael@ellerman.id.au Signed-off-by: Thomas Gleixner Cc: linuxppc-dev@lists.ozlabs.org commit 1b7155f7de119870f0d3fad89f125de2ff6c16be Author: Robert Richter Date: Tue Mar 29 20:02:57 2011 +0200 perf tools: Fix NO_NEWT=1 python build error Fix the following build error: GEN python/perf.so In file included from util/evsel.h:10, from util/python.c:6: util/hist.h:106:18: error: newt.h: No such file or directory error: command 'x86_64-pc-linux-gnu-gcc' failed with exit status 1 make: *** [python/perf.so] Error 1 by passing BASIC_CFLAGS to setup.py. BASIC_CFLAGS variable contains the -DNO_NEWT_SUPPORT switch which prevents building python c extension with newt. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: <20110329180236.GA19366@erda.amd.com> Signed-off-by: Robert Richter Signed-off-by: Arnaldo Carvalho de Melo commit ffd8c746fbef50cf12df239f9d23c2afe1a2c3cb Author: Johannes Berg Date: Tue Mar 29 15:28:11 2011 +0200 iwlegacy: fix bugs in change_interface If change_interface gets invoked during a firmware restart, it may crash; prevent that from happening by checking if ctx->vif is assigned. Additionally, in my initial commit I forgot to set the vif->p2p variable correctly, so fix that too. Cc: stable@kernel.org [2.6.38+] Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 24047e2c4feb8c126e92cc5bb7a863115c89bd72 Author: Christian Lamparter Date: Tue Mar 29 13:43:14 2011 +0200 carl9170: Fix tx aggregation problems with some clients Some clients seem to rely upon the reception of BlockAckReqs to flush their rx reorder buffer. In order to fix aggregation for these clients carl9170 should set IEEE80211_TX_STAT_AMPDU_NO_BACK to generate a BlockAckReq if the transmission of an AMPDU subframe fails. This fixes aggregation problems with Intel 5100 Windows STAs (and maybe others as well). Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit 0263aa45293838b514b8af674a03faf040991a90 Author: Stanislaw Gruszka Date: Tue Mar 29 11:24:21 2011 +0200 iwl3945: disable hw scan by default After new NetworkManager 0.8.996 changes, hardware scanning is causing microcode errors as reported here: https://bugzilla.redhat.com/show_bug.cgi?id=683571 and sometimes kernel crashes: https://bugzilla.redhat.com/show_bug.cgi?id=688252 Also with hw scan there are very bad performance on some systems as reported here: https://bugzilla.redhat.com/show_bug.cgi?id=671366 Since Intel no longer supports 3945, there is no chance to get proper firmware fixes, we need workaround problems by disable hardware scanning by default. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 8d4ca61a10feea9583dc62ec1514722e99bdcd3d Author: Xose Vazquez Perez Date: Sun Mar 27 20:33:06 2011 +0200 wireless: rt2x00: rt2800usb.c add and identify ids taken from staging/rt2860 0x0411,0x016f de37cd49b5a54facef174cf34496919857436e8f MelCo(Buffalo) WLI-UC-G301N 0x050d,0x825b 12840c63b0679f7fab88ea1cc26b52db8b574ce7 Belkin F5D8055 0x050d,0x935a 705059a670f3af2b37695e82de0ee58e75e656ed Belkin F6D4050 v1 0x050d,0x935b 5d92fe3387d086fc2f10426fbdb6b86d6cce5a47 Belkin F6D4050 v2 identifed from ralink driverss 0x0930,0x0a07 RT35xx TOSHIBA 2010_1215_RT3572_Linux_STA_v2.5.0.0.DPO 0x1d4d,0x0011 3072 Pegatron 2011_0107_RT3070_RT3370_Linux_STA_v2.5.0.1_DPO Signed-off-by: Xose Vazquez Perez Acked-by: Ivo van Doorn Signed-off-by: John W. Linville commit 3bda50e3eaf58a4b9c4ce34204e5faa15c8b1b97 Author: Stanislaw Gruszka Date: Mon Mar 14 14:15:06 2011 +0100 iwl3945: do not deprecate software scan Software scanning can be used for workaround some performance problems, so do not deprecate it. Signed-off-by: Stanislaw Gruszka Acked-by: Wey-Yi Guy Signed-off-by: John W. Linville commit 4b2a58abd1e17c0ee53c8dded879e015917cca67 Author: Tommi Virtanen Date: Mon Mar 28 14:59:38 2011 -0700 libceph: Create a new key type "ceph". This allows us to use existence of the key type as a feature test, from userspace. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit e2c3d29b4295c3eec18294bc34f0c99a7b9ae413 Author: Tommi Virtanen Date: Fri Mar 25 16:40:48 2011 -0700 libceph: Get secret from the kernel keys api when mounting with key=NAME. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit 8323c3aa74cd92465350294567142d12ffdcc963 Author: Tommi Virtanen Date: Fri Mar 25 16:32:57 2011 -0700 ceph: Move secret key parsing earlier. This makes the base64 logic be contained in mount option parsing, and prepares us for replacing the homebew key management with the kernel key retention service. Signed-off-by: Tommi Virtanen Signed-off-by: Sage Weil commit fbdb9190482fd83a3eb20cdeb0da454759f479d7 Author: Sage Weil Date: Tue Mar 29 12:11:06 2011 -0700 libceph: fix null dereference when unregistering linger requests We should only clear r_osd if we are neither registered as a linger or a regular request. We may unregister as a linger while still registered as a regular request (e.g., in reset_osd). Incorrectly clearing r_osd there leads to a null pointer dereference in __send_request. Also simplify the parallel check in __unregister_request() where we just removed r_osd_item and know it's empty. Signed-off-by: Sage Weil commit 4d439517561d009e170e2fe20be1ba25e19abe75 Author: David S. Miller Date: Tue Mar 29 14:18:39 2011 -0300 perf symbols: Properly align symbol_conf.priv_size If symbol_conf.priv_size is not a multiple of "sizeof(u64)" we'll bus error on sparc64 in symbol__new because the "struct symbol *" pointer is computed by adding symbol_conf.priv_size to the memory allocated. We cannot isolate the fix to symbol__new and symbol__delete since the private area is computed by subtracting the priv_size value from a "struct symbol" pointer, so then the private area can still be potentially unaligned. So, simply align the symbol_conf.priv_size value in symbol__init() Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LKML-Reference: <20110328.175849.112593455.davem@davemloft.net> Signed-off-by: David S. Miller Signed-off-by: Arnaldo Carvalho de Melo commit ca6a42586fae639ff9e5285d9bdc550fcb1b8d41 Author: David Ahern Date: Fri Mar 25 13:11:11 2011 -0600 perf tools: Emit clearer message for sys_perf_event_open ENOENT return Resend of patch sent back in January 2011 in light of recent confusion around unsupported events for a given platform. Improve sys_perf_event_open ENOENT return handling in top and record, just like 5a3446b does for stat. Retry of Arnaldo's patch using ui_warning instead of die which allows the fallback from hardware cycles to software clock. Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: linux-kernel@vger.kernel.org LKML-Reference: <1301080271-20945-1-git-send-email-daahern@cisco.com> Signed-off-by: David Ahern [ committer note: Some adjustments to make it apply to newer codebase ] Signed-off-by: Arnaldo Carvalho de Melo commit c286c419c784c238cd699be37fec7a9acc30d89f Author: Arnaldo Carvalho de Melo Date: Mon Mar 28 09:50:11 2011 -0300 perf tools: Fixup exit path when not able to open events We have to deal with the TUI mode in perf top, so that we don't end up with a garbled screen when, say, a non root user on a machine with a paranoid setting (the default) tries to use 'perf top'. Introduce a ui__warning_paranoid() routine shared by top and record that tells the user the valid values for /proc/sys/kernel/perf_event_paranoid. Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Arnaldo Carvalho de Melo commit 234af26ff123dfb2aa48772124721b1354c8e0a5 Author: Dan Carpenter Date: Tue Mar 29 06:25:59 2011 +0300 ceph: unlock on error in ceph_osdc_start_request() There was a missing unlock on the error path if __map_request() failed. Signed-off-by: Dan Carpenter Signed-off-by: Sage Weil commit 4ac5fc6a3e4d90120f292526bcaa5ee182a7411b Author: Xiaotian Feng Date: Tue Mar 29 16:34:32 2011 +0800 x86, microcode: Unregister syscore_ops after microcode unloaded Currently, microcode doesn't unregister syscore_ops after it's unloaded. So if we modprobe then rmmod microcode, the stale microcode syscore_ops info will stay on syscore_ops_list. Later when we're trying to reboot/halt/shutdown the machine, kernel will panic on syscore_shutdown(). With the patch applied, I can reboot/halt/shutdown my machine successfully. Signed-off-by: Xiaotian Feng Cc: Tigran Aivazian Cc: Rafael J. Wysocki LKML-Reference: <1301387672-23661-1-git-send-email-dfeng@redhat.com> Signed-off-by: Ingo Molnar commit ca444564a947034557a85357b3911d067cac4b8f Author: Jean Delvare Date: Fri Mar 25 15:20:14 2011 +0100 x86: Stop including in two asm header files Stop including in x86 header files which don't need it. This will let the compiler complain when this header is not included by source files when it should, so that contributors can fix the problem before building on other architectures starts to fail. Credits go to Geert for the idea. Signed-off-by: Jean Delvare Cc: James E.J. Bottomley Cc: Geert Uytterhoeven Cc: Stephen Rothwell LKML-Reference: <20110325152014.297890ec@endymion.delvare> [ this also fixes an upstream build bug in drivers/media/rc/ite-cir.c ] Signed-off-by: Ingo Molnar commit 1dfd7b494b3d8fb1e8a7383a8095f77eb058cd83 Merge: 6c6804fb2cef 914a76ca5eed Author: Ingo Molnar Date: Tue Mar 29 09:32:28 2011 +0200 Merge branch 'core' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent commit 170531bae648c0ef8d56b44dc5bd8d67717b0db9 Author: Seth Forshee Date: Sat Mar 26 22:53:34 2011 -0700 Input: sparse-keymap - report KEY_UNKNOWN for unknown scan codes This allows for debugging non-functional keys easily from userspace. Signed-off-by: Seth Forshee Signed-off-by: Dmitry Torokhov commit f3cf5c4fedbe13880cd80a9fa1aebae79ebef20e Author: Seth Forshee Date: Sat Mar 26 22:53:34 2011 -0700 Input: sparse-keymap - report scancodes with key events Scancodes are useful debugging aids when incorrect keycodes are being sent, as is common with laptop hotkeys. Signed-off-by: Seth Forshee Signed-off-by: Dmitry Torokhov commit 499fe9a419d43410be576bcc825658997b6ce822 Author: Daniel Halperin Date: Thu Mar 24 16:01:48 2011 -0700 mac80211: fix aggregation frame release during timeout Suppose the aggregation reorder buffer looks like this: x-T-R1-y-R2, where x and y are frames that have not been received, T is a received frame that has timed out, and R1,R2 are received frames that have not yet timed out. The proper behavior in this scenario is to move the window past x (skipping it), release T and R1, and leave the window at y until y is received or R2 times out. As written, this code will instead leave the window at R1, because it has not yet timed out. Fix this by exiting the reorder loop only when the frame that has not timed out AND there are skipped frames earlier in the current valid window. Signed-off-by: Daniel Halperin Signed-off-by: John W. Linville commit 2b78ac9bfc7483ba4bda9ad3d10dd4afcf88337c Author: Juuso Oikarinen Date: Mon Mar 28 14:32:32 2011 +0300 cfg80211: fix BSS double-unlinking (continued) This patch adds to the fix "fix BSS double-unlinking" (commit 3207390a8b58bfc1335750f91cf6783c48ca19ca) by Johannes Berg. It turns out, that the double-unlinking scenario can also occur if expired BSS elements are removed whilst an interface is performing association. To work around that, replace list_del with list_del_init also in the "cfg80211_bss_expire" function, so that the check for whether the BSS still is in the list works correctly in cfg80211_unlink_bss. Signed-off-by: Juuso Oikarinen Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit bef9bacc4ec7ea6a02876164cd6ccaa4759edce4 Author: Mariusz Kozlowski Date: Sat Mar 26 19:26:55 2011 +0100 cfg80211:: fix possible NULL pointer dereference In cfg80211_inform_bss_frame() wiphy is first dereferenced on privsz initialisation and then it is checked for NULL. This patch fixes that. Signed-off-by: Mariusz Kozlowski Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 67aa030c0dff6095128bcb4e8043b48360f32331 Author: Mariusz Kozlowski Date: Sat Mar 26 18:58:51 2011 +0100 mac80211: fix possible NULL pointer dereference This patch moves 'key' dereference after BUG_ON(!key) so that when key is NULL we will see proper trace instead of oops. Signed-off-by: Mariusz Kozlowski Acked-by: Johannes Berg Signed-off-by: John W. Linville commit 1f951a7f8ba05192291f781ef99a892697e47d62 Author: Petr Štetiar Date: Sun Mar 27 13:31:26 2011 +0200 mac80211: fix NULL pointer dereference in ieee80211_key_alloc() The ieee80211_key struct can be kfree()d several times in the function, for example if some of the key setup functions fails beforehand, but there's no check if the struct is still valid before we call memcpy() and INIT_LIST_HEAD() on it. In some cases (like it was in my case), if there's missing aes-generic module it could lead to the following kernel OOPS: Unable to handle kernel NULL pointer dereference at virtual address 0000018c .... PC is at memcpy+0x80/0x29c ... Backtrace: [] (ieee80211_key_alloc+0x0/0x234 [mac80211]) from [] (ieee80211_add_key+0x70/0x12c [mac80211]) [] (ieee80211_add_key+0x0/0x12c [mac80211]) from [] (__cfg80211_set_encryption+0x2a8/0x464 [cfg80211]) Signed-off-by: Petr Štetiar Reviewed-by: Johannes Berg Signed-off-by: John W. Linville commit f62d816fc4324afbb7cf90110c70b6a14139b225 Author: Felix Fietkau Date: Fri Mar 25 17:43:41 2011 +0100 ath9k: fix a chip wakeup related crash in ath9k_start When the chip is still asleep when ath9k_start is called, ath9k_hw_configpcipowersave can trigger a data bus error. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit 4dc217df68a17a57f8464c74c1b4785e40bddf77 Author: Felix Fietkau Date: Fri Mar 25 15:30:38 2011 +0100 mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS rates When a client connects in HT mode but does not provide any valid MCS rates, the function that finds the next sample rate gets stuck in an infinite loop. Fix this by falling back to legacy rates if no usable MCS rates are found. Signed-off-by: Felix Fietkau Cc: stable@kernel.org Signed-off-by: John W. Linville commit dfad549d98b60160547d1b8299051b9456c8da85 Author: Stephen Boyd Date: Wed Mar 23 22:46:15 2011 +0100 ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support The inline assembly differences for v6 vs. v7 are purely optimizations. On a v7 processor, an mrc with the pc sets the condition codes to the 28-31 bits of the register being read. It just so happens that the TX/RX full bits the DCC support code is testing for are high enough in the register to be put into the condition codes. On a v6 processor, this "feature" isn't implemented and thus we have to do the usual read, mask, test operations to check for TX/RX full. Thus, we can drop the v7 implementation and just use the v6 implementation for both. Cc: Tony Lindgren Signed-off-by: Stephen Boyd Signed-off-by: Russell King commit 8e8806990cfd91a4ec25df6f00528008c4b0087a Author: Ming Lei Date: Mon Mar 28 06:10:25 2011 +0100 ARM: 6838/1: etm: fix section mismatch warning The patch fixes the warning below: WARNING: arch/arm/kernel/built-in.o(.data+0x27c): Section mismatch in reference from the variable etb_driver to the function .init.text:etb_probe() The variable etb_driver references the function __init etb_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, WARNING: arch/arm/kernel/built-in.o(.data+0x2cc): Section mismatch in reference from the variable etm_driver to the function .init.text:etm_probe() The variable etm_driver references the function __init etm_probe() If the reference is valid then annotate the variable with __init* or __refdata (see linux/init.h) or name the variable: *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console, Signed-off-by: Ming Lei Signed-off-by: Russell King commit 7f479c64a52094354c10309fcacaa71de015dc9e Author: Colin Cross Date: Sun Mar 27 00:45:25 2011 +0100 ARM: 6837/1: remove unused pci_fixup_prpmc1100 The PrPMC1100 machine was removed in 2.6.11, but left a reference to machine_is_prpmc1100 in arch/arm/kernel/bios32.c. 6f82f4db80189281a8ac42f2e72396accb719b57 removed the machine type, which causes a build failure: CC arch/arm/kernel/bios32.o arch/arm/kernel/bios32.c: In function 'pci_fixup_prpmc1100': arch/arm/kernel/bios32.c:174: error: implicit declaration of function 'machine_is_prpmc1100' Remove the unused pci_fixup_prpcm1100. Signed-off-by: Colin Cross Signed-off-by: Russell King commit 0652f067360fc3be2c3e668085f5fb2b76402928 Author: Viktor Rosendahl Date: Sat Mar 26 18:11:01 2011 +0100 ARM: 6836/1: kprobes/fix emulation of LDR/STR instruction when Rn == PC The Rn value from the emulation is unconditionally written back; this is fine as long as Rn != PC because in that case, even if the instruction isn't a write back instruction, it will only result in the same value being written back. In case Rn == PC, then the emulated instruction doesn't have the actual PC value in Rn but an adjusted value; when this is written back, it will result in the PC being incorrectly updated. An altenative solution would be to check bits 24 and 22 to see whether the instruction actually is a write back instruction or not. I think it's enough to check whether Rn != PC, because: - it's looks cheaper than the alternative - to my understaning it's not permitted to update the PC with a write back instruction, so we don't lose any ability to emulate legal instructions. - in case of writing back for non write back instructions where Rn != PC, it doesn't matter because the values are the same. Regarding the second point above, it would possibly be prudent to add some checking to prep_emulate_ldr_str(), so that instructions with both write back and Rn == PC would be rejected. Signed-off-by: Viktor Rosendahl Signed-off-by: Russell King commit 255bae73b214f143a3c7cc74d4792eb166a10d46 Merge: a737823d3766 dc7b602dd481 Author: Russell King Date: Mon Mar 28 18:57:19 2011 +0100 Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes commit 5f183860d5007ec76ea36bfa6c36d66e37f0dbcf Merge: 938c0ace3ffb a10aabd5e313 Author: Russell King Date: Mon Mar 28 18:52:44 2011 +0100 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable commit 6c6804fb2cef2d6aceb38b0eb0803210d77ff390 Author: Andrew Lutomirski Date: Thu Mar 24 00:36:56 2011 -0400 perf symbols: Fix vsyscall symbol lookup Perf can't currently trace into the vsyscall page. It looks like it was meant to work. Tested on 2.6.38 and today's -git. The bug is easy to reproduce. Compile this: int main() { int i; struct timespec t; for(i = 0; i < 10000000; i++) clock_gettime(CLOCK_MONOTONIC, &t); return 0; } and run it through perf record; perf report. The top entry shows "[unknown]" and you can't zoom in. It looks like there are two issues. The first is a that a test for user mode executing in kernel space is backwards. (That's the first hunk below). The second (I think) is that something's wrong with the code that generates lots of little struct dso objects for different sections -- when it runs on vmlinux it results in bogus long_name values which cause objdump to fail. Cc: Ingo Molnar Cc: Paul Mackerras Cc: Peter Zijlstra LPU-Reference: Signed-off-by: Andy Lutomirski Signed-off-by: Arnaldo Carvalho de Melo commit ccd0d44fad38dc1bb4b26dcc7a30e9f2c3b36870 Author: Steven Rostedt Date: Fri Mar 25 16:21:06 2011 -0400 WARN_ON_SMP(): Add comment to explain ({0;}) The define to use ({0;}) for the !CONFIG_SMP case of WARN_ON_SMP() can be confusing. As the WARN_ON_SMP() needs to be a nop when CONFIG_SMP is not set, including all its parameters must not be evaluated, and that it must work as both a stand alone statement and inside an if condition, we define it to a funky ({0;}). A simple "0" will not work as it causes gcc to give the warning that the statement has no effect. As this strange definition has raised a few eyebrows from some major kernel developers, it is wise to document why we create such a work of art. Cc: Linus Torvalds Cc: Alexey Dobriyan Signed-off-by: Steven Rostedt commit d454f39f3ff3ee5a818c271026081a48a537bd41 Merge: e9c4a5e10e06 e1bb31b44466 Author: Takashi Iwai Date: Mon Mar 28 13:02:29 2011 +0200 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc commit e9c4a5e10e063647b12e393dd3149c95175fd5ff Merge: c6b358748e19 19aab08d69e0 Author: Takashi Iwai Date: Mon Mar 28 12:39:28 2011 +0200 Merge branch 'for-2.6.39' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into fix/asoc commit c6b358748e19ce7e230b0926ac42696bc485a562 Author: Takashi Iwai Date: Mon Mar 28 12:05:31 2011 +0200 ALSA: hda - Fix pin-config of Gigabyte mobo Use pin-fix instead of the static quirk for Gigabyte mobos 1458:a002. Bugzilla: https://bugzilla.novell.com/show_bug.cgi?id=677256 Signed-off-by: Takashi Iwai commit dc7b602dd481cad61fc4f18874bbdc5b04b5ee3e Author: Konstantin Porotchkin Date: Sun Mar 27 11:54:49 2011 +0200 Fix the broken build for Marvell Dove platform. Remove call to the old GPIO init function. Fix old MPP control offset value. Signed-off-by: Konstantin Porotchkin Acked-by: Saeed Bishara Signed-off-by: Nicolas Pitre commit d51ca07634b8a441f731e087e93775a67d629a8c Author: Sylvestre Ledru Date: Sat Mar 26 22:52:25 2011 -0700 Input: h3600_ts_input - fix a spelling error Signed-off-by: Sylvestre Ledru Signed-off-by: Dmitry Torokhov commit e35fb8c1db2d6fc92783d492e458d19b06502742 Author: Ping Cheng Date: Sat Mar 26 21:16:05 2011 -0700 Input: wacom - report resolution for pen devices Touch resolution is reported to the userland by retrieving the value from the HID descriptor. But pen resolution is not since it can not be retrieved. The current Wacom X driver has a resolution table. To centralize the source of these values, the resolution entries are added in the wacom_features struct for x and y coordinates respectively. The values are then reported to the userland. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 7b824bbdd6210155bac9e1a1d795f94f8f2927b2 Author: Ping Cheng Date: Sat Mar 26 21:16:04 2011 -0700 Input: wacom - constify wacom_features for a new missed Bamboo models Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 6b0ae4097c1ebad98c7b33f83b4ca7e93890ed12 Author: Mariusz Kozlowski Date: Sat Mar 26 19:29:34 2011 +0100 ceph: fix possible NULL pointer dereference This patch fixes 'event_work' dereference before it is checked for NULL. Signed-off-by: Mariusz Kozlowski Signed-off-by: Sage Weil commit e1bb31b444668bc957c337d33803db7cb3330745 Author: Wolfram Sang Date: Fri Mar 25 16:51:45 2011 +0100 ASoC: imx: fix burstsize for DMA SSI counts in words, the DMA engine in bytes. (Wrong) factor got removed in bf974a0 (ASoC i.MX: switch to new DMA api). Signed-off-by: Wolfram Sang Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 2c4cf17a52f04fbe929977252d5b8ab81d2c6e9b Author: Wolfram Sang Date: Fri Mar 25 16:51:44 2011 +0100 ASoC: imx: set watermarks for mx2-dma They got accidently removed by f0fba2a (ASoC: multi-component - ASoC Multi-Component Support). Reintroduce them and get rid of the superfluous defines because the fiq-driver has its own hardcoded values. Signed-off-by: Wolfram Sang Acked-by: Liam Girdwood Signed-off-by: Mark Brown Cc: stable@kernel.org commit 19aab08d69e05c8d9a9ad315e59dd0493bf86045 Author: Axel Lin Date: Sat Mar 26 15:53:58 2011 +0800 ASoC: twl6040: Return -ENOMEM if create_singlethread_workqueue fails Signed-off-by: Axel Lin Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 56a3536c226f58497a8b1b7959b581983bcf04c9 Author: Peter Ujfalusi Date: Thu Mar 24 08:58:05 2011 +0200 ASoC: tlv320dac33: Restore L/R DAC power control register Register 0x40, 0x41 need to be restored after power up, since it contains gain related fields, which affects playback volume. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit a737823d37666255e3e74ce84bc9611a038e0888 Author: Will Deacon Date: Fri Mar 25 17:12:37 2011 +0100 ARM: 6835/1: perf: ensure overflows aren't missed due to IRQ latency If a counter overflows during a perf stat profiling run it may overtake the last known value of the counter: 0 prev new 0xffffffff |----------|-------|----------------------| In this case, the number of events that have occurred is (0xffffffff - prev) + new. Unfortunately, the event update code will not realise an overflow has occurred and will instead report the event delta as (new - prev) which may be considerably smaller than the real count. This patch adds an extra argument to armpmu_event_update which indicates whether or not an overflow has occurred. If an overflow has occurred then we use the maximum period of the counter to calculate the elapsed events. Acked-by: Jamie Iles Reported-by: Ashwin Chaugule Signed-off-by: Will Deacon Signed-off-by: Russell King commit 574b69cbb633037a9c305d2993aeb680f4a8badd Author: Will Deacon Date: Fri Mar 25 13:13:34 2011 +0100 ARM: 6834/1: perf: reset counters on all CPUs during initialisation ARMv7 dictates that the interrupt-enable and count-enable registers for each PMU counter are UNKNOWN following core reset. This patch adds a new (optional) function pointer to struct arm_pmu for resetting the PMU state during init. The reset function is called on each CPU via an arch_initcall in the generic ARM perf_event code and allows the PMU backend to write sane values to any UNKNOWN registers. Acked-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit d25d3b4c4d0e27975ee659a64b6d29f02fdbfde4 Author: Will Deacon Date: Fri Mar 25 13:12:23 2011 +0100 ARM: 6833/1: perf: add required isbs() to ARMv7 backend The ARMv7 architecture does not guarantee that effects from co-processor writes are immediately visible to following instructions. This patch adds two isbs to the ARMv7 perf code: (1) Immediately after selecting an event register, so that the PMU state following this instruction is consistent with the new event. (2) Immediately before writing to the PMCR, so that any previous writes to the PMU have taken effect before (typically) enabling the counters. Acked-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit fb4fe87d79511398a68000d2100c825f54b51652 Author: Nicolas Pitre Date: Tue Mar 22 19:09:14 2011 +0100 ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues Signed-off-by: Nicolas Pitre Reviewed-by: Dave Martin Signed-off-by: Russell King commit 0efc48ecaf0f84430524a1759ab9c60aad8eab1e Author: Pawel Moll Date: Thu Mar 17 13:10:22 2011 +0100 ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile The second GIC, present when EB board is used with a MPCore tile, was initialised starting with irq number 64, which made interrupts 64-95 in the primary GIC unusable. Signed-off-by: Pawel Moll Signed-off-by: Russell King commit 938c0ace3ffb8cc2073a6d2e68fa7a6ab7cb471e Merge: 16c29dafcc86 5898eb79fb45 Author: Russell King Date: Sat Mar 26 10:03:03 2011 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable Conflicts: arch/arm/mach-pxa/tosa.c commit 92a19d66a3cc17feae20b4c1147e8b4dbf7b2282 Author: Mike Frysinger Date: Fri Mar 25 16:24:36 2011 -0400 Blackfin: bitops: fix include order after little endian inclusion The le.h header requires things like test_bit to be declared, so we need to move its inclusion to after the point where that happens. Signed-off-by: Mike Frysinger commit 901c23fb18fad6506c90e17fa265970c311b9227 Author: Mike Frysinger Date: Thu Mar 24 02:34:42 2011 -0400 Blackfin: defconfigs: update after misc devices defaulted to N The default value for misc devices was changed from Y to N which causes problems for mini defconfigs that were relying on this defaulting to Y. So update all of the defconfigs accordingly. Reported-by: Uwe Kleine-König Signed-off-by: Mike Frysinger commit b75a9e6bfba5c7343391ac1bacd44d6652dde8da Author: Joe Perches Date: Wed Oct 20 11:11:51 2010 -0700 Blackfin: use more standard pr_fmt in the module loader Changed pr_fmt(fmt) to make the format arguments match the format. Changed an argument name in apply_relocate from me to mod so that the pr_err is consistent with the other uses. Added missing '\n' to a format. Signed-off-by: Joe Perches Signed-off-by: Mike Frysinger commit ef550f6f4f6c9345a27ec85d98f4f7de1adce79c Author: Sage Weil Date: Fri Mar 25 13:27:48 2011 -0700 ceph: flush msgr_wq during mds_client shutdown The release method for mds connections uses a backpointer to the mds_client, so we need to flush the workqueue of any pending work (and ceph_connection references) prior to freeing the mds_client. This fixes an oops easily triggered under UML by while true ; do mount ... ; umount ... ; done Also fix an outdated comment: the flush in ceph_destroy_client only flushes OSD connections out. This bug is basically an artifact of the ceph -> ceph+libceph conversion. Signed-off-by: Sage Weil commit a10aabd5e313ec6481569be20d120191692b4ca6 Author: Wolfram Sang Date: Wed Feb 23 14:51:57 2011 +0100 arm: mach-mx3: pcm043: add write-protect and card-detect for SD1 Signed-off-by: Wolfram Sang Signed-off-by: Sascha Hauer commit ef560bfe01eff692a307b7d73e60625ccdf05d87 Author: Eric Bénard Date: Fri Feb 25 14:38:31 2011 +0100 eukrea_mbimxsd51: add SD Card detect Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 01ea9aeae84536e2afe769be69b994de9f7ceed7 Author: Eric Bénard Date: Fri Feb 25 13:49:14 2011 +0100 eukrea_mbimxsd25-baseboard: add SD card detect Signed-off-by: Eric Bénard Acked-by: Wolfram Sang Signed-off-by: Sascha Hauer commit d335cf97060c44e9beb2a25151b5fba8740e1929 Author: Eric Bénard Date: Fri Feb 25 13:49:58 2011 +0100 mx3/eukrea_mbimxsd-baseboard: add SD card detect support Signed-off-by: Eric Bénard Acked-by: Wolfram Sang Signed-off-by: Sascha Hauer commit da8db3aab55142ad39061e6b0db1e7b065eac61a Author: Eric Bénard Date: Fri Feb 25 13:49:57 2011 +0100 mx3/eukrea_mbimxsd-baseboard: fix gpio request without this patch, we get : ------------[ cut here ]------------ WARNING: at drivers/gpio/gpiolib.c:99 gpio_ensure_requested+0x4c/0x104() autorequest GPIO-4 .../... [] (platform_lcd_set_power+0x34/0x40) from [] (platform_lcd_probe+0xb8/0xd8) Signed-off-by: Eric Bénard Signed-off-by: Sascha Hauer commit 5bb2c828420992357cfe66ceb6f4c3d4121ae1ce Author: Shawn Guo Date: Tue Feb 22 16:50:24 2011 +0800 ARM: mxs/mx28evk: add mmc device Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Tested-by: Marc Kleine-Budde [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer commit 1b6f1e885ef08c6fda87979a2ca05e910d479985 Author: Shawn Guo Date: Tue Feb 22 16:49:19 2011 +0800 ARM: mxs/mx23evk: add mmc device Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Acked-by: Marc Kleine-Budde [sha: updated to Uwes v4 version] Signed-off-by: Sascha Hauer commit 47babe692e90e0333b2448969639b8f0940e3682 Author: Shawn Guo Date: Wed Mar 16 11:31:06 2011 +0100 ARM: mxs: dynamically allocate mmc device Signed-off-by: Shawn Guo [ukleinek: fix naming to include complete device name in functions] Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 251290a6078cb88382344b3ee535ae8c6254c1b5 Author: Andres Salomon Date: Fri Mar 4 08:06:53 2011 -0800 ARM: mx51_efika: update platform data for new mfd changes Note that this relies on stuff currently in mfd's next tree, but this is also a newer driver. I'm not sure which tree it should go through, as it's a problem that shows up in next. From: Andres Salomon MFD changes in c738892f cause the mc13xxx_platform_data struct to change. This changes one more (new) user of it, fixing a build error. Signed-off-by: Andres Salomon Signed-off-by: Sascha Hauer commit 58d5ad5e3c39311835ffcf80353d1318e4f9c155 Author: Julien Boibessot Date: Thu Mar 24 17:29:15 2011 +0100 mx2/iomux: Set direction for CSPI2 pins Signed-off-by: Julien Boibessot Signed-off-by: Sascha Hauer commit b77dcf8460ae57d4eb9fd3633eb4f97b8fb20716 Author: Thomas Gleixner Date: Thu Mar 24 20:16:42 2011 +0100 Bluetooth: Fix warning with hci_cmd_timer After we made debugobjects working again, we got the following: WARNING: at lib/debugobjects.c:262 debug_print_object+0x8e/0xb0() Hardware name: System Product Name ODEBUG: free active (active state 0) object type: timer_list hint: hci_cmd_timer+0x0/0x60 Pid: 2125, comm: dmsetup Tainted: G W 2.6.38-06707-gc62b389 #110375 Call Trace: [] warn_slowpath_common+0x7a/0xb0 [] warn_slowpath_fmt+0x46/0x50 [] debug_print_object+0x8e/0xb0 [] ? hci_cmd_timer+0x0/0x60 [] debug_check_no_obj_freed+0x125/0x230 [] ? check_object+0xb3/0x2b0 [] kfree+0x150/0x190 [] ? bt_host_release+0x16/0x20 [] bt_host_release+0x16/0x20 [] device_release+0x27/0xa0 [] kobject_release+0x4c/0xa0 [] ? kobject_release+0x0/0xa0 [] kref_put+0x36/0x70 [] kobject_put+0x27/0x60 [] put_device+0x17/0x20 [] hci_free_dev+0x29/0x30 [] vhci_release+0x36/0x70 [] fput+0xd6/0x1f0 [] filp_close+0x66/0x90 [] sys_close+0x99/0xf0 [] system_call_fastpath+0x16/0x1b That timer was introduced with commit 6bd32326cda(Bluetooth: Use proper timer for hci command timout) Timer seems to be running when the thing is closed. Removing the timer unconditionally fixes the problem. And yes, it needs to be fixed before the HCI_UP check. Signed-off-by: Thomas Gleixner Tested-by: Ingo Molnar Signed-off-by: Gustavo F. Padovan commit a0cc9a1b5712ea52aaa4e7abfa0ec2dbe0d820ff Author: Andrei Emeltchenko Date: Thu Mar 24 17:16:08 2011 +0200 Bluetooth: delete hanging L2CAP channel Sometimes L2CAP connection remains hanging. Make sure that L2CAP channel is deleted. Signed-off-by: Andrei Emeltchenko Signed-off-by: Gustavo F. Padovan commit 6994ca5e8ade57d18b7d1e05aad040c441a2ad37 Author: Johan Hedberg Date: Wed Mar 16 14:29:34 2011 +0200 Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_reply The code was correctly calling _unlock at the end of the function but there was no actual _lock call anywhere. Signed-off-by: Johan Hedberg Signed-off-by: Gustavo F. Padovan commit 8763b4da41132e2d5a896cd5e629c3c0a652205e Author: Vinicius Costa Gomes Date: Mon Mar 14 18:20:33 2011 -0300 Bluetooth: Fix sending LE data over USB Now that we have support for LE connections, before discarding a frame we must check if there's a LE connection over that transport. Signed-off-by: Vinicius Costa Gomes Acked-by: Ville Tervo Signed-off-by: Gustavo F. Padovan commit f630cf0d5434e3923e1b8226ffa2753ead6b0ce5 Author: Gustavo F. Padovan Date: Wed Mar 16 15:36:29 2011 -0300 Bluetooth: Fix HCI_RESET command synchronization We can't send new commands before a cmd_complete for the HCI_RESET command shows up. Reported-by: Mikko Vinni Reported-by: Justin P. Mattock Reported-by: Ed Tomlinson Signed-off-by: Gustavo F. Padovan Tested-by: Justin P. Mattock Tested-by: Mikko Vinni Tested-by: Ed Tomlinson commit 52cb1c0d208565d8f06b743cdc6596d744f92e3b Author: Suraj Sumangala Date: Wed Mar 9 14:44:05 2011 +0530 Bluetooth: Increment unacked_frames count only the first transmit This patch lets 'l2cap_pinfo.unacked_frames' be incremented only the first time a frame is transmitted. Previously it was being incremented for retransmitted packets too resulting the value to cross the transmit window size. Signed-off-by: Suraj Sumangala Signed-off-by: Gustavo F. Padovan commit 63a8588debd4dc72becb9e27add9343c76301c7d Author: Marc-Antoine Perennou Date: Thu Mar 24 14:51:21 2011 -0300 Bluetooth: add support for Apple MacBook Pro 8,2 Just adding the vendor details makes it work fine. Signed-off-by: Marc-Antoine Perennou Signed-off-by: Gustavo F. Padovan commit 6ee3b5a12740eddc5a76e130b6cc7cc64468d1f7 Author: Chris Wilson Date: Thu Mar 24 13:26:43 2011 +0000 drm/i915/lvds: Always return connected in the absence of better information The LVDS connector should default to connected. We tried our best to verify the claims of the BIOS that the hardware exists during init(), and then during detect() we then try to verify that the panel is open. In the event of an unsuccessful query, we should then always report that the LVDS panel is connected. This was only the case for gen2/3, later generations leaked the return value from the panel probe instead. Reported-and-tested-by: Alessandro Suardi Signed-off-by: Chris Wilson Reviewed-by: Keith Packard commit 914a76ca5eedc9f286a36f61c4eaa95b451ba3e6 Author: Andi Kleen Date: Wed Mar 16 15:44:33 2011 -0400 oprofile, x86: Allow setting EDGE/INV/CMASK for counter events For some performance events it's useful to set the EDGE and INV bits and the CMASK mask in the counter control register. The list of predefined events Intel releases for each CPU has some events which require these settings to get more "natural" to use higher level events. oprofile currently doesn't allow this. This patch adds new extra configuration fields for them, so that they can be specified in oprofilefs. An updated oprofile daemon can then make use of this to set them. v2: Write back masked extra value to variable. Signed-off-by: Andi Kleen Signed-off-by: Robert Richter commit 0ca03cd7d0fa3bfbd56958136a10f19733c4ce12 Author: Mark Brown Date: Wed Mar 23 20:45:40 2011 +0000 ASoC: Explicitly say registerless widgets have no register This stops code that handles widgets generically from attempting to access registers for these widgets. Signed-off-by: Mark Brown Acked-by: Liam Girdwood Cc: stable@kernel.org commit 0adf882b6894cd150392400e9642787cf691016a Author: Dinh Nguyen Date: Mon Mar 21 16:30:37 2011 -0500 ARM: mx51: Implement code to allow mx51 to enter WFI Implement code for MX51 that allows the SoC to enter WFI when arch_idle is called. This patch is also necessary for correctly suspending the system. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit b6e89b21824cc37ab19e0209a7754c74d237a123 Author: Dinh Nguyen Date: Mon Mar 21 16:30:36 2011 -0500 ARM: mx51: Add entry for gpc_dvfs_clk For MX51 SRPG, we need to turn on the GPC clock in order to set the SRPG registers. Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 16f246e69b8857c6a2993f1b6663e92d4d4e5395 Author: Dinh Nguyen Date: Mon Mar 21 16:30:35 2011 -0500 ARM: mx50: Add support to get the silicon revision For MX50, the HW_ADADIG_DIGPROG register in the ANATOP module will have the correct silicon revision: Major Minor Description 0x50 0x0 TO1.0 0x50 0x1 TO1.1 Signed-off-by: Dinh Nguyen Signed-off-by: Sascha Hauer commit 021ebc2da02a7f3107a8f31d8a0ebfbe4175429e Author: Lothar Waßmann Date: Mon Mar 21 17:48:05 2011 +0100 ARM: mxs: configure and register the second FEC device on TX28/STK5-V4 Signed-off-by: Lothar Waßmann Signed-off-by: Sascha Hauer commit 5d18724588a4f632e836357a43b33bf4b538af82 Author: Shawn Guo Date: Sun Mar 20 11:17:59 2011 +0800 ARM: mxc: fix buggy '.end' of IORESOURCE_MEM in device codes Signed-off-by: Shawn Guo Acked-by: Wolfram Sang Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 65047a0f695ed975855e9b83bb922ecb1ff250ab Author: Huang Weiyi Date: Fri Mar 18 22:05:55 2011 +0800 ARM i.MX: remove duplicated #include Remove duplicated #include('s) in arch/arm/mach-mx5/mx51_efika.c Signed-off-by: Huang Weiyi Signed-off-by: Sascha Hauer commit 5658bff6c2c4a07fb25195eac70205934b8f5a0d Author: Uwe Kleine-König Date: Fri Mar 18 12:24:08 2011 +0100 ARM: imx: let MACH_IMX27_VISSTRIM_M10 select IMX_HAVE_PLATFORM_IMX_SSI mach-imx27_visstrim_m10.c uses imx27_add_imx_ssi() so it needs to select IMX_HAVE_PLATFORM_IMX_SSI to fix: arch/arm/mach-imx/built-in.o: In function `visstrim_m10_board_init': mach-imx27_visstrim_m10.c:(.init.text+0x308): undefined reference to `imx_add_imx_ssi' mach-imx27_visstrim_m10.c:(.init.text+0x394): undefined reference to `imx27_imx_ssi_data' Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 0ff2593bf6c06cd99f5414295ecb31bc629b3d15 Author: Julien Boibessot Date: Fri Mar 18 09:31:46 2011 +0100 MX51: Add AUDMUX ports definitions Signed-off-by: Julien Boibessot Signed-off-by: Sascha Hauer commit c124befc0d1981f5f3e438d06313fa8270a9edb6 Author: Jan Weitzel Date: Thu Mar 17 13:44:30 2011 +0100 ARM: mxc: Add sched_clock to mxc platform Add sched_clock using cyc_to_sched_clock and update_sched_clock with HAVE_SCHED_CLOCK tested on iMX27 and iMX35 Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer commit 93b20e4fdbe1ddc4bef79d968cb1ba453324a499 Author: Jan Weitzel Date: Thu Mar 17 13:44:29 2011 +0100 ARM: mxc: Add dummy_get_cycles to avoid access before init is done this is needed to use get_cycles with sched_clock. Accessing timer without enabled clk will result in crash Signed-off-by: Jan Weitzel Signed-off-by: Sascha Hauer commit 350ac9ddce074855030b88c9e8c016574d2e9097 Author: Fabio Estevam Date: Wed Mar 16 22:52:34 2011 -0300 ARM: mx5/mx53_evk: Make the reset pin name more meaningful As there is a mx53_smd board in the kernel, using SMD_FEC_PHY_RST as the pin name can be misleading when used on a MX53_EVK board. Change the pin name to reflect the board name. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 6ea6392cc4ff9214c7356e8ca71244c006a95ddb Author: Fabio Estevam Date: Wed Mar 16 22:52:33 2011 -0300 ARM: mx5/mx53_evk: Use gpio_request_one in mx53_evk_fec_reset Current code inside mx53_evk_fec_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit ce191e415cd0c6d5240caf5c6827500842868da2 Author: Fabio Estevam Date: Wed Mar 16 22:52:31 2011 -0300 ARM: mx5/babbage: Use gpio_request_one in babbage_fec_reset Current code inside babbage_fec_reset uses gpio_direction_output with initial value of the GPIO and also sets the GPIO value via gpio_set_value to the same level right after. This is not needed. By using gpio_request_one it is possible to set the direction and initial value in one shot. Signed-off-by: Fabio Estevam Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 14fb20c9d25be4ee115cafd7201d4833664ae59d Author: Frank Li Date: Tue Mar 15 17:04:10 2011 +0800 ARM: mx53_loco: Add GPIO Keypad support Signed-off-by: Frank Li Signed-off-by: Sascha Hauer commit 76422dbf3ccdd46d925cdb0909445e4616b55187 Author: Fabio Estevam Date: Thu Mar 17 23:32:11 2011 -0300 ARM: mx51: Print silicon revision on boot Having the silicon revision to appear on the boot log is a useful information. MX31 and MX35 already show the silicon revision on boot. Add support for displaying such information for MX51 as well. Tested on a MX51EVK, where it shows: CPU identified as i.MX51, silicon rev 3.0 Signed-off-by: Fabio Estevam Signed-off-by: Sascha Hauer commit a3b55791b5b2b4b6d31ece9b3975466ec2f07b1b Author: Peter Ujfalusi Date: Fri Mar 18 15:15:11 2011 +0200 ASoC: tlv320dac33: Fix inconsistent spinlock usage The lock is used within the interrupt handler. Correct the spinlock usage, and use irqsave/irqrestore flavour of spin_lock/unlock. Signed-off-by: Peter Ujfalusi Acked-by: Mark Brown Signed-off-by: Liam Girdwood commit 7780c803bd103895a9c1c9a3c91db5b45c66e367 Author: Robin Becker Date: Sat Mar 12 15:32:45 2011 +0000 arm: mach-kirkwood: add led in sheevaplug-setup.c This patch adds a second, red, led for the standard sheevaplug. The sheeva_esata mpp config is left unchanged. Tested on a standard sheevaplug Signed-off-by: Robin Becker Acked-by: Peter Korsgaard Signed-off-by: Nicolas Pitre commit 5898eb79fb45d4fd4ce22139c168de937bfaab38 Author: Axel Lin Date: Mon Mar 7 13:56:11 2011 +0800 ARM: pxa/am300epd: fix leak in am300_init_gpio_regs error path If gpio_request fails when i > 0, gpios[0] is not freed in current implementation. Signed-off-by: Axel Lin Signed-off-by: Eric Miao commit 8aad172e6c54c74b1effe88ded2f308db3e1b658 Author: Axel Lin Date: Mon Mar 7 13:55:15 2011 +0800 ARM: pxa/am200epd: fix leak in am200_init_gpio_regs error path If gpio_request fails when i > 0, gpios[0] is not freed in current implementation. Signed-off-by: Axel Lin Signed-off-by: Eric Miao commit e3b1ceedf7adc4adfc989ee78a30fca7b62480b5 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:22 2011 +0200 ARM: PXA: Z2: Use switch event for lid Otherwise userspace might be confused. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 54d5710058ebe34451f4ab1d73d86cd8214897b7 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:21 2011 +0200 ARM: PXA: Z2: Add default triggers for LEDs So user can see if there's any mmc activity and if device's charging. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 034e17563b90fa20342b78a2faac9cba3a1c4a38 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:20 2011 +0200 ARM: PXA: Z2: Keep kbd backlight disabled by default It eats too much power, and anyway it's not usefull during boot process. Userspace can enable it later. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit b8f56a78e3a161f10bfd4e648a3d3828718aaa80 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:19 2011 +0200 ARM: PXA: Z2: Fix libertas init/tear down sequences GPIO15 seems to be not related to WiFi, so don't touch it. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 233cdbce55b8948b46fcd76ad77c1f33b8c01095 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:18 2011 +0200 ARM: PXA: Z2: Fix battery pdata Fix coefficients to get actual voltage, and make voltage_max/voltage_min looks like values for LiIon battery. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 2e62344de8e2a7e402fe2a009c3d09bc6fd589e6 Author: Vasily Khoruzhick Date: Sun Mar 13 17:19:17 2011 +0200 ARM: PXA: Z2: Use only power button as wake source It's very easy to press some keypad key when Z2 is closed, so to prevent unexpected wakeups, use only 'Power' key to wake Z2 from sleep. Signed-off-by: Vasily Khoruzhick Acked-by: Marek Vasut commit 27be9a9e378dad166fc81df310e052e7b67cb667 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:50 2011 +0200 ARM: pxafb: don't disable controller on cpufreq transition if overlay in use It's not safe to disable controller if overlay(s) is enabled (results in system hang). So we avoid to disable controller in this case. Userspace should choose proper governor to avoid freq changing when overlay is in use, otherwise LCD may blink. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit dcf8eee94f7eb2671e6d5774e81d45ad06b4f980 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:49 2011 +0200 ARM: pxafb: fix typo in ypos assignment Sascha Hauer pointed that ypos takes value of xpos due to typo. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 7779cee3f45122d2f81397f55d7a14f654a0b276 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:48 2011 +0200 ARM: pxafb: fix plane Z-ordering problem pxafb_overlay_init is not right place to change Z-ordering, move it to main plane initialization. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 1b98d7c4491e5eaba7c403ec1bc5997e6596e569 Author: Vasily Khoruzhick Date: Fri Mar 11 11:20:47 2011 +0200 ARM: pxafb: rework pxafb overlay memory management PXAFB overlay memory management is something messy: - it allocates memory dynamically on open/release, and it results in memory allocation failure after ~1h of uptime (system does not have 115k of physically contiguous memory) - in release callback it tries to free memory even if it was not allocated. Also driver touches FDADR1 on main plane reconfiguration, and it can cause problems if overlay1 is enabled. This patch attempts to fix those issues. Patch is based on Russell King's work. Signed-off-by: Vasily Khoruzhick Signed-off-by: Eric Miao commit 1014cc38280f29ea0a39ec9a853fa0c3fdfebc7c Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:20 2011 +0300 ARM: pxa: drop gpio_vbus field from pxa2xx_udc_mach_info Neither pxa25x_udc, nor pxa27x_udc use gpio_vbus/gpio_vbus_inverted anymore. Drop those two fields from udc info completely. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit a8ecc860ef117f9405758d8d1378553afcdd9ca3 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:19 2011 +0300 ARM: pxa25x_udc: stop handling gpio-vbus internally Stop handling gpio-vbus internally. All boards that depended on this functionality have been converted to use gpio-vbus tranceiver. All new boards can use it right from the start. Drop unused code. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit ef8b3cc68a1df83717bc8f9e7737084246a56ce2 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:18 2011 +0300 ARM: pxa/tosa: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit d19f4cbd4ba08d32d5e5d0cbc98f920fcc225448 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:17 2011 +0300 ARM: pxa/gumstix: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Cc: Steve Sakoman Signed-off-by: Eric Miao commit 133dce0687b4c38184609fa921d060a54dff93e9 Author: Dmitry Eremin-Solenikov Date: Mon Feb 14 15:33:16 2011 +0300 ARM: pxa/eseries: switch to using gpio-vbus transceiver Switch from handling gpio-vbus in pxa25x_udc to using standard gpio-vbus tranceiver. Signed-off-by: Dmitry Eremin-Solenikov Cc: Ian Molton Signed-off-by: Eric Miao commit ccc46e29a63c88aa9ac72aac86ff0cfd5c627a11 Author: Haojian Zhuang Date: Wed Nov 24 11:54:23 2010 +0800 ARM: pxa: auto compute shift and mult of timer Use auto-computed shift and mult of timer with new API clocksource_calc_mult_shift()/clockevents_calc_mult_shift(). Signed-off-by: Haojian Zhuang Cc: Nicolas Pitre Signed-off-by: Eric Miao commit 4321e1a12b811c02441240aa6183156791204f3f Author: Russell King - ARM Linux Date: Tue Feb 15 15:37:30 2011 +0800 ARM: pxa: clean up set_pxa_fb_info set_pxa_fb_info() has been a long-standing wart in the naming scheme of the pxa_set_xxx_info() functions. This renames the function, and combines set_pxa_fb_parent() with set_pxa_fb_info(). Signed-off-by: Russell King Acked-by: Igor Grinberg Signed-off-by: Eric Miao commit 54a93b69a4341a14acb67e0bb19b9bf1cc878cb2 Author: Marek Vasut Date: Thu Jan 13 11:45:30 2011 +0100 ARM: pxa: PalmZ72: Add OV9640 camera support Rework of patch from 2009: PalmZ72: Add support for OV9640 camera sensor Signed-off-by: Marek Vasut commit 9ed3fbf1cbc2b747b3532985059f4738c15f4c07 Author: Marek Vasut Date: Sat Jan 15 19:22:19 2011 +0100 ARM: pxa: Update copyright notices for Palm devices Signed-off-by: Marek Vasut commit 6b1e3fca6ffb981db05688b1660a5d03d242edd4 Author: Marek Vasut Date: Sat Jan 15 19:19:05 2011 +0100 ARM: pxa: Use gpio arrays in palmld_hdd driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. This patch also properly frees GPIOs in case ata_host_activate() call fails. Signed-off-by: Marek Vasut commit e27af7edda008d225ad542c3b6645483683a7e91 Author: Marek Vasut Date: Sat Jan 15 19:11:16 2011 +0100 ARM: pxa: Use gpio arrays in vpac270_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 235a175c401ab2d79d63f08257acebe1558a0621 Author: Marek Vasut Date: Sat Jan 15 18:59:55 2011 +0100 ARM: pxa: Use gpio arrays in palmtx_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit ba388307946cf86050d63cd398b4b341e2fb5043 Author: Marek Vasut Date: Sat Jan 15 18:59:43 2011 +0100 ARM: pxa: Use gpio arrays in palmtc_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 2070417dffa9e75b370a5c0dee8c5dc3605e1c4d Author: Marek Vasut Date: Sat Jan 15 18:49:07 2011 +0100 ARM: pxa: Use gpio arrays in palmld_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit e593106ca409e5e37d18121d922fc4f449c60d41 Author: Marek Vasut Date: Sat Jan 15 18:40:49 2011 +0100 ARM: pxa: Use gpio arrays in colibri_pcmcia driver Use gpio_request_array() / gpio_free_array(), this makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 7428fff20494935b4ce767d7c80de077e8d1d745 Author: Marek Vasut Date: Sat Jan 15 17:55:45 2011 +0100 ARM: pxa: PalmTE2: Use gpio arrays in backlight init Use gpio_request_array() / gpio_free_array() in backlight init and exit functions. This makes the code cleaner and less error prone. Signed-off-by: Marek Vasut commit 7bcdca95c039d1cd1cfddd6aa012026b409ddb14 Author: Alexander Clouter Date: Sun Mar 6 10:04:31 2011 +0000 ARM: orion5x: replace printk with pr_{err,info,...} in ts78xx-setup.c Signed-off-by: Alexander Clouter Signed-off-by: Nicolas Pitre