commit 7f0d384cafabfbb56663ee6944c18fc0450fc5d6 Merge: 90ec781 01afaf6 Author: Linus Torvalds Date: Fri Jun 4 21:12:39 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: Minix: Clean up left over label fix truncate inode time modification breakage fix setattr error handling in sysfs, configfs fcntl: return -EFAULT if copy_to_user fails wrong type for 'magic' argument in simple_fill_super() fix the deadlock in qib_fs mqueue doesn't need make_bad_inode() commit 90ec7819737d42a0ad1c2df1ff56016facae3c6e Merge: 8ce655e 9bea7f2 Author: Linus Torvalds Date: Fri Jun 4 21:09:48 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: module: fix bne2 "gave up waiting for init of module libcrc32c" module: verify_export_symbols under the lock module: move find_module check to end module: make locking more fine-grained. module: Make module sysfs functions private. module: move sysfs exposure to end of load_module module: fix kdb's illicit use of struct module_use. module: Make the 'usage' lists be two-way commit 9bea7f23952d5948f8e5dfdff4de09bb9981fb5f Author: Rusty Russell Date: Sat Jun 5 11:17:37 2010 -0600 module: fix bne2 "gave up waiting for init of module libcrc32c" Problem: it's hard to avoid an init routine stumbling over a request_module these days. And it's not clear it's always a bad idea: for example, a module like kvm with dynamic dependencies on kvm-intel or kvm-amd would be neater if it could simply request_module the right one. In this particular case, it's libcrc32c: libcrc32c_mod_init crypto_alloc_shash crypto_alloc_tfm crypto_find_alg crypto_alg_mod_lookup crypto_larval_lookup request_module If another module is waiting inside resolve_symbol() for libcrc32c to finish initializing (ie. bne2 depends on libcrc32c) then it does so holding the module lock, and our request_module() can't make progress until that is released. Waiting inside resolve_symbol() without the lock isn't all that hard: we just need to pass the -EBUSY up the call chain so we can sleep where we don't hold the lock. Error reporting is a bit trickier: we need to copy the name of the unfinished module before releasing the lock. Other notes: 1) This also fixes a theoretical issue where a weak dependency would allow symbol version mismatches to be ignored. 2) We rename use_module to ref_module to make life easier for the only external user (the out-of-tree ksplice patches). Signed-off-by: Rusty Russell Cc: Linus Torvalds Cc: Tim Abbot Tested-by: Brandon Philips commit be593f4ce4eb1bd40e38fdc403371f149f6f12eb Author: Rusty Russell Date: Sat Jun 5 11:17:37 2010 -0600 module: verify_export_symbols under the lock It disabled preempt so it was "safe", but nothing stops another module slipping in before this module is added to the global list now we don't hold the lock the whole time. So we check this just after we check for duplicate modules, and just before we put the module in the global list. (find_symbol finds symbols in coming and going modules, too). Signed-off-by: Rusty Russell commit 3bafeb6247042dcbb72b0141ec7c7107de9f0b99 Author: Linus Torvalds Date: Sat Jun 5 11:17:36 2010 -0600 module: move find_module check to end I think Rusty may have made the lock a bit _too_ finegrained there, and didn't add it to some places that needed it. It looks, for example, like PATCH 1/2 actually drops the lock in places where it's needed ("find_module()" is documented to need it, but now load_module() didn't hold it at all when it did the find_module()). Rather than adding a new "module_loading" list, I think we should be able to just use the existing "modules" list, and just fix up the locking a bit. In fact, maybe we could just move the "look up existing module" a bit later - optimistically assuming that the module doesn't exist, and then just undoing the work if it turns out that we were wrong, just before adding ourselves to the list. Signed-off-by: Rusty Russell commit 75676500f8298f0ee89db12db97294883c4b768e Author: Rusty Russell Date: Sat Jun 5 11:17:36 2010 -0600 module: make locking more fine-grained. Kay Sievers reports that we still have some contention over module loading which is slowing boot. Linus also disliked a previous "drop lock and regrab" patch to fix the bne2 "gave up waiting for init of module libcrc32c" message. This is more ambitious: we only grab the lock where we need it. Signed-off-by: Rusty Russell Cc: Brandon Philips Cc: Kay Sievers Cc: Linus Torvalds commit 6407ebb271fc34440b306f305e1efb7685eece26 Author: Rusty Russell Date: Sat Jun 5 11:17:36 2010 -0600 module: Make module sysfs functions private. These were placed in the header in ef665c1a06 to get the various SYSFS/MODULE config combintations to compile. That may have been necessary then, but it's not now. These functions are all local to module.c. Signed-off-by: Rusty Russell Cc: Randy Dunlap commit 80a3d1bb410e000e176931a076cdf19a1e89a955 Author: Rusty Russell Date: Sat Jun 5 11:17:36 2010 -0600 module: move sysfs exposure to end of load_module This means a little extra work, but is more logical: we don't put anything in sysfs until we're about to put the module into the global list an parse its parameters. This also gives us a logical place to put duplicate module detection in the next patch. Signed-off-by: Rusty Russell commit c8e21ced08b39ef8dfe7236fb2a923a95f645262 Author: Rusty Russell Date: Sat Jun 5 11:17:35 2010 -0600 module: fix kdb's illicit use of struct module_use. Linus changed the structure, and luckily this didn't compile any more. Reported-by: Stephen Rothwell Signed-off-by: Rusty Russell Cc: Jason Wessel Cc: Martin Hicks commit 2c02dfe7fe3fba97a5665d329d039d2415ea5607 Author: Linus Torvalds Date: Mon May 31 12:19:37 2010 -0700 module: Make the 'usage' lists be two-way When adding a module that depends on another one, we used to create a one-way list of "modules_which_use_me", so that module unloading could see who needs a module. It's actually quite simple to make that list go both ways: so that we not only can see "who uses me", but also see a list of modules that are "used by me". In fact, we always wanted that list in "module_unload_free()": when we unload a module, we want to also release all the other modules that are used by that module. But because we didn't have that list, we used to first iterate over all modules, and then iterate over each "used by me" list of that module. By making the list two-way, we simplify module_unload_free(), and it allows for some trivial fixes later too. Signed-off-by: Linus Torvalds Signed-off-by: Rusty Russell (cleaned & rebased) commit 8ce655e737dc395e115ecdce143a43b9b6127f46 Merge: 999fd1a 3a4b4aa Author: Linus Torvalds Date: Fri Jun 4 15:42:30 2010 -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: wacom - add Cintiq 21UX2 and Intuos4 WL Input: ads7846 - fix compiler warning in ads7846_probe() Input: tps6507x-ts - a couple work queue cleanups Input: s3c2410_ts - tone down logging Input: s3c2410_ts - fix build error due to ADC Kconfig rename commit 999fd1ab344dabd9c985b638bf4c29495b8e4619 Merge: 9a9620d ac422f9 Author: Linus Torvalds Date: Fri Jun 4 15:42:09 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits) sh: Make intc messages consistent via pr_fmt. sh: make sure static declaration on ms7724se sh: make sure static declaration on mach-migor sh: make sure static declaration on mach-ecovec24 sh: make sure static declaration on mach-ap325rxa clocksource: sh_cmt: compute mult and shift before registration clocksource: sh_tmu: compute mult and shift before registration sh: PIO disabling for x3proto and urquell. sh: mach-sdk7786: conditionally disable PIO support. sh: support for platforms without PIO. usb: r8a66597-hcd pio to mmio accessor conversion. usb: gadget: r8a66597-udc pio to mmio accessor conversion. usb: gadget: m66592-udc pio to mmio accessor conversion. sh: add romImage MMCIF boot for sh7724 and Ecovec V2 sh: add boot code to MMCIF driver header sh: prepare MMCIF driver header file sh: allow romImage data between head.S and the zero page sh: Add support MMCIF for ecovec sh: remove duplicated #include input: serio: disable i8042 for non-cayman sh platforms. ... commit 9a9620db07b27700a4de9e86985735fffb78e2f8 Merge: e620d1e 52707f9 Author: Linus Torvalds Date: Fri Jun 4 15:39:54 2010 -0700 Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/i7core: (83 commits) i7core_edac: Better describe the supported devices Add support for Westmere to i7core_edac driver i7core_edac: don't free on success i7core_edac: Add support for X5670 Always call i7core_[ur]dimm_check_mc_ecc_err i7core_edac: fix memory leak of i7core_dev EDAC: add __init to i7core_xeon_pci_fixup i7core_edac: Fix wrong device id for channel 1 devices i7core: add support for Lynnfield alternate address i7core_edac: Add initial support for Lynnfield i7core_edac: do not export static functions edac: fix i7core build edac: i7core_edac produces undefined behaviour on 32bit i7core_edac: Use a more generic approach for probing PCI devices i7core_edac: PCI device is called NONCORE, instead of NOCORE i7core_edac: Fix ringbuffer maxsize i7core_edac: First store, then increment i7core_edac: Better parse "any" addrmask i7core_edac: Use a lockless ringbuffer edac: Create an unique instance for each kobj ... commit e620d1e39aa33b43bed96aa7f2ebbc88914aed58 Merge: d2dd328 666092c Author: Linus Torvalds Date: Fri Jun 4 15:38:12 2010 -0700 Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 * 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (87 commits) V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability V4L/DVB: ivtv: Avoid accidental video standard change V4L/DVB: ivtvfb : Module load / unload fixes V4L/DVB: cx2341x: Report correct temporal setting for log-status V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address V4L/DVB: drivers/media: Eliminate a NULL pointer dereference V4L/DVB: dvb-core: Fix ULE decapsulation bug V4L/DVB: Bug fix: make IR work again for dm1105 V4L/DVB: media/IR: nec-decoder needs to select BITREV V4L/DVB: video/saa7134: change dprintk() to i2cdprintk() V4L/DVB: video/saa7134: remove duplicate break V4L/DVB: IR/imon: add auto-config for 0xffdc rf device V4L/DVB: IR/imon: clean up usage of bools V4L/DVB: em28xx: remove unneeded null checks V4L/DVB: ngene: remove unused #include V4L/DVB: ak881x needs slab.h V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote V4L/DVB: drivers/media: Use kzalloc V4L/DVB: m920x: Select simple tuner ... commit d2dd328b7f7bc6cebe167648289337755944ad2a Merge: c1518f1 1abec4f Author: Linus Torvalds Date: Fri Jun 4 15:37:44 2010 -0700 Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block * 'for-linus' of git://git.kernel.dk/linux-2.6-block: (27 commits) block: make blk_init_free_list and elevator_init idempotent block: avoid unconditionally freeing previously allocated request_queue pipe: change /proc/sys/fs/pipe-max-pages to byte sized interface pipe: change the privilege required for growing a pipe beyond system max pipe: adjust minimum pipe size to 1 page block: disable preemption before using sched_clock() cciss: call BUG() earlier Preparing 8.3.8rc2 drbd: Reduce verbosity drbd: use drbd specific ratelimit instead of global printk_ratelimit drbd: fix hang on local read errors while disconnected drbd: Removed the now empty w_io_error() function drbd: removed duplicated #includes drbd: improve usage of MSG_MORE drbd: need to set socket bufsize early to take effect drbd: improve network latency, TCP_QUICKACK drbd: Revert "drbd: Create new current UUID as late as possible" brd: support discard Revert "writeback: fix WB_SYNC_NONE writeback from umount" Revert "writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync" ... commit c1518f12bab97a6d409a25aaccb02dc8895800f3 Merge: a094c0a cbab05f Author: Linus Torvalds Date: Fri Jun 4 15:37:21 2010 -0700 Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: gconfig: fix build failure on fedora 13 commit a094c0afc3515aaf962dd0793f3b23fe67e6b192 Merge: f9196e7 640f7dc Author: Linus Torvalds Date: Fri Jun 4 15:27:59 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (27 commits) Staging: sep: return -EFAULT on copy_to_user errors Staging: rc2860: return -EFAULT on copy_to_user errors Staging: Eliminate a NULL pointer dereference staging: Use GFP_ATOMIC when a lock is held Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c Staging: comedi: fixing ni_labpc to mite dependancy Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependencies Staging: phison: depends on ATA_BMDMA Staging: iio-utils: fix memory overflow for dynamically allocateded memory to hold filename Staging: adis16255: add proper section markings to hotplug funcs Staging: adis16255: fix typo in Kconfig Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL Staging: batman-adv: Don't call free_netdev twice Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock Staging: batman-adv: fix rogue packets on shutdown Staging: add MSM framebuffer driver Staging: comedi: fixing ni_tio to mite PCI dependancy Staging: comedi: fix 8255 and DAS08 Kconfig dependancies. Staging: comedi: For COMEDI_BUFINFO, check access to command Staging: comedi: COMEDI_BUFINFO with no async - report no bytes read or written ... commit f9196e7c03bfefbb8933c7af579c3c6caa72ea53 Merge: bf4282c 75de46b Author: Linus Torvalds Date: Fri Jun 4 15:27:27 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: fix setattr error handling in sysfs, configfs kobject: free memory if netlink_kernel_create() fails lib/kobject_uevent.c: fix CONIG_NET=n warning commit bf4282cbcf7f53c23e87fb0cef945591cdc8d631 Merge: d7940b0 66169ad Author: Linus Torvalds Date: Fri Jun 4 15:23:07 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: serial: add support for various Titan PCI cards vt_ioctl: return -EFAULT on copy_from_user errors serial: altera_uart: Proper section for altera_uart_remove tty: fix a little bug in scrup, vt.c altera_uart: Simplify altera_uart_console_putc altera_uart: Don't take spinlock in already protected functions TTY/n_gsm: potential double lock serial: bfin_5xx: fix typo in IER check serial: bfin_5xx: IRDA is not affected by anomaly 05000230 serial_cs: add and sort IDs for serial and modem cards msm_serial: fix serial on trout commit d7940b04fa441b06b69f05faef43c5fb2156ab72 Merge: 683eb94 c043f12 Author: Linus Torvalds Date: Fri Jun 4 15:22:31 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: USB: unbind all interfaces before rebinding them USB: serial: digi_acceleport: Eliminate a NULL pointer dereference usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected USB: cdc-acm: fix resource reclaim in error path of acm_probe USB: ftdi_sio: fix DTR/RTS line modes USB: s3c-hsotg: Ensure FIFOs are fully flushed after layout USB: s3c-hsotg: SoftDisconnect minimum 3ms USB: s3c-hsotg: Ensure TX FIFO addresses setup when initialising FIFOs USB: s3c_hsotg: define USB_GADGET_DUALSPEED in Kconfig USB: s3c: Enable soft disconnect during initialization USB: xhci: Print NEC firmware version. USB: xhci: Wait for host to start running. USB: xhci: Wait for controller to be ready after reset. USB: isp1362: fix inw warning on Blackfin systems USB: mos7840: fix null-pointer dereference commit 683eb94777c3c67b9b258765b9cb03641344c418 Author: Cory Maccarrone Date: Fri Jun 4 14:15:07 2010 -0700 omap: remove BUG_ON for disabled interrupts Remove a BUG_ON for when interrupts are disabled during an MMC request. During boot, interrupts can be disabled when a request is made, causing this bug to be triggered. In reality, there's no reason this should halt the kernel, as the driver has proved reliable in spite of disabled interrupts, and additionally, there's nothing in this code that would require interrupts to be enabled. The only setup I've managed to make it trigger on is on the HTC Herald during bootup when the driver is built into the kernel (mostly because that's all I have). I believe it's related to the fact that on bootup I get many timeout errors on "CMD5" while initializing the card. Each CMD5 timeout triggers that bug (I changed it to a WARN_ON to get it to boot in) due to the fact that part of the timeout code involves sending the request again. With interrupts turned off, that BUG would be triggered. Signed-off-by: Cory Maccarrone Acked-by: Tony Lindgren Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb21c7ce18eff8e6e7877ca1d06c6db719376e3c Author: KOSAKI Motohiro Date: Fri Jun 4 14:15:05 2010 -0700 vmscan: fix do_try_to_free_pages() return value when priority==0 reclaim failure Greg Thelen reported recent Johannes's stack diet patch makes kernel hang. His test is following. mount -t cgroup none /cgroups -o memory mkdir /cgroups/cg1 echo $$ > /cgroups/cg1/tasks dd bs=1024 count=1024 if=/dev/null of=/data/foo echo $$ > /cgroups/tasks echo 1 > /cgroups/cg1/memory.force_empty Actually, This OOM hard to try logic have been corrupted since following two years old patch. commit a41f24ea9fd6169b147c53c2392e2887cc1d9247 Author: Nishanth Aravamudan Date: Tue Apr 29 00:58:25 2008 -0700 page allocator: smarter retry of costly-order allocations Original intention was "return success if the system have shrinkable zones though priority==0 reclaim was failure". But the above patch changed to "return nr_reclaimed if .....". Oh, That forgot nr_reclaimed may be 0 if priority==0 reclaim failure. And Johannes's patch 0aeb2339e54e ("vmscan: remove all_unreclaimable scan control") made it more corrupt. Originally, priority==0 reclaim failure on memcg return 0, but this patch changed to return 1. It totally confused memcg. This patch fixes it completely. Reported-by: Greg Thelen Signed-off-by: KOSAKI Motohiro Acked-by: Johannes Weiner Acked-by: KAMEZAWA Hiroyuki Tested-by: Greg Thelen Acked-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e506f7adce8e6165a104d3d78fddd8ff0cdccf8 Author: Akinobu Mita Date: Fri Jun 4 14:15:04 2010 -0700 kernel/: fix BUG_ON checks for cpu notifier callbacks direct call The commit 80b5184cc537718122e036afe7e62d202b70d077 ("kernel/: convert cpu notifier to return encapsulate errno value") changed the return value of cpu notifier callbacks. Those callbacks don't return NOTIFY_BAD on failures anymore. But there are a few callbacks which are called directly at init time and checking the return value. I forgot to change BUG_ON checking by the direct callers in the commit. Signed-off-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 94b3dd0f7bb393d93e84a173b1df9b8b64c83ac4 Author: Greg Thelen Date: Fri Jun 4 14:15:03 2010 -0700 cgroups: alloc_css_id() increments hierarchy depth Child groups should have a greater depth than their parents. Prior to this change, the parent would incorrectly report zero memory usage for child cgroups when use_hierarchy is enabled. test script: mount -t cgroup none /cgroups -o memory cd /cgroups mkdir cg1 echo 1 > cg1/memory.use_hierarchy mkdir cg1/cg11 echo $$ > cg1/cg11/tasks dd if=/dev/zero of=/tmp/foo bs=1M count=1 echo echo CHILD grep cache cg1/cg11/memory.stat echo echo PARENT grep cache cg1/memory.stat echo $$ > tasks rmdir cg1/cg11 cg1 cd / umount /cgroups Using fae9c79, a recent patch that changed alloc_css_id() depth computation, the parent incorrectly reports zero usage: root@ubuntu:~# ./test 1+0 records in 1+0 records out 1048576 bytes (1.0 MB) copied, 0.0151844 s, 69.1 MB/s CHILD cache 1048576 total_cache 1048576 PARENT cache 0 total_cache 0 With this patch, the parent correctly includes child usage: root@ubuntu:~# ./test 1+0 records in 1+0 records out 1048576 bytes (1.0 MB) copied, 0.0136827 s, 76.6 MB/s CHILD cache 1052672 total_cache 1052672 PARENT cache 0 total_cache 1052672 Signed-off-by: Greg Thelen Acked-by: Paul Menage Acked-by: KAMEZAWA Hiroyuki Acked-by: Li Zefan Cc: [2.6.34.x] Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 007d08678eb87478b65b3f229960c81dd7c7b8f3 Author: Heiko Carstens Date: Fri Jun 4 14:15:02 2010 -0700 lib: add s390 to atomic64_dec_if_positive archs Add s390 to list of architectures that have atomic64_dec_if_positive implemented so we get rid of this warning: lib/atomic64_test.c:129:2: warning: #warning Please implement atomic64_dec_if_positive for your architecture, and add it to the IF above Signed-off-by: Heiko Carstens Cc: Luca Barbieri Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1413357d924792e2e332dcb6b712a7fb2a5fb25 Author: Thadeu Lima de Souza Cascardo Date: Fri Jun 4 14:15:00 2010 -0700 fbdev: fix frame buffer devices menu Commit f601441916d1e19291d0b4f044b4a7551e2924d0 ("imxfb: add support for i.MX25:) has inserted the symbol HAVE_FB_IMX, which does not depend on FB after the menuconfig FB. This breaks the menu, presenting most of the drivers outside of it, when using menuconfig. Moving the symbol to the start of the file, just like HAVE_FB_ATMEL, fixes the problem without breaking it for iMX25 configurations (tested with ARCH=arm, no build). Signed-off-by: Thadeu Lima de Souza Cascardo Cc: Sascha Hauer Acked-by: Uwe Kleine-König Acked-by: Baruch Siach Cc: "David S. Miller" Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc0ccfceb8aa6800040ba4f37a36ee306aa71c9f Author: Cesar Eduardo Barros Date: Fri Jun 4 14:14:58 2010 -0700 arch/um: fix kunmap_atomic() call in skas/uaccess.c kunmap_atomic() takes a pointer to within the page, not the struct page. Signed-off-by: Cesar Eduardo Barros Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 485d527686850d68a0e9006dd9904f19f122485e Author: Oleg Nesterov Date: Fri Jun 4 14:14:58 2010 -0700 sys_personality: change sys_personality() to accept "unsigned int" instead of u_long task_struct->pesonality is "unsigned int", but sys_personality() paths use "unsigned long pesonality". This means that every assignment or comparison is not right. In particular, if this argument does not fit into "unsigned int" __set_personality() changes the caller's personality and then sys_personality() returns -EINVAL. Turn this argument into "unsigned int" and avoid overflows. Obviously, this is the user-visible change, we just ignore the upper bits. But this can't break the sane application. There is another thing which can confuse the poorly written applications. User-space thinks that this syscall returns int, not long. This means that the returned value can be negative and look like the error code. But note that libc won't be confused and thus errno won't be set, and with this patch the user-space can never get -1 unless sys_personality() really fails. And, most importantly, the negative RET != -1 is only possible if that app previously called personality(RET). Pointed-out-by: Wenming Zhang Suggested-by: Linus Torvalds Signed-off-by: Oleg Nesterov Cc: "H. Peter Anvin" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6d03f9158516b50d0d343158e3f33bcff1e4ca5 Author: Albert Herranz Date: Fri Jun 4 14:14:57 2010 -0700 fb_defio: redo fix for non-dirty ptes As pointed by Nick Piggin, ->page_mkwrite provides a way to keep a page locked until the associated PTE is marked dirty. Re-implement the fix by using this mechanism. Signed-off-by: Albert Herranz Acked-by: Jaya Kumar Acked-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3f505ca45735c35576dab4ceb3e3736d528b6672 Author: Albert Herranz Date: Fri Jun 4 14:14:56 2010 -0700 Revert "fb_defio: fix for non-dirty ptes" This reverts commit 49bbd815fd8ba26d0354900b783b767c7f47c816 ("fb_defio: fix for non-dirty ptes"). Although the fix provided is correct, it's been suggested to avoid the underlying race in the same way as it is currently done in filesystems like NFS, for maintainability. A following patch "fb_defio: redo fix for non-dirty ptes" will provide such an alternate fix. Signed-off-by: Albert Herranz Cc: Jaya Kumar Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1da083c9b23dafd6bcb08dcfec443e66e90efff0 Author: Mike Frysinger Date: Fri Jun 4 14:14:55 2010 -0700 flat: fix unmap len in load error path The data chunk is mmaped with 'len' which remains unchanged, so use that when unmapping in the error path rather than trying to recalculate (and incorrectly so) the value used originally. Signed-off-by: Mike Frysinger Acked-by: David McCullough Acked-by: Greg Ungerer Cc: Paul Mundt Cc: Michal Simek Cc: Hirokazu Takata Cc: Geert Uytterhoeven Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e94de8acbe524d919f1ea8807913d7b005e1578 Author: Mike Frysinger Date: Fri Jun 4 14:14:53 2010 -0700 fs/binfmt_flat.c: split the stack & data alignments The stack and data have different alignment requirements, so don't force them to wear the same shoe. Increase the data alignment to match that which the elf2flt linker script has always been using: 0x20 bytes. Not only does this bring the kernel loader in line with the toolchain, but it also fixes a swath of gcc tests which try to force larger alignment values but randomly fail when the FLAT loader fails to deliver. Signed-off-by: Mike Frysinger Cc: Herbert Xu Cc: David Woodhouse Cc: Pekka Enberg Acked-by: David McCullough Acked-by: Greg Ungerer Cc: Paul Mundt Tested-by: Michal Simek Cc: Hirokazu Takata Cc: Yoshinori Sato Cc: Geert Uytterhoeven Cc: Jie Zhang Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55adaa495edc429be84399f83df80dfb7f36598b Author: Dmitry Torokhov Date: Fri Jun 4 14:14:52 2010 -0700 vmware balloon: clamp number of collected non-balloonable pages Limit number of accumulated non-balloonable pages during inflation cycle, otherwise there is a chance we will be spinning and growing the list forever. This happens during torture tests when balloon target changes while we are in the middle of inflation cycle and monitor starts refusing to lock pages (since they are not needed anymore). Signed-off-by: Dmitry Torokhov Acked-by: Bhavesh Davda Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f76f5d71048e116f76d2eb02226b01d50890e2f4 Author: Nick Piggin Date: Fri Jun 4 14:14:51 2010 -0700 xtensa: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page fault") , we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin Acked-by: David Rientjes Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c421b08ef52f38049c6f591c5d260a97af7b0000 Author: Nick Piggin Date: Fri Jun 4 14:14:51 2010 -0700 mn10300: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page fault") , we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin Acked-by: David Rientjes Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 68db30ce609a8fc21b95f38f509c65dab0ecfa96 Author: Nick Piggin Date: Fri Jun 4 14:14:49 2010 -0700 m32r: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page fault") , we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin Acked-by: David Rientjes Cc: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f9c497c4aea28be826b8450a5339952f2ffc705e Author: Nick Piggin Date: Fri Jun 4 14:14:49 2010 -0700 frv: invoke oom-killer from page fault As explained in commit 1c0fe6e3bd ("mm: invoke oom-killer from page fault") , we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin Acked-by: David Howells Acked-by: David Rientjes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b7e5d1f04104d98895945ecb463d750320dcd6cf Author: Heiko Carstens Date: Fri Jun 4 14:14:48 2010 -0700 ramoops: add HAS_IOMEM dependency The driver fails to compile on s390: drivers/char/ramoops.c: In function 'ramoops_init': drivers/char/ramoops.c:122: error: implicit declaration of function 'ioremap' Since we won't make use of the driver anyway on s390 just let it depend on HAS_IOMEM. Signed-off-by: Heiko Carstens Cc: Marco Stornelli Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cbe17701a0379c7b05a79a6df4f24e41d2afde8 Author: Heiko Carstens Date: Fri Jun 4 14:14:47 2010 -0700 fs/compat_rw_copy_check_uvector: add missing compat_ptr call A call to access_ok is missing a compat_ptr conversion. Introduced with b83733639a494d5f42fa00a2506563fbd2d3015d "compat: factor out compat_rw_copy_check_uvector from compat_do_readv_writev" fs/compat.c: In function 'compat_rw_copy_check_uvector': fs/compat.c:629: warning: passing argument 1 of '__access_ok' makes pointer from integer without a cast Signed-off-by: Heiko Carstens Reviewed-by: Jeff Moyer Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eaa6e4dd4bf243a357056448e54d7c673cd44acb Author: Maurus Cuelenaere Date: Fri Jun 4 14:14:46 2010 -0700 rtc: s3c: initialize s3c_rtc_cpu_type before using it Make sure s3c_rtc_cpu_type is initialised _before_ it's used in an if() check. Reported-by: Jiri Pinkava Signed-off-by: Maurus Cuelenaere Cc: Paul Gortmaker Cc: Alessandro Zummo Cc: Maurus Cuelenaere Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e893de59a4982791368b3ce412bc67dd601a88a0 Author: Maurus Cuelenaere Date: Fri Jun 4 14:14:44 2010 -0700 rtc: s3c: initialize driver data before using it s3c_rtc_setfreq() uses the platform driver data to derive struct rtc_device, so make sure drvdata is set _before_ s3c_rtc_setfreq() is called. Signed-off-by: Maurus Cuelenaere Cc: Paul Gortmaker Cc: Alessandro Zummo Cc: Maurus Cuelenaere Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01afaf61983d08ed1c9e5e8f2fcf4f40e9008033 Author: Andrew Hendry Date: Fri Jun 4 22:51:24 2010 +1000 Minix: Clean up left over label Remove a left over fail label. Signed-off-by: Andrew Hendry Signed-off-by: Al Viro commit af5a30d8cfcfc561336f982b06345d6b815e0bb3 Author: Nick Piggin Date: Thu Jun 3 22:01:46 2010 +1000 fix truncate inode time modification breakage mtime and ctime should be changed only if the file size has actually changed. Patches changing ext2 and tmpfs from vmtruncate to new truncate sequence has caused regressions where they always update timestamps. There is some strange cases in POSIX where truncate(2) must not update times unless the size has acutally changed, see 6e656be89. This area is all still rather buggy in different ways in a lot of filesystems and needs a cleanup and audit (ideally the vfs will provide a simple attribute or call to direct all filesystems exactly which attributes to change). But coming up with the best solution will take a while and is not appropriate for rc anyway. So fix recent regression for now. Signed-off-by: Nick Piggin Signed-off-by: Al Viro commit 8718d36cf99f5acf0f37487557ec25aee54b930b Author: Nick Piggin Date: Mon May 31 17:58:02 2010 +1000 fix setattr error handling in sysfs, configfs sysfs and configfs setattr functions have error cases after the generic inode's attributes have been changed. Fix consistency by changing the generic inode attributes only when it is guaranteed to succeed. Signed-off-by: Nick Piggin Signed-off-by: Al Viro commit 5b54470daded19d83ea2bbf5f6bc12662942cd63 Author: Dan Carpenter Date: Thu Jun 3 12:35:42 2010 +0200 fcntl: return -EFAULT if copy_to_user fails copy_to_user() returns the number of bytes remaining, but we want to return -EFAULT. ret = fcntl(fd, F_SETOWN_EX, NULL); With the original code ret would be 8 here. V2: Takuya Yoshikawa pointed out a similar issue in f_getown_ex() Signed-off-by: Dan Carpenter Signed-off-by: Al Viro commit 7d683a09990ff095a91b6e724ecee0ff8733274a Author: Roberto Sassu Date: Thu Jun 3 11:58:28 2010 +0200 wrong type for 'magic' argument in simple_fill_super() It's used to superblock ->s_magic, which is unsigned long. Signed-off-by: Roberto Sassu Reviewed-by: Mimi Zohar Signed-off-by: Eric Paris CC: stable@kernel.org Signed-off-by: Al Viro commit 971b2e8a3f5dc0cbef19ec1a77b6d20237aa751e Author: Al Viro Date: Fri May 28 21:32:44 2010 -0400 fix the deadlock in qib_fs get_sb_single() calls fill_super with superblock locked; calling deactivate_super() will deadlock immedately. Moreover, if fill_super callback returns an error, get_sb_single() will release the reference to superblock itself just fine. Signed-off-by: Al Viro commit 0abbb609ac511fc226b8b1082613193c8ecf8324 Author: Al Viro Date: Fri May 28 19:06:15 2010 -0400 mqueue doesn't need make_bad_inode() It never hashes them anyway and does final iput() immediately afterwards. With ->drop_inode() being generic_delete_inode()... Signed-off-by: Al Viro commit 640f7dcfe047aa5859df5f5d41e7f6455a442b89 Author: Dan Carpenter Date: Fri Jun 4 12:38:40 2010 +0200 Staging: sep: return -EFAULT on copy_to_user errors copy_to_user() returns the number of bytes remaining but we want to return a negative error code here. These functions are used in the ioctl handler and the error code gets returned to userspace. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 2d98bb22c33b033182edd3a3c6b4c4e1d091db4d Author: Dan Carpenter Date: Fri Jun 4 12:39:51 2010 +0200 Staging: rc2860: return -EFAULT on copy_to_user errors copy_to_user() returns the number of bytes remaining but we want to return a negative error code. This is in the ioctl handler and the error code gets passed to userspace. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c60e55f30a4dac15db51b398c3bd94e4cfbf743a Author: Julia Lawall Date: Thu May 27 14:37:19 2010 +0200 Staging: Eliminate a NULL pointer dereference Eliminate a NULL or near NULL pointer dereference. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 0aa3f139cd5123ffb8f397b91d777635e9761c24 Author: Julia Lawall Date: Sun May 30 22:27:46 2010 +0200 staging: Use GFP_ATOMIC when a lock is held In each case, the containing function is only called from one place, where a spin lock is held. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @gfp exists@ identifier fn; position p; @@ fn(...) { ... when != spin_unlock when any GFP_KERNEL@p ... when any } @locked@ identifier gfp.fn; @@ spin_lock(...) ... when != spin_unlock fn(...) @depends on locked@ position gfp.p; @@ - GFP_KERNEL@p + GFP_ATOMIC // Signed-off-by: Julia Lawall Cc: Jonathan Cameron Cc: Marek Lindner Cc: Martyn Welch Signed-off-by: Greg Kroah-Hartman commit ebe8622342f12bed387f7de4b5fb7c52005ccb29 Author: Martin Homuth-Rosemann Date: Mon May 31 22:33:04 2010 +0200 Staging: comedi - correct parameter gainlkup for DAQCard-6024E in driver ni_mio_cs.c Correct at least one of the incorrect specs for a national instrument data acquisition card DAQCard-6024E. This card has only four different gain settings (+-10V, +-5V, +-0.5V, +-0.05V). Signed-off-by: Martin Homuth-Rosemann Cc: stable Signed-off-by: Greg Kroah-Hartman commit 7f00b36e9e7d2026d546d61e0b1a62949617fee0 Author: Alexander Kurz Date: Thu Jun 3 15:50:24 2010 +0400 Staging: comedi: fixing ni_labpc to mite dependancy the dependancy of ni_labpc on mite was missing, Signed-off-by: Alexander Kurz Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman index 0aa2b0d..79f5f2e 100644 commit f502cb6eb28e55c19cea9c2005661c7898f2de99 Author: Henk de Groot Date: Wed Jun 2 21:30:00 2010 +0200 Staging: wlags49_h2, wlags49_h25: fixed Kconfig dependencies Fixes Kconfig so the wlags49_h2 and wlags49_h25 drivers can be selected from menuconfig without having to select another WLAN driver first. Before it could only be selected when another driver already selected WIRELESS_EXT. Also adds WEXT_PRIV on which the driver also depends. Align help text in Kconfig. Signed-off-by: Henk de Groot Signed-off-by: Greg Kroah-Hartman commit c28040e515154462971ba97ec14a82c27fcfb683 Author: Randy Dunlap Date: Wed May 26 10:30:02 2010 -0700 Staging: phison: depends on ATA_BMDMA phison uses interfaces and data that are built only when ATA_BMDMA is enabled, so it should depend on that symbol. drivers/staging/phison/phison.c:43: error: implicit declaration of function 'ATA_BMDMA_SHT' drivers/staging/phison/phison.c:43: error: initializer element is not constant drivers/staging/phison/phison.c:43: error: (near initialization for 'phison_sht.module') drivers/staging/phison/phison.c:47: error: 'ata_bmdma_port_ops' undeclared here (not in a function) Signed-off-by: Randy Dunlap Cc: evan_ko@phison.com Signed-off-by: Greg Kroah-Hartman commit b6ee30a27f8204d20aebe6e743e38d4b85ee753d Author: Barry Song <21cnbao@gmail.com> Date: Tue May 25 17:40:04 2010 +0800 Staging: iio-utils: fix memory overflow for dynamically allocateded memory to hold filename Signed-off-by: Barry Song <21cnbao@gmail.com> Acked-by: Jonathan Cameron Signed-off-by: Greg Kroah-Hartman commit c3dee74f52bb844db40865dae3c465212c6a09eb Author: Mike Frysinger Date: Mon May 24 00:55:42 2010 -0400 Staging: adis16255: add proper section markings to hotplug funcs Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 08a16d9f0effe8b7fd31995a7bd418a45ef2d6e7 Author: Mike Frysinger Date: Mon May 24 00:55:41 2010 -0400 Staging: adis16255: fix typo in Kconfig Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 0375fc4d2748b7c7064d481b36e32ef19e43d8db Author: Sven Eckelmann Date: Sat May 22 17:48:47 2010 +0200 Staging: batman-adv: Don't allocate icmp packet with GFP_KERNEL A new buffer for a packet is created when a icmp packet is received. This happens in a context with disabled irq. Thus we are not allowed to sleep or call function which might sleep. kmalloc must be called with GFP_ATOMIC instead of GFP_KERNEL to ensure that it does not sleep. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 3d9b2358930a3e5225b28ac1458236f3d667e368 Author: Sven Eckelmann Date: Sat May 22 17:48:46 2010 +0200 Staging: batman-adv: Don't call free_netdev twice Free_netdev is registered as destructor in interface_setup for every soft_device. This destructor is automatically called from unregister_netdev and we must not call it again for the freed net_device. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 20c8a44b7cd5e56b62898a87f620b3a7269eb898 Author: Sven Eckelmann Date: Sat May 22 17:48:45 2010 +0200 Staging: batman-adv: Call unregister_netdev on failures to get rtnl lock We must call unregister_netdev when we couldn't initialise the batman-adv module and the soft_device was registered. There are two version of the function which we can use: * unregister_netdevice - removes device * unregister_netdev - takes rtnl semaphore and remove device We don't hold the semaphore in an error situation. So we must use unregister_netdev. Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 5f411a90ee163801434775264b4f9932f1de9e4c Author: Marek Lindner Date: Sat May 22 17:48:44 2010 +0200 Staging: batman-adv: fix rogue packets on shutdown On module shutdown batman-adv would purge the internal packet queue by sending all remaining packets which could confuse other nodes. Now, the packets are silently discarded. Signed-off-by: Marek Lindner Signed-off-by: Sven Eckelmann Signed-off-by: Greg Kroah-Hartman commit 9d20015391dfc47f6371492925cc0333ac403414 Author: Stepan Moskovchenko Date: Wed May 19 11:03:30 2010 -0700 Staging: add MSM framebuffer driver Qualcomm development of the MSM SOC framebuffer driver has diverged significantly from the driver used by Android. This is a snapshot of our current driver, in all it's agony. We are putting this in staging to help with the process of converging the two drivers. At this point, the driver has been tested only in dumb framebuffer mode. Signed-off-by: Stepan Moskovchenko Signed-off-by: David Brown Signed-off-by: Abhijeet Dharmapurikar [dwalker@codeaurora.org: added a small compile fix and TODO.] Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman commit 34ef545aa8c68d91e2e503ac05c129094772afb4 Author: Alexander Kurz Date: Thu May 20 00:32:42 2010 +0400 Staging: comedi: fixing ni_tio to mite PCI dependancy On Wed, 19 May 2010, Randy Dunlap wrote: > linux-next of 2010-0519: > when CONFIG_PCI is not enabled: > > drivers/staging/comedi/drivers/mite.c: In function 'mite_init': > drivers/staging/comedi/drivers/mite.c:89: error: implicit declaration of function 'pci_dev_get' > drivers/staging/comedi/drivers/mite.c:89: warning: assignment makes pointer from integer without a cast > make[5]: *** [drivers/staging/comedi/drivers/mite.o] Error 1 This patch fixes the problem. Signed-off-by: Alexander Kurz Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 824196248c1f28aa7d151fd5b11d76182c751f19 Author: Alexander Kurz Date: Wed May 19 23:13:19 2010 +0400 Staging: comedi: fix 8255 and DAS08 Kconfig dependancies. Both drivers support directly or indirectly multiple bus types, hence both are listed independent of bus types. Signed-off-by: Alexander Kurz Signed-off-by: Greg Kroah-Hartman commit 53fa827e295d8b09a2446b3126577244644d256d Author: Ian Abbott Date: Wed May 19 18:09:50 2010 +0100 Staging: comedi: For COMEDI_BUFINFO, check access to command Don't allow COMEDI_BUFINFO ioctl if some other file object has locked the subdevice or has an active command. If there is no active command, just report back the last buffer position. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 4772c018e35b6a21e8a8bde54568b59998540a16 Author: Ian Abbott Date: Wed May 19 18:09:49 2010 +0100 Staging: comedi: COMEDI_BUFINFO with no async - report no bytes read or written When the COMEDI_BUFINFO ioctl is used on a subdevice without asynchronous streaming command support, set 'bytes_read = 0' and 'bytes_written = 0' in the buffer info returned back to the user. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit d261154057c27f6c1d256b6198b0ad08733f1758 Author: Ian Abbott Date: Wed May 19 17:22:41 2010 +0100 Staging: comedi: don't write to buffer if command finished For write(), any data copied to the data buffer after the previously set up streaming acquisition command has finished won't be used, but a non-empty write() does not currently return 0 (or -EPIPE on error) after the command has finished until the data buffer has been filled up. Change this behavior to return 0 (or -EPIPE) any time after the command has finished, without bothering to fill up the buffer with more useless data. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit ee4063fa6bd801fa6ea045f23a2934db009b3dac Author: Ian Abbott Date: Wed May 19 16:59:40 2010 +0100 Staging: comedi: amplc_dio200: Protect counter subdevice with spinlock The internal state of an 82C54 counter timer chip will get messed up if several threads read, write, configure, or check the status of the chip simultaneously. Protect the register access sequences with a spin lock. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit d4da77a73cb9cc9a1a349daa1a2723505b086e2d Author: Ian Abbott Date: Wed May 19 16:34:07 2010 +0100 Staging: comedi: adv_pci_dio: Support Advantech PCI-1735U Add support for the Advantech PCI-1735U card, including support for a counter subdevice (based on an 82C54 counter timer chip). The counter subdevice needs more testing, as the only person I know who tried it couldn't get it to work! Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit b2e68b00d5d3698c228f549c02f4f79305d2b270 Author: Ian Abbott Date: Wed May 19 15:11:58 2010 +0100 Staging: comedi: addi-data: don't overwrite name for request_irq() The Addi-Data PCI drivers for Comedi use sprintf() in their comedi "attach" routine to construct a string to pass as the name in the call to request_irq(). All calls to "attach" routine share the same static buffer for this name, but the contents will differ on each call (including the comedi device number and the comedi board name). This changes the name displayed in /proc/interrupts for previous calls to request_irq() using the same buffer. Just use the board name instead; it has slightly less information (no comedi device number) but at least it doesn't change over the lifetime of the IRQ handler. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit 6d8b0f5be5108f6a3fc922ca4acfbf10e14d6cd0 Author: Ian Abbott Date: Wed May 19 15:11:57 2010 +0100 Staging: comedi: Give the addi_apci_* drivers different driver names It is not currently possible for more than one of the addi_apci_* drivers to register themselves with comedi at once because they all use the same comedi driver name "addi_common". Give them different names. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman commit a4cff8b82a3cd0c95348ad4ae28cee7a918a35cd Author: Sreedhara DS Date: Tue Jun 1 12:50:06 2010 +0100 Staging: mid: Intel MID touch screen driver Touchscreen driver used by intel mid devices. Some clean up by Alan Cox. This driver is basically ready for upstreaming properly but is tied wrongly to the SPI layer and needs firmware/SFI changes to fix that. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman commit d7636e0b0769e0f4f437ff33168d723f86e7c080 Author: apatard@mandriva.com Date: Wed May 19 10:44:14 2010 +0200 staging: Add framebuffer driver for XGI chipsets This driver handles XG20, XG21, XG40, XG42 chipsets from XGI. They're also known as Z7,Z9,Z11 chipsets. It's based on the SiS fb driver but has been heavily modified by XGI to support their newer chipsets. Signed-off-by: Arnaud Patard Signed-off-by: Greg Kroah-Hartman commit 66169ad17d9c67a33608830dd83dcef55c85a756 Author: Yegor Yefremov Date: Fri Jun 4 09:58:18 2010 +0200 serial: add support for various Titan PCI cards serial: add support for various Titan PCI cards Models: 200I, 400I, 800I, 400EH, 800EH, 800EHB, 100E, 200E, 400E, 800E, 200EI, 200EISI Signed-off-by: Yegor Yefremov Signed-off-by: Greg Kroah-Hartman commit 3fde85df5421eb01f563fef6f111ba73ab0d120e Author: Dan Carpenter Date: Fri Jun 4 12:20:46 2010 +0200 vt_ioctl: return -EFAULT on copy_from_user errors copy_from_user() returns the number of bytes remaining but we want to return a negative error code here. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit c1bfffa94e0ca951ed450788991c9310adb8e823 Author: Tobias Klauser Date: Mon May 31 15:01:08 2010 +0200 serial: altera_uart: Proper section for altera_uart_remove altera_uart_remove should be in .devexit.text Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 962400e8fd29981a7b166e463dd143b6ac6a3e76 Author: Frank Pan Date: Wed May 26 15:37:43 2010 +0800 tty: fix a little bug in scrup, vt.c The code uses vc->vc_cols instead of vc->vc_size_row by mistake, it will cause half of the region which is going to clear remain uncleared. The issue happens in background consoles, so it's hard to observe. Frank Pan Signed-off-by: Frank Pan Cc: stable Signed-off-by: Greg Kroah-Hartman commit fadf34f0f05ca5ea02ffcd89544cd372bbdb739b Author: Tobias Klauser Date: Tue May 25 17:00:08 2010 +0200 altera_uart: Simplify altera_uart_console_putc The check for the TRDY flag after writing the character is not needed. Also do a cpu_relax() inside the loop. Pass a struct uart_port to altera_uart_console_putc, so we do not need to get it (and dereference pointers) for every character. Cc: Thomas Chou Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit d8d721f4c005f9a69bd1b5d5c6ba99b7e1d464de Author: Tobias Klauser Date: Tue May 25 16:59:55 2010 +0200 altera_uart: Don't take spinlock in already protected functions Don't take the port spinlock in uart functions where the serial core already takes care of locking/unlocking them. The code would actually lock up on architectures where spinlocks are implemented (not the case on nios2 where this driver is primarily used for now, thus this bug didn't trigger). Also protect calling altera_uart_rx_chars/altera_uart_tx_chars in the interrupt handler by the port spinlock. Thanks to Ian Abbott for pointing these issues out. Cc: Ian Abbott Cc: Thomas Chou Signed-off-by: Tobias Klauser Signed-off-by: Greg Kroah-Hartman commit 328be395a396b1333b56e04571365dc614c96e46 Author: Dan Carpenter Date: Tue May 25 11:37:17 2010 +0200 TTY/n_gsm: potential double lock In gsm_dlci_data_kick() we call gsm_dlci_data_sweep() with the "gsm->tx_lock" held so we can't lock it again inside gsm_dlci_data_sweep(). I removed that lock from and added one to gsmld_write_wakeup() instead. The sweep function is only called from those two places. Signed-off-by: Dan Carpenter Acked-by: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman commit e59e2bd9e85604ad601ec7dd056baffcd6ad56a0 Author: Sonic Zhang Date: Sun May 23 04:40:14 2010 -0400 serial: bfin_5xx: fix typo in IER check This most likely won't cause problems on systems as people don't typically enable GPIO RTS/CTS if they don't actually use it. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit ca3e442e8dbbe2551473f36f0e7797b1d3205f5a Author: Graf Yang Date: Sun May 23 04:40:13 2010 -0400 serial: bfin_5xx: IRDA is not affected by anomaly 05000230 Anomaly 05000230 (over sampling of the UART STOP bit) applies only when the peripheral is operating in UART mode. So drop the anomaly handling when the UART is in IRDA mode. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 99ec88f345945208c650b54279dddc8dfd705571 Author: Alexander Kurz Date: Thu May 20 00:40:08 2010 +0400 serial_cs: add and sort IDs for serial and modem cards Signed-off-by: Alexander Kurz Signed-off-by: Greg Kroah-Hartman commit 18c79d76ece432a48c985ea404800f8ee154ada2 Author: Abhijeet Dharmapurikar Date: Thu May 20 15:20:23 2010 -0700 msm_serial: fix serial on trout Set the mnd counter based on uartclk. This fixes a problem on 7x30 where the uartclk is 19.2Mhz rather than the usual 4.8Mhz. Trout incorrectly reports uartclk to be running at 19.2Mhz It is actually running at 4.8Mhz. For trout force mnd counter values as if uartclk was fed by tcxo/4. Signed-off-by: Abhijeet Dharmapurikar [dwalker@codeaurora.org: inlined, moved into header, added comments.] Signed-off-by: Daniel Walker Signed-off-by: Greg Kroah-Hartman commit 75de46b98dda624397ccb17c106e51f478a79c15 Author: Nick Piggin Date: Mon May 31 17:58:02 2010 +1000 fix setattr error handling in sysfs, configfs sysfs and configfs setattr functions have error cases after the generic inode's attributes have been changed. Fix consistency by changing the generic inode attributes only when it is guaranteed to succeed. Signed-off-by: Nick Piggin Acked-by: Joel Becker Signed-off-by: Greg Kroah-Hartman commit 743db2d903bc4e963a31496328d847d69f75047c Author: Dan Carpenter Date: Tue May 25 11:51:10 2010 +0200 kobject: free memory if netlink_kernel_create() fails There is a kfree(ue_sk) missing on the error path if netlink_kernel_create() fails. Signed-off-by: Dan Carpenter Reviewed-by: "Eric W. Biederman" Signed-off-by: Greg Kroah-Hartman commit c842128607a50a670df5f9c75261db2e21db3c45 Author: Andrew Morton Date: Fri May 21 15:05:21 2010 -0700 lib/kobject_uevent.c: fix CONIG_NET=n warning lib/kobject_uevent.c:87: warning: 'kobj_bcast_filter' defined but not used Repairs "hotplug: netns aware uevent_helper" Cc: Eric W. Biederman Cc: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit c043f1245654a726925529007210e9f786426448 Author: Alan Stern Date: Fri Jun 4 14:02:42 2010 -0400 USB: unbind all interfaces before rebinding them This patch (as1387) fixes a bug introduced during the changeover to the runtime PM framework. When a driver doesn't support resume or reset-resume, and consequently its interfaces need to be unbound and rebound, we have to unbind all the interfaces before trying to rebind any of them. Otherwise the driver's probe method for one interface could try to claim a different interface and fail, because that other interface hasn't been unbound yet. This fixes Bugzilla #15788. The symptom is that some USB sound cards don't work after hibernation. Signed-off-by: Alan Stern Tested-by: François Valenduc Cc: stable [.34] Signed-off-by: Greg Kroah-Hartman commit 109f34e71b9049a57f6cdf3f1da6bee2b722b259 Author: Julia Lawall Date: Thu May 27 14:32:09 2010 +0200 USB: serial: digi_acceleport: Eliminate a NULL pointer dereference If port is NULL, then the call to dev_err will dereference a value that is a small offset from NULL. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman commit 1f23b2d98c11fed43c552a5dbd00c793f81a8736 Author: Grant Likely Date: Wed Jun 2 13:53:17 2010 -0600 usb: fix ehci_hcd build failure when both generic-OF and xilinx is selected This patch fixes the driver to allow both CONFIG_USB_EHCI_HCD_PPC_OF and CONFIG_USB_ECHI_HCD_XILINX to be selected. Signed-off-by: Grant Likely CC: John Linn CC: Alan Stern Signed-off-by: Greg Kroah-Hartman commit c2572b78aa0447244a38e555ebb1b3b48a0088a5 Author: Axel Lin Date: Mon May 31 08:04:47 2010 +0800 USB: cdc-acm: fix resource reclaim in error path of acm_probe This patch fixes resource reclaim in error path of acm_probe: 1. In the case of "out of memory (read urbs usb_alloc_urb)\n")", there is no need to call acm_read_buffers_free(acm) here. Fix it by goto alloc_fail6 instead of alloc_fail7. 2. In the case of "out of memory (write urbs usb_alloc_urb)", usb_alloc_urb may fail in any iteration of the for loop. Current implementation does not properly free allocated snd->urb. Fix it by goto alloc_fail8 instead of alloc_fail7. 3. In the case of device_create_file(&intf->dev,&dev_attr_iCountryCodeRelDate) fail, acm->country_codes is kfreed. As a result, device_remove_file for dev_attr_wCountryCodes will not be executed in acm_disconnect. Fix it by calling device_remove_file for dev_attr_wCountryCodes before goto skip_countries. Signed-off-by: Axel Lin Acked-by: Oliver Neukum Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 6a1a82df91fa0eb1cc76069a9efe5714d087eccd Author: Daniel Mack Date: Thu Jun 3 13:55:02 2010 +0200 USB: ftdi_sio: fix DTR/RTS line modes Call set_mctrl() and clear_mctrl() according to the flow control mode selected. This makes serial communication for FT232 connected devices work when CRTSCTS is not set. This fixes a regression introduced by 4175f3e31 ("tty_port: If we are opened non blocking we still need to raise the carrier"). This patch calls the low-level driver's dtr_rts() function which consequently sets TIOCM_DTR | TIOCM_RTS. A later call to set_termios() without CRTSCTS in cflags, however, does not reset these bits, and so data is not actually sent out on the serial wire. Signed-off-by: Daniel Mack Cc: Johan Hovold Cc: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1703a6d3c38944731ba23594843a704d828266f3 Author: Ben Dooks Date: Tue May 25 05:36:52 2010 +0100 USB: s3c-hsotg: Ensure FIFOs are fully flushed after layout According to the design guide, if the FIFO layout is changed, then the FIFOs must be flushed to ensure all FIFO pointers are correct. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 2e0e0777ec2ea1cb5461bded2c09573a9d778622 Author: Ben Dooks Date: Tue May 25 05:36:51 2010 +0100 USB: s3c-hsotg: SoftDisconnect minimum 3ms The shortest period SoftDisconnect can be asserted for is 3 milliseconds according to the V210 datasheet, so ensure that we add an msleep() to the registration code to enforce this. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 0f002d200598918f5058dfcfda3da46f29019765 Author: Ben Dooks Date: Tue May 25 05:36:50 2010 +0100 USB: s3c-hsotg: Ensure TX FIFO addresses setup when initialising FIFOs Some versions of the S3C HS OtG block startup with overlapping TX FIFO information, so change the fifo_init code to ensure that known values are set into the FIFO registers at initialisation/reset time. This also ensures that the FIFO RAM pointers are in a known state before use. Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 0287e43dda1a425da662f879dd27352021b0ca63 Author: Maurus Cuelenaere Date: Tue May 25 05:36:49 2010 +0100 USB: s3c_hsotg: define USB_GADGET_DUALSPEED in Kconfig The s3c_hsotg driver sets usb_gadget->is_dualspeed to 1, yet it doesn't define USB_GADGET_DUALSPEED in Kconfig. This triggers a NULL pointer dereference in the composite driver (which is fixed in another patch). Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 390b166138e95a47bdfde6582a1935f65e5c6547 Author: Thomas Abraham Date: Mon May 24 17:48:56 2010 +0900 USB: s3c: Enable soft disconnect during initialization Enable soft disconnect bit the OTG core during initialization. Without this, the host sees that a gadget is connected and tries to enumerate. The soft disconnect should be enabled until the USB gadget driver is registered with this otg driver. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks Signed-off-by: Greg Kroah-Hartman commit 0238634d02dd10b678ebe9ea5d8803483277ee93 Author: Sarah Sharp Date: Mon May 24 13:25:28 2010 -0700 USB: xhci: Print NEC firmware version. The NEC xHCI host controller firmware version can be found by putting a vendor-specific command on the command ring and extracting the BCD encoded-version out of the vendor-specific event TRB. The firmware version debug line in dmesg will look like: xhci_hcd 0000:05:00.0: NEC firmware version 30.21 (NEC merged with Renesas Technologies and became Renesas Electronics on April 1, 2010. I have their OK to merge this vendor-specific code.) Signed-off-by: Sarah Sharp Cc: Satoshi Otani Signed-off-by: Greg Kroah-Hartman commit ed07453fd356025cc25272629e982f5e4607632c Author: Sarah Sharp Date: Mon May 24 13:25:21 2010 -0700 USB: xhci: Wait for host to start running. When the run bit is set in the xHCI command register, it may take a few microseconds for the host to start running. We cannot ring any doorbells until the host is actually running, so wait until the status register says the host is running. Signed-off-by: Sarah Sharp Reported-by: Shinya Saito Cc: stable Signed-off-by: Greg Kroah-Hartman commit 2d62f3eea98354d61f90d6b115eecf9be5f4bdfe Author: Sarah Sharp Date: Mon May 24 13:25:15 2010 -0700 USB: xhci: Wait for controller to be ready after reset. After software resets an xHCI host controller, it must wait for the "Controller Not Ready" (CNR) bit in the status register to be cleared. Software is not supposed to ring any doorbells or write to any registers except the status register until this bit is cleared. Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit 0c8a32dff4f9ebed3e067e52e12842d7d7e047a0 Author: Mike Frysinger Date: Fri May 21 04:37:42 2010 -0400 USB: isp1362: fix inw warning on Blackfin systems The Blackfin code is incorrectly casting the argument to inw() to a pointer. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit b41709f1263bb1ad37efc43fea0bb0b670c12e78 Author: Johan Hovold Date: Wed May 19 22:13:17 2010 +0200 USB: mos7840: fix null-pointer dereference Fix null-pointer dereference on error path. Cc: stable Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit b8a3c6091a2337391ed878693604d712d6420241 Merge: ed8319e 85f1bb4 Author: Linus Torvalds Date: Fri Jun 4 13:04:39 2010 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: ACPI: Eliminate us to pm ticks conversion in common path ACPI: Fix the incorrect calculation about C-state idle time ACPI: update feature-removal.txt to reflect deleted acpi=ht option ACPI / EC / PM: Fix names of functions that block/unblock EC transactions ACPI / EC / PM: Fix race between EC transactions and system suspend commit 85f1bb4ace038289d587bcff64128be10613f9f3 Merge: b42f5b0 bceefad Author: Len Brown Date: Fri Jun 4 15:23:02 2010 -0400 Merge branch 'acpi-idle' into release commit ed8319e9b269ed19449432db3aefc11eb7be7376 Merge: bc23416 e29df91 Author: Linus Torvalds Date: Fri Jun 4 12:22:43 2010 -0700 Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6 * 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6: SFI: do not return freed pointer commit bceefad59ab66d1b1a815a1738744ea013da966e Author: Venkatesh Pallipadi Date: Wed Jun 2 10:01:09 2010 -0700 ACPI: Eliminate us to pm ticks conversion in common path acpi_enter_[simple|bm] routines does us to pm tick conversion on every idle wakeup and the value is only used in /proc/acpi display. We can store the time in us and convert it into pm ticks before printing instead and avoid the conversion in the common path. Signed-off-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit 157317ba3ec3e5a4d9683b8d24ba40b4f8f3296b Author: Zhao Yakui Date: Wed Jun 2 11:04:09 2010 +0800 ACPI: Fix the incorrect calculation about C-state idle time The C-state idle time is not calculated correctly, which will return the wrong residency time in C-state. It will have the following effects: 1. The system can't choose the deeper C-state when it is idle next time. Of course the system power is increased. E.g. On one server machine about 40W idle power is increased. 2. The powertop shows that it will stay in C0 running state about 95% time although the system is idle at most time. 2.6.35-rc1 regression caused-by: 2da513f582a96c053aacc2c92873978d2ea7abff (ACPI: Minor cleanup eliminating redundant PMTIMER_TICKS to NS conversion) Signed-off-by: Zhao Yakui Reported-by: Yu Zhidong Tested-by: Yu Zhidong Acked-by: Venkatesh Pallipadi Signed-off-by: Len Brown commit bc23416cd4579093acc1e7d819eee747def623da Merge: ad84563 d437680 Author: Linus Torvalds Date: Fri Jun 4 09:48:03 2010 -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: hda-intel - fix wallclk variable update and condition ALSA: asihpi - Fix uninitialized variable ALSA: hda: Use LPIB for ASUS M2V usb/gadget: Replace the old USB audio FU definitions in f_audio.c ASoC: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1 ASoC: Add missing Kconfig entry for Phytec boards ALSA: usb-audio: export UAC2 clock selectors as mixer controls ALSA: usb-audio: clean up find_audio_control_unit() ALSA: usb-audio: add UAC2 sepecific Feature Unit controls ALSA: usb-audio: unify constants from specification ALSA: usb-audio: parse clock topology of UAC2 devices ALSA: usb-audio: fix selector unit string index accessor include/linux/usb/audio-v2.h: add more UAC2 details ALSA: usb-audio: support partially write-protected UAC2 controls ALSA: usb-audio: UAC2: clean up parsing of bmaControls ALSA: hda: Use LPIB for another mainboard ALSA: hda: Use mb31 quirk for an iMac model ALSA: hda: Use LPIB for an ASUS device commit 1abec4fdbb142e3ccb6ce99832fae42129134a96 Author: Mike Snitzer Date: Tue May 25 13:15:15 2010 -0400 block: make blk_init_free_list and elevator_init idempotent blk_init_allocated_queue_node may fail and the caller _could_ retry. Accommodate the unlikely event that blk_init_allocated_queue_node is called on an already initialized (possibly partially) request_queue. Signed-off-by: Mike Snitzer Signed-off-by: Jens Axboe commit c86d1b8ae622e1ea5d20e98bd72fbd7d9dd69016 Author: Mike Snitzer Date: Thu Jun 3 11:34:52 2010 -0600 block: avoid unconditionally freeing previously allocated request_queue On blk_init_allocated_queue_node failure, only free the request_queue if it is wasn't previously allocated outside the block layer (e.g. blk_init_queue_node was blk_init_allocated_queue_node caller). This addresses an interface bug introduced by the following commit: 01effb0 block: allow initialization of previously allocated request_queue Otherwise the request_queue may be free'd out from underneath a caller that is managing the request_queue directly (e.g. caller uses blk_alloc_queue + blk_init_allocated_queue_node). Signed-off-by: Mike Snitzer Signed-off-by: Jens Axboe commit 3a4b4aaa546fa3d57b2ea7f41234f7d2e328da3f Author: Ping Cheng Date: Thu Jun 3 22:10:21 2010 -0700 Input: wacom - add Cintiq 21UX2 and Intuos4 WL Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit ad8456361fa19068cf49b50a4f98e41b73c08e76 Merge: 39d1121 d8d9129 Author: Linus Torvalds Date: Thu Jun 3 15:48:15 2010 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: libata: implement on-demand HPA unlocking libata: use the enlarged capacity after late HPA unlock SCSI: implement sd_unlock_native_capacity() libata-sff: trivial corrections to Kconfig help text sata_nv: don't diddle with nIEN on mcp55 sata_via: magic vt6421 fix for transmission problems w/ WD drives commit 39d112100e561686ab1e2b19c57984163ad6c1fa Merge: 167b712 02f7269 Author: Linus Torvalds Date: Thu Jun 3 15:47:51 2010 -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, trace: Fix sched_switch() prev_state argument sched: Fix wake_affine() vs RT tasks sched: Make sure timers have migrated before killing the migration_thread commit 167b7129042a4b4c09bb4ede5482ff79340a3999 Merge: 39059cc 4adc8b7 Author: Linus Torvalds Date: Thu Jun 3 15:47:22 2010 -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, smpboot: Fix cores per node printing on boot x86/amd-iommu: Fall back to GART if initialization fails x86/amd-iommu: Fix crash when request_mem_region fails x86/mm: Remove unused DBG() macro arch/x86/kernel: Add missing spin_unlock commit 39059cceeda478cd040d521b9541d1113035c908 Merge: b01b7dc c2cdf6a Author: Linus Torvalds Date: Thu Jun 3 15:46:37 2010 -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/macio: Fix probing of macio devices by using the right of match table agp/uninorth: Fix oops caused by flushing too much powerpc/pasemi: Update MAINTAINERS file powerpc/cell: Fix integer constant warning powerpc/kprobes: Remove resume_execution() in kprobes powerpc/macio: Don't dereference pointer before null check commit b01b7dc2832a1a286ae84ffa3e940ce9f8e352c2 Merge: f150dba6 b3831cb Author: Linus Torvalds Date: Thu Jun 3 15:46:09 2010 -0700 Merge branch 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6 * 'for-linus/bugfixes' of git://xenbits.xensource.com/people/ianc/linux-2.6: xen: avoid allocation causing potential swap activity on the resume path xen: ensure timer tick is resumed even on CPU driving the resume commit f150dba6d4a1e275b62ca76572c2786c71b91e85 Merge: 636667a c6df8d5 Author: Linus Torvalds Date: Thu Jun 3 15:45:26 2010 -0700 Merge branch 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Fix crash in swevents perf buildid-list: Fix --with-hits event processing perf scripts python: Give field dict to unhandled callback perf hist: fix objdump output parsing perf-record: Check correct pid when forking perf: Do the comm inheritance per thread in event__process_task perf: Use event__process_task from perf sched perf: Process comm events by tid blktrace: Fix new kernel-doc warnings perf_events: Fix unincremented buffer base on partial copy perf_events: Fix event scheduling issues introduced by transactional API perf_events, trace: Fix perf_trace_destroy(), mutex went missing perf_events, trace: Fix probe unregister race perf_events: Fix races in group composition perf_events: Fix races and clean up perf_event and perf_mmap_data interaction commit 636667a545b2d16797f27002a65d688c195c9b60 Merge: ceadda0 60e5e0b Author: Linus Torvalds Date: Thu Jun 3 15:45:03 2010 -0700 Merge branch 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus * 'virtio' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus: virtio: console: Fix crash when port is unplugged and blocked for write virtio: console: Fix crash when hot-unplugging a port and read is blocked virtio-blk: fix minimum number of S/G elements commit ceadda057c000fa82e6bbe508923d8181414dea7 Merge: 95619be fbae3fb Author: Linus Torvalds Date: Thu Jun 3 15:44:43 2010 -0700 Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging: i2c: Remove all i2c_set_clientdata(client, NULL) in drivers i2c/busses: Move two drivers to embedded section i2c: Rename i2c_check_addr to i2c_check_addr_busy i2c: Document reserved I2C addresses i2c: Check for address validity on client registration i2c: Share the I2C device presence detection code Documentation/i2c: Checkpatch cleanup commit 95619be590638bd48469ac81c0f6236f349f5640 Merge: 03cd373 0f0a8fa Author: Linus Torvalds Date: Thu Jun 3 15:42:21 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: crypto4xx - Fix build breakage n2_crypto: Plumb fallback ahash requests properly. n2_crypto: Fix MAU kmem_cache name. n2_crypto: Fix build after of_device/of_platform_driver changes. commit c6df8d5ab87a246942d138321e1721edbb69f6e1 Author: Peter Zijlstra Date: Thu Jun 3 11:21:20 2010 +0200 perf: Fix crash in swevents Frederic reported that because swevents handling doesn't disable IRQs anymore, we can get a recursion of perf_adjust_period(), once from overflow handling and once from the tick. If both call ->disable, we get a double hlist_del_rcu() and trigger a LIST_POISON2 dereference. Since we don't actually need to stop/start a swevent to re-programm the hardware (lack of hardware to program), simply nop out these callbacks for the swevent pmu. Reported-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra LKML-Reference: <1275557609.27810.35218.camel@twins> Signed-off-by: Ingo Molnar commit 03cd3739818d3fa7f973d0fb6d3aa63122ea00a0 Merge: 1067b6c 06b4367 Author: Linus Torvalds Date: Thu Jun 3 07:20:28 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6: cifs: fix page refcount leak commit 1067b6c2bea7fd2cc9da290d865ab3f3b91c8130 Merge: a652883 d8dcaa1 Author: Linus Torvalds Date: Thu Jun 3 07:19:45 2010 -0700 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (41 commits) drm/radeon/kms: make sure display hw is disabled when suspending drm/vmwgfx: Allow userspace to change default layout. Bump minor. drm/vmwgfx: Fix framebuffer modesetting drm/vmwgfx: Fix vga save / restore with display topology. vgaarb: use MIT license vgaarb: convert pr_devel() to pr_debug() drm: fix typos in Linux DRM Developer's Guide drm/radeon/kms/pm: voltage fixes drm/radeon/kms/pm: radeon_set_power_state fixes drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+ drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen drm/radeon/kms/pm: add support for SetVoltage cmd table (V2) drm/radeon/kms/evergreen: add initial CS parser drm/kms: disable/enable poll around switcheroo on/off drm/nouveau: fixup confusion over which handle the DSM is hanging off. drm/nouveau: attempt to get bios from ACPI v3 drm/nv50: cast IGP memory location to u64 before shifting drm/ttm: Fix ttm_page_alloc.c drm/ttm: Fix cached TTM page allocation. drm/vmwgfx: Remove some leftover debug messages. ... commit a652883a244901742d6c9733a9eebdf72e3114ea Merge: a57ee62 ee227c5 Author: Linus Torvalds Date: Thu Jun 3 07:17:31 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: of/powerpc: fix fsl_msi device node pointer of/watchdog: gef_wdt.c: fix build breakage of/edac: fix build breakage in drivers of/net: fs_enet/mii-bitbang.c: fix build breakage of/usb: fsl_qe_udc.c: fix build breakage of/crypto: crypto4xx_core.c: fix build breakage of/dma: fix build breakage in ppc4xx adma driver of/mtd: nand: fix build breakage in drivers of/video: fix build breakage in FB drivers of/pcmcia: m8xx_pcmcia.c: Fix build failures of/rtc: rtc-mpc5121.c: Fix build failures of/dma: mpc512x_dma.c: Fix build failures of/mtd/nand: mpc5121_nfc.c: Fix build failures of/spi: mpc512x_psc_spi.c: Fix build failures watchdog: Fix build failure with OF changes of/spi: Fix build failure on spi_ppc4xx.c of/usb: fix build error due to of_node pointer move of/powerpc: fix 85xx RapidIO device node pointer commit 60e5e0b84045ce0f6ab07a02c7fcd6627b53d2d3 Author: Amit Shah Date: Thu May 27 13:24:40 2010 +0530 virtio: console: Fix crash when port is unplugged and blocked for write When a program that has a virtio port opened and blocked for a write operation, a port hot-unplug event will later led to a crash when SIGTERM was sent to the program. Fix that. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit 0047634d3daebca9e99a22eb89167bf77f35cdfa Author: Amit Shah Date: Thu May 27 13:24:39 2010 +0530 virtio: console: Fix crash when hot-unplugging a port and read is blocked When removing a port we don't check if a program was blocked for read. This leads to a crash when SIGTERM is sent to the program after hot-unplugging the port. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell commit a5b365a652206ca300256974ed9301a7d241a6ed Author: Christoph Hellwig Date: Tue May 25 14:17:54 2010 +0200 virtio-blk: fix minimum number of S/G elements We need at least one S/G element to operate properly, as does the block layer which increments it to one anyway. We hit this due to a qemu bug which advertises a sg_elements of 0 under some circumstances. Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell (tweaked logic) commit ff9da691c0498ff81fdd014e7a0731dab2337dac Author: Jens Axboe Date: Thu Jun 3 14:54:39 2010 +0200 pipe: change /proc/sys/fs/pipe-max-pages to byte sized interface This changes the interface to be based on bytes instead. The API matches that of F_SETPIPE_SZ in that it rounds up the passed in size so that the resulting page array is a power-of-2 in size. The proc file is renamed to /proc/sys/fs/pipe-max-size to reflect this change. Signed-off-by: Jens Axboe commit 419f8367ea37e5adc5d95479e8fd5554b92b49fe Author: Jens Axboe Date: Thu Jun 3 12:45:28 2010 +0200 pipe: change the privilege required for growing a pipe beyond system max Change it to CAP_SYS_RESOURCE, as that more accurately models what we want to control. Suggested-by: Michael Kerrisk Signed-off-by: Jens Axboe commit 6a6ca57de92fcae34603551ac944aa74758c30d4 Author: Jens Axboe Date: Thu Jun 3 12:44:30 2010 +0200 pipe: adjust minimum pipe size to 1 page We don't need to pages to guarantee the POSIX requirement that upto a page size write must be atomic to an empty pipe. Signed-off-by: Jens Axboe commit fbae3fb1546e199ab0cd185348f8124411a1ca9d Author: Wolfram Sang Date: Thu Jun 3 11:33:58 2010 +0200 i2c: Remove all i2c_set_clientdata(client, NULL) in drivers I2C drivers can use the clientdata-pointer to point to private data. As I2C devices are not really unregistered, but merely detached from their driver, it used to be the drivers obligation to clear this pointer during remove() or a failed probe(). As a couple of drivers forgot to do this, it was agreed that it was cleaner if the i2c-core does this clearance when appropriate, as there is no guarantee for the lifetime of the clientdata-pointer after remove() anyhow. This feature was added to the core with commit e4a7b9b04de15f6b63da5ccdd373ffa3057a3681 to fix the faulty drivers. As there is no need anymore to clear the clientdata-pointer, remove all current occurrences in the drivers to simplify the code and prevent confusion. Signed-off-by: Wolfram Sang Acked-by: Mark Brown Acked-by: Greg Kroah-Hartman Acked-by: Richard Purdie Acked-by: Dmitry Torokhov Signed-off-by: Jean Delvare commit 35bfc353dcaecc99c277e3646564f3f785760bde Author: Wolfram Sang Date: Thu Jun 3 11:33:56 2010 +0200 i2c/busses: Move two drivers to embedded section And fix a typo while we are here Signed-off-by: Wolfram Sang Signed-off-by: Jean Delvare commit 3b5f794b8b647409155cade4eac2825bc49b4a66 Author: Jean Delvare Date: Thu Jun 3 11:33:55 2010 +0200 i2c: Rename i2c_check_addr to i2c_check_addr_busy Otherwise it's not clear what it is checking. Also move the function to save a forward declaration. Signed-off-by: Jean Delvare commit 656b8761ab21715eb1a35bb078dfd05e901be4ec Author: Jean Delvare Date: Thu Jun 3 11:33:53 2010 +0200 i2c: Document reserved I2C addresses Move strict I2C address validity check to a single function, and document the reserved I2C addresses there. Signed-off-by: Jean Delvare Cc: Hans Verkuil commit 3a89db5f30576654bf1b0036af9b50ed5ab1b6c5 Author: Jean Delvare Date: Thu Jun 3 11:33:52 2010 +0200 i2c: Check for address validity on client registration Do basic address validity checks when a client is being registered. We already had checks in place for devices which are being detected, but not for devices which are simply instantiated. This is a very basic check. We don't want to do strict checking here because some devices are known to infringe the I2C address constraints (e.g. IR receivers at 7-bit address 0x7a while this value is supposedly reserved for 10-bit addresses.) So we assume the caller knows what it is doing. Signed-off-by: Jean Delvare Cc: Matthieu Castet commit 63e4e80218803ff506b3ea4f2349b17916a35730 Author: Jean Delvare Date: Thu Jun 3 11:33:51 2010 +0200 i2c: Share the I2C device presence detection code Use the same I2C device presence detection code for legacy and new device detection functions. This is more consistent and makes the code smaller. Signed-off-by: Jean Delvare Cc: Matthieu Castet commit 89140f41575ae2a7a5c24e856880594ccbdfcaff Author: Andrea Gelmini Date: Thu Jun 3 11:33:50 2010 +0200 Documentation/i2c: Checkpatch cleanup Remove all trailing whitespace in Documentation/i2c. Signed-off-by: Andrea Gelmini Signed-off-by: Jean Delvare commit b3831cb55d383e8eb55d3b56c715fb48459b87c9 Author: Ian Campbell Date: Tue May 25 10:45:35 2010 +0100 xen: avoid allocation causing potential swap activity on the resume path Since the device we are resuming could be the device containing the swap device we should ensure that the allocation cannot cause IO. On resume, this path is triggered when the running system tries to continue using its devices. If it cannot then the resume will fail; to try to avoid this we let it dip into the emergency pools. The majority of these changes were made when linux-2.6.18-xen.hg changeset e8b49cfbdac0 was ported upstream in a144ff09bc52ef3f3684ed23eadc9c7c0e57b3aa but somehow this hunk was dropped. Signed-off-by: Ian Campbell Acked-by: Jeremy Fitzhardinge Cc: Stable Kernel # .32.x commit cd52e17ea8278f8449b6174a8e5ed439a2e44ffb Author: Ian Campbell Date: Wed May 19 16:19:25 2010 +0100 xen: ensure timer tick is resumed even on CPU driving the resume The core suspend/resume code is run from stop_machine on CPU0 but parts of the suspend/resume machinery (including xen_arch_resume) are run on whichever CPU happened to schedule the xenwatch kernel thread. As part of the non-core resume code xen_arch_resume is called in order to restart the timer tick on non-boot processors. The boot processor itself is taken care of by core timekeeping code. xen_arch_resume uses smp_call_function which does not call the given function on the current processor. This means that we can end up with one CPU not receiving timer ticks if the xenwatch thread happened to be scheduled on CPU > 0. Use on_each_cpu instead of smp_call_function to ensure the timer tick is resumed everywhere. Signed-off-by: Ian Campbell Acked-by: Jeremy Fitzhardinge Cc: Stable Kernel # .32.x commit cbab05f041a4cff6ca15856bdd35238b282b64eb Author: Richard Kennedy Date: Thu May 27 10:22:28 2010 +0100 gconfig: fix build failure on fedora 13 Making gconfig fails on fedora 13 as the linker cannot resolve dlsym. Adding libdl to the link command fixes this. make shows this error :- /usr/bin/ld: scripts/kconfig/kconfig_load.o: undefined reference to symbol 'dlsym@@GLIBC_2.2.5' /usr/bin/ld: note: 'dlsym@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line /lib64/libdl.so.2: could not read symbols: Invalid operation tested on x86_64 fedora 13. Signed-off-by: Richard Kennedy Reviewed-by: WANG Cong Cc: Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 0f0a8fa735bbde4b0bc3e96e4bb2e5b380a324db Author: Anatolij Gustschin Date: Thu Jun 3 16:53:49 2010 +1000 crypto: crypto4xx - Fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Herbert Xu commit ee227c577cde47f78e2df359f9c32ba047060767 Author: Wolfram Sang Date: Thu Jun 3 06:03:46 2010 +0200 of/powerpc: fix fsl_msi device node pointer Signed-off-by: Wolfram Sang Signed-off-by: Grant Likely commit d8dcaa1dc50f5aecd38d34180cd99d6af8566c88 Author: Alex Deucher Date: Wed Jun 2 12:08:41 2010 -0400 drm/radeon/kms: make sure display hw is disabled when suspending Disable the display hw when suspending. Should fix bug: https://bugzilla.redhat.com/show_bug.cgi?id=522393 Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit d8bd19d2aff95e52c7f356cc2fc722584a656065 Author: Jakob Bornecrantz Date: Tue Jun 1 11:54:20 2010 +0200 drm/vmwgfx: Allow userspace to change default layout. Bump minor. The host may change the layout and, since the change is communicated to the master, the master needs a way to communicate the change to the kernel driver. The minor version number is bumped to advertize the availability of this feature. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 991b7b44f8cfa1b9beff8c4c2f2ec888b925c2a7 Author: Jakob Bornecrantz Date: Tue Jun 1 11:38:16 2010 +0200 drm/vmwgfx: Fix framebuffer modesetting Must set SVGA_NUM_REG_GUEST_DISPLAY before setting up the display information. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 7c4f77801f103c9eb0465bf42313d5e1721d2991 Author: Thomas Hellstrom Date: Tue Jun 1 11:38:17 2010 +0200 drm/vmwgfx: Fix vga save / restore with display topology. vga save / restore previously didn't handle the display topology case. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit c0db9cbc73338d8e2987a19a02388d67aeec0bfe Author: Tiago Vignatti Date: Mon May 24 18:24:31 2010 +0300 vgaarb: use MIT license Signed-off-by: Tiago Vignatti Cc: Henry Zhao Signed-off-by: Dave Airlie commit 2d6e9b91971034103ac51b20fa692258bf6bdd40 Author: Tiago Vignatti Date: Mon May 24 18:24:30 2010 +0300 vgaarb: convert pr_devel() to pr_debug() We want to be able to use CONFIG_DYNAMIC_DEBUG in arbiter code, switch the few existing pr_devel() calls to pr_debug(). Also, add one more debug information regarding decoding count. Signed-off-by: Tiago Vignatti Signed-off-by: Dave Airlie commit ce04cc089b22862f7d6ad5aa3ada0dd07e41b833 Author: Nicolas Kaiser Date: Fri May 28 07:33:49 2010 +0200 drm: fix typos in Linux DRM Developer's Guide A few typos in the DRM Developer's Guide. Signed-off-by: Nicolas Kaiser Acked-by: Jesse Barnes Signed-off-by: Dave Airlie commit 84d88f4c92763f519b9e081cdd685a44de14f8c0 Author: Alex Deucher Date: Thu May 27 17:01:42 2010 -0400 drm/radeon/kms/pm: voltage fixes - Enable GPIO voltage for non pm modes as well so resetting the default voltage works. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 92645879d07a48897fe8888c2e37607aa1189cc9 Author: Alex Deucher Date: Thu May 27 17:01:41 2010 -0400 drm/radeon/kms/pm: radeon_set_power_state fixes - wait for vbl for both profile and dynpm - unify profile and dynpm code paths more - call pm_misc before of after clocks to make sure voltage is changed in the proper order. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit c5e8ce61d64995f4076c6a9b2f8b4b71e0be2e37 Author: Alex Deucher Date: Thu May 27 17:01:40 2010 -0400 drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+ The default power state does not always match the default clocks and voltage for a particular card. The information in the firmware info table is correct and should be used in preference to the info the default power state. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 9349d5cc920c10845693f906ebd67f394f1d0d04 Author: Alex Deucher Date: Fri May 28 19:35:01 2010 -0400 drm/radeon/kms/pm: enable SetVoltage on r7xx/evergreen I missed these in the r6xx commit. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 7ac9aa5a1f1b87adb69bcbec2b89e228f074103a Author: Alex Deucher Date: Thu May 27 19:25:54 2010 -0400 drm/radeon/kms/pm: add support for SetVoltage cmd table (V2) - This enables voltage adjustment on r6xx+ and certain r5xx asics. - Voltage drop support is already available for most r1xx-r5xx asics. V2: endian fix for voltage table. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit b74dbf2aed8d8c4f93ac2c44bab5c81f65be62a0 Author: Anatolij Gustschin Date: Thu Jun 3 03:30:31 2010 +0200 of/watchdog: gef_wdt.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit a26f95fed31d917eee616d1cd6360e4ce782e3dc Author: Anatolij Gustschin Date: Thu Jun 3 03:17:42 2010 +0200 of/edac: fix build breakage in drivers Fixes build errors in EDAC drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 4eecb17825a9cd2ea750c177487000fab4c19ea2 Author: Anatolij Gustschin Date: Thu Jun 3 03:06:54 2010 +0200 of/net: fs_enet/mii-bitbang.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 3ed3880230288c3eba1174b865ea7cdfbcb20033 Author: Anatolij Gustschin Date: Thu Jun 3 02:59:55 2010 +0200 of/usb: fsl_qe_udc.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 7cea8cc4705d25d9c7baee06efd665db27481242 Author: Anatolij Gustschin Date: Thu Jun 3 02:53:18 2010 +0200 of/crypto: crypto4xx_core.c: fix build breakage Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 05c02542c20aa00dc9a66f4bfb1a89d1131457f2 Author: Anatolij Gustschin Date: Thu Jun 3 02:46:37 2010 +0200 of/dma: fix build breakage in ppc4xx adma driver Fixes build error caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit c8a4d0fd2ac2ce6b3409f51fcf918dcb3617ec97 Author: Anatolij Gustschin Date: Thu Jun 3 02:37:17 2010 +0200 of/mtd: nand: fix build breakage in drivers Fixes build errors in drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit d4b8b2c2c0b980fa756267e43e39e5ac3c894857 Author: Anatolij Gustschin Date: Thu Jun 3 02:20:44 2010 +0200 of/video: fix build breakage in FB drivers Fixes build errors in a number of framebuffer drivers caused by the OF device_node pointer being moved into struct device Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 2005ce3521b7a38f12085e0420f405a8ee06f606 Author: Anatolij Gustschin Date: Thu Jun 3 01:38:57 2010 +0200 of/pcmcia: m8xx_pcmcia.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - typo in match_table field in the struct device_driver (which shoud be of_match_table) Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit a57ee627499d116f6872a5634ea4f015da0eacd2 Author: Mikulas Patocka Date: Wed Jun 2 11:09:04 2010 -0400 Fix colors for Mach64 Use the same color-calculating algorithm as in atyfb_imageblit in this driver or in generic cfb_fillrect. This patch fixes bad colors when using an accelerator in 15-bit and 16-bit modes. Signed-off-by: Mikulas Patocka Signed-off-by: Linus Torvalds commit 295bdd9c52e57daf995fe80eff8c53938443fa2f Author: Grant Likely Date: Wed Jun 2 14:06:09 2010 -0600 of/rtc: rtc-mpc5121.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Grant Likely CC: Paul Gortmaker CC: Alessandro Zummo CC: Wolfgang Denk CC: Tejun Heo CC: Anatolij Gustschin CC: rtc-linux@googlegroups.com CC: devicetree-discuss@lists.ozlabs.org commit b4a75c91b8a6cb80ba7772f69613025ddf75ebc2 Author: Anatolij Gustschin Date: Mon May 31 18:39:13 2010 +0200 of/dma: mpc512x_dma.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit 14acbbf8bada18f19930d38ce33c3947b2c718e0 Author: Anatolij Gustschin Date: Mon May 31 18:37:15 2010 +0200 of/mtd/nand: mpc5121_nfc.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit ef7f2e831c3a563505c9bc5b16ef4bcae3cf4b53 Author: Anatolij Gustschin Date: Mon May 31 18:34:54 2010 +0200 of/spi: mpc512x_psc_spi.c: Fix build failures Fixes build errors caused by the: - OF device_node pointer being moved into struct device - removal of the match_table field from struct of_platform_driver Signed-off-by: Anatolij Gustschin Signed-off-by: Grant Likely commit de2b606c24f178038b95a831f21a35a29faa6eab Author: Michael Guntsche Date: Wed Jun 2 02:25:52 2010 -0600 watchdog: Fix build failure with OF changes commit 61c7a080a5a061c976988fd4b844dfb468dda255 ( of: Always use 'struct device.of_node' to get device node pointer.) missed drivers/watchdog/mpc8xxx_wdt.c. This patch fixes it Signed-off-by: Michael Guntsche Signed-off-by: Grant Likely commit b53550781b7d51036aea3b3ee63ece3c6c8f4597 Author: Grant Likely Date: Tue May 25 23:24:02 2010 -0600 of/spi: Fix build failure on spi_ppc4xx.c This patch fixes a build error caused by the OF device_node pointer being moved into struct device. Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely CC: Sean MacLennan CC: spi-devel-general@lists.sourceforge.net CC: devicetree-discuss@lists.ozlabs.org commit ffabc9a6e8b34151a97fc91fcbef827f07504f75 Author: Grant Likely Date: Wed Jun 2 13:35:02 2010 -0600 of/usb: fix build error due to of_node pointer move Fix driver to use new location of of_node pointer (introduced by commit use new location of of_node pointer (introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Grant Likely Reported-by: John Linn CC: Greg Kroah-Hartman CC: Alan Stern CC: linux-usb@vger.kernel.org CC: devicetree-discuss@lists.ozlabs.org commit d8d9129ea28e2177749627c82962feb26e8d11e9 Author: Tejun Heo Date: Sat May 15 20:09:34 2010 +0200 libata: implement on-demand HPA unlocking Implement ata_scsi_unlock_native_capacity() which will be called through SCSI layer when block layer notices that partitions on a device extend beyond the end of the device. It requests EH to unlock HPA, waits for completion and returns the current device capacity. This allows libata to unlock HPA on demand instead of having to decide whether to unlock upfront. Unlocking on demand is safer than unlocking by upfront because some BIOSes write private data to the area beyond HPA limit. This was suggested by Ben Hutchings. Signed-off-by: Tejun Heo Suggested-by: Ben Hutchings Signed-off-by: Jeff Garzik commit 68939ce5fc17ee9c03ef6e543d4f82bd9f5583d4 Author: Tejun Heo Date: Sat May 15 20:09:33 2010 +0200 libata: use the enlarged capacity after late HPA unlock After late HPA unlock, libata kept using the original capacity ignoring the new larger native capacity. Enlarging device on the fly doesn't cause any harm. Use the larger native capacity instead. This will enable on-demand HPA unlocking. Signed-off-by: Tejun Heo Cc: Ben Hutchings Signed-off-by: Jeff Garzik commit 72ec24bd7725545bc149d80cbd21a7578d9aa206 Author: Tejun Heo Date: Sat May 15 20:09:32 2010 +0200 SCSI: implement sd_unlock_native_capacity() Implement sd_unlock_native_capacity() method which calls into hostt->unlock_native_capacity() if implemented. This will be invoked by block layer if partitions extend beyond the end of the device and can be used to implement, for example, on-demand ATA host protected area unlocking. Signed-off-by: Tejun Heo Cc: Ben Hutchings Signed-off-by: Jeff Garzik commit ed4e2f801cf1484a68c4b41878353f26e6554c6a Author: Stefan Richter Date: Sat May 29 12:47:45 2010 +0200 libata-sff: trivial corrections to Kconfig help text Signed-off-by: Stefan Richter Signed-off-by: Jeff Garzik commit f3faf8fc3fab45c3526efe8c9e99bb23f8723350 Author: Tejun Heo Date: Tue Jun 1 17:29:21 2010 +0200 sata_nv: don't diddle with nIEN on mcp55 On mcp55, nIEN gets stuck once set and liteon blueray rom iHOS104-08 violates ATA specification and fails to set I on D2H Reg FIS if nIEN is set when the command was issued. When the other party is following the spec, both devices can work fine but when the two flaws are put together, they can't talk to each other. mcp55 has its own IRQ masking mechanism and there's no reason to mess with nIEN in the first place. Fix it by dropping nIEN diddling from nv_mcp55_freeze/thaw(). This was originally reported by Cengiz. Although Cengiz hasn't verified the fix yet, I could reproduce this problem and verfiy the fix. Even if Cengiz is experiencing different or additional problems, this patch is needed. Signed-off-by: Tejun Heo Reported-by: Cengiz Günay Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit 8b27ff4cf6d15964aa2987aeb58db4dfb1f87a19 Author: Tejun Heo Date: Mon May 31 16:26:48 2010 +0200 sata_via: magic vt6421 fix for transmission problems w/ WD drives vt6421 has problems talking to recent WD drives. It causes a lot of transmission errors while high bandwidth transfer as reported in the following bugzilla entry. https://bugzilla.kernel.org/show_bug.cgi?id=15173 Joseph Chan provided the following fix. I don't have any idea what it does but I can verify the issue is gone with the patch applied. Signed-off-by: Tejun Heo Originally-from: Joseph Chan Reported-by: Jorrit Tijben Cc: stable@kernel.org Signed-off-by: Jeff Garzik commit d4376802999d478a103868d7e7b1f473e4a387af Merge: c7a441b e854df6 Author: Takashi Iwai Date: Wed Jun 2 14:18:13 2010 +0200 Merge branch 'fix/asoc' into for-linus commit c7a441bba9de3b4e166b6a4449208bc906d70558 Merge: ead54d8 e4caa8b Author: Takashi Iwai Date: Wed Jun 2 14:18:06 2010 +0200 Merge branch 'fix/hda' into for-linus commit e854df613fe934c94a0b39eccb4104e72ccbbded Merge: 67a3e12 29512c9 Author: Takashi Iwai Date: Wed Jun 2 14:17:44 2010 +0200 Merge branch 'for-2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6 into fix/asoc commit e4caa8bab3862a7694ab7c6dfede223227ad7fc5 Merge: 9f75c1b edb3993 Author: Takashi Iwai Date: Wed Jun 2 14:15:10 2010 +0200 Merge branch 'master' of git.alsa-project.org:alsa-kernel into fix/hda commit edb39935c8b19fcd9a8f619d0bc1e9d04594cd2b Author: Jaroslav Kysela Date: Wed Jun 2 13:29:17 2010 +0200 ALSA: hda-intel - fix wallclk variable update and condition This patch fixes thinko introduced in "last minutes" before commiting of the last wallclk patch. It also fixes the condition checking if the first period after last wallclk update is processed. There is a little rounding error in period_wallclk. Signed-off-by: Jaroslav Kysela commit ead54d878465291746c91c95749990d62742a6cf Merge: 21896bc 9f75c1b Author: Takashi Iwai Date: Wed Jun 2 12:09:29 2010 +0200 Merge branch 'fix/hda' into for-linus commit 21896bc010c17e5ac58951e771496ec2fb1051ed Author: Takashi Iwai Date: Wed Jun 2 12:08:37 2010 +0200 ALSA: asihpi - Fix uninitialized variable Initialize prev_ctl properly before reference: sound/pci/asihpi/asihpi.c: In function ‘snd_card_asihpi_mixer_new’: sound/pci/asihpi/asihpi.c:2568:30: warning: ‘prev_ctl.dst_node_index’ may be used uninitialized in this function Signed-off-by: Takashi Iwai commit ac422f9443191e050c16fe99baeb5c3d74934589 Author: Paul Mundt Date: Wed Jun 2 18:10:00 2010 +0900 sh: Make intc messages consistent via pr_fmt. Wrapping pr_fmt to the KBUILD_MODNAME prefix seems to be the trendy thing to do these days, so just do that instead of manually tidying up the stragglers. Signed-off-by: Paul Mundt commit 560526f1617acca62b645c81fb43923954d4ddc5 Author: Kuninori Morimoto Date: Wed Jun 2 00:27:38 2010 +0000 sh: make sure static declaration on ms7724se Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 30e0cc1ae0ca961de2764f584021c90d774d1063 Author: Kuninori Morimoto Date: Wed Jun 2 00:27:46 2010 +0000 sh: make sure static declaration on mach-migor Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 3ce0933437763f692c669d07d1b7b016b9e2fa41 Author: Kuninori Morimoto Date: Wed Jun 2 00:27:31 2010 +0000 sh: make sure static declaration on mach-ecovec24 Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit f4cdd757bef262a16188fa89141cc243a9cfc81b Author: Kuninori Morimoto Date: Wed Jun 2 00:27:26 2010 +0000 sh: make sure static declaration on mach-ap325rxa Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit f4d7c3565c1692c54d9152b52090fe73f0029e37 Author: Paul Mundt Date: Wed Jun 2 17:10:44 2010 +0900 clocksource: sh_cmt: compute mult and shift before registration Based on the sh_tmu change in 66f49121ffa41a19c59965b31b046d8368fec3c7 ("clocksource: sh_tmu: compute mult and shift before registration"). The same issues impact the sh_cmt driver, so we take the same approach here. Cc: stable@kernel.org Signed-off-by: Paul Mundt commit 66f49121ffa41a19c59965b31b046d8368fec3c7 Author: Aurelien Jarno Date: Mon May 31 21:45:48 2010 +0000 clocksource: sh_tmu: compute mult and shift before registration Since commit 98962465ed9e6ea99c38e0af63fe1dcb5a79dc25 ("nohz: Prevent clocksource wrapping during idle"), the CPU of an R2D board never goes to idle. This commit assumes that mult and shift are assigned before the clocksource is registered. As a consequence the safe maximum sleep time is negative and the CPU never goes into idle. This patch fixes the problem by moving mult and shift initialization from sh_tmu_clocksource_enable() to sh_tmu_register_clocksource(). Signed-off-by: Aurelien Jarno Cc: stable@kernel.org Signed-off-by: Paul Mundt commit c2cdf6aba0dfcfb54be646ab630c1bccd180e890 Author: Benjamin Herrenschmidt Date: Wed Jun 2 17:09:18 2010 +1000 powerpc/macio: Fix probing of macio devices by using the right of match table Grant patches added an of mach table to struct device_driver. However, while he changed the macio device code to use that, he left the match table pointer in struct macio_driver and didn't update drivers to use the "new" one, thus breaking the probing. This completes the change by moving all drivers to setup the "new" one, removing all traces of the old one, and while at it (since it changes the exact same locations), I also remove two other duplicates from struct driver which are the name and owner fields. Signed-off-by: Benjamin Herrenschmidt commit 79905ad50bcf025deb81382413719ed600734941 Author: Paul Mackerras Date: Tue Jun 1 19:33:08 2010 +0000 agp/uninorth: Fix oops caused by flushing too much This fixes a sporadic oops at boot on G5 Power Macs. The table_end variable has the address of the last byte of the table. Adding on PAGE_SIZE means we flush too much, and if the page after the table is not mapped for any reason, the kernel will oops. Instead we add on 1 because flush_dcache_range() interprets its second argument as the first byte past the range to be flushed. Signed-off-by: Paul Mackerras Signed-off-by: Benjamin Herrenschmidt commit 92e197095e0aa59273decbeaa4b63de58e342355 Author: Olof Johansson Date: Sat May 22 05:17:38 2010 +0000 powerpc/pasemi: Update MAINTAINERS file PWRficient platform work is definitely in maintenance mode these days, update MAINTAINERS file to reflect reality. Website is long gone as well. Signed-off-by: Olof Johansson Signed-off-by: Benjamin Herrenschmidt commit 257d569821165a76fb4c91d74909c2e61fe41e46 Author: Denis Kirjanov Date: Thu May 27 04:19:52 2010 +0000 powerpc/cell: Fix integer constant warning Fix smatch warning: warning: constant 0x800000000 is so big it is long Signed-off-by: Denis Kirjanov Signed-off-by: Benjamin Herrenschmidt commit db97bc7f9997fef41b24c91f61c2f776d32d7ce3 Author: Ananth N Mavinakayanahalli Date: Thu May 27 19:19:20 2010 +0000 powerpc/kprobes: Remove resume_execution() in kprobes emulate_step() in kprobe_handler() would've already determined if the probed instruction can be emulated. We single-step in hardware only if the instruction couldn't be emulated. resume_execution() therefore is superfluous -- all we need is to fix up the instruction pointer after single-stepping. Thanks to Paul Mackerras for catching this. Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Benjamin Herrenschmidt commit 83aea945c21c646184a494a32ad5524248b60226 Author: Andreas Schwab Date: Tue Jun 1 05:58:40 2010 +0000 powerpc/macio: Don't dereference pointer before null check Signed-off-by: Andreas Schwab Signed-off-by: Benjamin Herrenschmidt commit 45fdf00dea92a480a8023c94d1a1aa887dcd3f69 Author: Alexandre Bounine Date: Fri May 28 13:56:17 2010 -0400 of/powerpc: fix 85xx RapidIO device node pointer Fixes bug introduced by commit 61c7a080a5a061c976988fd4b844dfb468dda255 (of: Always use 'struct device.of_node' to get device node pointer) Signed-off-by: Alexandre Bounine Signed-off-by: Grant Likely commit 56960b3602be6fde9f09c7958fa06b26384307cc Author: Dmitry Torokhov Date: Wed Jun 2 00:40:06 2010 -0700 Input: ads7846 - fix compiler warning in ads7846_probe() This patch fixes the follwing warning introduced by commit 067fb2f648543894ce775082c5636f4c32b99e4f ("Input: ads7846 - return error on regulator_get() failure"): drivers/input/touchscreen/ads7846.c: In function 'ads7846_probe': drivers/input/touchscreen/ads7846.c:1167: warning: format '%ld' expects type 'long int', but argument 4 has type 'int' Signed-off-by: Dmitry Torokhov commit 4adc8b71cc142f9a7b44b13b99aab38ba897c56f Author: Borislav Petkov Date: Tue Jun 1 21:04:55 2010 +0200 x86, smpboot: Fix cores per node printing on boot Percpu initialization happens now after booting the cores on the machine and this causes them all to be displayed as belonging to node 0: Jun 8 05:57:21 kepek kernel: [ 0.106999] Booting Node 0, Processors #1 #2 #3 #4 #5 #6 #7 #8 #9 #10 #11 #12 #13 #14 #15 #16 #17 #18 #19 #20 #21 #22 #23 Ok. Use early_cpu_to_node() to get the correct node of each core instead. Signed-off-by: Borislav Petkov Cc: Mike Travis LKML-Reference: <20100601190455.GA14237@aftab> Signed-off-by: Ingo Molnar commit 019e2574f965b800ba76f319d817eae9405ae064 Merge: 4705b2e 861160b Author: Paul Mundt Date: Wed Jun 2 16:32:12 2010 +0900 Merge branch 'sh/iomap' commit 861160bfd097de7dbf3195bbef210e4f787327ab Author: Paul Mundt Date: Wed May 26 15:58:45 2010 +0900 sh: PIO disabling for x3proto and urquell. urquell only provides PIO in the PCI case, while the x3proto board never had a working PCIe controller, so it can simply disable it outright. Signed-off-by: Paul Mundt commit 242239715c8394da16b1dd0d6f3254f99cac10d2 Author: Paul Mundt Date: Tue May 25 20:10:24 2010 +0900 sh: mach-sdk7786: conditionally disable PIO support. SDK7786 only supports PIO via the PCI I/O space, so we disable PIO completely for the non-PCI case. Signed-off-by: Paul Mundt commit 86e4dd5add77ab809f5427391dfabb8f78cbcb58 Author: Paul Mundt Date: Tue May 25 20:06:13 2010 +0900 sh: support for platforms without PIO. This extends some of the existing special casing for HAS_IOPORT platforms and gets it to the point where platforms can begin to conditionally select it. The major changes here are that the PIO routines themselves go away completely, including all of the machvec port mapping wrappers. With this in place it's possible for any non-machvec abusing platform to disable PIO completely. At present this is left as an opt-in until the abusers are the odd ones out instead of the majority. Signed-off-by: Paul Mundt commit 1c98347e613bf17ea2f18c9766ce0ab77f65a96d Author: Paul Mundt Date: Wed Jun 2 16:27:54 2010 +0900 usb: r8a66597-hcd pio to mmio accessor conversion. r8a66597-hcd is erroneously using PIO routines on MMIO registers, which presently blows up for any platform that elects to either override or do away with PIO routines. This managed to work for the common cases since the PIO routines were simply wrapped to their MMIO counterparts. This switches over to using the MMIO routines directly, and enables us to kill off a lot of superfluous casting in the process. Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit e8b48669de54d390644c77cd26d5c9fccbc1e0a1 Author: Paul Mundt Date: Wed Jun 2 16:27:12 2010 +0900 usb: gadget: r8a66597-udc pio to mmio accessor conversion. r8a66597-udc is erroneously using PIO routines on MMIO registers, which presently blows up for any platform that elects to either override or do away with PIO routines. This managed to work for the common cases since the PIO routines were simply wrapped to their MMIO counterparts. This switches over to using the MMIO routines directly, and enables us to kill off a lot of superfluous casting in the process. Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit abb24f4846d1537d73605e8576de8359a98e5ced Author: Paul Mundt Date: Wed Jun 2 16:26:13 2010 +0900 usb: gadget: m66592-udc pio to mmio accessor conversion. m66592-udc is erroneously using PIO routines on MMIO registers, which presently blows up for any platform that elects to either override or do away with PIO routines. This managed to work for the common cases since the PIO routines were simply wrapped to their MMIO counterparts. This switches over to using the MMIO routines directly, and enables us to kill off a lot of superfluous casting in the process. Acked-by: Yoshihiro Shimoda Signed-off-by: Paul Mundt commit da3fd1a0010ccc9fe6fd5ae2b9e85e1aacc03e4d Merge: 2fb750e b5c874f Author: Ingo Molnar Date: Wed Jun 2 09:13:12 2010 +0200 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent commit f7a2e30246281944064113dafbafe3eb14cd89e3 Author: Dan Carpenter Date: Tue Jun 1 21:29:40 2010 -0700 Input: tps6507x-ts - a couple work queue cleanups 1) Use msecs_to_jiffies() instead of calculating by hand. 2) Call cancel_delayed_work_sync() instead of cancel_delayed_work() followed by a separate flush_workqueue(). 3) Remove the "tsc->wq = 0;" Sparse complains about that because tsc->wq is a pointer, not an int. It's not needed because we just free the pointer anyway. Signed-off-by: Dan Carpenter Signed-off-by: Dmitry Torokhov commit b42f5b0f0fd8c1c442c1b29a3fbcb338e8bd7732 Merge: fe95568 0a76a34 Author: Len Brown Date: Tue Jun 1 22:53:36 2010 -0400 Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release commit aef4b9aaae1decc775778903922bd0075cce7a88 Merge: 709d015 a7fed9f Author: Linus Torvalds Date: Tue Jun 1 14:13:14 2010 -0700 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set powerpc/44x: icon: select SM502 and frame buffer console support powerpc/85xx: Add P1021MDS board support powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing powerpc/fsl_msi: add removal path and probe failing path powerpc/fsl_msi: enable msi sharing through AMP OSes powerpc/fsl_msi: enable msi allocation in all banks powerpc/fsl_msi: fix the conflict of virt_msir's chip_data powerpc/fsl_msi: Add multiple MSI bank support powerpc/kexec: Add support for FSL-BookE powerpc/fsl-booke: Move the entry setup code into a seperate file powerpc/fsl-booke: fix the case where we are not in the first page powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS powerpc/fsl-booke: Add hibernation support for FSL BookE processors powerpc/e500mc: Implement machine check handler. powerpc/44x: Add basic ICON PPC440SPe board support powerpc/44x: Fix UART clocks on 440SPe powerpc/44x: Add reset-type to katmai.dts powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. commit 709d015bb810a3377feaee3093d110a17e919019 Merge: 08a6685 e3a815f Author: Linus Torvalds Date: Tue Jun 1 14:12:27 2010 -0700 Merge branch 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel * 'drm-intel-next' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel: (41 commits) drm/i915: add HAS_BSD check to i915_getparam drm/i915: Honor sync polarity from VBT panel timing descriptors drm/i915: Unmask interrupt for render engine on Sandybridge drm/i915: Fix PIPE_CONTROL command on Sandybridge drm/i915: Fix up address spaces in slow_kernel_write() drm/i915: Use non-atomic kmap for slow copy paths drm/i915: Avoid moving from CPU domain during pwrite drm/i915: Cleanup after failed initialization of ringbuffers drm/i915: Reject bind_to_gtt() early if object > aperture drm/i915: Check error code whilst moving buffer to GTT domain. drm/i915: Remove spurious warning "Failure to install fence" drm/i915: Rebind bo if currently bound with incorrect alignment. drm/i915: Include pitch in set_base debug statement. drm/i915: Only print "nothing to do" debug message as required. drm/i915: Propagate error from unbinding an unfenceable object. drm/i915: Avoid nesting of domain changes when setting display plane drm/i915: Hold the spinlock whilst resetting unpin_work along error path drm/i915: Only print an message if there was an error drm/i915: Clean up leftover bits from hws move to ring structure. drm/i915: Add CxSR support on Pineview DDR3 ... commit 08a66859e69264f3223560d06b88e80c1a6a6387 Author: Dan Carpenter Date: Tue Jun 1 20:58:22 2010 +0100 FS-Cache: Remove unneeded null checks fscache_write_op() makes unnecessary checks of the page variable to see if it is NULL. It can't be NULL at those points as the kernel would already have crashed a little higher up where we examined page->index. Furthermore, unless radix_tree_gang_lookup_tag() can return 1 but no page, a NULL pointer crash should not be encountered there as we can only get there if r_t_g_l_t() returned 1. Signed-off-by: Dan Carpenter Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit b5c874f14c5f57cc8654e9184694196c466147bb Author: Arnaldo Carvalho de Melo Date: Tue Jun 1 12:37:05 2010 -0300 perf buildid-list: Fix --with-hits event processing When we use plain 'perf buildid-list' we use only what is in the buildid table in the perf.data header. And those have absolute pathnames because at 'perf record' time we used __perf_session__process_events and that doesn't sets up the path shortening code in map__new() that happens if symbol_conf.full_paths is false, the default. On the other hand, when we use 'perf buildid-list --with-hits' we process all the events using perf_session__process_events, adding entries to the global DSO list _after_ removing the current directory from the DSO name, for presentation purposes. Because of that we end up having two entries in the DSO list when recording events for binaries using relative pathnames. Fix it minimally by setting symbol_conf.full_paths to true when marking the DSOs with hits in 'perf buildid-list --with-hits', as used by 'perf archive' Right fix longer term is to shorten the path only at presentation time. Will be done for 2.6.36. Reported-by: Stephane Eranian Tested-by: Stephane Eranian Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: <20100601183837.GC4093@ghostprotocols.net> Signed-off-by: Arnaldo Carvalho de Melo commit e3a815fcd38043b8f1bb526123d8ab6ae01deb77 Author: Zou Nan hai Date: Mon May 31 13:58:47 2010 +0800 drm/i915: add HAS_BSD check to i915_getparam This will let userland only try to use the new media decode functionality when the appropriate kernel is present. Signed-off-by: Zou Nan hai Signed-off-by: Eric Anholt commit 9bc354998f8aa8a83b0cd430e8fcf2cbc3be7367 Author: Adam Jackson Date: Fri May 28 17:17:37 2010 -0400 drm/i915: Honor sync polarity from VBT panel timing descriptors I'm actually kind of shocked that it works at all otherwise. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 06b43672a9e665cab18dc7b77d56d36884b90d45 Author: Jeff Layton Date: Tue Jun 1 10:54:45 2010 -0400 cifs: fix page refcount leak Commit 315e995c63a15cb4d4efdbfd70fe2db191917f7a is causing OOM kills when stress-testing a CIFS filesystem. The VFS readpages operation takes a page reference. The older code just handed this reference off to the page cache, but the new code takes an extra one. The simplest fix is to put the new reference after add_to_page_cache_lru. Signed-off-by: Jeff Layton Acked-by: Nick Piggin Signed-off-by: Steve French commit 0a6531ebea13b164825ba28e77dcbed3e9386884 Author: Randy Dunlap Date: Tue Jun 1 09:55:07 2010 -0700 Documentation/timers/hpet_example.c: only build on X86 We should only build hpet_example on x86[-64], where it is implemented. It can cause build errors on other architectures. Signed-off-by: Randy Dunlap Reported-by: Heiko Carstens Cc: Heiko Carstens Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit 037776fcbe73236408f6c9ca97c782457efd6b53 Author: Denis Kirjanov Date: Tue Jun 1 17:15:39 2010 +0100 AFS: Fix possible null pointer dereference in afs_alloc_server() Fix a possible null pointer dereference in afs_alloc_server(): the server pointer is NULL if there was an allocation failure, and under such a condition, we can't dereference it in the _leave() statement. Signed-off-by: Denis Kirjanov Signed-off-by: David Howells Signed-off-by: Linus Torvalds commit 5c113fbeed7a5a192d8431a768965f8a45c16475 Author: Daniel J Blueman Date: Tue Jun 1 12:15:11 2010 +0100 fix cpu_chain section mismatch... In commit e9fb7631ebcd ("cpu-hotplug: introduce cpu_notify(), __cpu_notify(), cpu_notify_nofail()") the new helper functions access cpu_chain. As a result, it shouldn't be marked __cpuinitdata (via section mismatch warning). Alternatively, the helper functions should be forced inline, or marked __ref or __cpuinit. In the meantime, this patch silences the warning the trivial way. Signed-off-by: Daniel J Blueman Signed-off-by: Linus Torvalds commit 0a76a34ff0804f1f413807b2e2d12117c2b602ca Author: Len Brown Date: Tue Jun 1 12:13:23 2010 -0400 ACPI: update feature-removal.txt to reflect deleted acpi=ht option Per plan, acpi=ht was removed in 2.6.35-rc1. Signed-off-by: Len Brown commit e29df91e67428c1a651d18df6ec047fcb30282d3 Author: Dan Carpenter Date: Fri May 28 12:33:15 2010 +0200 SFI: do not return freed pointer We never actually use the return value of sfi_sysfs_install_table() but it still seems wrong to return a freed pointer. Signed-off-by: Dan Carpenter Signed-off-by: Len Brown commit 1f73897861b8ef0be64ff4b801f8d6f830f683b5 Merge: b904d71 64ffc9f Author: Linus Torvalds Date: Tue Jun 1 08:55:52 2010 -0700 Merge branch 'for-35' of git://repo.or.cz/linux-kbuild * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits) kbuild: Revert part of e8d400a to resolve a conflict kbuild: Fix checking of scm-identifier variable gconfig: add support to show hidden options that have prompts menuconfig: add support to show hidden options which have prompts gconfig: remove show_debug option gconfig: remove dbg_print_ptype() and dbg_print_stype() kconfig: fix zconfdump() kconfig: some small fixes add random binaries to .gitignore kbuild: Include gen_initramfs_list.sh and the file list in the .d file kconfig: recalc symbol value before showing search results .gitignore: ignore *.lzo files headerdep: perlcritic warning scripts/Makefile.lib: Align the output of LZO kbuild: Generate modules.builtin in make modules_install Revert "kbuild: specify absolute paths for cscope" kbuild: Do not unnecessarily regenerate modules.builtin headers_install: use local file handles headers_check: fix perl warnings export_report: fix perl warnings ... commit b904d7131d116900524bd36ec170dcd97846bfd3 Merge: 2e8949f 4150764 Author: Linus Torvalds Date: Tue Jun 1 08:51:25 2010 -0700 Merge branch 'for-linus' of git://www.jni.nu/cris * 'for-linus' of git://www.jni.nu/cris: CRIS: Don't use mask_irq as symbol name CRIS: Simplify param.h by simply including CRISv10: Whitespace fixes for hw_settings.S CRISv10: Trivial fixes. CRISv32: Fix RS485 port 4 CD Kconfig item. CRISv32: Remove duplicated Kconfig items. cris: push down BKL into some device drivers commit 2e8949f09e3097c629f33323eaf280cf5c88c81a Author: Alan Cox Date: Tue Jun 1 12:51:00 2010 +0100 intel_scu_ipc: Length fix Commands with data must set the length in the message. Signed-off-by: Alan Cox Signed-off-by: Linus Torvalds commit 076dab234d29d1c0d60e26a5fa48aabb7fa58f79 Merge: e30c7c3 b42d916 Author: Linus Torvalds Date: Tue Jun 1 08:13:20 2010 -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: (28 commits) drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held ksz884x: Add missing validate_addr hook ksz884x: convert to netdev_tx_t virtio-net: pass gfp to add_buf be2net: convert hdr.timeout in be_cmd_loopback_test() to le32 can: mpc5xxx_can.c: Fix build failure net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 net: sock_queue_err_skb() dont mess with sk_forward_alloc netfilter: xtables: stackptr should be percpu netfilter: don't xt_jumpstack_alloc twice in xt_register_table greth: Fix build after OF device conversions. net: fix sk_forward_alloc corruptions Phonet: listening socket lock protects the connected socket list caif: unlock on error path in cfserl_receive() be2net: remove superfluous externs be2net: add unlock on error path net/rds: Add missing mutex_unlock drivers/isdn/hardware/mISDN: Add missing spin_unlock fs_enet: Adjust BDs after tx error skb: make skb_recycle_check() return a bool value ... commit e30c7c3b306312c157d67eedd6a01920518b756c Author: Takuya Yoshikawa Date: Tue Jun 1 14:10:47 2010 +0100 binfmt_elf_fdpic: Fix clear_user() error handling clear_user() returns the number of bytes that could not be copied rather than an error code. So we should return -EFAULT rather than directly returning the results. Without this patch, positive values may be returned to elf_fdpic_map_file() and the following error handlings do not function as expected. 1. ret = elf_fdpic_map_file_constdisp_on_uclinux(params, file, mm); if (ret < 0) return ret; 2. ret = elf_fdpic_map_file_by_direct_mmap(params, file, mm); if (ret < 0) return ret; Signed-off-by: Takuya Yoshikawa Signed-off-by: David Howells Acked-by: Mike Frysinger CC: Alexander Viro CC: Andrew Morton CC: Daisuke HATAYAMA CC: Paul Mundt Signed-off-by: Linus Torvalds commit b4ca761577535b2b4d153689ee97342797dfff05 Merge: 28f4197 67a3e12 Author: Jens Axboe Date: Tue Jun 1 12:42:12 2010 +0200 Merge branch 'master' into for-linus Conflicts: fs/pipe.c Signed-off-by: Jens Axboe commit 28f4197e5d4707311febeec8a0eb97cb5fd93c97 Author: Jens Axboe Date: Tue Jun 1 12:23:18 2010 +0200 block: disable preemption before using sched_clock() Commit 9195291e5f05e01d67f9a09c756b8aca8f009089 added calls to sched_clock() from preemptible code. sched_clock() is both the wrong interface AND cannot be called without preempt disabled. Apply a temporary fix to get rid of the warnings, a real patch is in the works. Signed-off-by: Jens Axboe commit 713b686494a577b3c4f4f9f585a4705fc30d51c2 Author: Dan Carpenter Date: Tue Jun 1 12:17:48 2010 +0200 cciss: call BUG() earlier I moved the range check after the increment. The current code would write past the end of the array once before calling BUG(). Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe commit c8fcb14fecac72bb2cd2974cf133fba6c4b4a13d Merge: e565813 d7f0776 Author: Ingo Molnar Date: Tue Jun 1 11:45:45 2010 +0200 Merge branch 'amd-iommu/2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into x86/urgent commit c02514850d67be8db6b2b6658cbc23ac1fbf8bc7 Author: Pierre Tardy Date: Mon May 31 23:12:09 2010 +0200 perf scripts python: Give field dict to unhandled callback trace_unhandled() callback does not allow to access event fields, this patch resolves the problem. It can also been used as a more pythonic and flexible way for script writters to demux event types This will for example greatly simplify pytimechart event demux. Acked-by: Frederic Weisbecker Acked-by: Tom Zanussi Cc: Ingo Molnar , Cc: Frederic Weisbecker Cc: Tom Zanussi LKML-Reference: <1275340329-2397-1-git-send-email-tardyp@gmail.com> Signed-off-by: Pierre Tardy Signed-off-by: Arnaldo Carvalho de Melo commit 099c5c310e9744bd0654881bb55c137051228e56 Author: Philipp Reisner Date: Thu May 27 13:46:35 2010 +0200 Preparing 8.3.8rc2 Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 2a0ab2cd73c26835e635ed4e3868f983519048fb Author: Philipp Reisner Date: Wed May 26 17:59:55 2010 +0200 drbd: Reduce verbosity The "Local READ/WRITE failed" messages are too verbose. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 7383506c87237dbd627f0b8b72b50117f25c5ca2 Author: Lars Ellenberg Date: Thu May 27 11:51:56 2010 +0200 drbd: use drbd specific ratelimit instead of global printk_ratelimit using the global printk_ratelimit() may mask other messages. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit d255e5ff5fc6cc6c60dd014d1261448a7bbc8134 Author: Lars Ellenberg Date: Thu May 27 09:45:45 2010 +0200 drbd: fix hang on local read errors while disconnected "canceled" w_read_retry_remote never completed, if they have been canceled after drbd_disconnect connection teardown cleanup has already run (or we are currently not connected anyways). Fixed by not queueing a remote retry if we already know it won't work (pdsk not uptodate), and cleanup ourselves on "cancel", in case we hit a race with drbd_disconnect. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 32fa7e91f923d8b2578c42016ff3a94efc9968a2 Author: Philipp Reisner Date: Wed May 26 17:13:18 2010 +0200 drbd: Removed the now empty w_io_error() function Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 039e1fb65496636778e24c881a5e58ed7c39fbb3 Author: Andrea Gelmini Date: Sun May 23 21:48:13 2010 +0200 drbd: removed duplicated #includes drbd/drbd_receiver.c: linux/mm.h is included more than once. Signed-off-by: Andrea Gelmini Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit ba11ad9a3b9dd2dbb9c6686ea9d41a9a77d94327 Author: Lars Ellenberg Date: Tue May 25 16:26:16 2010 +0200 drbd: improve usage of MSG_MORE It seems to improve performance if we allow the "p_data" header in its own frame (no MSG_MORE), but sendpage all but the last page with MSG_MORE. This is also in preparation of a later zero copy receive implementation. Suggested by Eduard.Guzovsky@stratus.com on drbd-dev. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 5dbf1673383f2f1554f0634fdfc390d59dc2c7d6 Author: Lars Ellenberg Date: Tue May 25 16:18:01 2010 +0200 drbd: need to set socket bufsize early to take effect quoting tcp(7): On individual connections, the socket buffer size must be set prior to the listen(2) or connect(2) calls in order to have it take effect. This adds a wrapper to do so, and uses it appropriately. Improves performance in certain situations. Note that because we cannot easily determine which socket will be "meta" and wich "data" (bulk) socket, we adjust both sockets. Previously, DRBD only adjusted the bufsizes of the "data" socket. Thanks again to Eduard.Guzovsky@stratus.com. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 344fa462e3246bd102059ccc3c59deef416676dd Author: Lars Ellenberg Date: Tue May 25 14:23:57 2010 +0200 drbd: improve network latency, TCP_QUICKACK On Thu, Apr 29, 2010 at 04:00:50PM -0400, Eduard.Guzovsky@stratus.com wrote on drbd-dev@lists.linbit.com Subject: [Drbd-dev] DRBD small synchronous writes performance improvements > 1. TCP_QUICKACK option is set incorrectly. The goal was force TCP to > send and ACK as a "one time" event. Instead the code permanently sets > connection in the QUICKACK mode. He is right, we actually want to use an even val with TCP_QUICKACK. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit 2c8d196759054b632788633b20e39167df36041d Author: Philipp Reisner Date: Tue May 25 14:32:03 2010 +0200 drbd: Revert "drbd: Create new current UUID as late as possible" The late-UUID writing is delayed until the next release. Signed-off-by: Philipp Reisner Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe commit b7c335713ea130d707c22d7f7c57a8eca75ded7e Author: Nick Piggin Date: Wed May 26 15:41:14 2010 +0200 brd: support discard Support discard requests in brd by zeroing or deleting the underlying backing pages. This is simply to help with testing and documentation nature of brd code. Signed-off-by: Nick Piggin Signed-off-by: Jens Axboe commit 0e3c9a2284f5417f196e327c254d0b84c9ee8929 Author: Jens Axboe Date: Tue Jun 1 11:08:43 2010 +0200 Revert "writeback: fix WB_SYNC_NONE writeback from umount" This reverts commit e913fc825dc685a444cb4c1d0f9d32f372f59861. We are investigating a hang associated with the WB_SYNC_NONE changes, so revert them for now. Conflicts: fs/fs-writeback.c mm/page-writeback.c Signed-off-by: Jens Axboe commit f17625b318d9b151e7bd41e31223e9d89b2aaa77 Author: Jens Axboe Date: Tue Jun 1 11:05:22 2010 +0200 Revert "writeback: ensure that WB_SYNC_NONE writeback with sb pinned is sync" This reverts commit 7c8a3554c683f512dbcee26faedb42e4c05f12fa. We are investigating a hang associated with the WB_SYNC_NONE changes, so revert them for now. Signed-off-by: Jens Axboe commit 75d9ef1707cf3db264a549142a1f54a5380d63dc Author: Konstantin Stepanyuk Date: Thu May 27 02:10:11 2010 +0400 perf hist: fix objdump output parsing hist_entry__annotate() runs objdump with -S option so the output may contain lines of any format. If a line starts with a colon strtoull() returns 0 and calculated offset will be negative. This causes perf annotate segfaults. Make sure that strtoull() has parsed at least one digit. Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Ingo Molnar Cc: Mike Galbraith Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Tom Zanussi LKML-Reference: Signed-off-by: Konstantin Stepanyuk Signed-off-by: Arnaldo Carvalho de Melo commit d7f0776975334070a93370ae048fda0c31a91c38 Author: Joerg Roedel Date: Mon May 31 15:05:20 2010 +0200 x86/amd-iommu: Fall back to GART if initialization fails This patch implements a fallback to the GART IOMMU if this is possible and the AMD IOMMU initialization failed. Otherwise the fallback would be nommu which is very problematic on machines with more than 4GB of memory or swiotlb which hurts io-performance. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit e82752d8b5a7e0a5e4d607fd8713549e2a4e2741 Author: Joerg Roedel Date: Fri May 28 14:26:48 2010 +0200 x86/amd-iommu: Fix crash when request_mem_region fails When request_mem_region fails the error path tries to disable the IOMMUs. This accesses the mmio-region which was not allocated leading to a kernel crash. This patch fixes the issue. Cc: stable@kernel.org Signed-off-by: Joerg Roedel commit 1d61e73ab4c7470833241af888939a7aab2b0354 Merge: 84fe6c1 67a3e12 Author: Joerg Roedel Date: Tue Jun 1 09:57:49 2010 +0200 Merge commit 'v2.6.35-rc1' into amd-iommu/2.6.35 commit 02f726949f2be0967aa4871dd4e47d3967779b26 Author: Peter Zijlstra Date: Mon May 31 18:13:25 2010 +0200 sched, trace: Fix sched_switch() prev_state argument For CONFIG_PREEMPT=y kernels the sched_switch(.prev_state) argument isn't useful because we can get preempted with current->state != TASK_RUNNING without actually getting removed from the runqueue. Cure this by treating all preempted tasks as runnable from the tracer's point of view. Signed-off-by: Peter Zijlstra Cautiously-acked-by: Steven Rostedt LKML-Reference: <1275322715.27810.23323.camel@twins> Signed-off-by: Ingo Molnar commit e51fd5e22e12b39f49b1bb60b37b300b17378a43 Author: Peter Zijlstra Date: Mon May 31 12:37:30 2010 +0200 sched: Fix wake_affine() vs RT tasks Mike reports that since e9e9250b (sched: Scale down cpu_power due to RT tasks), wake_affine() goes funny on RT tasks due to them still having a !0 weight and wake_affine() still subtracts that from the rq weight. Since nobody should be using se->weight for RT tasks, set the value to zero. Also, since we now use ->cpu_power to normalize rq weights to account for RT cpu usage, add that factor into the imbalance computation. Reported-by: Mike Galbraith Tested-by: Mike Galbraith Signed-off-by: Peter Zijlstra LKML-Reference: <1275316109.27810.22969.camel@twins> Signed-off-by: Ingo Molnar commit b42d9165e1e3d92e4e3318642463dbe592a12568 Author: Julia Lawall Date: Tue Jun 1 00:26:06 2010 -0700 drivers/isdn/hardware/mISDN: Use GFP_ATOMIC when a lock is held The function inittiger is only called from nj_init_card, where a lock is held. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @gfp exists@ identifier fn; position p; @@ fn(...) { ... when != spin_unlock_irqrestore when any GFP_KERNEL@p ... when any } @locked@ identifier gfp.fn; @@ spin_lock_irqsave(...) ... when != spin_unlock_irqrestore fn(...) @depends on locked@ position gfp.p; @@ - GFP_KERNEL@p + GFP_ATOMIC // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 96ed741e15896eea43f7203523db88bc8105c359 Author: Denis Kirjanov Date: Mon May 31 00:26:21 2010 +0000 ksz884x: Add missing validate_addr hook Add missing validate_addr hook Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit 5ed83663f77ee7404022d046321f69545cd311b8 Author: Denis Kirjanov Date: Mon May 31 00:24:49 2010 +0000 ksz884x: convert to netdev_tx_t Convert TX hook to netdev_tx_t type Signed-off-by: Denis Kirjanov Signed-off-by: David S. Miller commit aa989f5e46bb913e1a5966bb7d32eb2d00c1894e Author: Michael S. Tsirkin Date: Mon May 31 01:10:01 2010 +0000 virtio-net: pass gfp to add_buf virtio-net bounces buffer allocations off to a thread if it can't allocate buffers from the atomic pool. However, if posting buffers still requires atomic buffers, this is unlikely to succeed. Fix by passing in the proper gfp_t parameter. Signed-off-by: Michael S. Tsirkin Signed-off-by: Rusty Russell Signed-off-by: David S. Miller commit 3ffd05159815d477f971a3259fc758f0c3c7e640 Author: Sathya Perla Date: Tue Jun 1 00:19:33 2010 -0700 be2net: convert hdr.timeout in be_cmd_loopback_test() to le32 The current code fails on ppc as hdr.timeout is not being converted to le32. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller commit 6bd17eb96ffc9c3b52927913d59da9ced5109c6a Author: Anatolij Gustschin Date: Mon May 31 08:56:03 2010 +0000 can: mpc5xxx_can.c: Fix build failure Fixes build error caused by the OF device_node pointer being moved into struct device. Signed-off-by: Anatolij Gustschin Cc: Wolfgang Grandegger Cc: Grant Likely Signed-off-by: David S. Miller commit 288fcee8b7aa98796d96cd5b1b2e8005639328bf Author: Joe Perches Date: Mon May 31 23:48:19 2010 -0700 net/ipv4/tcp_input.c: fix compilation breakage when FASTRETRANS_DEBUG > 1 Commit: c720c7e8383aff1cb219bddf474ed89d850336e3 missed these. Signed-off-by: Joe Perches Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 5953a303471951a4c2f2127f0b4c74df7ceb7ac2 Merge: b1faf56 7489aec Author: David S. Miller Date: Mon May 31 23:44:57 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6 commit b1faf5666438090a4dc4fceac8502edc7788b7e3 Author: Eric Dumazet Date: Mon May 31 23:44:05 2010 -0700 net: sock_queue_err_skb() dont mess with sk_forward_alloc Correct sk_forward_alloc handling for error_queue would need to use a backlog of frames that softirq handler could not deliver because socket is owned by user thread. Or extend backlog processing to be able to process normal and error packets. Another possibility is to not use mem charge for error queue, this is what I implemented in this patch. Note: this reverts commit 29030374 (net: fix sk_forward_alloc corruptions), since we dont need to lock socket anymore. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 9f75c1b12c5ef392ddcea575b13560842c28b1b3 Author: Daniel T Chen Date: Sun May 30 13:08:41 2010 -0400 ALSA: hda: Use LPIB for ASUS M2V BugLink: https://launchpad.net/bugs/587546 Symptom: On the reporter's ASUS M2V, using PulseAudio in Ubuntu 10.04 LTS results in the PA daemon crashing shortly after attempting playback of an audio file. Test case: Using Ubuntu 10.04 LTS (Linux 2.6.32.12), Linux 2.6.33, or Linux 2.6.34, attempt playback of an audio file while PulseAudio is active. Resolution: add SSID for this machine to the position_fix quirk table, explicitly specifying the LPIB method. Reported-and-Tested-By: D Tangman Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit f07ff97b012ff9485618faeadcc9b1e5f72ceefa Author: Takashi Iwai Date: Tue Jun 1 07:42:03 2010 +0200 usb/gadget: Replace the old USB audio FU definitions in f_audio.c The USB audio FU definitions were renewed by the commit 65f25da44b51f55e3a74301c25f29263be2bf1ba ALSA: usb-audio: unify constants from specification Signed-off-by: Takashi Iwai commit 666092c679f7d9eb9f5230087f960a487fda721c Author: Ian Armstrong Date: Sun May 23 22:27:49 2010 -0300 V4L/DVB: ivtv: Timing tweaks and code re-order to try and improve stability Added small delay on device open & close to allow hardware to settle. Move yuv register restore to before the decoder firmware call to stop playback. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit bd62307b20ff864c48541e46c3ee2bb9cc330f64 Author: Ian Armstrong Date: Sun May 23 22:19:11 2010 -0300 V4L/DVB: ivtv: Avoid accidental video standard change For yuv video output, pass fake values to avoid firmware trying to change video standard. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 5f39b9f660778c3b095fc380da178d58a040add5 Author: Ian Armstrong Date: Sun May 23 22:10:30 2010 -0300 V4L/DVB: ivtvfb : Module load / unload fixes Check firmware state when loading module & if firmware is not responding exit with an error. When module is unloaded, only disable the framebuffer & not all decoder output. Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 064a2485aa45956cf1e8520e716839e9d7555b90 Author: Ian Armstrong Date: Sun May 23 21:56:33 2010 -0300 V4L/DVB: cx2341x: Report correct temporal setting for log-status [Andy Walls comment:] This patch from Ian removes the cx2341x module lying about the setting of the temporal filter for the log status ioctl(). Signed-off-by: Ian Armstrong Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 6afdeaf865b729287e02aafc61d8d013b89996ef Author: Andy Walls Date: Sun May 23 18:53:35 2010 -0300 V4L/DVB: cx18, cx23885, v4l2 doc, MAINTAINERS: Update Andy Walls' email address A trivial change to update my email address from my dead awalls@radix.net address to my current awalls@md.metrocast.net address. Signed-off-by: Andy Walls Signed-off-by: Mauro Carvalho Chehab commit 4202066c6995200b2755a4501ea90f5d4e163e41 Author: Julia Lawall Date: Thu May 27 09:36:45 2010 -0300 V4L/DVB: drivers/media: Eliminate a NULL pointer dereference In each case, the print involves dereferencing a value that is NULL or is near NULL. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r exists@ expression E,E1; identifier f; statement S1,S2,S3; @@ if ((E == NULL && ...) || ...) { ... when != if (...) S1 else S2 when != E = E1 * E->f ... when any return ...; } else S3 // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit 5c331fc8c19e181bffab46e9d18e1637cdc47170 Author: Ang Way Chuang Date: Thu May 27 02:02:09 2010 -0300 V4L/DVB: dvb-core: Fix ULE decapsulation bug Fix ULE decapsulation bug when less than 4 bytes of ULE SNDU is packed into the remaining bytes of a MPEG2-TS frame ULE (Unidirectional Lightweight Encapsulation RFC 4326) decapsulation code has a bug that incorrectly treats ULE SNDU packed into the remaining 2 or 3 bytes of a MPEG2-TS frame as having invalid pointer field on the subsequent MPEG2-TS frame. Signed-off-by: Ang Way Chuang Acked-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 84b14f181a36eea6591779156ef356f8d198bbfd Author: Igor M. Liplianin Date: Wed May 26 23:31:21 2010 -0300 V4L/DVB: Bug fix: make IR work again for dm1105 It makes IR to work again for dm1105 and, possibly, others. Signed-off-by: Igor M. Liplianin Signed-off-by: Mauro Carvalho Chehab commit 033608c1f33bcacba8d3a960240a7b2900b1d5ff Author: Randy Dunlap Date: Wed May 26 14:08:51 2010 -0300 V4L/DVB: media/IR: nec-decoder needs to select BITREV Fix ir-nec-decoder build: it uses bitrev library code, so select BITREVERSE in its Kconfig. ir-nec-decoder.c:(.text+0x1a2517): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2526): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2530): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2539): undefined reference to `byte_rev_table' Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 129c34d8fce443d1c43d32637abbab8433504497 Author: Dan Carpenter Date: Wed May 26 11:58:10 2010 -0300 V4L/DVB: video/saa7134: change dprintk() to i2cdprintk() The problem is that dprintk() dereferences "dev" which is null here. The i2cdprintk() uses "ir" so that's OK. Also Jean Delvare pointed out a typo in the comment so we may as well fix that. Signed-off-by: Dan Carpenter Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit f0e5481f2f5304ffebd43d97bd5118443fac8d23 Author: Dan Carpenter Date: Tue May 25 06:21:50 2010 -0300 V4L/DVB: video/saa7134: remove duplicate break The original code had two break statements in a row. Signed-off-by: Dan Carpenter Acked-by: Jean Delvare Signed-off-by: Mauro Carvalho Chehab commit bbe4690f6caef2b36c95dd50e59bc3f4e2eaa6ad Author: Jarod Wilson Date: Mon May 24 12:02:05 2010 -0300 V4L/DVB: IR/imon: add auto-config for 0xffdc rf device Add auto-config support for iMON 2.4G LT RF device, based on debug output from Giulio Amodeo in Red Hat bugzilla #572288. Also flips the switch on only setting up the rf associate sysfs attr only if we think we're looking at an RF device, vs. previously, setting up the attr for all 0xffdc devices, so its possible (but a bit unlikely) there's another iMON RF device we'll have to fix up. Nb: should be applied after "IR/imon: clean up usage of bools", or there will be a slight contextual mismatch. Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit f789bf4013e5e003e5d75ec0b8fa280aa66f401f Author: Jarod Wilson Date: Mon May 24 12:00:31 2010 -0300 V4L/DVB: IR/imon: clean up usage of bools There was a mix of 0/1 and false/true. Pick one convention and stick with it (I picked false/true). Signed-off-by: Jarod Wilson Signed-off-by: Mauro Carvalho Chehab commit 517521e4651ac106fc2a4f7638c284f60de92bb8 Author: Dan Carpenter Date: Sat May 22 16:53:27 2010 -0300 V4L/DVB: em28xx: remove unneeded null checks The "dev" variable is used as a list cursor in a list_for_each_entry() loop and can never be null here so I removed the check. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab commit 7853d408b792f9015072f7c4649bd3a5d4f6ed02 Author: Huang Weiyi Date: Sat May 22 14:12:06 2010 -0300 V4L/DVB: ngene: remove unused #include Remove unused #include ('s) in drivers/media/dvb/ngene/ngene-dvb.c drivers/media/dvb/ngene/ngene-i2c.c Signed-off-by: Huang Weiyi Signed-off-by: Mauro Carvalho Chehab commit 1db2c22b2216718d4d9adb4a9450bb3dc70e56d2 Author: Randy Dunlap Date: Thu May 20 18:08:23 2010 -0300 V4L/DVB: ak881x needs slab.h Add slab.h to fix ak881x build: drivers/media/video/ak881x.c:265:error: implicit declaration of function 'kzalloc' drivers/media/video/ak881x.c:265:warning: assignment makes pointer from integer without a cast drivers/media/video/ak881x.c:283:error: implicit declaration of function 'kfree' Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 806b07c29b711aaf90c81d2a19711607769f8246 Author: Jean Delvare Date: Wed May 26 10:05:11 2010 -0300 V4L/DVB: FusionHDTV: Use quick reads for I2C IR device probing IR support on FusionHDTV cards is broken since kernel 2.6.31. One side effect of the switch to the standard binding model for IR I2C devices was to let i2c-core do the probing instead of the ir-kbd-i2c driver. There is a slight difference between the two probe methods: i2c-core uses 0-byte writes, while the ir-kbd-i2c was using 0-byte reads. As some IR I2C devices only support reads, the new probe method fails to detect them. For now, revert to letting the driver do the probe, using 0-byte reads. In the future, i2c-core will be extended to let callers of i2c_new_probed_device() provide a custom probing function. Signed-off-by: Jean Delvare Tested-by: "Timothy D. Lenz" Signed-off-by: Mauro Carvalho Chehab commit f137f9d0009067289a2fa6c4da9b82084cdd257e Author: Hermann Gausterer Date: Tue May 18 04:26:17 2010 -0300 V4L/DVB: Technotrend S2-3200 ships with a TT 1500 remote The Technotrend Budget S2-3200 ships with the Technotrend 1500 bundled remote which is already supported. Just add the right Subsystem Device ID. Signed-off-by: Hermann Gausterer Signed-off-by: Mauro Carvalho Chehab commit 2ef17c9fc8241e5b08c60ca82345c540bb001876 Author: Julia Lawall Date: Thu May 13 16:59:15 2010 -0300 V4L/DVB: drivers/media: Use kzalloc Use kzalloc rather than the combination of kmalloc and memset. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression x,size,flags; statement S; @@ -x = kmalloc(size,flags); +x = kzalloc(size,flags); if (x == NULL) S -memset(x, 0, size); // Signed-off-by: Julia Lawall Signed-off-by: Mauro Carvalho Chehab commit 59fd08afe0f9ae3a3b793fc178a3c3677b1e716c Author: Ben Hutchings Date: Sat May 15 13:46:16 2010 -0300 V4L/DVB: m920x: Select simple tuner Update the Kconfig selections to match the code. Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit e245b0bd8253fc54dfe3b5e453af0c9841098f87 Author: Ben Hutchings Date: Sat May 15 13:45:58 2010 -0300 V4L/DVB: dib0700: Select dib0090 frontend Update the Kconfig selections to match the code. Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit d46b36e7f927772bb72524dc9f1e384e3cb4a975 Author: Ben Hutchings Date: Sat May 15 13:45:37 2010 -0300 V4L/DVB: budget: Select correct frontends Update the Kconfig selections to match the code. Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit 9947e98a76455cec4a64aef536d375fa37cbfc32 Author: Ben Hutchings Date: Sat May 15 13:45:21 2010 -0300 V4L/DVB: dw2102: Select tda10023 frontend, not tda10021 Update the Kconfig selections to match the code. Signed-off-by: Ben Hutchings Signed-off-by: Mauro Carvalho Chehab commit 58aac2bff192970a1186c33fbea181efe9464dd2 Author: Randy Dunlap Date: Fri May 14 14:09:57 2010 -0300 V4L/DVB: [-next] IR: fix ir-nec-decoder build, select BITREVERSE Fix ir-nec-decoder build: it uses bitrev library code, so select BITREVERSE in its Kconfig. ir-nec-decoder.c:(.text+0x1a2517): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2526): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2530): undefined reference to `byte_rev_table' ir-nec-decoder.c:(.text+0x1a2539): undefined reference to `byte_rev_table' Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit a49ba1674b0cf507e62d97fbd91ce345a37b11a8 Author: Prarit Bhargava Date: Wed May 12 19:30:02 2010 -0300 V4L/DVB: Add notification to cxusb_dualdig4_rev2_frontend_attach() error handling Add a notification to the dib7000p_i2c_enumeration() failure path in cxusb_dualdig4_rev2_frontend_attach(). Signed-off-by: Prarit Bhargava Signed-off-by: Mauro Carvalho Chehab commit 63fc31e8d0757574edb03ed73986be56e70a75c1 Author: Herton Ronaldo Krzesinski Date: Mon May 10 15:43:31 2010 -0300 V4L/DVB: saa7134: add RM-K6 remote control support for Avermedia M135A This change adds support for one more remote control type for Avermedia M135A (model RM-K6), shipped with Positivo machines. Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Mauro Carvalho Chehab commit 7e2d9820c37525da2469147eec897488ec141bcf Author: Stefan Ringel Date: Sun May 23 15:31:44 2010 -0300 V4L/DVB: tm6000: add DVB support for tuner xc5000 [mchehab@redhat.com: Fix compilation breakage due to duplicate cfg config delaration without {}] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit dcf5d3aa081617a4a8aa56b7e24988d600148f50 Author: Stefan Ringel Date: Sun May 23 15:29:26 2010 -0300 V4L/DVB: tm6000: set variable dev_mode in function tm6000_start_stream set variable dev_mode in function tm6000_start_stream and check mode Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 71d67f739e0b02995c2eb650448f031b76720307 Author: Stefan Ringel Date: Sun May 23 15:29:24 2010 -0300 V4L/DVB: tm6000: Properly select the tuners Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit f36cc0342df21fc6820b53cdfba3e98ee5943f46 Author: Stefan Ringel Date: Sun May 23 15:29:25 2010 -0300 V4L/DVB: tm6000: Add control to the power led Turn power led off, if device is disconnected Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 5a4b55e2c256d78fd86679ee00777c393c87c94a Author: Stefan Ringel Date: Wed May 19 13:58:27 2010 -0300 V4L/DVB: tm6000: bugfix stabilizing urb data Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 4b6ed9fd0baf34da6912bebee46c36eda0411984 Author: Stefan Ringel Date: Wed May 19 13:58:26 2010 -0300 V4L/DVB: tm6000: bugfix video image bugfix: Avoid loosing frames, causing image delays on some of the image lines. [mchehab@redhat.com: Fix compilation breakage by merging with the patch fix] Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 3569417e5a2c20764158961a2f6c514d26136e5f Author: Stefan Ringel Date: Wed May 19 13:58:25 2010 -0300 V4L/DVB: tm6000: add vbi message inside the type switch add case line for vbi message Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 0f9bdbc2da442a78990579cabc1554446ed784a7 Author: Stefan Ringel Date: Wed May 19 13:58:24 2010 -0300 V4L/DVB: tm6000: bugfix incorrect size Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 2a15ac7ad625dc22885446016d730a451df1b7d4 Author: Dmitri Belimov Date: Tue May 18 04:23:29 2010 -0300 V4L/DVB: tm6000, reset I2C bus function Add new function for reset I2C bus. Rework some code for use this function. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov Signed-off-by: Mauro Carvalho Chehab commit b9eb39d8f419d76e1d59febe48a6791f1fbb68c4 Author: Stefan Ringel Date: Mon May 10 13:22:50 2010 -0300 V4L/DVB: tm6000: Remove an extra ; symbol Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 0439db75c1fbb28a3b314ae354582e4f180daf52 Author: Stefan Ringel Date: Mon May 10 13:22:51 2010 -0300 V4L/DVB: tm6000: add extension module support add module init over tm6000 extension Signed-off-by: Stefan Ringel Signed-off-by: Mauro Carvalho Chehab commit 9e1d9e7bac5c2bafc3c0c51db88c15f3fbcec83f Author: Herton Ronaldo Krzesinski Date: Sat May 8 02:23:37 2010 -0300 V4L/DVB: saa7134: add support for Avermedia M733A This change adds support for Avermedia M733A. The original version for linux 2.6.31 was sent to me from Avermedia, original author is unknown. I ported it to current kernels, expanded and fixed key code handling for RM-K6 remote control, and added an additional pci id also supported. [mchehab@redhat.com: make checkpatch.pl happier] Signed-off-by: Herton Ronaldo Krzesinski Signed-off-by: Mauro Carvalho Chehab commit e65f8c4e3eef3a0946f8e8fba1fb6aabde734f50 Author: Guy Martin Date: Fri May 7 04:34:40 2010 -0300 V4L/DVB: stv6110x: Fix kernel null pointer deref The following OOPS happened when plugging two TT s2-1600: [ 96.521023] saa7146: register extension 'budget dvb'. [ 96.521052] budget dvb 0000:05:00.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16 [ 96.521070] IRQ 16/: IRQF_DISABLED is not guaranteed on shared IRQs [ 96.521076] saa7146: found saa7146 @ mem ffffc90011182c00 (revision 1, irq 16) (0x13c2,0x101c). [ 96.521080] saa7146 (0): dma buffer size 192512 [ 96.521081] DVB: registering new adapter (TT-Budget S2-1600 PCI) [ 96.539929] adapter has MAC addr = 00:d0:5c:cc:b0:a2 [ 96.890149] stv6110x_attach: Attaching STV6110x [ 96.912516] DVB: registering adapter 0 frontend 0 (STV090x Multistandard)... [ 96.912600] budget dvb 0000:05:01.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17 [ 96.912639] IRQ 17/: IRQF_DISABLED is not guaranteed on shared IRQs [ 96.912667] saa7146: found saa7146 @ mem ffffc90011314800 (revision 1, irq 17) (0x13c2,0x101c). [ 96.912673] saa7146 (1): dma buffer size 192512 [ 96.912676] DVB: registering new adapter (TT-Budget S2-1600 PCI) [ 96.930893] adapter has MAC addr = 00:d0:5c:cc:b0:a3 [ 97.233478] BUG: unable to handle kernel NULL pointer dereference at 0000000000000010 [ 97.233647] IP: [] stv6110x_set_mode+0x70/0x80 [stv6110x] [ 97.233753] PGD 3c16f067 PUD 3c383067 PMD 0 [ 97.234147] CPU 0 [ 97.234246] Pid: 5200, comm: modprobe Not tainted 2.6.33.2 #1 P5QSE/P5Q SE [ 97.234317] RIP: 0010:[] [] stv6110x_set_mode+0x70/0x80 [stv6110x] [ 97.234456] RSP: 0018:ffff88003c125c98 EFLAGS: 00010246 [ 97.234461] RAX: ffffffffa029c460 RBX: ffff88003f84d800 RCX: ffff88003a19e140 [ 97.234461] RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 [ 97.234461] RBP: ffff88003f84d828 R08: 0000000000000002 R09: 0000000000000004 [ 97.234461] R10: 0000000000000003 R11: 0000000000000010 R12: ffff88003f84d800 [ 97.234461] R13: ffff88003f84d828 R14: ffff88003f84d828 R15: 0000000000000001 [ 97.234461] FS: 00007f9f7253e6f0(0000) GS:ffff880001800000(0000) knlGS:0000000000000000 [ 97.234461] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b [ 97.234461] CR2: 0000000000000010 CR3: 000000003c382000 CR4: 00000000000006b0 [ 97.234461] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [ 97.234461] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [ 97.234461] Process modprobe (pid: 5200, threadinfo ffff88003c124000, task ffff88003e893ac0) [ 97.234461] ffff88003f84d800 ffff88003f84d828 ffff88003f84d800 ffffffffa0292343 [ 97.234461] <0> ffff88003f84d828 ffff88003ef70ae0 ffffffffa0280800 ffffffffa02934d2 [ 97.234461] <0> ffffffffa0295260 0000000000000000 ffffffffa02948b0 ffff88003df79800 [ 97.234461] [] ? stv090x_sleep+0x33/0x120 [stv090x] [ 97.234461] [] ? stv090x_attach+0x1e2/0x73c [stv090x] [ 97.234461] [] ? dma_generic_alloc_coherent+0xa5/0x160 [ 97.234461] [] ? saa7146_init_one+0x7d5/0x910 [saa7146] [ 97.234461] [] ? local_pci_probe+0x12/0x20 [ 97.234461] [] ? pci_device_probe+0x110/0x120 [ 97.234461] [] ? driver_probe_device+0x98/0x1b0 [ 97.234461] [] ? __driver_attach+0x93/0xa0 [ 97.234461] [] ? __driver_attach+0x0/0xa0 [ 97.234461] [] ? bus_for_each_dev+0x58/0x80 [ 97.234461] [] ? bus_add_driver+0x14d/0x280 [ 97.234461] [] ? budget_init+0x0/0xc [budget] [ 97.234461] [] ? driver_register+0x79/0x170 [ 97.234461] [] ? budget_init+0x0/0xc [budget] [ 97.234461] [] ? __pci_register_driver+0x58/0xe0 [ 97.234461] [] ? budget_init+0x0/0xc [budget] [ 97.234461] [] ? do_one_initcall+0x35/0x190 [ 97.234461] [] ? sys_init_module+0xe7/0x260 [ 97.234461] [] ? system_call_fastpath+0x16/0x1b [ 97.234461] RIP [] stv6110x_set_mode+0x70/0x80 [stv6110x] [ 97.234461] RSP [ 97.240074] ---[ end trace b53ecbbbbef15e99 ]--- Prevents calling stv6110x_set_mode() if fe->tuner_priv is not defined, in order to avoid the above bug. Signed-off-by: Guy Martin Signed-off-by: Mauro Carvalho Chehab commit 76952c7e598f68bf12adf307d6a9a0de3b33b985 Author: Guy Martin Date: Fri May 7 04:09:25 2010 -0300 V4L/DVB: TT CT-3650 DVB-C support Add support for the DVB-C frontend of the TT CT-3650. DVB-T fe, CI and IR are not implemented. Signed-off-by: Guy Martin Signed-off-by: Mauro Carvalho Chehab commit 283d637bbd7301c9fb2236103b990b9d66099d78 Author: Hans Verkuil Date: Sun May 9 06:44:16 2010 -0300 V4L/DVB: tvp514x: simplify try/g/s_fmt handling Since there is only one possible format just have all three calls do the same. Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit f1a4435f3efa510760adf6acb87c62653de9a0ee Author: Hans Verkuil Date: Sun May 9 06:40:18 2010 -0300 V4L/DVB: tvp514x: remove obsolete fmt_list Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 3907b07294a9a87793ca9e0223c7bf66b6108ab0 Author: Hans Verkuil Date: Sun May 9 06:39:44 2010 -0300 V4L/DVB: tvp514x: add missing newlines Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit c2fc80961fc2059c05bf07c92decfffde2a0f9ef Author: Hans Verkuil Date: Sun May 9 06:37:14 2010 -0300 V4L/DVB: tvp514x: there is only one supported format, so simplify the code Get rid of unnecessary code since this driver supports only one pixel format. Removing this code will make the transition to the mbus API easier as well. Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit a75ffc124611a535aec8f403817d382d106c68d7 Author: Hans Verkuil Date: Sun May 9 06:32:47 2010 -0300 V4L/DVB: tvp514x: make std_list const Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 2db4e78f14a5b4741b09d03e6d17610537a9af27 Author: Hans Verkuil Date: Sun May 9 06:30:15 2010 -0300 V4L/DVB: tvp514x: do NOT change the std as a side effect Several calls (try_fmt, g_parm among others) changed the current standard as a side effect of that call. But the standard may only be changed by s_std. Signed-off-by: Hans Verkuil Reviewed-by: Vaibhav Hiremath Tested-by: Vaibhav Hiremath Acked-by: Vaibhav Hiremath Signed-off-by: Mauro Carvalho Chehab commit 3805f201934e5384f6e941222dc1968cb638a88c Author: Hans Verkuil Date: Sat May 8 17:55:00 2010 -0300 V4L/DVB: v4l2-subdev.h: fix enum_mbus_fmt prototype enum_mbus_fmt received an index argument that was defined as an int instead of an unsigned int. This is now fixed. This had the knock-on effect that the index argument in the callback get_formats in soc_camera.h also had to be changed to unsigned int. Signed-off-by: Hans Verkuil Acked-by: Guennadi Liakhovetski Signed-off-by: Mauro Carvalho Chehab commit cf69b808caf8e729949cf20446bec0b9ace033b7 Author: Hans Verkuil Date: Sun May 9 07:39:32 2010 -0300 V4L/DVB: au8522_decoder: g/s_fmt doesn't do anything: remove g/s_fmt is going to disappear, so if it is not doing anything, then just remove it. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 468df208e84d1e7c65b0d005dbbf09f5aea92409 Author: Hans Verkuil Date: Sat May 8 17:26:00 2010 -0300 V4L/DVB: tvp5150: remove obsolete g/s_fmt ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit ea01b11a07961aabbaec58d572b24f3df4b8065c Author: Hans Verkuil Date: Sun May 9 10:19:25 2010 -0300 V4L/DVB: mt9v011: add enum/try/s_mbus_fmt support Note that this driver is only used by em28xx and that em28xx does not actually call the enum/try/s_fmt ops of mt9v011. So these functions have never been tested. And in fact the driver really implements cropping instead of scaling. So it seems to be doing the wrong thing :-( Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 260bb38a21a19edc8a328f3ac8dd45c184d01216 Author: Hans Verkuil Date: Sat May 8 19:02:11 2010 -0300 V4L/DVB: v4l2-mediabus.h: added V4L2_MBUS_FMT_SGRBG8_1X8 Needed for mt9v011. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 029ed3261021c76f0b8538a2f715d89506555676 Author: Hans Verkuil Date: Sat May 8 17:20:35 2010 -0300 V4L/DVB: saa7115: remove obsolete g/s_fmt ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c1658cafd1910cbec1b546ecd1f76e8fc99fc513 Author: Hans Verkuil Date: Sat May 8 17:20:00 2010 -0300 V4L/DVB: cx24850: remove obsolete g/s_fmt ops Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 112cb4a8a092a6338a0e2309aac134e502f2a489 Author: Hans Verkuil Date: Sun May 9 10:11:01 2010 -0300 V4L/DVB: cx231xx: convert to s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cc99113b8cfb8b9685490db0b9bf0d26c9705ad3 Author: Hans Verkuil Date: Sun May 9 10:09:28 2010 -0300 V4L/DVB: cx23885: convert to s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit fa190ee91fcc3800f2c5d14810dc1b48a4b5d4e5 Author: Hans Verkuil Date: Sat May 8 17:16:18 2010 -0300 V4L/DVB: pvrusb2: convert to s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 31bf95fb5725013fd7d95d6d5b1e45f4c88b1f56 Author: Hans Verkuil Date: Sun May 9 09:41:41 2010 -0300 V4L/DVB: saa7134: convert to use the new mbus API Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 51623ef9aedd8b786a12a4475201827ee85d285c Author: Hans Verkuil Date: Sun May 9 09:39:58 2010 -0300 V4L/DVB: saa6752hs: add g/s_mbus_fmt support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 3a21ceed7f373894a7c537b4dbbe484f36e7ae24 Author: Hans Verkuil Date: Sat May 8 17:08:58 2010 -0300 V4L/DVB: v4l2-mediabus.h: add two helper functions Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 66e9df07d362b63a594e8663260e0430ba4a17bf Author: Hans Verkuil Date: Sat May 8 16:40:23 2010 -0300 V4L/DVB: saa717x: remove obsolete s_fmt op Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 60298c99f792bb2fe12137360d448c72234b2d0b Author: Hans Verkuil Date: Sat May 8 16:39:01 2010 -0300 V4L/DVB: saa7127: remove obsolete g_fmt support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 9e36eabc8a6fb87d9b97057e0d0f5195c475fbdc Author: Hans Verkuil Date: Sat May 8 16:37:53 2010 -0300 V4L/DVB: cx18: remove old g/s_fmt from the cx18_av subdev cx18 has now switched over completely to the new mediabus subdev ops. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit e17ad1de031f2d5cade70eb0469a53f17d90d7c2 Author: Hans Verkuil Date: Sun May 9 09:54:58 2010 -0300 V4L/DVB: cx18: add s_mbus_fmt support Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 475977ac3db72c008f5aaa5f19bd991b72f26e42 Author: Hans Verkuil Date: Sat May 8 16:28:51 2010 -0300 V4L/DVB: ivtv: convert to use s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 6c69db9de7a8934bdeb690663fab6fe046203ac4 Author: Hans Verkuil Date: Sun May 9 09:50:34 2010 -0300 V4L/DVB: saa717x: add support for s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 96fd004fe40b8e3beff2a6e27ae0411a4d315f1e Author: Hans Verkuil Date: Sun May 9 09:48:50 2010 -0300 V4L/DVB: cx25840: add support for s_mbus_fmt Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit c463d93f22254f46168b49ad1149d1ec1e904711 Author: Hans Verkuil Date: Sun May 9 09:47:23 2010 -0300 V4L/DVB: saa7115: add s_mbus_fmt op Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit f1158af2b2e064532470516943511863a873c5e5 Author: Hans Verkuil Date: Sun May 9 06:54:46 2010 -0300 V4L/DVB: V4L2 Spec: Improve the VIDIOC_QUERY_DV_PRESET description Make explicit what should happen when the input signal is missing, unreliable or does not map to a supported preset. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 51ff9ef13366b3752a8ab6229c466fd1bd671d3a Author: Oliver Endriss Date: Wed May 19 04:17:18 2010 -0300 V4L/DVB: ngene: Remove debug message Remove debug message. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 478b3a42bdcd8d1cb57c91cabdc8b6164c639e42 Author: Oliver Endriss Date: Wed May 19 04:15:44 2010 -0300 V4L/DVB: ngene: MSI cleanup MSI cleanup. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 5a2a1848a7d744a437f96b79a655c13b8090e74d Author: Oliver Endriss Date: Sun May 16 06:07:07 2010 -0300 V4L/DVB: ngene: Make command timeout workaround configurable Make command timeout workaround configurable, activate it for firmware version <= 17. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 4387418129895fd9aa2e2f6368ea69e9c4ddd0f2 Author: Oliver Endriss Date: Sun May 16 05:29:14 2010 -0300 V4L/DVB: ngene: Implement support for MSI Add MSI support, may be enabled with firmware version 18. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit eb05d155bc9f51ff701c09bc9b5e4b4f5a4b4d9f Author: Oliver Endriss Date: Sun May 16 05:17:49 2010 -0300 V4L/DVB: ngene: Do not call demuxer with interrupts disabled It is neither a good idea nor necessary to call the demuxer with interrupts disabled. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit 9d78f46071b2cbc91eaf533e1ea441af36eed06a Author: Oliver Endriss Date: Sun May 16 05:08:49 2010 -0300 V4L/DVB: ngene: Support new device 'Digital Devices DuoFlex S2 miniPCIe' Add subsystem id DD10/DD20 'Digital Devices DuoFlex S2 miniPCIe'. Signed-off-by: Oliver Endriss Signed-off-by: Mauro Carvalho Chehab commit c4f95d84b8dedf28adda927561f7e09b1d5ea626 Author: Warren Bosworth Focke Date: Fri May 7 15:40:04 2010 -0300 V4L/DVB: gspca - sonixj: Add webcam 0c45:60ce Signed-off-by: Warren Bosworth Focke Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 6804675e3644361b1d509cac5427bab42a0bc6da Author: Jean-François Moine Date: Fri May 7 15:35:08 2010 -0300 V4L/DVB: gspca - sonixj: Add information about some potential JPEG webcams Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit 040000ae7d27d9229959f4a4e9d67cf6c93e8ef8 Author: Jean-François Moine Date: Fri May 7 15:27:44 2010 -0300 V4L/DVB: gspca - sonixb: Have 0c45:602e handled by sonixb instead of sn9c102 This change fixes the Debian Bug #579332 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=579332 Signed-off-by: Jean-François Moine Signed-off-by: Mauro Carvalho Chehab commit e3a5ee73e7223cda78f2770572c5ad01928496d6 Author: Mike Isely Date: Sat May 15 00:30:29 2010 -0300 V4L/DVB: pvrusb2: Fix kernel oops on device tear-down pvrusb2: Delete sysfs class device as the _very_ last step, after we're sure that all driver contexts have gone away first. This is important because it appears that there isn't any protection from a struct device instance reference a deleted struct class instance. The assumption in the kernel code appears to be that the class instance is assumed to be around for the life of the device. So we can't let the class instance go away until all referencing device instances are gone; this is ensured by delaying removal of the class instance until after the driver contexts have all gone away. This bug has been present for a very long time but it didn't apparently become malignant until recently (probably because of other changes in the kernel). Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 7a6ac34848226e315e0d70333bb4ab83190d9f1d Author: Mike Isely Date: Sat May 15 00:28:44 2010 -0300 V4L/DVB: pvrusb2: Fix minor internal array allocation pvrusb2: Need one extra attribute slot allocated so that worst case still has a trailing null pointer. This wasn't causing visible symptoms; it was found through inspection while investigating other issues. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 28c4a5e6d32410f7c0b8fa9cc52eac424229f10a Author: Mike Isely Date: Sat May 15 00:23:46 2010 -0300 V4L/DVB: pvrusb2: Fix USB parent device reference count pvrusb2: Correctly reference count pointer to parent USB device when linked from sysfs interface. This is technically a pretty nasty problem, however as far as I know nobody had been getting burned by it (yet). Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit d72baad3f0e59041d68db7524537046e3a4121a2 Author: Mike Isely Date: Sat May 15 00:15:38 2010 -0300 V4L/DVB: pvrusb2: Fix kernel oops at device unregistration pvrusb2: Fix oops caused by touching deleted memory after unregistration. This bug was introduced when we had started using video_device_node_name() - that function was being called potentially after the underlying structure (referenced by that function) had been deleted. The fix rearranges things slightly so that the function is called before destruction takes place. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 8fd0444817e557568d8bddd77828d9ae0d606e04 Author: Mike Isely Date: Sat May 15 00:13:35 2010 -0300 V4L/DVB: pvrusb2: New feature to mark specific hardware support as experimental This adds a flag in the device attribute structure which can be used to mark support for a particular device as experimental. Any devices flagged in this way, when encountered at run-time, will generate a warning message to the kernel log. Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit 6861800c1512ca8452c5f350a7c0af445ece773b Author: Mike Isely Date: Sat May 15 00:09:47 2010 -0300 V4L/DVB: pvrusb2: Avoid using stack allocated buffers when performing USB I/O Drivers shouldn't assume that the stack is DMA-safe. [mchehab@redhat.com: fix patch description] Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit c641a18969178ac1649e022156c85adb7c889451 Author: Mike Isely Date: Sat May 15 00:07:04 2010 -0300 V4L/DVB: pvrusb2: Fix Gotview hardware support pvrusb2: Fix RF tuner problem with gotview hardware - this bug was introduced when switching over to the subdev model of driver control Signed-off-by: Mike Isely Signed-off-by: Mauro Carvalho Chehab commit e4425eab6b2da050bae55cffa01e573767a819a1 Author: Abylay Ospan Date: Wed May 12 04:24:09 2010 -0300 V4L/DVB: cx23885: Check register errors Fix kernel Oops when number of NetUP Dual DVB-S2-CI cards more than DVB_MAX_ADAPTERS limit. [mchehab@redhat.com: move the return to the proper place] Signed-off-by: Abylay Ospan Signed-off-by: Mauro Carvalho Chehab commit d71964fb9731412ce1f86cd7d9b71f1f94a04b0d Author: Hans Verkuil Date: Mon May 10 03:55:25 2010 -0300 V4L/DVB: c-qcam: convert to V4L2 Note: due to lack of hardware this conversion is untested. However, it is pretty straightforward so I do not expect any problems. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit 483d67ff0a208b43f0b97fca91d3a142afaba7fa Author: Hans Verkuil Date: Mon May 10 03:51:02 2010 -0300 V4L/DVB: bw-qcam: convert to V4L2 Note: due to lack of hardware I was not able to test this conversion. But it is pretty straightforward, so I do not expect any problems. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab commit cb5fcbd540b438a5d311bd15dc910841d01ed140 Author: Alex Deucher Date: Fri May 28 19:01:35 2010 -0400 drm/radeon/kms/evergreen: add initial CS parser Advanced validation is not implemented yet. The mesa code that uses this will be released soon. Signed-off-by: Alex Deucher Signed-off-by: Dave Airlie commit 36d1701c502d4f46386e1000ad58d9497a11688d Merge: afa3b60 8b281db Author: Dave Airlie Date: Tue Jun 1 11:32:29 2010 +1000 Merge remote branch 'nouveau/for-airlied' of ../drm-nouveau-next into drm-testing * 'nouveau/for-airlied' of ../drm-nouveau-next: drm/nv50: cast IGP memory location to u64 before shifting drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack drm/nouveau: fix dual-link displays when plugged into single-link outputs drm/nv50: obey dcb->duallink_possible drm/nv50: fix duallink_possible calculation for DCB 4.0 cards drm/nouveau: don't execute INIT_GPIO unless we're really running the table drm/nv40: allow cold-booting of nv4x chipsets drm/nouveau: fix POST detection for certain chipsets drm/nouveau: Add getparam for current PTIMER time. drm/nouveau: allow cursor image and position to survive suspend commit afa3b60c905f606e8245115474d77787035e02eb Merge: c09a350 fbf8176 Author: Dave Airlie Date: Tue Jun 1 11:32:06 2010 +1000 Merge branch 'drm-switcheroo-fixes' into drm-testing * drm-switcheroo-fixes: drm/kms: disable/enable poll around switcheroo on/off drm/nouveau: fixup confusion over which handle the DSM is hanging off. drm/nouveau: attempt to get bios from ACPI v3 commit c09a35028567ae2c11d627bf69134b87a3c0efae Merge: 4abe438 1ca14e7 Author: Dave Airlie Date: Tue Jun 1 11:32:06 2010 +1000 Merge branch 'drm-vmware-fixes' into drm-testing * drm-vmware-fixes: drm/vmwgfx: Remove some leftover debug messages. drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. drm/vmwgfx: Unpause overlay on update. drm/vmwgfx: Some modesetting cleanups and fixes. drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code. drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit. drm/vmwgfx: Reserve first part of VRAM for framebuffer. drm/vmwgfx: Support older hardware. drm/vmwgfx: Get connector status from detection function. drm/vmwgfx: Add kernel throttling support. Bump minor. drm/vmwgfx: Make sure to unpin old and pin new framebuffer. drm/vmwgfx: Fix single framebuffer detection. drm/vmwgfx: Assume larger framebuffer max size. commit fbf81762e385d3d45acad057b654d56972acf58c Author: Dave Airlie Date: Tue Jun 1 09:09:06 2010 +1000 drm/kms: disable/enable poll around switcheroo on/off Because we aren't in a suspend state the poll will still run when we have switcherooed a card off. Signed-off-by: Dave Airlie commit fc5ea29d72bde1bec230538becf396caad8621b8 Author: Dave Airlie Date: Mon May 31 17:10:52 2010 +1000 drm/nouveau: fixup confusion over which handle the DSM is hanging off. This fixes the DSM setup correctly since vga switcheroo. Signed-off-by: Dave Airlie commit afeb3e11147adb357603b071d6d7d1f30ea7f19d Author: Dave Airlie Date: Wed Apr 7 13:55:09 2010 +1000 drm/nouveau: attempt to get bios from ACPI v3 Some of the laptops with the switchable graphics, seem to not post the secondary GPU at all, and we can't find a copy of the BIOS anywhere except in the ACPI rom retrieval. This adds support for ACPI ROM retrieval to nouveau. Signed-off-by: Dave Airlie commit 8b281db596744a15b2abbfdbf655796c64e172ca Author: Ben Skeggs Date: Mon May 31 09:04:03 2010 +1000 drm/nv50: cast IGP memory location to u64 before shifting Signed-off-by: Ben Skeggs commit 4abe4389790d5f02569fbacdf035536ba84c7d44 Author: Thomas Hellstrom Date: Wed May 26 16:21:04 2010 +0200 drm/ttm: Fix ttm_page_alloc.c Fix a number of typos misspellings and checkpatch.pl warnings. Replace "[ttm] " with TTM_PFX Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit e8613c0e29d0018a80652e6ae58660c8a75ac74b Author: Thomas Hellstrom Date: Wed May 26 16:21:03 2010 +0200 drm/ttm: Fix cached TTM page allocation. This patch fixes a regression introduced with the pool page allocator in the event that there are no highmem pages (for example x86_64), in which case cached page allocation would fail. Tested with the vmwgfx driver on a 64-bit vm. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1ca14e75caae504fdf957cf0c1c4f3aafc886a60 Author: Thomas Hellstrom Date: Fri May 28 11:22:06 2010 +0200 drm/vmwgfx: Remove some leftover debug messages. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 316ab13ae2ad603fd5e3a909524e68d98db1b1b6 Author: Jakob Bornecrantz Date: Fri May 28 11:22:05 2010 +0200 drm/vmwgfx: Print warnings in kernel log about bo pinning that fails. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 792778e8e058471e1909b78d7c5e6ab94962ff8e Author: Jakob Bornecrantz Date: Fri May 28 11:22:04 2010 +0200 drm/vmwgfx: Unpause overlay on update. The unpause codepath uses vmw_overlay_update() so we must unset the paused status. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 259600d593181b8a3b1d7fe99d93233b1b113fd0 Author: Jakob Bornecrantz Date: Fri May 28 11:22:03 2010 +0200 drm/vmwgfx: Some modesetting cleanups and fixes. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit d451f62a7c567654f74018be9ab8da8089660d3b Author: Jakob Bornecrantz Date: Fri May 28 11:22:02 2010 +0200 drm/vmwgfx: Don't use SVGA_REG_ENABLE in modesetting code. We should not use SVGA_REG_ENABLE anywhere but in the fifo setup code, since it controls whether the device is active. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit bbfad33663fe8de1cce84ac776664292c46fe7ae Author: Jakob Bornecrantz Date: Fri May 28 11:22:01 2010 +0200 drm/vmwgfx: Remove duplicate member from struct vmw_legacy_display_unit. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 22ee861c816689b2566290356d54e4a01c9b2e74 Author: Thomas Hellstrom Date: Fri May 28 11:22:00 2010 +0200 drm/vmwgfx: Reserve first part of VRAM for framebuffer. The host may be touching this part of VRAM at modesetting, even if we never use it ourselves, since we blit screen updates from 3D surfaces. Make sure no DMA buffers are placed in this part of VRAM. V2: Fix an error check in vmw_surface_dmabuf_pin(). Signed-off-by: Thomas Hellstrom Signed-off-by: Jakob Bornecrantz Signed-off-by: Dave Airlie commit d7e1958dbe4a7b81d4cab5fab545a068501b967e Author: Jakob Bornecrantz Date: Fri May 28 11:21:59 2010 +0200 drm/vmwgfx: Support older hardware. V2: Fix a couple of typos. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1ae1ddd5e99bbc067414ff571ac18d4312b4c8cf Author: Jakob Bornecrantz Date: Fri May 28 11:21:58 2010 +0200 drm/vmwgfx: Get connector status from detection function. Also make sure the ldu::active member is properly initialized. Part of fix by Michel Daenzer . Signed-off-by: Jakob Bornecrantz Signed-off-by: Michel Daenzer Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 1925d4565888eb313cc923372da6a08bbfb3a859 Author: Thomas Hellstrom Date: Fri May 28 11:21:57 2010 +0200 drm/vmwgfx: Add kernel throttling support. Bump minor. The throttle_us member in the execbuf argument is now honored. If the member is 0, no waiting for lag will occur, which guarantees backwards compatibility with well-behaved clients. Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 04e9e94dba3e564ce810cedab88e957dfd681b4a Author: Jakob Bornecrantz Date: Fri May 28 11:21:56 2010 +0200 drm/vmwgfx: Make sure to unpin old and pin new framebuffer. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 6a591a96d7315fbe81acc33e20bab4956d1f02a3 Author: Jakob Bornecrantz Date: Fri May 28 11:21:55 2010 +0200 drm/vmwgfx: Fix single framebuffer detection. V2: Fix a typo. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 7e71f8a59e1c9adbbc3b737b4b818c8aa4169d0e Author: Jakob Bornecrantz Date: Fri May 28 11:21:54 2010 +0200 drm/vmwgfx: Assume larger framebuffer max size. Signed-off-by: Jakob Bornecrantz Signed-off-by: Thomas Hellstrom Signed-off-by: Dave Airlie commit 2fb750e825b5347de0390315f4284f13709a9856 Author: Borislav Petkov Date: Mon May 31 23:18:18 2010 +0200 perf-record: Check correct pid when forking When forking the child to be traced, we should check the correct return value from fork() and not a local variable which is otherwise unused. Signed-off-by: Borislav Petkov Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian LKML-Reference: <20100531211818.GA30175@liondog.tnic> Signed-off-by: Frederic Weisbecker commit dd833d713ccc79e00176eb1b3a6c65638c44e27b Author: Frederic Weisbecker Date: Tue Jun 1 00:43:07 2010 +0200 perf: Do the comm inheritance per thread in event__process_task event__process_task() doesn't propagate the comm copy on clone, but only on process fork. So we loose all the tid:comm resolution for tasks that aren't a main process thread. Progragate the per thread granularity to event__process_task for pid resolution. This fixes various unresolved pids in perf sched, especially when we trace multithread processes. The problem is quickly reproducible with the messaging benchmark using the multithread mode "-t" : perf sched record perf bench sched messaging -t Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit af64865ba6825e10fe62a3105fea5cadffeb52c6 Author: Frederic Weisbecker Date: Tue Jun 1 00:03:40 2010 +0200 perf: Use event__process_task from perf sched perf sched uses event__process_comm(), which means it can resolve comms from: - tasks that have exec'ed (kernel comm events) - tasks that were running when perf record started the actual recording (synthetized comm events) But perf sched can't resolve the pids of tasks that were created after the recording started. To solve this, we need to inherit the comms on fork events using event__process_task(). This fixes various unresolved pids in perf sched, easily visible with: perf sched record perf bench sched messaging Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit 13eb04fdbeb9d21dfe4696630daefe18ef6a1a84 Author: Frederic Weisbecker Date: Mon May 31 23:38:44 2010 +0200 perf: Process comm events by tid When we synthetize the existing running tasks though procfs, we walk through every threads of a process, queuing one comm events per tid. But then on report time, event__process_comm() only creates and sets the comm on a per process granularity. This is the right thing for comm events that came from the kernel, as they are only created on exec. Sub-threads then inherit their comm from fork events. But that doesn't work with our synthetized comm events taken from procfs informations as the per thread granularity is done on comm events directly there. Hence we need event__process_comm() to work with the tid rather than the pid. It won't change anything for comm events coming from the kernel but this will fix the synthetized ones. Before: $ ./perf report -D | grep COMM | grep firefox 0x2c7b8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7d0 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7e8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c800 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c818 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c830 [0x18]: PERF_RECORD_COMM: firefox:5297 After: $ ./perf report -D | grep COMM | grep firefox 0x2c7b8 [0x18]: PERF_RECORD_COMM: firefox:5297 0x2c7d0 [0x18]: PERF_RECORD_COMM: firefox:5299 0x2c7e8 [0x18]: PERF_RECORD_COMM: firefox:5300 0x2c800 [0x18]: PERF_RECORD_COMM: firefox:5308 0x2c818 [0x18]: PERF_RECORD_COMM: firefox:5309 0x2c830 [0x18]: PERF_RECORD_COMM: firefox:5312 This fixes various unresolved pid on perf sched. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Tom Zanussi Cc: Stephane Eranian commit fbf89f25fc4dc68ba0857aca87e70fa5d2592d81 Author: Mark Brown Date: Mon May 31 11:57:24 2010 -0700 Input: s3c2410_ts - tone down logging The S3C touchscreen driver is logging at LOG_INFO on every stylus up event which spams the console needlessly. Reduce the priority of the message to debug level for some peace and quiet. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 829ab5b52b7ee1d92b2373662b82b6f38cae7166 Author: Mark Brown Date: Mon May 31 11:57:24 2010 -0700 Input: s3c2410_ts - fix build error due to ADC Kconfig rename The name of the Kconfig symbol for the ADC has changed as a result of application to more SoCs but the select statement has not been updated, causing linker failures as the ADC core has not been built. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit 293a7cfeedc2b2380a7c7274902323c3cf5f7575 Author: Rusty Russell Date: Mon May 31 19:53:50 2010 +0930 module: fix reference to mod->percpu after freeing module. Rafael sees a sometimes crash at precpu_modfree from kernel/module.c; it only occurred with another (since-reverted) patch, but that patch simply changed timing to uncover this bug, it was otherwise unrelated. The comment about the mod being freed is self-explanatory, but neither Tejun nor I read it. This bug was introduced in 259354deaa, after it had previously been fixed in 6e2b75740b. How embarrassing. Reported-by: "Rafael J. Wysocki" Signed-off-by: Rusty Russell Embarrassingly-Acked-by: Tejun Heo Cc: Masami Hiramatsu Tested-by: "Rafael J. Wysocki" Signed-off-by: Linus Torvalds commit 29512c95b5e2f0f245bfa4975ccae6c3449d4dd2 Author: Sascha Hauer Date: Mon May 31 14:19:50 2010 +0200 ASoC: MX31ads sound support should depend on MACH_MX31ADS_WM1133_EV1 Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit fc9cbe3998ea23a0658c97159c35765c98eafa37 Author: Sascha Hauer Date: Mon May 31 10:49:54 2010 +0200 ASoC: Add missing Kconfig entry for Phytec boards Signed-off-by: Sascha Hauer Acked-by: Liam Girdwood Signed-off-by: Mark Brown commit 09414207d4daab8c4990bface3a79fdba3474bec Author: Daniel Mack Date: Mon May 31 13:35:44 2010 +0200 ALSA: usb-audio: export UAC2 clock selectors as mixer controls The UAC2 clock selectors are fortunately compatible with UAC1 audio selector units, so we can simply reuse the same approach to get all the linked units. Requests to this control need a different CS value though. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 67e1daa0bb30eda6ec5add27c3abf4536030f5a6 Author: Daniel Mack Date: Mon May 31 13:35:43 2010 +0200 ALSA: usb-audio: clean up find_audio_control_unit() Use a struct to parse the audio units, and return usable descriptors for all types. There's no need to limit the result set, except for some kind of sanity check. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 2e0281d15c220d0a81c45c73872aa08d2f3ae3ef Author: Daniel Mack Date: Mon May 31 13:35:42 2010 +0200 ALSA: usb-audio: add UAC2 sepecific Feature Unit controls The bits to enable them are always 0 for UAC1 devices, so no additional checks are required. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 65f25da44b51f55e3a74301c25f29263be2bf1ba Author: Daniel Mack Date: Mon May 31 13:35:41 2010 +0200 ALSA: usb-audio: unify constants from specification Move more definitions from private enums to appropriate header files. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 79f920fbff566ffc9de44111eb1456a3cef310f0 Author: Daniel Mack Date: Mon May 31 14:51:31 2010 +0200 ALSA: usb-audio: parse clock topology of UAC2 devices Audio devices which comply to the UAC2 standard can export complex clock topologies in its descriptors and set up links between them. The entities that are defined are - clock sources, which define the end-leafs. - clock selectors, which act as switch to select one out of many possible clocks sources. - clock multipliers, which have an input clock source, and act as clock source again. They can be used to derive one clock from another. All sample rate changes, clock validity queries and the like must go to clock source elements, while clock selectors and multipliers can be used as terminal clock source. The following patch adds a parser for these elements and functions to iterate over the tree and find the leaf nodes (clock sources). The samplerate set functions were moved to the new clock.c file. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 7176d37a28fa4ea7e32815007673f578cdcebf51 Author: Daniel Mack Date: Mon May 31 13:35:39 2010 +0200 ALSA: usb-audio: fix selector unit string index accessor This is another regression from the UAC2 code refactoring. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 5dd360ebd8328affb22225141cece3a29403b965 Author: Daniel Mack Date: Mon May 31 13:35:38 2010 +0200 include/linux/usb/audio-v2.h: add more UAC2 details Also, remove the 'bmControl' field from uac_clock_selector_descriptor, which was at the wrong offset. This struct is currently unused. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit a6a3325913efbe35a10e87fd3e9c3ce621fd32c7 Author: Daniel Mack Date: Mon May 31 13:35:37 2010 +0200 ALSA: usb-audio: support partially write-protected UAC2 controls So far, UAC2 controls are marked read-only if any of the channels are marked read-only in the descriptors. Change this behaviour and - mark them writeable unless all channels are read-only - store the read-only mask in usb_mixer_elem_info and - check the mask again in set_cur_mix_value(), and bail out for write-protected channels. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit dcbe7bcfa32c5bc4f9bb6c75d4d41bb4db8c36fc Author: Daniel Mack Date: Mon May 31 13:35:36 2010 +0200 ALSA: usb-audio: UAC2: clean up parsing of bmaControls Introduce two new static inline functions for a more readable parsing of UAC2 bmaControls. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai commit 7489aec8eed4f2f1eb3b4d35763bd3ea30b32ef5 Author: Eric Dumazet Date: Mon May 31 16:41:35 2010 +0200 netfilter: xtables: stackptr should be percpu commit f3c5c1bfd4 (netfilter: xtables: make ip_tables reentrant) introduced a performance regression, because stackptr array is shared by all cpus, adding cache line ping pongs. (16 cpus share a 64 bytes cache line) Fix this using alloc_percpu() Signed-off-by: Eric Dumazet Acked-By: Jan Engelhardt Signed-off-by: Patrick McHardy commit c936e8bd1de2fa50c49e3df6fa5036bf07870b67 Author: Xiaotian Feng Date: Mon May 31 16:41:09 2010 +0200 netfilter: don't xt_jumpstack_alloc twice in xt_register_table In xt_register_table, xt_jumpstack_alloc is called first, later xt_replace_table is used. But in xt_replace_table, xt_jumpstack_alloc will be used again. Then the memory allocated by previous xt_jumpstack_alloc will be leaked. We can simply remove the previous xt_jumpstack_alloc because there aren't any users of newinfo between xt_jumpstack_alloc and xt_replace_table. Signed-off-by: Xiaotian Feng Cc: Patrick McHardy Cc: "David S. Miller" Cc: Jan Engelhardt Cc: Andrew Morton Cc: Rusty Russell Cc: Alexey Dobriyan Acked-By: Jan Engelhardt Signed-off-by: Patrick McHardy commit bc284f94f84c3d76e49c6f3df9028c503f9589d9 Author: David S. Miller Date: Mon May 31 05:47:32 2010 -0700 greth: Fix build after OF device conversions. Signed-off-by: David S. Miller commit 64960848abd18d0bcde3f53ffa7ed0b631e6b25d Merge: 2903037 67a3e12 Author: David S. Miller Date: Mon May 31 05:46:45 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit e565813ab95875af0d51a6bcd537068380bb06ea Author: Akinobu Mita Date: Mon May 24 22:04:51 2010 +0900 x86/mm: Remove unused DBG() macro DBG() macro for CONFIG_DEBUG_PER_CPU_MAPS is unused. Signed-off-by: Akinobu Mita LKML-Reference: <1274706291-13554-1-git-send-email-akinobu.mita@gmail.com> Signed-off-by: Ingo Molnar commit 546cf44a1b507c1cbb5cf42bbe6169780567f36f Author: Randy Dunlap Date: Sat May 29 11:45:07 2010 -0700 blktrace: Fix new kernel-doc warnings Fix blktrace.c kernel-doc warnings: Warning(kernel/trace/blktrace.c:858): No description found for parameter 'ignore' Warning(kernel/trace/blktrace.c:890): No description found for parameter 'ignore' Signed-off-by: Randy Dunlap Cc: Jens Axboe Cc: Steven Rostedt Cc: Frederic Weisbecker LKML-Reference: <20100529114507.c466fc1e.randy.dunlap@oracle.com> Signed-off-by: Ingo Molnar commit b90c076424da8166797bdc34187660fd0124f530 Author: Daniel T Chen Date: Sun May 30 19:31:41 2010 -0400 ALSA: hda: Use LPIB for another mainboard BugLink: https://launchpad.net/bugs/580749 Symptom: on the original reporter's VIA VT1708-based board, the PulseAudio daemon dies shortly after the user attempts to play an audio file. Test case: boot from Ubuntu 10.04 LTS live cd; attempt to play an audio file. Resolution: add SSID for the original reporter's hardware to the position_fix quirk table, explicitly specifying the LPIB method. Reported-and-Tested-By: Harald Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 26fd74fc01991a18f0e3bd54f8b1b75945ee3dbb Author: Daniel T Chen Date: Sun May 30 09:55:23 2010 -0400 ALSA: hda: Use mb31 quirk for an iMac model BugLink: https://launchpad.net/bugs/542550 Symptom: On the reporter's iMac, in Ubuntu 10.04 LTS neither playback nor capture appear audible out-of-the-box. Test case: Boot from an Ubuntu 10.04 LTS live cd or from an installed configuration and attempt to play or capture audio. Resolution: Specify the mb31 quirk for this machine in the codec SSID table. Reported-and-Tested-By: f3a97 Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit dd37f8e8659bc617c3f2a84e007a4824ccdac458 Author: Daniel T Chen Date: Sun May 30 01:17:03 2010 -0400 ALSA: hda: Use LPIB for an ASUS device BugLink: https://launchpad.net/bugs/465942 Symptom: On the reporter's ASUS device, using PulseAudio in Ubuntu 10.04 LTS results in the PA daemon crashing shortly after attempting to select capture or to configure the audio hardware profile. Test case: Using Ubuntu 10.04 LTS (Linux 2.6.32.12), Linux 2.6.33, or Linux 2.6.34, adjust the HDA device's capture volume with PulseAudio. Resolution: add SSID for this machine to the position_fix quirk table, explicitly specifying the LPIB method. Reported-and-Tested-By: Irihapeti Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 74048f895fa8cbf8119b4999f1f44881a825f954 Author: Frederic Weisbecker Date: Thu May 27 21:34:58 2010 +0200 perf_events: Fix unincremented buffer base on partial copy If a sample size crosses to the next page boundary, the copy will be made in more than one step. However we forget to advance the source offset for the next copy, leading to unexpected double copies that completely mess up the traces. This fixes various kinds of bad traces that have irrelevant data inside, as an example: geany-4979 [001] 5758.077775: sched_switch: prev_comm=! prev_pid=121 prev_prio=0 prev_state=S|D|Z|X|x ==> next_comm= next_pid=7497072 next_prio=0 Signed-off-by: Frederic Weisbecker Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Signed-off-by: Peter Zijlstra LKML-Reference: <1274988898-5639-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit 90151c35b19633e0cab5a6c80f1ba4a51e7c913b Author: Stephane Eranian Date: Tue May 25 16:23:10 2010 +0200 perf_events: Fix event scheduling issues introduced by transactional API The transactional API patch between the generic and model-specific code introduced several important bugs with event scheduling, at least on X86. If you had pinned events, e.g., watchdog, and were over-committing the PMU, you would get bogus counts. The bug was showing up on Intel CPU because events would move around more often that on AMD. But the problem also existed on AMD, though harder to expose. The issues were: - group_sched_in() was missing a cancel_txn() in the error path - cpuc->n_added was not properly maintained, leading to missing actions in hw_perf_enable(), i.e., n_running being 0. You cannot update n_added until you know the transaction has succeeded. In case of failed transaction n_added was not adjusted back. - in case of failed transactions, event_sched_out() was called and eventually invoked x86_disable_event() to touch the HW reg. But with transactions, on X86, event_sched_in() does not touch HW registers, it simply collects events into a list. Thus, you could end up calling x86_disable_event() on a counter which did not correspond to the current event when idx != -1. The patch modifies the generic and X86 code to avoid all those problems. First, we keep track of the number of events added last. In case the transaction fails, we substract them from n_added. This approach is necessary (as opposed to delaying updates to n_added) because not all event updates use the transaction API, e.g., single events. Second, we encapsulate the event_sched_in() and event_sched_out() in group_sched_in() inside the transaction. That makes the operations symmetrical and you can also detect that you are inside a transaction and skip the HW reg access by checking cpuc->group_flag. With this patch, you can now overcommit the PMU even with pinned system-wide events present and still get valid counts. Signed-off-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1274796225.5882.1389.camel@twins> Signed-off-by: Ingo Molnar commit 2e97942fe57864588774f173cf4cd7bb68968b76 Author: Peter Zijlstra Date: Fri May 21 16:22:33 2010 +0200 perf_events, trace: Fix perf_trace_destroy(), mutex went missing Steve spotted I forgot to do the destroy under event_mutex. Reported-by: Steven Rostedt Signed-off-by: Peter Zijlstra LKML-Reference: <1274451913.1674.1707.camel@laptop> Signed-off-by: Ingo Molnar commit 3771f0771154675d4a0ca780be2411f3cc357208 Author: Peter Zijlstra Date: Fri May 21 12:31:09 2010 +0200 perf_events, trace: Fix probe unregister race tracepoint_probe_unregister() does not synchronize against the probe callbacks, so do that explicitly. This properly serializes the callbacks and the free of the data used therein. Also, use this_cpu_ptr() where possible. Acked-by: Frederic Weisbecker Signed-off-by: Peter Zijlstra LKML-Reference: <1274438476.1674.1702.camel@laptop> Signed-off-by: Ingo Molnar commit 8a49542c0554af7d0073aac0ee73ee65b807ef34 Author: Peter Zijlstra Date: Thu May 27 15:47:49 2010 +0200 perf_events: Fix races in group composition Group siblings don't pin each-other or the parent, so when we destroy events we must make sure to clean up all cross referencing pointers. In particular, for destruction of a group leader we must be able to find all its siblings and remove their reference to it. This means that detaching an event from its context must not detach it from the group, otherwise we can end up failing to clear all pointers. Solve this by clearly separating the attachment to a context and attachment to a group, and keep the group composed until we destroy the events. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit ac9721f3f54b27a16c7e1afb2481e7ee95a70318 Author: Peter Zijlstra Date: Thu May 27 12:54:41 2010 +0200 perf_events: Fix races and clean up perf_event and perf_mmap_data interaction In order to move toward separate buffer objects, rework the whole perf_mmap_data construct to be a more self-sufficient entity, one with its own lifetime rules. This greatly sanitizes the whole output redirection code, which was riddled with bugs and races. Signed-off-by: Peter Zijlstra Cc: LKML-Reference: Signed-off-by: Ingo Molnar commit 54e88fad223c4e1d94289611a90c7fe3ebe5631b Author: Amit K. Arora Date: Tue May 25 18:53:46 2010 +0530 sched: Make sure timers have migrated before killing the migration_thread Problem: In a stress test where some heavy tests were running along with regular CPU offlining and onlining, a hang was observed. The system seems to be hung at a point where migration_call() tries to kill the migration_thread of the dying CPU, which just got moved to the current CPU. This migration thread does not get a chance to run (and die) since rt_throttled is set to 1 on current, and it doesn't get cleared as the hrtimer which is supposed to reset the rt bandwidth (sched_rt_period_timer) is tied to the CPU which we just marked dead! Solution: This patch pushes the killing of migration thread to "CPU_POST_DEAD" event. By then all the timers (including sched_rt_period_timer) should have got migrated (along with other callbacks). Signed-off-by: Amit Arora Signed-off-by: Gautham R Shenoy Acked-by: Tejun Heo Signed-off-by: Peter Zijlstra Cc: Thomas Gleixner LKML-Reference: <20100525132346.GA14986@amitarora.in.ibm.com> Signed-off-by: Ingo Molnar commit 4705b2e8047221142af2ed5e37f54ac4c7f80a7d Author: Magnus Damm Date: Tue May 18 14:43:15 2010 +0000 sh: add romImage MMCIF boot for sh7724 and Ecovec V2 This patch is V2 of the MMCIF romImage boot support for sh7724 and the Ecovec board. With this patch applied and CONFIG_ROMIMAGE_MMCIF selected the romImage kernel image can be written to a MMC card and booted directly by the sh7724 cpu. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8a768952ca8cb5cad98cfa343e6fb131e3bbdc3e Author: Magnus Damm Date: Tue May 18 14:43:04 2010 +0000 sh: add boot code to MMCIF driver header This patch adds a set of MMCIF functions for the romImage boot loader that allows the kernel to be booted directly from an MMC card. Thanks to Jeremy Baker for the initial prototype. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 487d9fc5016529d7d77dfe35b666fd3a090e2953 Author: Magnus Damm Date: Tue May 18 14:42:51 2010 +0000 sh: prepare MMCIF driver header file Update the MMCIF driver to include register information and register access functions in the header file. The MMCIF boot code builds on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit b34bce45530ca897aea35915e0e42eb3c8047b52 Author: Magnus Damm Date: Tue May 18 14:42:40 2010 +0000 sh: allow romImage data between head.S and the zero page Extend the romImage code to allow putting data between the head.S file and the empty_zero_page. Needed in the case of more advanced loader code in a separate C file. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1238c684325d9710544af6f0d11bf7cd6efd5925 Author: Yusuke Goda Date: Tue Apr 27 10:15:32 2010 +0000 sh: Add support MMCIF for ecovec This patch adds MMCIF platform data for the Ecovec board. Signed-off-by: Yusuke Goda Signed-off-by: Paul Mundt commit 8fa76f7e61ef4e5bc97207143ea4e198b22487bc Merge: a41a7b9 67a3e12 Author: Paul Mundt Date: Mon May 31 12:59:19 2010 +0900 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 commit a7fed9f7369bfcfabed7aca1d608d286f2dfa7f6 Author: Benjamin Herrenschmidt Date: Mon May 31 11:49:00 2010 +1000 powerpc: Don't export cvt_fd & _df when CONFIG_PPC_FPU is not set Signed-off-by: Benjamin Herrenschmidt commit ecca1a34befbb13fc23d9a2cc0d6b725c7727fb2 Merge: 3d00d4f 48936a0 Author: Benjamin Herrenschmidt Date: Mon May 31 10:01:50 2010 +1000 Merge commit 'kumar/next' into next Conflicts: arch/powerpc/sysdev/fsl_msi.c commit 3d00d4ff11686895925f46265f4a78dc78196c2e Merge: 67a3e12 895443c Author: Benjamin Herrenschmidt Date: Mon May 31 09:59:00 2010 +1000 Merge commit 'jwb/next' into next commit 2903037400a26e7c0cc93ab75a7d62abfacdf485 Author: Eric Dumazet Date: Sat May 29 00:20:48 2010 -0700 net: fix sk_forward_alloc corruptions As David found out, sock_queue_err_skb() should be called with socket lock hold, or we risk sk_forward_alloc corruption, since we use non atomic operations to update this field. This patch adds bh_lock_sock()/bh_unlock_sock() pair to three spots. (BH already disabled) 1) skb_tstamp_tx() 2) Before calling ip_icmp_error(), in __udp4_lib_err() 3) Before calling ipv6_icmp_error(), in __udp6_lib_err() Reported-by: Anton Blanchard Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 7dfde179c38056b91d51e60f3d50902387f27c84 Author: Rémi Denis-Courmont Date: Wed May 26 00:44:44 2010 +0000 Phonet: listening socket lock protects the connected socket list The accept()'d socket need to be unhashed while the (listen()'ing) socket lock is held. This fixes a race condition that could lead to an OOPS. Signed-off-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit 97dc875f90a7b88a9fa476c256345c0d40fcdf6c Author: Dan Carpenter Date: Wed May 26 05:16:48 2010 +0000 caif: unlock on error path in cfserl_receive() There was an spin_unlock missing on the error path. The spin_lock was tucked in with the declarations so it was hard to spot. I added a new line. Signed-off-by: Dan Carpenter Acked-by: Sjur Brændeland Signed-off-by: David S. Miller commit c196b02ce60d7b1f9bc62a62c5706d4d58fbfc5a Author: Dan Carpenter Date: Wed May 26 04:47:39 2010 +0000 be2net: remove superfluous externs This fixes some sparse warnings: drivers/net/benet/be_cmds.c:1503:12: warning: function 'be_cmd_enable_magic_wol' with external linkage has definition drivers/net/benet/be_cmds.c:1668:12: warning: function 'be_cmd_get_seeprom_data' with external linkage has definition Signed-off-by: Dan Carpenter Acked-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 2892d9c2d925e0d72a7a529852942e2592a970f8 Author: Dan Carpenter Date: Wed May 26 04:46:35 2010 +0000 be2net: add unlock on error path The unlock accidentally got removed from the error path in dd131e76e5: "be2net: Bug fix to avoid disabling bottom half during firmware upgrade." Signed-off-by: Dan Carpenter Acked-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 5daf47bb4e708fde32c1856a0d049e3c3d03c36c Author: Julia Lawall Date: Wed May 26 05:54:21 2010 +0000 net/rds: Add missing mutex_unlock Add a mutex_unlock missing on the error path. In each case, whenever the label out is reached from elsewhere in the function, mutex is not locked. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * mutex_lock(E1); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * mutex_unlock(E1); // Signed-off-by: Julia Lawall Reviewed-by: Zach Brown Acked-by: Andy Grover Signed-off-by: David S. Miller commit e72e9f3814cb8c1076d627c29cec90b005838ac3 Author: Julia Lawall Date: Wed May 26 05:55:10 2010 +0000 drivers/isdn/hardware/mISDN: Add missing spin_unlock Add a spin_unlock missing on the error path. The return value of write_reg seems to be completely ignored, so it seems that the lock should be released in every case. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * spin_lock(E1,...); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * spin_unlock(E1,...); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 32f6249ba7d63d5d86dae930d63ca70ec11d59af Author: Mark Ware Date: Sat May 29 00:16:28 2010 -0700 fs_enet: Adjust BDs after tx error This patch fixes an occasional transmit lockup in the mac-fcc which occurs after a tx error. The test scenario had the local port set to autoneg and the other end fixed at 100FD, resulting in a large number of late collisions. According to the MPC8280RM 30.10.1.3 (also 8272RM 29.10.1.3), after a tx error occurs, TBPTR may sometimes point beyond BDs still marked as ready. This patch walks back through the BDs and points TBPTR to the earliest one marked as ready. Tested on a custom board with a MPC8280. Signed-off-by: Mark Ware Signed-off-by: David S. Miller commit 5b0daa3474d52bed906c4d5e92b44e10148c6972 Author: Changli Gao Date: Sat May 29 00:12:13 2010 -0700 skb: make skb_recycle_check() return a bool value Signed-off-by: Changli Gao Signed-off-by: David S. Miller commit 6057fd78a8dcce6269f029b967051d5a2e9b0895 Author: Brian Haley Date: Fri May 28 23:02:35 2010 -0700 IPv6: fix Mobile IPv6 regression Commit f4f914b5 (net: ipv6 bind to device issue) caused a regression with Mobile IPv6 when it changed the meaning of fl->oif to become a strict requirement of the route lookup. Instead, only force strict mode when sk->sk_bound_dev_if is set on the calling socket, getting the intended behavior and fixing the regression. Tested-by: Arnaud Ebalard Signed-off-by: Brian Haley Signed-off-by: David S. Miller commit e5e5cf4c71508ed38e921b31b438b8b349409f2a Merge: 045de01 da1fdb0 Author: David S. Miller Date: Fri May 28 22:36:41 2010 -0700 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit fe955682d2153b35dffcf1673dff0491096a3f0a Author: Rafael J. Wysocki Date: Fri Apr 9 01:40:38 2010 +0200 ACPI / EC / PM: Fix names of functions that block/unblock EC transactions The names of the functions used for blocking/unblocking EC transactions during suspend/hibernation suggest that the transactions are suspended and resumed by them, while in fact they are disabled and enabled. Rename the functions (and the flag used by them) to better reflect what they really do. Signed-off-by: Rafael J. Wysocki Signed-off-by: Len Brown commit d5a64513c6a171262082c250592c062e97a2c693 Author: Rafael J. Wysocki Date: Fri Apr 9 01:39:40 2010 +0200 ACPI / EC / PM: Fix race between EC transactions and system suspend There still is a race that may result in suspending the system in the middle of an EC transaction in progress, which leads to problems (like the kernel thinking that the ACPI global lock is held during resume while in fact it's not). To remove the race condition, modify the ACPI platform suspend and hibernate callbacks so that EC transactions are blocked right after executing the _PTS global control method and are allowed to happen again right after the low-level wakeup. Introduce acpi_pm_freeze() that will disable GPEs, wait until the event queues are empty and block EC transactions. Use it wherever GPEs are disabled in preparation for switching local interrupts off. Introduce acpi_pm_thaw() that will allow EC transactions to happen again and enable runtime GPEs. Use it to balance acpi_pm_freeze() wherever necessary. In addition to that use acpi_ec_resume_transactions_early() to unblock EC transactions as early as reasonably possible during resume. Also unblock EC transactions in acpi_hibernation_finish() and in the analogous suspend routine to make sure that the EC transactions are enabled in all error paths. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=14668 Signed-off-by: Rafael J. Wysocki Reported-and-tested-by: Maxim Levitsky Signed-off-by: Len Brown commit a1786bd270b08834a735e06c3d5430eeb0baf017 Author: Zhenyu Wang Date: Thu May 27 10:26:43 2010 +0800 drm/i915: Unmask interrupt for render engine on Sandybridge With splitted engines on Sandybridge, each engine has its own interrupt control as well. This unmasks the interrupt to properly enable pipe control notify event for render engine. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit ca76482e0f4b64942c704fa11c620ffd1bdd8475 Author: Zhenyu Wang Date: Thu May 27 10:26:42 2010 +0800 drm/i915: Fix PIPE_CONTROL command on Sandybridge Sandybridge(Gen6) has new format for PIPE_CONTROL command, the flush and post-op control are in dword 1 now. This changes command length field for difference between Ironlake and Sandybridge. I tried to test this with noop request and issue PIPE_CONTROL command for each sequence and track notify interrupts, which seems work fine. Hopefully we don't need workaround like on Ironlake for Sandybridge. Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit ab34c226812588de8f341ce48eb32c3fef5155a9 Author: Chris Wilson Date: Thu May 27 14:15:35 2010 +0100 drm/i915: Fix up address spaces in slow_kernel_write() Since we now get_user_pages() outside of the mutex prior to performing the copy, we kmap() the page inside the copy routine and so need to perform an ordinary memcpy() and not copy_from_user(). Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 99a03df57c82ec20848d2634f652c07ac3504b98 Author: Chris Wilson Date: Thu May 27 14:15:34 2010 +0100 drm/i915: Use non-atomic kmap for slow copy paths As we do not have a requirement to be atomic and avoid sleeping whilst performing the slow copy for shmem based pread and pwrite, we can use kmap instead, thus simplifying the code. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9b8c4a0b215e603497daebe8ecbc9b1f0f035808 Author: Chris Wilson Date: Thu May 27 14:21:01 2010 +0100 drm/i915: Avoid moving from CPU domain during pwrite We can avoid an early clflush when pwriting if we use the current CPU write domain rather than moving the object to the GTT domain for the purposes of the pwrite. This has the advantage of not flushing the presumably hot data that we want to upload into the bo, and of ascribing the clflush to the execution when profiling. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 68f95ba9e260516411411524c45263b5d53f393c Author: Chris Wilson Date: Thu May 27 13:18:22 2010 +0100 drm/i915: Cleanup after failed initialization of ringbuffers The callers expect us to cleanup any partially initialised structures before reporting the error. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit da1fdb02d9200ff28b6f3a380d21930335fe5429 Author: Christoph Fritz Date: Fri May 28 10:45:59 2010 +0200 ssb: fix NULL ptr deref when pcihost_wrapper is used Ethernet driver b44 does register ssb by it's pcihost_wrapper and doesn't set ssb_chipcommon. A check on this value introduced with commit d53cdbb94a52a920d5420ed64d986c3523a56743 and ea2db495f92ad2cf3301623e60cb95b4062bc484 triggers: BUG: unable to handle kernel NULL pointer dereference at 00000010 IP: [] ssb_is_sprom_available+0x16/0x30 Signed-off-by: Christoph Fritz Signed-off-by: John W. Linville commit 654fc6073f68efa3b6c466825749e73e7fbb92cd Author: Chris Wilson Date: Thu May 27 13:18:21 2010 +0100 drm/i915: Reject bind_to_gtt() early if object > aperture If the object is bigger than the entire aperture, reject it early before evicting everything in a vain attempt to find space. v2: Use E2BIG as suggested by Owain G. Ainsworth. Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Eric Anholt commit 85cd4612fdab4e837d7eea048a697c75d0477d3b Author: Chris Wilson Date: Thu May 27 13:18:20 2010 +0100 drm/i915: Check error code whilst moving buffer to GTT domain. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 3d1cc47037f36004b10681d3436ef0942ebb279b Author: Chris Wilson Date: Thu May 27 13:18:19 2010 +0100 drm/i915: Remove spurious warning "Failure to install fence" This particular warning is harmless as we emit during the normal pinning process where the batch buffer requires more fences than is available without eviction. Only if we fail to evict enough fences does this become a problem, so include the requested number of fences in the ultimate *error* message. v2: Remember to compile test even trial patches to remove warnings. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit ac0c6b5ad3b3b513e1057806d4b7627fcc0ecc27 Author: Chris Wilson Date: Thu May 27 13:18:18 2010 +0100 drm/i915: Rebind bo if currently bound with incorrect alignment. Whilst pinning the buffer, check that that its current alignment matches the requested alignment. If it does not, rebind. This should clear up any final render errors whilst resuming, for reference: Bug 27070 - [i915] Page table errors with empty ringbuffer https://bugs.freedesktop.org/show_bug.cgi?id=27070 Bug 15502 - render error detected, EIR: 0x00000010 https://bugzilla.kernel.org/show_bug.cgi?id=15502 Bug 13844 - i915 error: "render error detected" https://bugzilla.kernel.org/show_bug.cgi?id=13844 Signed-off-by: Chris Wilson Cc: stable@kernel.org Signed-off-by: Eric Anholt commit a7faf32d00529b9c501e37a31d4bf8acef4f8f59 Author: Chris Wilson Date: Thu May 27 13:18:17 2010 +0100 drm/i915: Include pitch in set_base debug statement. Add the pitch that we about to write into the control register along with the base, offset and coordinates that go into the other control registers. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit a939406fda8ddc7de69ee9186356d09dc6daaa2c Author: Chris Wilson Date: Thu May 27 13:18:16 2010 +0100 drm/i915: Only print "nothing to do" debug message as required. If the FBC is already disabled, then we do not even attempt to disable FBC and so there is no point emitting a debug statement at that point, having already emitted one saying why we are disabling FBC. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 808b24d6ed8b155aac17007788390ebfde263f30 Author: Chris Wilson Date: Thu May 27 13:18:15 2010 +0100 drm/i915: Propagate error from unbinding an unfenceable object. Signed-off-by: Chris Wilson Cc: Jesse Barnes Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit b118c1e363befe3d74469f4a014ce6353097f08a Author: Chris Wilson Date: Thu May 27 13:18:14 2010 +0100 drm/i915: Avoid nesting of domain changes when setting display plane Nesting domain changes will cause confusion when trying to interpret the tracepoints describing the sequence of changes for the object, as well as obscuring the order of operations for the reader of the code. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 368a07d26ae99c80678a968946744fd83e7708d0 Author: Johannes Berg Date: Fri May 28 14:26:23 2010 +0200 mac80211: make a function static sparse correctly complains that __ieee80211_get_channel_mode is not static. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit c6a6368b32aa4fd145e840c8d8dac6923fae2688 Author: Prarit Bhargava Date: Thu May 27 14:41:20 2010 -0400 libertas: fix uninitialized variable warning Fixes: drivers/net/wireless/libertas/rx.c: In function process_rxed_802_11_packet: drivers/net/wireless/libertas/rx.c:354: error: radiotap_hdr.flags may be used uninitialized in this function Signed-off-by: Prarit Bhargava Signed-off-by: John W. Linville commit 468f0b44ce4b002ca7d9260f802a341854752c02 Author: Chris Wilson Date: Thu May 27 13:18:13 2010 +0100 drm/i915: Hold the spinlock whilst resetting unpin_work along error path Delay taking the mutex until we need to and ensure that we hold the spinlock when resetting unpin_work on the error path. Also defer the debugging print messages until after we have released the spinlock. Signed-off-by: Chris Wilson Cc: Jesse Barnes Cc: Kristian Høgsberg Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit 7c9fd60f9764373414c0a64f500a78635b0a0a7b Author: Vasanthakumar Thiagarajan Date: Wed May 26 19:06:53 2010 -0700 ath9k: Fix bug in the way "bf_tx_aborted" of struct ath_buf is used This bug was introduced by the following commit Author: Vasanthakumar Thiagarajan Date: Thu Apr 15 17:38:46 2010 -0400 ath9k: Remove ATH9K_TX_SW_ABORTED and introduce a bool for this purpose Wrong buffer is checked for bf_tx_aborted field in ath_tx_num_badfrms(), this may result in a rate scaling with wrong feedback (number of unacked frames in this case). It is the last one in the chain of buffers for an aggregate frame that should be checked. Also it misses the initialization of this field in the buffer, this may lead to a situation where we stop the sw retransmission of failed subframes associated to this buffer. Signed-off-by: Vasanthakumar Thiagarajan Signed-off-by: John W. Linville commit 35aed2e6be2feaa227fe5c7a0b7c286c4fe71592 Author: Chris Wilson Date: Thu May 27 13:18:12 2010 +0100 drm/i915: Only print an message if there was an error Only report an error if the GPU has actually detected one, otherwise we are just hung. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9be8ab2ea81f84c1726d79613c342141f5d19a3b Author: Justin P. Mattock Date: Wed May 26 11:00:04 2010 -0700 ath9k: Fix ath_print in xmit for hardware reset. ath_print in xmit.c should say "Reseting hardware" instead of Resetting HAL!(since HAL is being fazed out). dmesg shows: [ 8660.899624] ath: Failed to stop TX DMA in 100 msec after killing last frame [ 8660.899676] ath: Unable to stop TxDMA. Reset HAL! Signed-off-by: Justin P. Mattock Signed-off-by: John W. Linville commit becd214277ed41dc6f745f5f8db39d84c6c7ffc8 Author: Ben Skeggs Date: Sat May 29 03:06:14 2010 +1000 drm/nv50: use alternate source of SOR_MODE_CTRL for DP hack Fixes module unload+reload on Dell M4500, where the "normal" registers get reset to 0. Signed-off-by: Ben Skeggs commit 26099a74805eaf79f3058cc4097ebaa8cc55122c Author: Ben Skeggs Date: Fri May 28 10:13:16 2010 +1000 drm/nouveau: fix dual-link displays when plugged into single-link outputs When selecting the native mode for a display we weren't taking into account whether or not it was actually supported on that particular output. This patch modifies our native mode selection to run all modes through mode_valid() first. Signed-off-by: Ben Skeggs commit 2c58077541cc6859a9a9046d9c3a4d61bdbd4f18 Author: Ben Skeggs Date: Fri May 28 10:04:05 2010 +1000 drm/nv50: obey dcb->duallink_possible It was once assumed that all G8x had dual-link TMDS everywhere, this isn't actually the case - especially considering passive DP->DVI converters and some HDMI connectors only support single-link. Signed-off-by: Ben Skeggs commit 23484874e6bf837704bf1fa61605d33a12b174e3 Author: Ben Skeggs Date: Fri May 28 09:39:11 2010 +1000 drm/nv50: fix duallink_possible calculation for DCB 4.0 cards Signed-off-by: Ben Skeggs commit 73db4bedc5dde97adf59b5b5a07c6cf0ee56e668 Author: Ben Skeggs Date: Wed May 26 10:41:45 2010 +1000 drm/nouveau: don't execute INIT_GPIO unless we're really running the table This resulted in accidently switching off the eDP panel on certain laptops since the default state in the GPIO table was off. Fixes rh#582621 Signed-off-by: Ben Skeggs commit f50c0b91e7718e7deda46475cfd0ea1413daed04 Author: Ben Skeggs Date: Tue May 25 13:48:07 2010 +1000 drm/nv40: allow cold-booting of nv4x chipsets Signed-off-by: Ben Skeggs commit d13102c6b4836289138431e3fbfc08e90c925ffd Author: Ben Skeggs Date: Tue May 25 13:47:16 2010 +1000 drm/nouveau: fix POST detection for certain chipsets We totally fail at detecting un-POSTed chipsets prior to G80. This commit changes the pre-G80 POST detection to read the programmed horizontal total from CRTC 0, and assume the card isn't POSTed if it's 0. NVIDIA use some other heuristics more similar to what we do on G80, but I wasted quite a long time trying to figure out the exact specifics of what they do so we can try this for a bit instead. Signed-off-by: Ben Skeggs commit 7fc74f17e6c9b4d86371c3a947afc32bd6bc9691 Author: Marcin Kościelnicki Date: Sun May 23 11:36:04 2010 +0000 drm/nouveau: Add getparam for current PTIMER time. This will be useful for computing GPU-CPU latency, including GL_ARB_timer_query extension. Signed-off-by: Marcin Kościelnicki Signed-off-by: Ben Skeggs commit b334f2b3b68c35fd86a0cbc90ecee40e63ba2f37 Author: Maarten Maathuis Date: Sun May 9 14:49:52 2010 +0200 drm/nouveau: allow cursor image and position to survive suspend - This isn't triggered yet on a normal kernel, because it still does a VT switch, but it seemed like a good idea to fix this now. Tested-by: Maxim Levitsky Signed-off-by: Maarten Maathuis Signed-off-by: Ben Skeggs commit 64ffc9ff424c65adcffe7d590018cc75e2d5d42a Author: Michal Marek Date: Thu May 27 16:07:37 2010 +0200 kbuild: Revert part of e8d400a to resolve a conflict A more complete patch in the kernel-doc tree also contains this change. Reported-by: Stephen Rothwell Signed-off-by: Michal Marek commit 84fe6c19e4a598e8071e3bd1b2c923454eae1268 Author: Julia Lawall Date: Thu May 27 12:31:51 2010 +0200 arch/x86/kernel: Add missing spin_unlock Add a spin_unlock missing on the error path. The locks and unlocks are balanced in other functions, so it seems that the same should be the case here. The semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression E1; @@ * spin_lock(E1,...); <+... when != E1 if (...) { ... when != E1 * return ...; } ...+> * spin_unlock(E1,...); // Cc: stable@kernel.org Signed-off-by: Julia Lawall Signed-off-by: Joerg Roedel commit e20f9c64c79e2282f9eb531509181965ec8f0a92 Author: Eric Anholt Date: Wed May 26 14:51:06 2010 -0700 drm/i915: Clean up leftover bits from hws move to ring structure. Fixes /debug/dri/0/i915_gem_interrupt output for status page. Signed-off-by: Eric Anholt commit 9553426372eef71c849499fb1d232f4b0577c0f9 Author: Li Peng Date: Tue May 18 18:58:44 2010 +0800 drm/i915: Add CxSR support on Pineview DDR3 Pineview with DDR3 memory has different latencies to enable CxSR. This patch updates CxSR latency table to add Pineview DDR3 latency configuration. It also adds one flag "is_ddr3" for checking DDR3 setting in MCHBAR. Cc: Shaohua Li Cc: Zhao Yakui Signed-off-by: Li Peng Signed-off-by: Eric Anholt commit d8201ab6514f8dc1a0ccfac52c688d80976a425a Author: Dan Carpenter Date: Fri May 7 10:39:00 2010 +0200 i915: remove unneeded null checks The "encoder" variable can never be null because it is used as loop cursor in a list_for_each_entry() loop. Signed-off-by: Dan Carpenter Signed-off-by: Eric Anholt commit 90a78e8f60f679b0937011314a6cda39c7449d1d Author: Dan Carpenter Date: Fri May 7 10:40:09 2010 +0200 i915/intel_sdvo: remove unneeded null check The "connector" variable is used as the cursor in a list_for_each_entry() and it's always non-null so we don't need to check it. Signed-off-by: Dan Carpenter Signed-off-by: Eric Anholt commit 467b200da78c56036e58850a7f27902937d506f7 Author: Zhenyu Wang Date: Wed May 12 11:02:14 2010 +0800 drm/i915: Fix HDMI mode select for Cougarpoint PCH For real HDMI sink, CPT HDMI port has to set 'HDMI' mode flag in order to make HDMI audio work correctly. This is required patch for drm/i915 to enable HDMI audio on CPT PCH, ALSA patch is at http://mailman.alsa-project.org/pipermail/alsa-devel/2010-May/027601.html Tested-by: Fengguang Wu Signed-off-by: Zhenyu Wang Signed-off-by: Eric Anholt commit 778c35444f7bbb8f1816d40ada650e19c5da9c02 Author: Daniel Vetter Date: Thu May 13 11:49:44 2010 +0200 drm/i915: combine all small integers into one single bitfield This saves a whooping 7 dwords. Zero functional changes. Because some of the refcounts are rather tightly calculated, I've put BUG_ONs in the code to check for overflows. Signed-off-by: Daniel Vetter Signed-off-by: Eric Anholt commit a7de64e540d2017a8e44dec1ca9d88a509aa7e05 Author: Adam Jackson Date: Thu May 13 14:45:43 2010 -0400 drm/i915/dp: Add DPCD data to debug output Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 9962c9252e46eda7058067cbe73bdf1ed74b0d37 Author: Adam Jackson Date: Thu May 13 14:45:42 2010 -0400 drm/i915/dp: Only enable enhanced framing if the sink supports it DisplayPort spec v1.1a, Table 2-52. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 9908ff736adf261e749b4887486a32ffa209304c Author: Chris Wilson Date: Sat May 15 09:57:03 2010 +0100 drm/i915: Kill dangerous pending-flip debugging We can, by virtue of a vblank interrupt firing in the middle of setting up the unpin work (i.e. after we set the unpin_work field and before we write to the ringbuffer) enter intel_finish_page_flip() prior to receiving the pending flip notification. Therefore we can expect to hit intel_finish_page_flip() under normal circumstances without a pending flip and even without installing the pending_flip_obj. This is exacerbated by aperture thrashing whilst binding the framebuffer References: Bug 28079 - "glresize" causes kernel panic in intel_finish_page_flip. https://bugs.freedesktop.org/show_bug.cgi?id=28079 Reported-by: Nick Bowler Signed-off-by: Chris Wilson Cc: Jesse Barnes Cc: stable@kernel.org Reviewed-by: Jesse Barnes Signed-off-by: Eric Anholt commit f1befe71fa7a79ab733011b045639d8d809924ad Author: Chris Wilson Date: Tue May 18 12:24:51 2010 +0100 agp/intel: Restrict GTT mapping to valid range on i915 and i945 References: Bug 15733 - Crash when accessing nonexistent GTT entries in i915 https://bugzilla.kernel.org/show_bug.cgi?id=15733 On G33 and above, the size of the GTT space is determined by the GMCH control register. Prior to this revision, the size is determined by the size of the aperture. So we must careful to map and fill the appropriate range depending on chipset. Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 9a7e8492d17394a81d5534abf90b5b2ada7ea3c0 Author: Tobias Klauser Date: Thu May 20 10:33:46 2010 +0200 drm/i915: Storage class should be before const qualifier The C99 specification states in section 6.11.5: The placement of a storage-class specifier other than at the beginning of the declaration specifiers in a declaration is an obsolescent feature. Signed-off-by: Tobias Klauser Signed-off-by: Eric Anholt commit 7648fa99eb77a2e1a90b7beaa420e07d819b9c11 Author: Jesse Barnes Date: Thu May 20 14:28:11 2010 -0700 drm/i915: add power monitoring support Add power monitoring support to the i915 driver for use by the IPS driver. Export the available power info to the IPS driver through a few new inter-driver hooks. When used together, the IPS driver and this patch can significantly increase graphics performance on Ironlake class chips. Signed-off-by: Jesse Barnes [anholt: Fixed 32-bit compile. stupid obfuscating div_u64()] Signed-off-by: Eric Anholt commit 7a772c492fcfffae812ffca78a628e76fa57fe58 Author: Adam Jackson Date: Mon May 24 16:46:29 2010 -0400 drm/i915/gen4: Extra CRT hotplug paranoia Disable the CRT plug interrupt while doing the force cycle, explicitly clear any CRT interrupt we may have generated, and restore when done. Should mitigate interrupt storms from hotplug detection. Signed-off-by: Adam Jackson Signed-off-by: Eric Anholt commit 734b4157b367d66405f7dab80085d17c9c8dd3b5 Author: Krzysztof Halasa Date: Tue May 25 18:41:46 2010 +0200 drm/i915: Add support for interlaced display. This doesn't change the clock limits (minimums), i.e. it won't make it output 720x576 PAL nor 720x480 NTSC, but it will work with modes like 1080i etc. (including GLX and textured Xvideo, not sure about the overlay). Tested on i915 + analog VGA, it would be worth checking if newer chips (and which ones) still support interlaced mode. Signed-off-by: Krzysztof Halasa Signed-off-by: Eric Anholt commit f953c9353f5fe6e98fa7f32f51060a74d845b5f8 Author: Daniel J Blueman Date: Mon May 17 14:23:52 2010 +0100 i915: fix lock imbalance on error path... While investigating Intel i5 Arrandale GPU lockups with -rc4, I noticed a lock imbalance. Signed-off-by: Daniel J Blueman Signed-off-by: Eric Anholt commit f41275e893191eeb7a88e431d594e167adbd5234 Author: Li Zefan Date: Mon May 24 16:25:44 2010 +0800 drm/i915: Convert more trace events to DEFINE_EVENT Convert i915_gem_object_clflush to DEFINE_EVENT, and save ~0.5K: text data bss dec hex filename 13204 2732 12 15948 3e4c i915_trace_points.o.orig 12668 2732 12 15412 3c34 i915_trace_points.o No change in functionality. Signed-off-by: Li Zefan Acked-by: Steven Rostedt Signed-off-by: Eric Anholt commit 9517a92f48b08bb02cfb616825850b82b28461cc Author: Jesse Barnes Date: Fri May 21 09:40:45 2010 -0700 drm/i915: add timeout to FBC disable waits FBC disable on 965 can take long enough to trigger latency checks in the kernel so be sure to timeout after a reasonable period. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15015. Tested-by: James Ettle Signed-off-by: Jesse Barnes Signed-off-by: Eric Anholt commit d1b851fc0d105caa6b6e3e7c92d2987dfb52cbe0 Author: Zou Nan hai Date: Fri May 21 09:08:57 2010 +0800 drm/i915: implement BSD ring buffer V2 The BSD (bit stream decoder) ring is used for accessing the BSD engine which decodes video bitstream for H.264 and VC1 on G45+. It is asynchronous with the render ring and has access to separate parts of the GPU from it, though the render cache is coherent between the two. Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao Signed-off-by: Eric Anholt commit 852835f343146a82a528c3b712b373661d4fa17a Author: Zou Nan hai Date: Fri May 21 09:08:56 2010 +0800 drm/i915: convert some gem structures to per-ring V2 The active list and request list move into the ringbuffer structure, so each can track its active objects in the order they are in that ring. The flushing list does not, as it doesn't matter which ring caused data to end up in the render cache. Objects gain a pointer to the ring they are active on (if any). Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao Signed-off-by: Eric Anholt commit 8187a2b70e34c727a06617441f74f202b6fefaf9 Author: Zou Nan hai Date: Fri May 21 09:08:55 2010 +0800 drm/i915: introduce intel_ring_buffer structure (V2) Introduces a more complete intel_ring_buffer structure with callbacks for setup and management of a particular ringbuffer, and converts the render ring buffer consumers to use it. Signed-off-by: Zou Nan hai Signed-off-by: Xiang Hai hao [anholt: Fixed up whitespace fail and rebased against prep patches] Signed-off-by: Eric Anholt commit d3301d86b4bf2bcf649982ae464211d8bcf9575a Author: Eric Anholt Date: Fri May 21 13:55:54 2010 -0700 drm/i915: Rename dev_priv->ring to dev_priv->render_ring. With the advent of the BSD ring, be clear about which ring this is. The docs are pretty consistent with calling this the Render engine at this point. commit 62fdfeaf8b1f487060b6e160e7b5cd90287607c9 Author: Eric Anholt Date: Fri May 21 13:26:39 2010 -0700 drm/i915: Move ringbuffer-related code to intel_ringbuffer.c. This is preparation for supporting multiple ringbuffers on Ironlake. The non-copy-and-paste changes are: - de-staticing functions - I915_GEM_GPU_DOMAINS moving to i915_drv.h to be used by both files. - i915_gem_add_request had only half its implementation copy-and-pasted out of the middle of it. commit 79a78dd6266a4f3e31c800e941ec62e250770a7d Author: Chris Wilson Date: Mon May 17 09:23:54 2010 +0100 drm/i915: Fail to load driver if KMS request without GEM The i915's implementation of KMS requires GEM in order to manage the memory and execution domains of the framebuffer and associated resources. By the point at which we detect broken a BIOS and need to disable GEM, we have already registered ourselves as a KMS driver with several subsystems. Rather than introducing a fragile unwind and attempt to continue with UMS, spit out an error and unload the driver. References: [Bug 15754] IP: [] drm_mm_search_free+0x49/0x90 [drm] BUG: unable to handle kernel NULL pointer dereference at (null) https://bugzilla.kernel.org/show_bug.cgi?id=15754 [drm:i915_driver_load] *ERROR* Detected broken video BIOS with 262140/262144kB of video memory stolen. [drm:i915_driver_load] *ERROR* Disabling GEM. (try reducing stolen memory or updating the BIOS to fix). i915 0000:00:02.0: irq 30 for MSI/MSI-X [drm] set up 255M of stolen space BUG: unable to handle kernel NULL pointer dereference at (null) IP: [] drm_mm_search_free+0x49/0x90 [drm] PGD 69719067 PUD 69dda067 PMD 0 Oops: 0000 [#1] PREEMPT SMP last sysfs file: /sys/module/snd_seq_oss/initstate CPU 1 Pid: 867, comm: modprobe Not tainted 2.6.33-ARCH #1 G43Twins-FullHD/To Be Filled By O.E.M. RIP: 0010:[] [] drm_mm_search_free+0x49/0x90 [drm] RSP: 0018:ffff8800699f3af8 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffffffffffffffff RCX: 0000000000000000 RDX: 0000000000001000 RSI: 0000000000001000 RDI: ffff8800693d0f78 RBP: ffff8800699f3b18 R08: 0000000000001000 R09: 0000000000000000 R10: 2222222222222222 R11: 0000000000000000 R12: ffff880068de70c0 R13: 0000000000001000 R14: 0000000000000000 R15: ffff8800689cb000 FS: 00007fa93f4e5700(0000) GS:ffff880001880000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000000 CR3: 00000000695a0000 CR4: 00000000000406e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 Process modprobe (pid: 867, threadinfo ffff8800699f2000, task ffff8800694f4740) Stack: ffff880068de73c0 ffff880068de70c0 ffff8800689cb000 0000000000001000 <0> ffff8800699f3b68 ffffffffa0299f63 ffff8800693d0f78 0000120068de70c0 <0> ffff8800689cb000 ffff880068de73c0 ffff880068de70c0 ffff8800689cb000 Call Trace: [] i915_gem_object_bind_to_gtt+0x83/0x360 [i915] [] i915_gem_object_pin+0xa5/0xb0 [i915] [] i915_gem_init_ringbuffer+0xd5/0x510 [i915] [] i915_driver_load+0x4ce/0xd00 [i915] [] ? drm_sysfs_device_add+0x87/0xb0 [drm] [] ? drm_get_minor+0x1d3/0x330 [drm] [] drm_get_dev+0x326/0x580 [drm] [] i915_pci_probe+0x10/0xd0 [i915] [] local_pci_probe+0x12/0x20 [] pci_device_probe+0x80/0xb0 [] ? driver_sysfs_add+0x5a/0x90 [] driver_probe_device+0x93/0x1a0 [] __driver_attach+0x93/0xa0 [] ? __driver_attach+0x0/0xa0 [] bus_for_each_dev+0x68/0x90 [] driver_attach+0x19/0x20 [] bus_add_driver+0xcd/0x2d0 [] driver_register+0x78/0x140 [] __pci_register_driver+0x51/0xd0 [] ? i915_init+0x0/0x52 [i915] [] drm_init+0x111/0x120 [drm] [] ? register_shrinker+0x4d/0x60 [] ? i915_init+0x0/0x52 [i915] [] i915_init+0x50/0x52 [i915] [] do_one_initcall+0x37/0x1a0 [] sys_init_module+0xd7/0x250 [] system_call_fastpath+0x16/0x1b Code: eb 29 49 8b 41 28 31 d2 49 f7 f5 85 d2 74 39 44 89 c0 29 d0 48 89 c2 48 01 f2 49 39 d2 73 29 0f 1f 00 49 89 da 4c 89 d3 4d 89 d9 <4d> 8b 19 49 39 f9 41 0f 18 0b 74 2b 4d 8b 51 30 4d 89 cc 49 39 RIP [] drm_mm_search_free+0x49/0x90 [drm] RSP CR2: 0000000000000000 Signed-off-by: Chris Wilson Signed-off-by: Eric Anholt commit 5001960016bb53a1075bd9d62d7c067cd38c5a68 Author: Christian Lamparter Date: Tue May 25 23:58:47 2010 +0200 ar9170usb: fix read from freed driver context Commit "ar9170: wait for asynchronous firmware loading" introduced a bug, which is triggered by fatal errors while the driver is initializing the device. BUG: unable to handle kernel paging request at 6b6b6bf7 IP: [] kobject_put+0x7/0x70 *pde = 00000000 Oops: 0000 [#1] PREEMPT last sysfs file: /sys/devices/platform/hdaps/position Modules linked in: ar9170usb [...] Pid: 6246, comm: firmware/ar9170 Not tainted 2.6.34-wl #54 EIP: 0060:[] EFLAGS: 00010206 CPU: 0 EIP is at kobject_put+0x7/0x70 EAX: 6b6b6bd7 EBX: f4d3d0e0 ECX: f5ba9124 EDX: f6af2a7c ESI: 00000000 EDI: f4d3d0e0 EBP: 00000000 ESP: f5e98f9c DS: 007b ES: 007b FS: 0000 GS: 0000 SS: 0068 Process firmware/ar9170 (pid: 6246) Stack: c12532ed 00000246 f5bfaa70 f8487353 f4d3d0e0 Call Trace: [] ? device_release_driver+0x1d/0x30 [] ? ar9170_usb_firmware_failed+0x43/0x70 [ar9170usb] [] ? request_firmware_work_func+0x2c/0x70 [] ? request_firmware_work_func+0x0/0x70 [] ? kthread+0x74/0x80 [] ? kthread+0x0/0x80 [] ? kernel_thread_helper+0x6/0x10 Code: 40 d3 f2 ff 85 c0 89 c3 74 0a ba 44 86 4c c1 e8 [...] EIP: [] kobject_put+0x7/0x70 SS:ESP 0068:f5e98f9c CR2: 000000006b6b6bf7 ---[ end trace e81abb992434b410 ]--- Signed-off-by: Christian Lamparter Signed-off-by: John W. Linville commit b578bb490fb605c23c20b63995f26d3ab2cfb6e0 Author: John W. Linville Date: Wed May 26 14:40:32 2010 -0400 Revert "rt2x00: Fix rt2800usb TX descriptor writing." This reverts commit 663cb47cc2c5acd32850f67d051e47d62ed199c9. This patch was merged out of the proper order, so instead of fixing a problem with a prior (unmerged) patch, it creates one. Ooops! Signed-off-by: John W. Linville commit 895443c1c98a21198a0a5265041dc7ad14936d63 Author: Anatolij Gustschin Date: Wed May 26 00:36:30 2010 +0000 powerpc/44x: icon: select SM502 and frame buffer console support Enables SM502 frame buffer and framebuffer console in the default config file Signed-off-by: Anatolij Gustschin Signed-off-by: Josh Boyer commit a41a7b91772da2c77ac0da74285fd8ebd86a85ba Author: Huang Weiyi Date: Tue May 25 14:07:25 2010 +0000 sh: remove duplicated #include Remove duplicated #include('s) in arch/sh/boards/mach-ecovec24/setup.c Signed-off-by: Huang Weiyi Signed-off-by: Paul Mundt commit c9aa55e5271a53d28e93fa58759d318b403c15ba Author: David S. Miller Date: Sat May 22 01:09:04 2010 -0700 n2_crypto: Plumb fallback ahash requests properly. Do this by putting the async fallback request at the end of an n2 specific ahash request context, then properly adjusting the request private size in our ahash ->cra_init(). We also need to put the writable state bits into the n2 request private instead of the n2 cra_ctx. With help from Herbert Xu. Signed-off-by: David S. Miller commit 527b9525256f97ad8d092bbfc8fdc3c5409f4a4d Author: David S. Miller Date: Sat May 22 00:50:12 2010 -0700 n2_crypto: Fix MAU kmem_cache name. Both the CWQ and MAU caches unintentionally had that same name. Signed-off-by: David S. Miller commit ff6c7341e0bc486c3e1b369ab7f3b325b98600d3 Author: David S. Miller Date: Tue May 25 17:37:08 2010 -0700 n2_crypto: Fix build after of_device/of_platform_driver changes. Signed-off-by: David S. Miller commit 4150764fbba03ce4675b02b10872c665bb05a8aa Author: Jesper Nilsson Date: Tue May 25 17:48:14 2010 +0200 CRIS: Don't use mask_irq as symbol name kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson commit 392ed655262446a7d9bc678394600a1d81614313 Author: Jesper Nilsson Date: Tue May 25 16:50:04 2010 +0200 CRIS: Simplify param.h by simply including Signed-off-by: Robert P. J. Day Signed-off-by: Jesper Nilsson commit 6b9c88e2a3961346db1a23d967585af16ff33f05 Author: Jesper Nilsson Date: Tue May 25 15:04:06 2010 +0200 CRISv10: Whitespace fixes for hw_settings.S Remove trailing whitespace. Signed-off-by: Andrea Gelmini Signed-off-by: Jesper Nilsson commit 2f941a1be362cc2966ccb63cf15ccdfdb12a5a69 Author: Jesper Nilsson Date: Tue May 25 14:55:54 2010 +0200 CRISv10: Trivial fixes. - Removed CVS id tag. - Formatting fixes Signed-off-by: Andrea Gelmini Signed-off-by: Jesper Nilsson commit d708b41c96f404b8bb572f39973bbdf6d99d5f4b Author: Jesper Nilsson Date: Tue May 25 13:35:31 2010 +0200 CRISv32: Fix RS485 port 4 CD Kconfig item. The Kconfig item for port 4 CD was controlled by the same Kconfig item as for port 3. Signed-off-by: Jesper Nilsson commit f06d8b694c9c96d460990888561b3ab3a5f8192f Author: Jesper Nilsson Date: Tue May 25 13:33:51 2010 +0200 CRISv32: Remove duplicated Kconfig items. The items were duplicated when they should have been moved. Signed-off-by: Jesper Nilsson commit 4b3fb4e79cc3e40ec033a77f1b3d81e7851a6cf5 Author: Paul Mundt Date: Tue May 25 19:47:12 2010 +0900 input: serio: disable i8042 for non-cayman sh platforms. The sh64 cayman platform is the only sh board that ships with an i8042, so we just hide it for all of the others. Signed-off-by: Paul Mundt commit 0ae0b5d0557264bad65e22f1e2da4b83a02c4535 Author: Nick Piggin Date: Tue May 25 10:25:26 2010 +0200 fs/splice.c: fix mapping_gfp_mask usage mapping_gfp_mask() is not supposed to store allocation contex details, only page location details. So mapping_gfp_mask should be applied to the pagecache page allocation, wheras normal (kernel mapped) memory should be used for surrounding allocations such as radix-tree nodes allocated by add_to_page_cache. Context modifiers should be applied on a per-callsite basis. So change splice to follow this convention (which is followed in similar code patterns in core code). Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Jens Axboe commit d02a2c077fb81f3224c770be62a318165b23b486 Author: Shaohua Li Date: Tue May 25 10:16:53 2010 +0200 cfq-iosched: fix an oops caused by slab leak I got below oops when unloading cfq-iosched. Considering scenario: queue A merge to B, C merge to D and B will be merged to D. Before B is merged to D, we do split B. We should put B's reference for D. [ 807.768536] ============================================================================= [ 807.768539] BUG cfq_queue: Objects remaining on kmem_cache_close() [ 807.768541] ----------------------------------------------------------------------------- [ 807.768543] [ 807.768546] INFO: Slab 0xffffea0003e6b4e0 objects=26 used=1 fp=0xffff88011d584fd8 flags=0x200000000004082 [ 807.768550] Pid: 5946, comm: rmmod Tainted: G W 2.6.34-07097-gf4b87de-dirty #724 [ 807.768552] Call Trace: [ 807.768560] [] slab_err+0x8f/0x9d [ 807.768564] [] ? flush_cpu_slab+0x0/0x93 [ 807.768569] [] ? add_preempt_count+0xe/0xca [ 807.768572] [] ? sub_preempt_count+0xe/0xb6 [ 807.768577] [] ? _raw_spin_unlock+0x15/0x30 [ 807.768580] [] ? sub_preempt_count+0xe/0xb6 [ 807.768584] [] list_slab_objects+0x9b/0x19f [ 807.768588] [] ? add_preempt_count+0xc6/0xca [ 807.768591] [] kmem_cache_destroy+0x13f/0x21d [ 807.768597] [] cfq_slab_kill+0x1a/0x43 [cfq_iosched] [ 807.768601] [] cfq_exit+0x93/0x9e [cfq_iosched] [ 807.768606] [] sys_delete_module+0x1b1/0x219 [ 807.768612] [] system_call_fastpath+0x16/0x1b [ 807.768618] INFO: Object 0xffff88011d584618 @offset=1560 [ 807.768622] INFO: Allocated in cfq_get_queue+0x11e/0x274 [cfq_iosched] age=7173 cpu=1 pid=5496 [ 807.768626] ============================================================================= Cc: stable@kernel.org Signed-off-by: Shaohua Li Signed-off-by: Jens Axboe commit 8a37f520523df971bd3f926d8bd45ead37e857e8 Author: Paul Mundt Date: Tue May 25 16:16:40 2010 +0900 sh: handle early calls to return_address() when using dwarf unwinder. The dwarf unwinder ties in to an early initcall, but it's possible that return_address() calls will be made prior to that. This implements some additional error handling in to the dwarf unwinder as well as an exit path in the return_address() case to bail out if the unwinder hasn't come up yet. This fixes a NULL pointer deref in early boot when mempool_alloc() blows up on the not-yet-ready mempool via dwarf_unwind_stack(). Signed-off-by: Paul Mundt commit e1f42ff4f06e5feaa57a22556ad977ef62164e14 Author: Guennadi Liakhovetski Date: Mon May 24 07:53:24 2010 +0000 fbdev: fix erroneous index in drivers/video/sh_mobile_lcdcfb.c Signed-off-by: Guennadi Liakhovetski Signed-off-by: Paul Mundt commit 14baf9d7f275f0bbf42c1216ff1eef1109ca42ba Author: Paul Mundt Date: Mon May 24 16:31:08 2010 +0900 serial: sh-sci: fix up serial DMA build. asm/dmaengine.h no longer exists, update for the shared linux/sh_dma.h header. Signed-off-by: Paul Mundt commit 48936a08b85518c22a9467a8eaac35d43af54ab4 Author: Haiying Wang Date: Fri May 21 10:16:12 2010 -0400 powerpc/85xx: Add P1021MDS board support P1021 is a dual e500v2 core based SOC with: * 3 eTSECs (eTSEC1/3 RGMII, eTSEC2 SGMII on this board) * 2 PCIe Controller * 1 USB2.0 controller * eSDHC, eSPI, I2C, DUART * eLBC (NAND, BCSR, PMC0/1) * Security Engine (SEC 3.3.2) * Quicc Engine (QE) Signed-off-by: Haiying Wang Signed-off-by: Yu Liu Signed-off-by: Kumar Gala commit 710e33832653cccf7fc432023e7dbe8c49a1902f Author: Li Yang Date: Thu Apr 22 16:31:38 2010 +0800 powerpc/85xx: Change MPC8572DS camp dtses for MSI sharing Enable the sharing of MSI interrupt through AMP OSes in the mpc8572ds dtses. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 480599933a69a8a8dc1390c2164e49e20a1593b9 Author: Li Yang Date: Thu Apr 22 16:31:39 2010 +0800 powerpc/fsl_msi: add removal path and probe failing path Also cleanup the probe function. Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 061ca4adfb2e3c986a182fd30f7e939a1ff8d29d Author: Li Yang Date: Thu Apr 22 16:31:37 2010 +0800 powerpc/fsl_msi: enable msi sharing through AMP OSes Make a single PCIe MSI bank shareable through CAMP OSes. The number of MSI used by each core can be configured by dts file. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 694a7a3611a1c0e28d99b4955151c6ce68e89752 Author: Li Yang Date: Thu Apr 22 16:31:36 2010 +0800 powerpc/fsl_msi: enable msi allocation in all banks Put all fsl_msi banks in a linked list. The list of banks then can be traversed when allocating new msi interrupts. Also fix failing path of fsl_setup_msi_irqs(). Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 02adac6051b0ff8df3877ae3d94e0e68063c6a30 Author: Li Yang Date: Thu Apr 22 16:31:35 2010 +0800 powerpc/fsl_msi: fix the conflict of virt_msir's chip_data In fsl_of_msi_probe(), the virt_msir's chip_data have been stored the pointer to struct mpic. We add a struct fsl_msi_cascade_data to store the pointer to struct fsl_msi and msir_index in hanler_data. Otherwise, the pointer to struct mpic will be over-written, and will cause problem when calling eoi() of the irq. Signed-off-by: Zhao Chenhui Signed-off-by: Li Yang Signed-off-by: Kumar Gala commit 8081881327d4791f26ebf56cf304992673503ad4 Author: Lan Chunhe-B25806 Date: Mon Mar 15 06:38:33 2010 +0000 powerpc/fsl_msi: Add multiple MSI bank support Freescale QorIQ P4080 has three MSI banks and the original code can not work well. This patch adds multiple MSI banks support for Freescale processor. Signed-off-by: Lan Chunhe-B25806 Signed-off-by: Roy Zang Signed-off-by: Kumar Gala commit b3df895aebe091b1657a42a8c859bd49fc96646b Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:03 2010 +0200 powerpc/kexec: Add support for FSL-BookE This adds support kexec on FSL-BookE where the MMU can not be simply switched off. The code borrows the initial MMU-setup code to create the identical mapping mapping. The only difference to the original boot code is the size of the mapping(s) and the executeable address. The kexec code maps the first 2 GiB of memory in 256 MiB steps. This should work also on e500v1 boxes. SMP support is still not available. (Kumar: Added minor change to build to ifdef CONFIG_PPC_STD_MMU_64 some code that was PPC64 specific) Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 7c08ce718fd04e373d7473918ae02f1c04d5d504 Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:02 2010 +0200 powerpc/fsl-booke: Move the entry setup code into a seperate file This patch only moves the initial entry code which setups the mapping from what ever to KERNELBASE into a seperate file. No code change has been made here. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit 2289d2d1a8574a11e66b00c5a59090c6fc227751 Author: Sebastian Andrzej Siewior Date: Sun Apr 4 22:19:01 2010 +0200 powerpc/fsl-booke: fix the case where we are not in the first page During boot we change the mapping a few times until we have a "defined" mapping. During this procedure a small 4KiB mapping is created and after that one a 64MiB. Currently the offset of the 4KiB page in that we run is zero because the complete startup up code is in first page which starts at RPN zero. If the code is recycled and moved to another location then its execution will fail because the start address in 64 MiB mapping is computed wrongly. It does not consider the offset to the page from the begin of the memory. This patch fixes this. Usually (system boot) r25 is zero so this does not change anything unless the code is recycled. Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Kumar Gala commit b9598db3401282bb27b4aef77e3eee12015f7f29 Author: Jens Axboe Date: Mon May 24 19:34:43 2010 +0200 pipe: make F_{GET,SET}PIPE_SZ deal with byte sizes Instead of requiring an exact number of pages as the argument and return value, change the API to deal with number of bytes instead. This also relaxes the requirement that the passed in size must result in a power-of-2 page array size. Round up to the nearest power-of-2 automatically and return the resulting size of the pipe on success. Signed-off-by: Jens Axboe commit 0191f8697bbdfefcd36e7b8dc3eeddfe82893e4b Author: Jens Axboe Date: Mon May 24 19:15:57 2010 +0200 pipe: F_SETPIPE_SZ should return -EPERM for non-root If the passed in size is larger than what has been set as the system wide limit and the user is not root, we want to return permission denied (not invalid value). Signed-off-by: Jens Axboe commit e36f724b4ae70e443a7d152929b60059cbfa1a26 Author: Mike Snitzer Date: Mon May 24 09:07:32 2010 +0200 block: Adjust elv_iosched_show to return "none" for bio-based DM Bio-based DM doesn't use an elevator (queue is !blk_queue_stackable()). Longer-term DM will not allocate an elevator for bio-based DM. But even then there will be small potential for an elevator to be allocated for a request-based DM table only to have a bio-based table be loaded in the end. Displaying "none" for bio-based DM will help avoid user confusion. Signed-off-by: Mike Snitzer Signed-off-by: Jens Axboe commit 80b15c7389caa81a3860f9fc2ee47ec0ea572a63 Author: Konstantin Khlebnikov Date: Thu May 20 23:21:41 2010 +0400 cfq-iosched: compact io_context radix_tree Use small consequent indexes as radix tree keys instead of sparse cfqd address. This change will reduce radix tree depth from 11 (6 for 32-bit hosts) to 1 if host have <=64 disks under cfq control, or to 0 if there only one disk. So, this patch save 10*560 bytes for each process (5*296 for 32-bit hosts) For each cfqd allocate cic index from ida. To unlink dead cic from tree without cfqd access store index into ->key. (bit 0 -- dead mark, bits 1..30 -- index: ida produce id in range 0..2^31-1) Signed-off-by: Konstantin Khlebnikov Signed-off-by: Jens Axboe commit bca4b914b5da3d8e7b9b647f620b71dc85c0c394 Author: Konstantin Khlebnikov Date: Thu May 20 23:21:34 2010 +0400 cfq-iosched: remove dead_key from cfq_io_context Remove ->dead_key field from cfq_io_context to shrink its size to 128 bytes. (64 bytes for 32-bit hosts) Use lower bit in ->key as dead-mark, instead of moving key to separate field. After this for dead cfq_io_context we got cic->key != cfqd automatically. Thus, io_context's last-hit cache should work without changing. Now to check ->key for non-dead state compare it with cfqd, instead of checking ->key for non-null value as it was before. Plus remove obsolete race protection in cfq_cic_lookup. This race gone after v2.6.24-1728-g4ac845a Signed-off-by: Konstantin Khlebnikov Signed-off-by: Jens Axboe commit 0472fd0755fed200c750ba57e5ea46f941914adb Author: Andy Fleming Date: Mon Mar 29 20:39:08 2010 -0500 powerpc/85xx: Enable support for ports 3 and 4 on 8548 CDS I believe support was disabled due to issues with earlier versions of the board/processor. At worst, adding the ports back into the device tree should result in enabling ports that don't work on older systems, so the default should be to enable them. Signed-off-by: Andy Fleming Signed-off-by: Kumar Gala commit 90103f932f0d94e0a1a0e4faf20fb24a0b07264c Author: Anton Vorontsov Date: Mon May 17 22:56:52 2010 +0400 powerpc/fsl-booke: Add hibernation support for FSL BookE processors This is started as swsusp_32.S modifications, but the amount of #ifdefs made the whole file horribly unreadable, so let's put the support into its own separate file. The code should be relatively easy to modify to support 44x BookEs as well, but since I don't have any 44x to test, let's confine the code to FSL BookE. (The only FSL-specific part so far is 'flush_dcache_L1'.) Signed-off-by: Anton Vorontsov Acked-by: Scott Wood Signed-off-by: Kumar Gala commit fe04b1121511a97982a1fcdd38e44d2029304a6d Author: Scott Wood Date: Thu Apr 8 00:38:22 2010 -0500 powerpc/e500mc: Implement machine check handler. Most of the MSCR bit assigments are different in e500mc versus e500, and they are now write-one-to-clear. Some e500mc machine check conditions are made recoverable (as long as they aren't stuck on), most notably L1 instruction cache parity errors. Signed-off-by: Scott Wood Signed-off-by: Kumar Gala commit 52707f918cca231f8461d45e78a60014795f20d9 Author: Mauro Carvalho Chehab Date: Tue May 18 20:43:52 2010 -0300 i7core_edac: Better describe the supported devices Signed-off-by: Mauro Carvalho Chehab commit bd9e19ca46b54fa85141c4d20afd668379d94c81 Author: Vernon Mauery Date: Tue May 18 19:02:50 2010 -0300 Add support for Westmere to i7core_edac driver This adds new PCI IDs for the Westmere's memory controller devices and modifies the i7core_edac driver to be able to probe both Nehalem and Westmere processors. Signed-off-by: Vernon Mauery Signed-off-by: Mauro Carvalho Chehab commit d4d1ef4515cca074d5bbe1c63420822d6b20fe63 Author: Tony Luck Date: Tue May 18 10:53:25 2010 -0300 i7core_edac: don't free on success Signed-off-by: Tony Luck Signed-off-by: Mauro Carvalho Chehab commit ac1ececea995fd77c8da6a1299674f22991cecaa Author: Mauro Carvalho Chehab Date: Tue May 18 13:00:31 2010 -0300 i7core_edac: Add support for X5670 As reported by Vernon Mauery , X5670 (Westmere-EP) uses a different register for one of the uncore PCI devices. Add support for it. Those are the PCI ID's on this new chipset: fe:00.0 0600: 8086:2c70 (rev 02) fe:00.1 0600: 8086:2d81 (rev 02) fe:02.0 0600: 8086:2d90 (rev 02) fe:02.1 0600: 8086:2d91 (rev 02) fe:02.2 0600: 8086:2d92 (rev 02) fe:02.3 0600: 8086:2d93 (rev 02) fe:02.4 0600: 8086:2d94 (rev 02) fe:02.5 0600: 8086:2d95 (rev 02) fe:03.0 0600: 8086:2d98 (rev 02) fe:03.1 0600: 8086:2d99 (rev 02) fe:03.2 0600: 8086:2d9a (rev 02) fe:03.4 0600: 8086:2d9c (rev 02) fe:04.0 0600: 8086:2da0 (rev 02) fe:04.1 0600: 8086:2da1 (rev 02) fe:04.2 0600: 8086:2da2 (rev 02) fe:04.3 0600: 8086:2da3 (rev 02) fe:05.0 0600: 8086:2da8 (rev 02) fe:05.1 0600: 8086:2da9 (rev 02) fe:05.2 0600: 8086:2daa (rev 02) fe:05.3 0600: 8086:2dab (rev 02) fe:06.0 0600: 8086:2db0 (rev 02) fe:06.1 0600: 8086:2db1 (rev 02) fe:06.2 0600: 8086:2db2 (rev 02) fe:06.3 0600: 8086:2db3 (rev 02) (as usual, the same PCI devices repeat at ff: bus) The PCI device 8086:2c70 is shown as: fe:00.0 Host bridge: Intel Corporation QuickPath Architecture Generic Non-core Registers (rev 02) So, for this device to be recognized, it is only a matter of adding this new PCI ID to the driver. Signed-off-by: Mauro Carvalho Chehab commit 8a311e179e52d122ac203d8e88014284c18ca8ab Author: Vernon Mauery Date: Fri Apr 16 19:40:19 2010 -0300 Always call i7core_[ur]dimm_check_mc_ecc_err This fixes an error in function i7core_check_error In commit ca9c90ba09ca3c9799319f46a56f397afbf617c2 which converts the driver to use double buffering, there is a change in the logic. Before, if mce_count was zero, it skipped over a couple of statements and finished out with a call to the *check_mc_ecc_err function. The current code checks to see if mce_count is 0 and then exits. This change reverts the behavior back to the original where if there are no errors to report, we skip to the end and call the *check_mc_ecc_err function. This fix allows the driver to work again on my Nehalem based blades again. Signed-off-by: Vernon Mauery Signed-off-by: Mauro Carvalho Chehab commit 2a6fae326713ec84f307c045f6b497d4afaeb1d4 Author: Alexander Beregalov Date: Thu Jan 7 23:27:30 2010 -0300 i7core_edac: fix memory leak of i7core_dev Free already allocated i7core_dev. Signed-off-by: Alexander Beregalov Signed-off-by: Mauro Carvalho Chehab commit 71753e0141a220ecbf9c71a66e0a8acce9705fb5 Author: Jiri Slaby Date: Wed Dec 9 16:55:15 2009 -0300 EDAC: add __init to i7core_xeon_pci_fixup It's called only from an __init function and is the only user of pcibios_scan_specific_bus which will be marked as __devinit in the next patch. Signed-off-by: Jiri Slaby Signed-off-by: Mauro Carvalho Chehab commit a89eda26753311d8ff2da64da621714b2f8d5dcc Author: Stefan Roese Date: Tue May 11 03:55:34 2010 +0000 powerpc/44x: Add basic ICON PPC440SPe board support ICON is based on the AppliedMicro 440SPe. It is equipped with 64MByte NOR FLASH, SODIMM, Gigabit ethernet, SM502 on PCI(X), LSI SAS1068E on PCIe0 and custom FPGA on PCIe1. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit 58645c7f36b22d1c7b5ed966ce3f01129fa87813 Author: Benjamin Herrenschmidt Date: Tue May 11 16:22:50 2010 +0000 powerpc/44x: Fix UART clocks on 440SPe The code to fixup the serial ports on 440SPe uses the incorrect addresses for these. This fixes it. Signed-off-by: Benjamin Herrenschmidt Acked-by: Stefan Roese Signed-off-by: Josh Boyer commit 508fa179f8e0da5d7241e12ad1562b96f291e800 Author: Mauro Carvalho Chehab Date: Wed Oct 14 13:44:37 2009 -0300 i7core_edac: Fix wrong device id for channel 1 devices Signed-off-by: Mauro Carvalho Chehab commit f05da2f7855b3b88a831ca79e037245872549ec0 Author: Mauro Carvalho Chehab Date: Wed Oct 14 13:31:06 2009 -0300 i7core: add support for Lynnfield alternate address Signed-off-by: Mauro Carvalho Chehab commit 52a2e4fc3712d12888decd386d78ad526078a1fa Author: Mauro Carvalho Chehab Date: Wed Oct 14 11:21:58 2009 -0300 i7core_edac: Add initial support for Lynnfield Signed-off-by: Mauro Carvalho Chehab commit 4f7b9e7cbe68c97dbe1266709ecfc8b807b0d0ee Author: Stephen Rothwell Date: Fri Dec 4 16:49:34 2009 -0200 i7core_edac: do not export static functions Signed-off-by: Stephen Rothwell Signed-off-by: Mauro Carvalho Chehab commit 3b918c12df4f624140456d6c6f982bada8e1f095 Author: Randy Dunlap Date: Sun Nov 8 01:36:40 2009 -0200 edac: fix i7core build Fix build warning (missing header file) and build error when CONFIG_SMP=n. drivers/edac/i7core_edac.c:860: error: implicit declaration of function 'msleep' drivers/edac/i7core_edac.c:1700: error: 'struct cpuinfo_x86' has no member named 'phys_proc_id' Signed-off-by: Randy Dunlap Signed-off-by: Mauro Carvalho Chehab commit 486dd09f129da01cd02b212ba48dce987488b860 Author: Alan Cox Date: Sun Nov 8 01:34:27 2009 -0200 edac: i7core_edac produces undefined behaviour on 32bit Fix the shifts up Signed-off-by: Alan Cox Acked-by: Doug Thompson Signed-off-by: Mauro Carvalho Chehab commit de06eeef5809a69ff4daaae2bd63977e5404553d Author: Mauro Carvalho Chehab Date: Wed Oct 14 08:02:40 2009 -0300 i7core_edac: Use a more generic approach for probing PCI devices Currently, only one PCI set of tables is allowed. This prevents using the driver for other devices like Lynnfield, with have a different set of PCI ID's. Signed-off-by: Mauro Carvalho Chehab commit fd3826549db7f73d22b9c9abb80e01effb95c2ba Author: Mauro Carvalho Chehab Date: Wed Oct 14 06:07:07 2009 -0300 i7core_edac: PCI device is called NONCORE, instead of NOCORE Signed-off-by: Mauro Carvalho Chehab commit 321ece4dda32f52d4a28d6eb11f2ca2a5c93c191 Author: Mauro Carvalho Chehab Date: Thu Oct 8 13:11:08 2009 -0300 i7core_edac: Fix ringbuffer maxsize Signed-off-by: Mauro Carvalho Chehab commit 6e103be1c7c4adb50f25aaf1f1e8f828833c1719 Author: Mauro Carvalho Chehab Date: Mon Oct 5 09:40:09 2009 -0300 i7core_edac: First store, then increment Fix ringbuffer store logic. While here, add a few comments to the code and remove the undesired printk that could otherwise be called during NMI time. Signed-off-by: Mauro Carvalho Chehab commit 4f87fad1d32fcdda448f9eb430c9c234a1939ece Author: Mauro Carvalho Chehab Date: Sun Oct 4 11:54:56 2009 -0300 i7core_edac: Better parse "any" addrmask Instead of accepting just "any", accept also "any\n" Signed-off-by: Mauro Carvalho Chehab commit ca9c90ba09ca3c9799319f46a56f397afbf617c2 Author: Mauro Carvalho Chehab Date: Sun Oct 4 10:15:40 2009 -0300 i7core_edac: Use a lockless ringbuffer Signed-off-by: Mauro Carvalho Chehab commit b968759ee7102f86fec5f3349f7a8ab4556884a3 Author: Mauro Carvalho Chehab Date: Fri Sep 25 13:42:25 2009 -0300 edac: Create an unique instance for each kobj Current code only works when there's just one memory controller, since we need one kobj for each instance. Signed-off-by: Mauro Carvalho Chehab commit 35be95446734cbb10b088a6b38269ac4a8ac3a86 Author: Mauro Carvalho Chehab Date: Thu Sep 24 17:28:50 2009 -0300 Documentation/edac.txt: Reflect the sysfs changes at the document Signed-off-by: Mauro Carvalho Chehab commit f338d736910edf00e8426ee4322cfda585268d50 Author: Mauro Carvalho Chehab Date: Thu Sep 24 17:25:43 2009 -0300 i7core_edac: Convert UDIMM error counters into a proper sysfs group Instead of displaying 3 values at the same var, break it into 3 different sysfs nodes: /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm0 /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm1 /sys/devices/system/edac/mc/mc0/all_channel_counts/udimm2 For registered dimms, however, the error counters are already being displayed at: /sys/devices/system/edac/mc/mc0/csrow*/ce_count So, there's no need to add any extra sysfs nodes. Signed-off-by: Mauro Carvalho Chehab commit c419d921e68c54232ce6d369a3b528cd7644b2ae Author: Mauro Carvalho Chehab Date: Thu Sep 24 16:36:32 2009 -0300 edac: Don't create csrow entries on instance groups Signed-off-by: Mauro Carvalho Chehab commit cc301b3ae3f615fe243f023e68e22b8298a6f883 Author: Mauro Carvalho Chehab Date: Thu Sep 24 16:23:42 2009 -0300 edac: store/show methods for device groups weren't working Signed-off-by: Mauro Carvalho Chehab commit a5538e531fc1e00ac7185dcfcebf33c37b5d742e Author: Mauro Carvalho Chehab Date: Wed Sep 23 18:56:47 2009 -0300 i7core_edac: Add support for sysfs addrmatch group Signed-off-by: Mauro Carvalho Chehab commit 9fa2fc2e2d641df7d69dc4e06cf2552c44b58e95 Author: Mauro Carvalho Chehab Date: Wed Sep 23 16:26:09 2009 -0300 edac_core: Allow the creation of sysfs groups Currently, all sysfs nodes are stored at /sys/.*/mc. (regex) However, sometimes it is needed to create attribute groups. This patch extends edac_core to allow groups creation. Signed-off-by: Mauro Carvalho Chehab commit 4af91889e02c9933823ca8c62fc6f05dfd15f3bd Author: Mauro Carvalho Chehab Date: Thu Sep 24 09:58:26 2009 -0300 i7core_edac: Avoid printing a warning when debug is disabled Signed-off-by: Mauro Carvalho Chehab commit 4253868034221db6e42dbbb61e0305fe1757f8da Author: Mauro Carvalho Chehab Date: Thu Sep 24 09:59:13 2009 -0300 i7core_edac: We need to use list_for_each_entry_safe to avoid errors Signed-off-by: Mauro Carvalho Chehab commit 22e6bcbdcf9279321dbe646c5a234b816db12881 Author: Mauro Carvalho Chehab Date: Sat Sep 5 23:06:50 2009 -0300 i7core_edac: change remove module strategy The old remove module stragegy didn't work on devices with multiple cores, since only one PCI device is used to open all mc's, due to Nehalem nature. Also, it were based at pdev value. However, this doesn't point to the pci device used at mci->dev. So, instead, it unregisters all devices at once, deleting them from the device list. Signed-off-by: Mauro Carvalho Chehab commit 0f062792b48dc8389fb18cbfb9318625886644c7 Author: Mauro Carvalho Chehab Date: Sat Sep 5 12:16:19 2009 -0300 i7core_edac: remove static counter for max sockets The number of sockets is now fully dynamic. Get rid of this obsolete var. Signed-off-by: Mauro Carvalho Chehab commit 13d6e9b653e6f714024c67287c7d7eac54d8417b Author: Mauro Carvalho Chehab Date: Sat Sep 5 12:15:20 2009 -0300 i7core_edac: at remove, don't remove all pci devices at once Signed-off-by: Mauro Carvalho Chehab commit d88b85072fa7d406f54c30ceeabcd37e5a2ec21a Author: Mauro Carvalho Chehab Date: Sat Sep 5 05:10:31 2009 -0300 i7core_edac: Fix a bug when printing error counts with RDIMMs Signed-off-by: Mauro Carvalho Chehab commit c344436319e898784febbeeea71d1b0f65ef53ae Author: Mauro Carvalho Chehab Date: Sat Sep 5 05:10:15 2009 -0300 Documentation/edac.txt: Improve it to reflect the latest changes at the driver Signed-off-by: Mauro Carvalho Chehab commit d4c277957f4e8e6f2b626e2661cbbf9c76782e36 Author: Mauro Carvalho Chehab Date: Sat Sep 5 04:12:02 2009 -0300 i7core_edac: a few fixes for multiple mc's Signed-off-by: Mauro Carvalho Chehab commit 6c6aa3afdba2460cb668d4cb65c74dfa8eb43449 Author: Mauro Carvalho Chehab Date: Sat Sep 5 03:27:04 2009 -0300 i7core_edac: sanity check: print a warning if a mcelog is ignored In thesis, the other mc controller should handle it. Signed-off-by: Mauro Carvalho Chehab commit f47429494fd50c0b7396fe3f8a26ea638b47c5ba Author: Mauro Carvalho Chehab Date: Sat Sep 5 02:35:08 2009 -0300 i7core_edac: create one mc per socket/QPI Instead of creating just one memory controller, create one per socket (e. g. per Quick Link Path Interconnect). This better reflects the Nehalem architecture. Signed-off-by: Mauro Carvalho Chehab commit 66607706cee7b6901aa0509198f075859c93ec6a Author: Mauro Carvalho Chehab Date: Sat Sep 5 00:52:11 2009 -0300 Dynamically allocate memory for PCI devices Instead of using a static table assuming always 2 CPU sockets, allocate space dynamically for Nehalem PCI devs. This patch is part of a series of patches that changes i7core_edac to allow more than 2 sockets and to properly report one memory controller per socket. commit a55456f3446d19853af54b64b3840312f46b6ea5 Author: Mauro Carvalho Chehab Date: Sat Sep 5 00:47:21 2009 -0300 i7core: temporary workaround to allow it to compile against 2.6.30 Signed-off-by: Mauro Carvalho Chehab commit 3a3bb4a647db4cb2468641df8da2ee9491784a9a Author: Mauro Carvalho Chehab Date: Thu Sep 3 20:17:26 2009 -0300 i7core_edac: Improve corrected_error_counts output for RDIMM Just cosmetics. instead of showing something like: socket 0, channel 2dimm0: 1 dimm1: 0 dimm2: 0 socket 1, channel 2dimm0: 0 dimm1: 0 dimm2: 0 Show: socket 0, channel 2 RDIMM0: 1 RDIMM1: 0 RDIMM2: 0 socket 0, channel 2 RDIMM0: 0 RDIMM1: 0 RDIMM2: 0 This is more synthetic and easier to parse. Signed-off-by: Mauro Carvalho Chehab commit bc2d7245ff1c5466c877a0c32a7ec9563187a032 Author: Keith Mannthey Date: Thu Sep 3 00:05:05 2009 -0300 i7core_edac: Probe on Xeons eariler On the Xeon 55XX series cpus the pci deives are not exposed via acpi so we much explicitly probe them to make the usable as a Linux PCI device. This moves the detection of this state to before pci_register_driver is called. Its present position was not working on my systems, the driver would complain about not finding a specific device. This patch allows the driver to load on my systems. Signed-off-by: Keith Mannthey Signed-off-by: Mauro Carvalho Chehab commit 14d2c08343eecd13f6c6ec232c98b16762b97924 Author: Mauro Carvalho Chehab Date: Wed Sep 2 23:52:36 2009 -0300 i7core: Use registered memories per processor Instead of assuming that the entire machine has either registered or unregistered memories, do it at CPU socket based. While here, fix a bug at i7core_mce_output_error(), where the we're using m->cpu directly as if it would represent a socket. Instead, the proper socket_id is given by cpu_data[m->cpu].phys_proc_id. Signed-off-by: Mauro Carvalho Chehab --- commit b4e8f0b6eaa1e99f1a64e539466a8ee2fb521d62 Author: Mauro Carvalho Chehab Date: Wed Sep 2 23:49:59 2009 -0300 i7core_edac: Use Device 3 function 2 to report errors with RDIMM's Nehalem and upper chipsets provide an special device that has corrected memory error counters detected with registered dimms. This device is only seen if there are registered memories plugged. After this patch, on a machine fully equiped with RDIMM's, it will use the Device 3 function 2 to count corrected errors instead on relying at mcelog. For unregistered DIMMs, it will keep the old behavior, counting errors via mcelog. This patch were developed together with Keith Mannthey Signed-off-by: Keith Mannthey Signed-off-by: Mauro Carvalho Chehab commit 61053fdedb2080dadc18dc37abbba90d2e74bc03 Author: Keith Mannthey Date: Wed Sep 2 23:46:59 2009 -0300 i7core_edac: Fix ecc enable shift From: Keith Mannthey Simple correction to a shift value. ECC_ENABLED is bit 4 of MC_STATUS, Dev 3 Fun 0 Offset 0x4c This correctly identifies the state of the ECC at the machine. Signed-off-by: Keith Mannthey Signed-off-by: Mauro Carvalho Chehab commit 3ef288a98307adc9d3f83321b26281567f348ec6 Author: Mauro Carvalho Chehab Date: Wed Sep 2 23:43:33 2009 -0300 i7core_edac: Print an error message if pci register fails Signed-off-by: Mauro Carvalho Chehab commit b990538a78ea84e89551ccaddf182beb5e16e6d2 Author: Mauro Carvalho Chehab Date: Wed Aug 5 21:36:35 2009 -0300 i7core_edac: CodingSyle fixes/cleanups No functional changes. Signed-off-by: Mauro Carvalho Chehab commit 31983a04d686f9f90b356072089d8d677e40e776 Author: Mauro Carvalho Chehab Date: Wed Aug 5 21:16:56 2009 -0300 Documentation/edac.txt: Add Nehalem specific EDAC characteristics As Nehalem has a different binding to EDAC API, and its own different error injection code, documents it. Signed-off-by: Mauro Carvalho Chehab commit 4157d9f55435331deef01ba8a9a47f248c042fb2 Author: Mauro Carvalho Chehab Date: Wed Aug 5 20:27:15 2009 -0300 i7core_edac: fix error injection There were two stupid error injection bugs introduced by wrong cut-and-paste: one at socket store, and another at the error inject register. The last one were causing the code to not work at all. While here, adds debug messages to allow seeing what registers are being set while sending error injection. Signed-off-by: Mauro Carvalho Chehab commit 2068def56c09f2b24e6de04a1b84757a0fb07947 Author: Mauro Carvalho Chehab Date: Wed Aug 5 19:28:27 2009 -0300 i7core_edac: fix error codes for sysfs error injection interface Signed-off-by: Mauro Carvalho Chehab commit 276b824c3095b09e8cb76f5709f56e9c6818ae85 Author: Mauro Carvalho Chehab Date: Wed Jul 22 21:45:50 2009 -0300 i7core_edac: some fixes at error injection code Signed-off-by: Mauro Carvalho Chehab commit 17cb7b0cf78c14913c5410eff2ce03e1d9c8d958 Author: Mauro Carvalho Chehab Date: Mon Jul 20 18:48:18 2009 -0300 i7core_edac: Some cleanups at displayed info Signed-off-by: Mauro Carvalho Chehab commit 086271a0374bf0b9ce033aac9fb60530c421ad65 Author: Mauro Carvalho Chehab Date: Sat Jul 18 12:22:28 2009 -0300 i7core: remove some uneeded noisy debug messages Signed-off-by: Mauro Carvalho Chehab commit 3a7dde7fcd0dd50df33e0e7070d4947551d767fc Author: Mauro Carvalho Chehab Date: Sat Jul 18 12:20:04 2009 -0300 i7core: add socket info at the debug msg Signed-off-by: Mauro Carvalho Chehab commit ec6df24c15822e671801eeeb53758e14f3b28381 Author: Mauro Carvalho Chehab Date: Sat Jul 18 10:44:30 2009 -0300 i7core: better document i7core_get_active_channels() Signed-off-by: Mauro Carvalho Chehab commit c77720b9544d8825ff5b9546d0ee038cfa4d4eb2 Author: Mauro Carvalho Chehab Date: Sat Jul 18 10:43:08 2009 -0300 i7core: fix get_devices routine for Xeon55xx i7core_get_devices() were preparet to get just the first found device of each type. Due to that, on Xeon 55xx, only socket 1 were retrived. Rework i7core_get_devices() to clean it and to properly support Xeon 55xx. While here, fix a small typo. Signed-off-by: Mauro Carvalho Chehab commit a639539fa28531924c6b5e0f3963cc63d060947d Author: Mauro Carvalho Chehab Date: Fri Jul 17 10:54:23 2009 -0300 i7core: enrich error information based on memory transaction type Signed-off-by: Mauro Carvalho Chehab commit c5d34528696acadc40d2ba7601dbf35d65b74ad5 Author: Mauro Carvalho Chehab Date: Fri Jul 17 10:28:15 2009 -0300 i7core: check if the memory error is fatal or non-fatal Signed-off-by: Mauro Carvalho Chehab commit 310cbb7284fab9fc9cbb6bb893e51c414e15bba3 Author: Mauro Carvalho Chehab Date: Fri Jul 17 00:09:10 2009 -0300 i7core: fix probing on Xeon55xx Xeon55xx fails to probe with this error message: EDAC DEBUG: in drivers/edac/i7core_edac.c, line at 1660: MC: drivers/edac/i7core_edac.c: i7core_init() EDAC i7core: Device not found: dev 00:00.0 PCI ID 8086:2c41 i7core_edac: probe of 0000:00:14.0 failed with error -22 This is due to the fact that, on Xeon35xx (and i7core), device 00.0 has PCI ID 8086:2c40. Signed-off-by: Mauro Carvalho Chehab commit f237fcf2b7560be33386255042dc11167ca486d5 Author: Mauro Carvalho Chehab Date: Wed Jul 15 19:53:24 2009 -0300 i7core_edac: some fixes at memory error parser m->bank is not related to the memory bank but, instead, to the MCA Error register bank. Fix it accordingly. While here, improves the comments for Nehalem bank. A later fix is needed, in order to get bank/rank information from MCA error log. Signed-off-by: Mauro Carvalho Chehab commit 8a2f118e3a023a4e8cbe56a6e51f7b78fa8c76a0 Author: Mauro Carvalho Chehab Date: Wed Jul 15 19:01:08 2009 -0300 i7core_edac: decode mcelog error and send it via edac interface Enriches mcelog error by using the encoded information at MCE status and misc registers (IA32_MCx_STATUS, IA32_MCx_MISC). Some fixes are still needed here, in order to properly fill the EDAC fields. Signed-off-by: Mauro Carvalho Chehab commit ba6c5c62eeb877da638e43f1282f778432142eec Author: Mauro Carvalho Chehab Date: Wed Jul 15 09:02:32 2009 -0300 i7core_edac: maps all sockets as if ther are one MC controller Signed-off-by: Mauro Carvalho Chehab commit 67166af4abc11d9c0deb497ebe0b562f69c71942 Author: Mauro Carvalho Chehab Date: Wed Jul 15 06:56:23 2009 -0300 i7core_edac: add support for more than one MC socket Some Nehalem architectures have more than one MC socket. Socket 0 is located at bus 255. Currently, it is using up to 2 sockets, but increasing it to a larger number is just a matter of increasing MAX_SOCKETS definition. This seems to be required for properly support of Xeon 55xx. Still needs testing with Xeon 55xx. Signed-off-by: Mauro Carvalho Chehab commit d1fd4fb69eeeb7db0693df58b9116db498d5bfe1 Author: Mauro Carvalho Chehab Date: Fri Jul 10 18:39:53 2009 -0300 i7core_edac: Add a code to probe Xeon 55xx bus This code changes the detection procedure of i7core_edac. Instead of directly probing for MC registers, it probes for another register found on Nehalem. If found, it tries to pick the first MC PCI BUS. This should work fine with Xeon 35xx, but, on Xeon 55xx, this is at bus 254 and 255 that are not properly detected by the non-legacy PCI methods. The new detection code scans specifically at buses 254 and 255 for the Xeon 55xx devices. This code has not tested yet. After working, a change at the code will be needed, since the i7core is not yet ready for working with 2 sets of MC. Signed-off-by: Mauro Carvalho Chehab commit 5707b24a50b40582226618c56692af932db9fe02 Author: Aristeu Rozanski Date: Thu Jul 9 22:21:13 2009 -0300 pci: Add a probing code that seeks for an specific bus This patch adds a probing code that seeks for an specific pci bus. It still needs testing, but it is hoped that this will help to identify the memory controller with Xeon 55xx series. Signed-off-by: Aristeu Sergio Signed-off-by: Mauro Carvalho Chehab commit e9bd2e73793bf0f7fcd8f94b532bb8f5c5b44171 Author: Mauro Carvalho Chehab Date: Thu Jul 9 22:14:35 2009 -0300 i7core_edac: Adds write unlock to MC registers The public Intel Xeon 5500 volume 2 datasheet describes, on page 53, session 2.6.7 a register that can lock/unlock Memory Controller the configuration register, called MC_CFG_CONTROL. Adds support for it in the hope that software error injection would work. With my tests with Xeon 35xx, there's still something missing. With a program that does sequencial bit writes at dev 0.0, sometimes, it produces error injection, after unblocking the MC_CFG_CONTROL (and, sometimes, it just locks my testing machine). I'll try later to discover by trial and error what's the register that solves this issue on Xeon 35xx. Signed-off-by: Mauro Carvalho Chehab commit d5381642ab01b084787925acdf26b5524d434476 Author: Mauro Carvalho Chehab Date: Thu Jul 9 22:06:41 2009 -0300 i7core_edac: Add edac_mce glue Adds a glue code to allow i7core to work with mcelog. With the glue, i7core registers itself on edac_mce. At mce, when an error is detected, it calls all registered drivers (in this case, i7core), for EDAC error handling. TODO: It currently just prints the MCE error log using about the same format as mce panic messages. The error message should be enhanced with mcelog userspace info and converted into the proper EDAC format, to feed the EDAC error counts. Signed-off-by: Mauro Carvalho Chehab commit 963c5ba35984c87963480031d1d7e2e556256ad7 Author: Mauro Carvalho Chehab Date: Thu Jul 9 22:04:30 2009 -0300 edac/Kconfig: edac_mce can't be module Since mcelog is bool, edac_mce glue should also be bool, or otherwise will not work. Signed-off-by: Mauro Carvalho Chehab commit 696e409dbd1ce325129c5030267365619364dfa0 Author: Mauro Carvalho Chehab Date: Thu Jul 23 06:57:45 2009 -0300 edac_mce: Add an interface driver to report mce errors via edac edac_mce module is an interface module that gets mcelog data and forwards to any registered edac module that expects to receive data via mce. Signed-off-by: Mauro Carvalho Chehab commit 41fcb7feed70d8076f1591664314ca172fcdff7b Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:31 2009 -0300 i7core_edac: CodingStyle fixes Signed-off-by: Mauro Carvalho Chehab commit eb94fc402f1592dfe847b245d9109c11a99a2ea1 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:31 2009 -0300 i7core_edac: fill csrows edac sysfs info csrows is still fake, since we can't identify its representation with Nehalem registers. Signed-off-by: Mauro Carvalho Chehab commit 5566cb7c91ba4ff4447278bb27896b4a2bb7d18a Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:31 2009 -0300 i7core_edac: Memory info fixes and preparation for properly filling cswrow data Now, memory size is properly displayed: EDAC i7core: DOD Max limits: DIMMS: 2, 1-ranked, 8-banked EDAC i7core: DOD Max rows x colums = 0x4000 x 0x400 EDAC i7core: Memory channel configuration: EDAC i7core: Ch0 phy rd0, wr0 (0x063f7c31): 2 ranks, UDIMMs EDAC i7core: dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8, numrank: 1, numrow: 0x4000, numcol: 0x400 EDAC i7core: dimm 1 (0x00001288) 1024 Mb offset: 4, numbank: 8, numrank: 1, numrow: 0x4000, numcol: 0x400 EDAC i7core: Ch1 phy rd1, wr1 (0x063f7c31): 2 ranks, UDIMMs EDAC i7core: dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8, numrank: 1, numrow: 0x4000, numcol: 0x400 EDAC i7core: Ch2 phy rd3, wr3 (0x063f7c31): 2 ranks, UDIMMs EDAC i7core: dimm 0 (0x00000288) 1024 Mb offset: 0, numbank: 8, numrank: 1, numrow: 0x4000, numcol: 0x400 Still, as the way to retrieve csrows info is not known, it does a mapping of what's available to csrows basic unit at edac core. Signed-off-by: Mauro Carvalho Chehab commit 854d3349973a7c47bd989794037f526b74af20c4 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:30 2009 -0300 i7core_edac: Get more info about the memory DIMMs Signed-off-by: Mauro Carvalho Chehab commit 7dd6953c5fecc44d264710e1fa158d0038215b63 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:30 2009 -0300 i7core_edac: Add more information about each active dimm Thanks-to: Aristeu Rozanski for part of the code Signed-off-by: Mauro Carvalho Chehab commit b7c761512c5412eb30be567a0640060cccfc372f Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:30 2009 -0300 i7core_edac: Improve error handling Signed-off-by: Mauro Carvalho Chehab commit 1c6fed808f1ccd0804786e87f6b2c907dcd730fa Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:30 2009 -0300 i7core_edac: Properly fill struct csrow_info Thanks-to: Aristeu Rozanski for part of the code Signed-off-by: Mauro Carvalho Chehab commit ef708b53b98f2b53d9686a9f8f0b8d437952c295 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:30 2009 -0300 i7core_edac: Add additional tests for error detection Properly check the number of channels and improve probing error detection Signed-off-by: Mauro Carvalho Chehab commit 442305b152778f07504e9fdf64815d4841279bbe Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: Add a memory check routine, based on device 3 function 4 This function appears only on Xeon 5500 datasheet. Yet, testing with a Xeon 3503 showed that this is also implemented on other Nehalem processors. At the first read, MC_TEST_ERR_RCV1 and MC_TEST_ERR_RCV0 can contain any value. Modify CE error logic to update the error count only after the second read. An alternative approach would be to do a write at rcv0 and rcv1 registers, but it seemed better to keep they untouched, since BIOS might eventually assume that they are exclusive for their usage. Signed-off-by: Mauro Carvalho Chehab commit 87d1d272ba25a1863e40ebb1df4bc0eed7a8fd11 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: need mci->edac_check, otherwise module removal doesn't work There are some locking troubles with edac_core: if you don't declare an edac_check, module may suffer from soft lock. Signed-off-by: Mauro Carvalho Chehab commit 7b029d03c36e5b06e067884aaefcee2c1c62efc7 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: A few fixes at error injection code Signed-off-by: Mauro Carvalho Chehab commit f122a89222510e8f57e8e0b9b5cdd3ec8863fe4c Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: Show read/write virtual/physical channel association Signed-off-by: Mauro Carvalho Chehab commit 8f331907578623f90a134261a559fa3249142caa Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: Registers all supported MC functions Now, it will try to register on all supported Memory Controller functions. It should be noticed that dev3, function 2 is present only on chips with Registered DIMM's, according to the datasheet. So, the driver doesn't return -ENODEV is all functions but this one were successfully registered and enabled: EDAC i7core: Registered device 8086:2c18 fn=3 0 EDAC i7core: Registered device 8086:2c19 fn=3 1 EDAC i7core: Device not found: PCI ID 8086:2c1a (dev 3, func 2) EDAC i7core: Registered device 8086:2c1c fn=3 4 EDAC i7core: Registered device 8086:2c20 fn=4 0 EDAC i7core: Registered device 8086:2c21 fn=4 1 EDAC i7core: Registered device 8086:2c22 fn=4 2 EDAC i7core: Registered device 8086:2c23 fn=4 3 EDAC i7core: Registered device 8086:2c28 fn=5 0 EDAC i7core: Registered device 8086:2c29 fn=5 1 EDAC i7core: Registered device 8086:2c2a fn=5 2 EDAC i7core: Registered device 8086:2c2b fn=5 3 EDAC i7core: Registered device 8086:2c30 fn=6 0 EDAC i7core: Registered device 8086:2c31 fn=6 1 EDAC i7core: Registered device 8086:2c32 fn=6 2 EDAC i7core: Registered device 8086:2c33 fn=6 3 EDAC i7core: Driver loaded. Signed-off-by: Mauro Carvalho Chehab commit 0b2b7b7ec06ce615acd11374bf9a512e166dabb0 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:29 2009 -0300 i7core_edac: Add more status functions to EDAC driver This patch were co-authored with Aristeu Rozanski. Signed-off-by: Aristeu Sergio Signed-off-by: Mauro Carvalho Chehab commit 194a40feabb7cab38911a357c86e968e98024281 Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:48:28 2009 -0300 i7core_edac: Add error insertion code for Nehalem Implements set_inject_error() with the low-level code needed to inject memory errors at Nehalem, and adds some sysfs nodes to allow error injection The next patch will add an API for error injection. Signed-off-by: Mauro Carvalho Chehab commit a0c36a1f0fbab42590dab3c13c10fa7d20e6c2cd Author: Mauro Carvalho Chehab Date: Mon Jun 22 22:41:15 2009 -0300 i7core_edac: Add an EDAC memory controller driver for Nehalem chipsets This driver is meant to support i7 core/i7core extreme desktop processors and Xeon 35xx/55xx series with integrated memory controller. It is likely that it can be expanded in the future to work with other processor series based at the same Memory Controller design. For now, it has just a few MCH status reads. Signed-off-by: Mauro Carvalho Chehab commit 499f49026e25e74dc617bb0d96ed6e85a67f4980 Author: Stefan Roese Date: Thu May 6 21:43:43 2010 +0000 powerpc/44x: Add reset-type to katmai.dts Katmai needs "reset-type" = "chip reset" (2) to correctly reboot the board. Signed-off-by: Stefan Roese Cc: Josh Boyer Signed-off-by: Josh Boyer commit e2efc09e52680cecb0ca624e379cb4b4c56157c3 Author: Tirumala Marri Date: Mon Dec 21 22:49:41 2009 +0000 powerpc/44x: Adding PCI-E support for PowerPC 460SX based SOC. Add support for PCI-e on the AMCC 460SX boards Signed-off-by: Tirumala Marri Acked-by: Josh Boyer commit fb994ecc2b1c214951366c2ba5d8b121f0010d1f Author: Greg Thelen Date: Wed May 5 10:41:44 2010 -0700 kbuild: Fix checking of scm-identifier variable I'm looking Makefile in the -mm branch (dated 2010-04-28-16-53) and seeing what looks like a bug in the checking of scm-identifier. The "ifneq ($scm-identifier)" seems to always execute "ifeq ($(LOCALVERSION,)) ...". This patch fixes the checking of scm-identifier. Signed-off-by: Greg Thelen Acked-by: David Rientjes Signed-off-by: Michal Marek commit f35d77645808d1b890abb1a36260bf228854259e Author: Arnd Bergmann Date: Tue Apr 27 16:24:21 2010 +0200 cris: push down BKL into some device drivers A number of cris specific device drivers still use the locked ->ioctl operation. Convert them to unlocked_ioctl with explicit lock_kernel calls. Signed-off-by: Arnd Bergmann Signed-off-by: Jesper Nilsson commit 06f9a55cf72b6aa19b4206a05d6f9af6fa9648ea Author: Li Zefan Date: Wed Apr 14 11:46:24 2010 +0800 gconfig: add support to show hidden options that have prompts There's a button in gconfig to "Show all options", but I think normally we are not interested in those configs which have no prompt and thus can't be changed, so here I add a new button to show hidden options which have prompts. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 22c7eca61e51296643bb0a379fc726fda8f3b015 Author: Li Zefan Date: Wed Apr 14 11:46:02 2010 +0800 menuconfig: add support to show hidden options which have prompts Usage: Press to show all config symbols which have prompts. Quote Tim Bird: | I've been bitten by this numerous times. I most often | use ftrace on ARM, but when I go back to x86, I almost | always go through a sequence of searching for the | function graph tracer in the menus, then realizing it's | completely missing until I disable CC_OPTIMIZE_FOR_SIZE. | | Is there any way to have the menu item appear, but be | unsettable unless the SIZE option is disabled? I'm | not a Kconfig guru... I myself found this useful too. For example, I need to test ftrace/tracing and want to be sure all the tracing features are enabled, so I enter the "Tracers" menu, and press to see if there is any config hidden. I also noticed gconfig and xconfig have a button "Show all options", but that's a bit too much, and I think normally what we are not interested in those configs which have no prompt thus can't be changed by users. Exmaple: --- Tracers -*- Kernel Function Tracer - - Kernel Function Graph Tracer [*] Interrupts-off Latency Tracer - - Preemption-off Latency Tracer [*] Sysprof Tracer Here you can see 2 tracers are not selectable, and then can find out how to make them selectable. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 7b5d87215b38359ecadf7a69575b11e140a00484 Author: Li Zefan Date: Wed Apr 14 11:44:51 2010 +0800 gconfig: remove show_debug option This option is a no-op, so remove it. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 2944235430c37970f82ad57b8ead343ee6065004 Author: Li Zefan Date: Wed Apr 14 11:44:34 2010 +0800 gconfig: remove dbg_print_ptype() and dbg_print_stype() Just use sym_get_type() and prop_get_type_name(). Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit c6ccc30fd7870879981de03feeec61029754b0ea Author: Li Zefan Date: Wed Apr 14 11:44:20 2010 +0800 kconfig: fix zconfdump() zconfdump(), which is used for debugging, can't recognize P_SELECT, P_RANGE and P_MENU (if associated with a symbol, aka "menuconfig"), and output something like this: config X86 boolean default y unknown prop 6! unknown prop 6! unknown prop 6! ... Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 4280eae0990190d190dfa7dab9bca480215d5b19 Author: Li Zefan Date: Wed Apr 14 11:44:05 2010 +0800 kconfig: some small fixes - fix a typo in documentation - fix a typo in a printk on error - fix comments in dialog_inputbox() Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 7926c09dea682be6f3b2e42f16c50d8554c6bbdc Author: Jan III Sobieski Date: Sun Mar 28 15:38:31 2010 +0200 add random binaries to .gitignore Signed-off-by: Jan III Sobieski Signed-off-by: Michal Marek commit b83419363eff1535309df97a4bf319c42d900a9c Author: Jason Gunthorpe Date: Mon Mar 22 16:49:32 2010 -0600 kbuild: Include gen_initramfs_list.sh and the file list in the .d file Expand the dependency set used for the initrd to include the CONFIG_INITRAMFS_SOURCE file and the generator script itself. Otherwise changing the initramfs file list does not rebuild the CPIO. Signed-off-by: Jason Gunthorpe Signed-off-by: Michal Marek commit da6df879b9f88d2224174a9e4e76dc0e42e47ebc Author: Li Zefan Date: Fri Mar 19 14:57:47 2010 +0800 kconfig: recalc symbol value before showing search results A symbol's value won't be recalc-ed until we save config file or enter the menu where the symbol sits. So If I enable OPTIMIZE_FOR_SIZE, and search FUNCTION_GRAPH_TRACER: Symbol: FUNCTION_GRAPH_TRACER [=y] Prompt: Kernel Function Graph Tracer Defined at kernel/trace/Kconfig:140 Depends on: ... [=y] && (!X86_32 [=y] || !CC_OPTIMIZE_FOR_SIZE [=y]) ... From the dependency it should result in FUNCTION_GRAPH_TRACER=n, but it still shows FUNCTION_GRAPH_TRACER=y. Signed-off-by: Li Zefan Signed-off-by: Michal Marek commit 52b80025ebaa992688959b4cb2cd86c7e805b70f Author: Philipp Kohlbecher Date: Wed Mar 17 19:52:12 2010 +0100 .gitignore: ignore *.lzo files Ignore files compressed with lzop. Signed-off-by: Philipp Kohlbecher Signed-off-by: Michal Marek commit 1dcd81002453f9f22c6c4fd6c3c7d8f1c7c891fa Author: Stephen Hemminger Date: Mon Mar 8 08:24:27 2010 -0800 headerdep: perlcritic warning Minor perlcritic warning: headerdep.pl: "return" statement with explicit "undef" at line 84, column 2. See page 199 of PBP. (Severity: 5) The rationale according to PBP is that an explicit return of undef (contrary to most people's expectations) doesn't always evaluate as false. It has to with the fact that perl return value depends on context the function is called. If function is used in list context, the appropriate return value for false is an empty list; whereas in scalar context the return value for false is undefined. By just using a "return" both cases are handled. In the context of a trivial script this doesn't matter. But one script may be cut-paste into later code (most people like me only know 50% of perl), that is why perlcritic always complains Signed-off-by: Stephen Hemminger Signed-off-by: Michal Marek commit 2d74b2c62cf8867d0762f6e6b5ed8906cb6a745f Author: Wu Zhangjin Date: Thu Mar 11 17:42:14 2010 +0800 scripts/Makefile.lib: Align the output of LZO The output of LZO is not aligned with the other output: ... CC drivers/usb/mon/usbmon.mod.o LZO arch/mips/boot/compressed/vmlinux.lzo ... This patch fixes it. Signed-off-by: Wu Zhangjin Signed-off-by: Michal Marek commit 73d1393eb8507ed5fd7f8e696f6b1ecc18035ebe Author: Michal Marek Date: Wed Mar 10 12:28:58 2010 +0100 kbuild: Generate modules.builtin in make modules_install The previous approach didn't work if one did make modules && make modules_install Add modules.builtin as dependency of _modinst_, which is the target that actually needs the file. Reported-by: Andrew Morton Signed-off-by: Michal Marek commit e93bc1a0cab3e54e3c1947e01c8e73892e35630d Author: Michal Marek Date: Mon Mar 8 10:26:22 2010 +0100 Revert "kbuild: specify absolute paths for cscope" This reverts commit eb8f844c0a41c4529a7d06b7801296eca9ae67aa. Ian Campbell writes: > I keep my kernel source tree on a more powerful build box where I run my > builds etc (including "make cscope") but run my editor from my > workstation with an NFS mount to the source. This worked fine for me > using relative paths for cscope. Using absolute paths in cscope breaks > this previously working setup because the root path is not the same on > both systems. I guess this is similar to moving the source tree around. > > Without wanting to start a flamewar it really sounds to me like we are > working around a vim (or cscope) bug here, emacs with cscope bindings > works fine in this configuration. Given that absolute paths can be forced by make O=. cscope, change the default back to relative paths. Ian Campbell Cc: Daniel Vetter Signed-off-by: Michal Marek commit a6c366324cacd5f71107dd01362b995a1c67b1ad Author: Michal Marek Date: Mon Mar 8 10:07:12 2010 +0100 kbuild: Do not unnecessarily regenerate modules.builtin Only regenerate it if the configuration has changed. Also, do this after the modules build to fix errors with some weird Makefiles that are generated during build. Reported-by: Eric Miao Signed-off-by: Michal Marek commit bae4cecc09db9d472d71cb262de3c976147ad628 Author: Stephen Hemminger Date: Mon Feb 22 15:17:26 2010 -0800 headers_install: use local file handles Better practice to use 3 arg open and local file handles. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit dbbe33e99f41a6f07e61dbce455964112d8ac72b Author: Stephen Hemminger Date: Mon Feb 22 15:17:24 2010 -0800 headers_check: fix perl warnings According to PBP; best way practice is to use local reference for file handle and three argument open. Also perl prototypes are a mistake. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 91416cfdf98bdbc828fd3e5ca7208beba5979d63 Author: Stephen Hemminger Date: Mon Feb 22 15:17:22 2010 -0800 export_report: fix perl warnings Use local file handles, use three argument open. Don't modify arguments in perl grep (use sed instead) Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 9c49fd307a6cb2d3255f9441bce5b7cb08dff79e Author: Stephen Hemminger Date: Mon Feb 22 15:17:20 2010 -0800 profile2linkerlist: fix perl warnings Turn on strict checking. Simplify code by using "unless" statement. Signed-off-by: Stephen Hemminger Acked-by: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 86d08e569f63a71a2d259507e335beea32b4d2aa Author: Stephen Hemminger Date: Mon Feb 22 15:17:18 2010 -0800 namespace: perlcritic warnings Use local file handle not global. Make loop and other variables local in scope. Signed-off-by: Stephen Hemminger Cc: Hui Zhu Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit a208868fc0a90f62a91893b0193459de957c8d8e Author: Stephen Hemminger Date: Mon Feb 22 15:17:14 2010 -0800 checkversion: perl cleanup Turn on strict checking. Use three arguement open Standard practice in perl is to use undef not zero for false Signed-off-by: Stephen Hemminger Cc: Cong Wang Cc: Ralf Baechle Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 3da27157316cbcce326d56faa0a7a5cadc7ae507 Author: Stephen Hemminger Date: Mon Feb 22 15:17:12 2010 -0800 checkincludes: fix perlcritic warnings Turn on strict checking. Use local file handles. Use three argument open. Signed-off-by: Stephen Hemminger Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 1f2a144f5ab5e836b5ca8f67bd76b759fa947751 Author: Stephen Hemminger Date: Mon Feb 22 15:17:09 2010 -0800 scripts: improve checkstack Cleanup checkstack script: * Turn on strict checking * Fix resulting error message because the declaration syntax was incorrect. * Remove incorrect and misleading use of prototype - prototype not required for this type of sort function because $a and $b are being used in this contex - if prototype was being used it should be for both arguments * Use closure for sort function Signed-off-by: Stephen Hemminger Cc: Steven Rostedt Cc: Arjan van de Ven Cc: Cong Wang Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit b59a12258460b3d019918719b1bd2563cf37ad9a Author: FEJES Jozsef Date: Fri Mar 5 18:19:36 2010 +0100 kbuild: deb-pkg md5sums This patch creates the standard md5sums file for 'make deb-pkg' just like the dh_md5sums debhelper script. Signed-off-by: Jozsef Fejes Signed-off-by: Michal Marek commit e9cfaa9f4c99be6d6bfe468daa1dd3a3f326bc52 Author: Denys Vlasenko Date: Sat Feb 20 01:03:57 2010 +0100 Rename .text.start to .text..start. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit b6f4e451de78547a369a8dbb7bcb56c1919a6b79 Author: Denys Vlasenko Date: Sat Feb 20 01:03:56 2010 +0100 Rename special text sections in arch/frv from .text.XXX to .text..XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit a7df554ea095da4f60ff7f7b90a94c2df91942e4 Author: Denys Vlasenko Date: Sat Feb 20 01:03:55 2010 +0100 Rename .data.lock_aligned to .data..lock_aligned. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2c31c341a827b99eef743753aa9adb917b9ea6db Author: Denys Vlasenko Date: Sat Feb 20 01:03:54 2010 +0100 Rename .data.initvect to .data..initvect. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit c273fb3b5d0490d3058f6cce77a92860671ee7b6 Author: Denys Vlasenko Date: Sat Feb 20 01:03:53 2010 +0100 Rename .data.init to .data..init. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 07b3bb1ef211fdf20eddcae902d1098788ea2f6e Author: Denys Vlasenko Date: Sat Feb 20 01:03:52 2010 +0100 Rename .data.nosave to .data..nosave. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 9bf59424862ef5c1ba5d7ad6699a0b474916c4e3 Author: Denys Vlasenko Date: Sat Feb 20 01:03:51 2010 +0100 Rename .text.startup to .text..startup. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 819d67621edba0822352f7ae2a7ccb0387223675 Author: Denys Vlasenko Date: Sat Feb 20 01:03:49 2010 +0100 Rename .text.page_aligned to .text..page_aligned. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 75ddb0e87d0d31ad44d574e7fe2e962e4efecadb Author: Denys Vlasenko Date: Sat Feb 20 01:03:48 2010 +0100 Rename .text.lock to .text..lock. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2b55f3672c77e76b62efd0dba6bf29addac071fd Author: Denys Vlasenko Date: Sat Feb 20 01:03:47 2010 +0100 Rename .text.ivt to .text..ivt. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 041d5f94c4d67444c40584db0d1cacf32a47a25b Author: Denys Vlasenko Date: Sat Feb 20 01:03:46 2010 +0100 Rename .rodata.compressed to .rodata..compressed. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit d56a3c1a9faa3a1703ce696e111143bfd9f071f1 Author: Denys Vlasenko Date: Sat Feb 20 01:03:45 2010 +0100 Rename .data.vmpages and .data.vm0.XXX to .data..vmpages and .data..vm0.XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 54cb27a71f51d304342c79e62fd7667f2171062b Author: Denys Vlasenko Date: Sat Feb 20 01:03:44 2010 +0100 Rename .data.read_mostly to .data..read_mostly. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 3d9a854c2dac3e888393b23ba7adafcce4d6d4b9 Author: Denys Vlasenko Date: Sat Feb 20 01:03:43 2010 +0100 Rename .data[.percpu][.XXX] to .data[..percpu][..XXX]. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit dafb9320671316fbd030b1d2e0ab9b96597223cb Author: Denys Vlasenko Date: Sat Feb 20 01:03:42 2010 +0100 Rename .data..patch.XXX to .data..patch.XXX. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 9d1578a3ba7fe9d3eecf86615ee427789792c2d6 Author: Denys Vlasenko Date: Sat Feb 20 01:03:41 2010 +0100 Rename .data.init_irqstack to .data..init_irqstack. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit e1cb14b85f802c7717a46b1a38e1fba23ead86c3 Author: Denys Vlasenko Date: Sat Feb 20 01:03:40 2010 +0100 Rename .data.gate to .data..gate. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 1360e0707090c763d0d06cbc74b04f9c9588b582 Author: Denys Vlasenko Date: Sat Feb 20 01:03:39 2010 +0100 Rename .bss.stack to .bss..stack. Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 7c74df07f90cabe61d700727bca04682b4e477f3 Author: Tim Abbott Date: Sat Feb 20 01:03:38 2010 +0100 Rename .bss.page_aligned to .bss..page_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 75b134837263eb919d91678f7fcf3d54cd088c8d Author: Tim Abbott Date: Sat Feb 20 01:03:37 2010 +0100 Rename .data.page_aligned to .data..page_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 5f547f51a2205d18a507b88756e6988639db5f25 Author: Tim Abbott Date: Sat Feb 20 01:03:36 2010 +0100 powerpc: remove unused __page_aligned definition. There is already an architecture-independent __page_aligned_data macro for this purpose, so removing the powerpc-specific macro should be harmless. Signed-off-by: Tim Abbott Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 2af7687f1ad2c4571b9835f9bb2e3db9a738d258 Author: Tim Abbott Date: Sat Feb 20 01:03:35 2010 +0100 Rename .data.init_task to .data..init_task. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit 4af57b787b4be09419a2bb48aa705fa87ef41cca Author: Tim Abbott Date: Sat Feb 20 01:03:34 2010 +0100 Rename .data.cacheline_aligned to .data..cacheline_aligned. Signed-off-by: Tim Abbott Cc: Sam Ravnborg Signed-off-by: Denys Vlasenko Signed-off-by: Michal Marek commit bc75cc6b5636eed5f6a481cba808e906f71cfd94 Author: John Kacur Date: Tue Mar 2 16:57:52 2010 +0100 tags: Add the ability to make tags for all archs using "all" make ALLSOURCE_ARCHS=all tags - Document this in kbuild.txt Without this change you have to type each arch separately. Signed-off-by: John Kacur Signed-off-by: Michal Marek commit 4431d4ce996de2cd2c45583209ba0dbbc9bf2795 Author: John Kacur Date: Tue Mar 2 15:38:10 2010 +0100 tags: Fix spelling error in comment (is->if) Signed-off-by: John Kacur Signed-off-by: Michal Marek commit a8bac511c8c18878908eb49f33f7257610b15180 Author: Michal Marek Date: Fri Feb 19 16:18:41 2010 +0100 tags: Use $SRCARCH $ make mrproper $ make tags GEN tags find: `arch/x86_64/': No such file or directory Caused by commit f81b1be (tags: include headers before source files) Cc: Guennadi Liakhovetski Acked-by: WANG Cong Signed-off-by: Michal Marek commit e8d400a933fa44e2fba3849b084e1ae5814d7fca Author: Kirill Smelkov Date: Wed Feb 17 11:45:33 2010 +0300 kbuild: fix a couple of typos in Documentation Signed-off-by: Kirill Smelkov Signed-off-by: Michal Marek commit f81b1be40c44b33b9706d64c117edd29e627ad12 Author: Guennadi Liakhovetski Date: Mon Feb 8 00:25:59 2010 +0100 tags: include headers before source files Currently looking up a structure definition in TAGS / tags takes one to one of multiple "static struct X" definitions in arch sources, which makes it for many structs practically impossible to get to the required header. This patch changes the order of sources being tagged to first scan architecture includes, then the top-level include/ directory, and only then the rest. It also takes into account, that many architectures have more than one include directory, i.e., not only arch/$ARCH/include, but also arch/$ARCH/mach-X/include etc. Signed-off-by: Guennadi Liakhovetski Reviewed-by: WANG Cong [mmarek@suse.cz: fix 'var+=text' bashism] Signed-off-by: Michal Marek commit d0679c730395d0bde9a46939e7ba255b4ba7dd7c Author: Andi Kleen Date: Tue Feb 2 14:40:02 2010 -0800 kbuild: move -fno-dwarf2-cfi-asm to powerpc only Better dwarf2 unwind information is a good thing, it allows better debugging with kgdb and crash and helps systemtap. Commit 003086497f07f7f1e67c0c295e261740f822b377 ("Build with -fno-dwarf2-cfi-asm") disabled some CFI information globally to work around a module loader bug on powerpc. But this disables the better unwind tables for all architectures, not just powerpc. Move the workaround to powerpc and also add a suitable comment that's it really a workaround. This improves dwarf2 unwind tables on x86 at least. Signed-off-by: Andi Kleen Cc: Kyle McMartin Signed-off-by: Andrew Morton Acked-by: Benjamin Herrenschmidt Signed-off-by: Michal Marek commit 59dde3853e07aaadc2b63abd16c954d5b0606cf1 Author: Hui Zhu Date: Mon Feb 1 13:41:22 2010 +0800 markup_oops.pl: minor fixes 1. Fix a little format issue. 2. Check the return of "Getopt::Long::GetOptions". Output usage and exit if it get error. 3. Change $ARGV[$#ARGV] to $ARGV[0]. 4. Change the code which get $modulefile from modinfo. Replace the pipeline with `modinfo -F filename $module`. 4. Change usage from "Specify the module directory name" to "Specify the module filename". Signed-off-by: Hui Zhu Signed-off-by: Michal Marek commit 52e13e219d5930fb8fb774050e6ecffa244a60a9 Author: Hui Zhu Date: Tue Jan 26 17:13:07 2010 +0800 markup_oops.pl: add options to improve cross-sompilation environments The markup_oops.pl have 3 troubles to support cross-compiler environment: 1. It use objdump directly. 2. It use modinfo to get the message of module. 3. It use hex function that cannot support 64-bit number in 32-bit arch. This patch add 3 options to markup_oops.pl: 1. -c CROSS_COMPILE Specify the prefix used for toolchain. 2. -m MODULE_DIRNAME Specify the module directory name. 3. Change hex function to Math::BigInt->from_hex. After this patch, parse the x8664 oops in x86, we can: cat amd64m | perl ~/kernel/tmp/m.pl -c /home/teawater/kernel/bin/x8664- -m ./e.ko vmlinux Thanks, Hui Signed-off-by: Hui Zhu Cc: Andrew Morton Cc: Arjan van de Ven Cc: Sam Ravnborg Cc: ozan@pardus.org.tr Cc: Matthew Wilcox Acked-by: WANG Cong Signed-off-by: Michal Marek commit d224a94ab988c01f2841dccd39a518424fd26336 Merge: 70fb7ba 0db2524 Author: Michal Marek Date: Tue Feb 2 16:21:08 2010 +0100 Merge branch 'modpost' of git://git.pengutronix.de/git/ukl/linux-2.6 into kbuild/for-next Acked-by: Sam Ravnborg Signed-off-by: Michal Marek commit 70fb7ba652e8bdb05aa99ef46e3183684e0742f7 Author: Michal Marek Date: Fri Jan 29 14:22:43 2010 +0100 MAINTAINERS: add a few more patterns to kbuild Also, add a note that "unmaintained" files below scripts/ should go via the kbuild tree (best current practice). Signed-off-by: Michal Marek commit 880df92fa0bb2ebaf057ea1cc1e309b351fd73bc Author: John Saalwaechter Date: Sun Jan 31 16:18:58 2010 -0800 scripts: use %_tmppath in "make rpm-pkg" The mkspec script hardcodes "/var/tmp" into the generated rpm spec file's BuildRoot. The user, however, may have a custom setting for %_tmppath, which should be used in BuildRoot. This patch changes mkspec's BuildRoot output to appropriately use %_tmppath. Signed-off-by: John Saalwaechter Signed-off-by: Michal Marek commit 0139f1d9539395ca341e17060ae26f44f5f31434 Author: Hui Zhu Date: Thu Jan 28 06:58:02 2010 +0000 markup_oops.pl: fix for faulting instruction in the first line of a range I got a "No matching code found" when I use markup_oops.pl parse a error in a x86_64 module. cat e.c int init_module(void) { char *buf = 0; buf[0] = 3; return 0; } void cleanup_module(void) { //char *buf = 0; //buf[0] = 3; } MODULE_AUTHOR("Hui Zhu"); MODULE_LICENSE("GPL"); 0000000000000000 : init_module(): /home/teawater/study/kernel/stack2core/example/e.c:10 0: c6 04 25 00 00 00 00 movb $0x3,0x0 7: 03 /home/teawater/study/kernel/stack2core/example/e.c:13 8: 31 c0 xor %eax,%eax a: c3 retq b: 0f 1f 44 00 00 nopl 0x0(%rax,%rax,1) 0000000000000010 : cleanup_module(): /home/teawater/study/kernel/stack2core/example/e.c:20 10: f3 c3 repz retq 12: 90 nop 13: 90 nop Disassembly of section .modinfo: This is because the faulting instruction "movb $0x3,0x0" is the first line of the range. In the markup_oops.pl: main::(./scripts/markup_oops.pl:245): 245: if (InRange($1, $target)) { DB<2> p $line ffffffffa001b000: c6 04 25 00 00 00 00 movb $0x3,0x0 DB<3> p $counter 0 It just set $center in next loop. So it cannot get the $center. And even if $center is set to the right value 0. if ($center == 0) { print "No matching code found \n"; exit; } The first line $center will be 0, so I change the default value to -1. Signed-off-by: Hui Zhu Signed-off-by: Michal Marek commit 94a47083522ec4bcfc03134ebe908f1bfb393057 Author: Don Zickus Date: Tue Jan 26 22:20:41 2010 +0000 scripts: change scripts to use system python instead of env Just a small change to a couple of scripts to go from #!/usr/bin/env python to #!/usr/bin/python This shouldn't effect anyone, unless they don't install python there. In preparation for python3, Fedora is doing a big push to change the scripts to use the system python. This allows developers to put the python3 in their path without fear of breaking existing scripts. Now I am pretty sure anyone using python3 for testing purposes will probably not run any of the scripts I changed, but Fedora has this automated tool that checks for this stuff so I thought I would try to push it upstream. Signed-off-by: Don Zickus Acked-by: WANG Cong Acked-by: Jarod Wilson Signed-off-by: Michal Marek commit 71d41aed9468a1239cff1b2d928954885b09de6c Author: Himanshu Chauhan Date: Wed Jan 27 16:53:20 2010 -0800 scripts/kallsyms: suppress build warning Suppress a warn_unused_result warning. fgets is called as a part of error handling. It is called just to drop a line and return immediately. read_map is reading the file in a loop and read_symbol reads line by line. So I think there is no point in using return value for useful checking. Other checks like 3 items were returned or !EOF have already been done. Signed-off-by: Himanshu Chauhan Cc: WANG Cong Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit d4987bd7ae8401bd88896a6f76dc7af31fe55732 Author: Michal Marek Date: Wed Jan 27 09:46:23 2010 +0100 scripts/mkcompile_h: don't test for hardcoded paths Don't test for /bin/{dnsdomainname,domainname}, simply try to execute the command and check if it returned something. Reported-by: Glenn Sommer Acked-by: WANG Cong Tested-by: Glenn Sommer Signed-off-by: Michal Marek commit e66f25d7d1be19e177cf55126a40799757efae89 Author: Andi Kleen Date: Wed Jan 13 17:02:44 2010 +0100 Improve kconfig symbol hashing While looking for something else I noticed that the symbol hash function used by kconfig is quite poor. It doesn't use any of the standard hash techniques but simply adds up the string and then uses power of two masking, which is both known to perform poorly. The current x86 kconfig has over 7000 symbols. When I instrumented it showed that the minimum hash chain length was 16 and a significant number of them was over 30. It didn't help that the hash table size was only 256 buckets. This patch increases the hash table size to a larger prime and switches to a FNV32 hash. I played around with a couple of hash functions, but that one seemed to perform best with reasonable hash table sizes. Increasing the hash table size even further didn't seem like a good idea, because there are a couple of global walks which walk the complete hash table. I also moved the unnamed bucket to 0. It's still the longest of all the buckets (44 entries), but hopefully it's not often hit except for the global walk which doesn't care. The result is a much nicer distribution: (first column bucket length, second number of buckets with that length) 1: 3505 2: 1236 3: 294 4: 52 5: 3 47: 1 <--- this is the unnamed symbols bucket There are still some 5+ buckets, but increasing the hash table even more would be likely not worth it. This also cleans up the code slightly by removing hard coded magic numbers. I didn't notice a big performance difference either way on my Nehalem system, but I presume it'll help somewhat on slower systems. Signed-off-by: Andi Kleen Signed-off-by: Michal Marek commit 62718979780720e526a411dc66e810288aaa7bf6 Author: Joe Perches Date: Wed Jan 13 09:31:44 2010 -0800 Makefile: Document ability to make file.lst and file.S Signed-off-by: Joe Perches Acked-by: WANG Cong Signed-off-by: Michal Marek commit 85a256d8e0116c8f5ad276730830f5d4d473344d Author: David Rientjes Date: Wed Jan 13 13:01:05 2010 -0800 kbuild: improve version string logic The LOCALVERSION= string passed to "make" will now always be appended to the kernel version after CONFIG_LOCALVERSION, if it exists, regardless of whether CONFIG_LOCALVERSION_AUTO is set or not. This allows users to uniquely identify their kernel builds with a string. If CONFIG_LOCALVERSION_AUTO is enabled, the unique SCM tag reported by setlocalversion (or .scmversion) is appended to the kernel version, if it exists. When CONFIG_LOCALVERSION_AUTO is not enabled, a `+' is appended to the kernel version to represent that the kernel has been revised since the last release unless "make LOCALVERSION=" was used to uniquely identify the build. The end result is this: - when LOCALVERSION= is passed to "make", it is appended to the kernel version, - when CONFIG_LOCALVERSION_AUTO is enabled, a unique SCM identifier is appended if the respository has been revised beyond a tagged commit, and - when CONFIG_LOCALVERSION_AUTO is disabled, a `+' is appended if the repository has been revised beyond a tagged commit and LOCALVERSION= was not passed to "make". Examples: With CONFIG_LOCALVERSION_AUTO: "make" results in v2.6.32-rc4-00149-ga3ccf63. If there are uncommited changes to the respository, it results in v2.6.32-rc4-00149-ga3ccf63-dirty. If "make LOCALVERSION=kbuild" were used, it results in v2.6.32-rc4-kbuild-00149-ga3ccf63-dirty. Without CONFIG_LOCALVERSION_AUTO, "make" results in v2.6.32-rc4+ unless the repository is at the Linux v2.6.32-rc4 commit (in which case the version would be v2.6.32-rc4). If "make LOCALVERSION=kbuild" were used, it results in v2.6.32-rc4-kbuild. Also renames variables such as localver-auto and _localver-auto to more accurately describe what they represent: localver-extra and scm-identifier, respectively. Signed-off-by: David Rientjes Signed-off-by: Michal Marek commit 68c16edddf41044410fab59d4c179c023cb25afb Author: Nir Tzachar Date: Wed Jan 13 07:32:35 2010 +0200 nconfig: minor fix This patch fixes two problems reported by Jan Engelhardt: 1) Border is now properly placed, to always be visible 2) Long menu items are properly displayed Reported-by: Jan Engelhardt Signed-off-by: Nir Tzachar Signed-off-by: Michal Marek commit 851190c9304154b7d65596801415229c05994e91 Author: Michal Marek Date: Thu Jan 7 13:59:57 2010 +0100 nconfig: mark local functions as such scripts/kconfig/nconf.gui.c:23: warning: no previous prototype for 'set_normal_colors' scripts/kconfig/nconf.gui.c:68: warning: no previous prototype for 'normal_color_theme' scripts/kconfig/nconf.gui.c:100: warning: no previous prototype for 'no_colors_theme' scripts/kconfig/nconf.c:455: warning: no previous prototype for 'process_special_keys' scripts/kconfig/nconf.c:487: warning: no previous prototype for 'get_next_hot' scripts/kconfig/nconf.c:506: warning: no previous prototype for 'canbhot' scripts/kconfig/nconf.c:514: warning: no previous prototype for 'is_hot' scripts/kconfig/nconf.c:522: warning: no previous prototype for 'make_hot' scripts/kconfig/nconf.c:582: warning: no previous prototype for 'item_make' scripts/kconfig/nconf.c:626: warning: no previous prototype for 'item_add_str' scripts/kconfig/nconf.c:656: warning: no previous prototype for 'item_tag' scripts/kconfig/nconf.c:668: warning: no previous prototype for 'curses_item_index' scripts/kconfig/nconf.c:673: warning: no previous prototype for 'item_data' scripts/kconfig/nconf.c:684: warning: no previous prototype for 'item_is_tag' scripts/kconfig/nconf.c:691: warning: no previous prototype for 'set_config_filename' Signed-off-by: Michal Marek commit 692d97c380c6dce2c35a04c5dcbce4e831a42fa0 Author: nir.tzachar@gmail.com Date: Wed Nov 25 12:28:43 2009 +0200 kconfig: new configuration interface (nconfig) This patch was inspired by the kernel projects page, where an ncurses replacement for menuconfig was mentioned (by Sam Ravnborg). Building on menuconfig, this patch implements a more modern look interface using ncurses and ncurses' satellite libraries (menu, panel, form). The implementation does not depend on lxdialog, which is currently distributed with the kernel. Signed-off-by: Nir Tzachar Signed-off-by: Michal Marek commit c64152bfd0106807c8d3ddbe6d0928e14a64f7bb Author: Alexander Beregalov Date: Thu Jan 7 05:22:41 2010 +0300 genksyms: close ref_file after use It is the last place when the file is read, so close it. Signed-off-by: Alexander Beregalov Signed-off-by: Michal Marek commit da60fbbcb637b37b1d77a41886ae4e275422ca96 Author: Vadim Bendebury (вб) Date: Sun Dec 20 00:29:49 2009 -0800 menuconfig: wrap long help lines Help text for certain config options is very extensive (the text includes the names of all other options the option in question depends on). Long lines are not wrapped, making it impossible to see the list without scrolling horizontally. This patch adds some logic which wraps help screen lines at word boundaries to prevent truncating. Tested by running ARCH=powerpc make menuconfig O=/tmp/build which shows that the long lines are now wrapped, and ARCH=powerpc make xconfig O=/tmp/build to demonstrate that it still compiles and operates as expected. Signed-off-by: Vadim Bendebury Signed-off-by: Michal Marek commit 5358db0b0e16470337c6ec08177deb3f68ed7673 Author: Rabin Vincent Date: Tue Jan 5 20:27:58 2010 +0530 scripts: add ARM support to decodecode This patch adds support for decoding ARM oopses to scripts/decodecode. The following things are handled: - ARCH and CROSS_COMPILE environment variables are respected. - The Code: in x86 oopses is in bytes, while it is in either words (4 bytes) or halfwords for ARM. - Some versions of ARM objdump refuse to disassemble instructions generated by literal constants (".word 0x..."). The workaround is to strip the object file first. - The faulting instruction is marked (liked so) in ARM, but in x86. - ARM mnemonics may include characters such as [] which need to be escaped before being passed to sed for the "<- trapping instruction" substitution. Signed-off-by: Rabin Vincent Signed-off-by: Michal Marek commit 84336466011c589b6af554f2f2f1fcfa1a5c1437 Author: Roland McGrath Date: Mon Dec 21 16:24:06 2009 -0800 kconfig CROSS_COMPILE option This adds CROSS_COMPILE as a kconfig string so you can store it in .config. Then you can use plain "make" in the configured kernel build directory to do the right cross compilation without setting the command-line or environment variable every time. With this, you can set up different build directories for different kernel configurations, whether native or cross-builds, and then use the simple: make -C /build/dir M=module-source-dir idiom to build modules for any given target kernel, indicating which one by nothing but the build directory chosen. I tried a version that defaults the string with env="CROSS_COMPILE" so that in a "make oldconfig" with CROSS_COMPILE in the environment you can just hit return to store the way you're building it. But the kconfig prompt for strings doesn't give you any way to say you want an empty string instead of the default, so I punted that. Signed-off-by: Roland McGrath Cc: Sam Ravnborg Cc: Anibal Monsalve Salazar Cc: Steven Rostedt Cc: Michal Marek Signed-off-by: Andrew Morton Signed-off-by: Michal Marek commit 4b024242e8a4e9679fa327ea03958b89f89096c9 Author: Jiafu He Date: Thu Dec 17 18:22:13 2009 -0700 kbuild: Fix linking error built-in.o no such file or directory This patch fixes the link error "built-in.o: no such file or directory". The problem happens if "dirx/Makefile" contains only "obj-m += diry/ dirz/" and the empty "dirx/built-in.o" is missing. Adding $(subdir-m) into check for builtin-target fixes this error. Signed-off-by: Jiafu He Signed-off-by: Michal Marek commit 0db252452378aa7a9e001a13226e1cd1dc61453d Author: Uwe Kleine-König Date: Sat Jan 30 21:14:23 2010 +0100 modpost: don't allow *driver to reference .init.* Signed-off-by: Uwe Kleine-König commit af92a82d0fec4dfd344b2ffd7a63e30f05c53938 Author: Uwe Kleine-König Date: Sat Jan 30 20:52:50 2010 +0100 modpost: make symbol white list a per mismatch type variable Signed-off-by: Uwe Kleine-König commit fc2f7efadb755b020ad8fdf195515dacaf185e2d Author: Uwe Kleine-König Date: Sat Jan 30 16:57:48 2010 +0100 modpost: remove now unused NO_MISMATCH constant Signed-off-by: Uwe Kleine-König commit 0d2a636ee6c3b8c292fbaae05976fe1537b70958 Author: Uwe Kleine-König Date: Sat Jan 30 16:56:20 2010 +0100 modpost: pass around const struct sectioncheck * instead of enum mismatch This prepares having a per-check whitelist of symbol names. Signed-off-by: Uwe Kleine-König commit bbd3f4fb84f8c4a04f22c9c6dc119b0c4856c7d9 Author: Uwe Kleine-König Date: Sat Jan 30 16:35:47 2010 +0100 modpost: give most mismatch constants a better name Signed-off-by: Uwe Kleine-König commit 4a31a229fb6cbbeabf5ca9a0dcb55d53ca052048 Author: Uwe Kleine-König Date: Fri Jan 29 12:04:26 2010 +0100 modpost: define ALL_XXX{IN,EX}IT_SECTIONS Signed-off-by: Uwe Kleine-König commit b75dcabd6c6c71d7cea64f78b06d18d9cda0ddd1 Author: Uwe Kleine-König Date: Fri Jan 29 11:40:38 2010 +0100 modpost: members of *driver structs should not point to __init functions Either the functions referred to in a driver struct should live in .devinit or the driver should be registered using platform_driver_probe (or equivalent for different driver types) with ->probe being NULL. Signed-off-by: Uwe Kleine-König