commit 352d4657b23fbd329efccc396000a549e0150907 Merge: 95c46af 5286944 Author: Linus Torvalds Date: Fri Mar 19 13:49:29 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: fix compile errors in dma-mapping-common.h alpha: remove trailing spaces in messages alpha: use __ratelimit commit 95c46afe6034d15bdf0f95d69f25489cecad9a47 Merge: cf3966b 191aee5 Author: Linus Torvalds Date: Fri Mar 19 13:42:43 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: Remove IOMMU_VMERGE config option powerpc: Fix swiotlb to respect the boot option powerpc: Do not call prink when CONFIG_PRINTK is not defined powerpc: Use correct ccr bit for syscall error status powerpc/fsl-booke: Get coherent bit from PTE powerpc/85xx: Make sure lwarx hint isn't set on ppc32 commit cf3966bf6ecfe25a75d625771e327b84878bc09d Merge: 8dba8f9 17cf444 Author: Linus Torvalds Date: Fri Mar 19 13:42:00 2010 -0700 Merge branch 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'zerolen' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/misc-2.6: Delete zero-length file drivers/mtd/maps/omap_nor.c commit 8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866 Merge: 2eb645e 336cee4 Author: Linus Torvalds Date: Fri Mar 19 13:40:03 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: tty_port,usb-console: Fix usb serial console open/close regression tty: cpm_uart: use resource_size() tty_buffer: Fix distinct type warning hvc_console: Fix race between hvc_close and hvc_remove uartlite: Fix build on sparc. tty: Take a 256 byte padding into account when buffering below sub-page units Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call" commit 2eb645e7b5662da47646f76b41b4141f2c9bf13a Merge: 8fdb7e9 12ee3c0 Author: Linus Torvalds Date: Fri Mar 19 13:39:42 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: driver core: numa: fix BUILD_BUG_ON for node_read_distance driver-core: document ERR_PTR() return values kobject: documentation: Update to refer to kset-example.c. sysdev: the cpu probe/release attributes should be sysdev_class_attributes kobject: documentation: Fix erroneous example in kobject doc. driver-core: fix missing kernel-doc in firmware_class Driver core: Early platform kernel-doc update sysfs: fix sysfs lockdep warning in mlx4 code sysfs: fix sysfs lockdep warning in infiniband code sysfs: fix sysfs lockdep warning in ipmi code sysfs: Initialised pci bus legacy_mem field before use sysfs: use sysfs_bin_attr_init in firmware class driver commit 8fdb7e9f612b7c6ba6c3ba460c14263b5ce90f79 Merge: fc7f99c 4cb80cd Author: Linus Torvalds Date: Fri Mar 19 13:39:21 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: (45 commits) USB: gadget/multi: cdc_do_config: remove redundant check usb: r8a66597-hcd: fix removed from an attached hub USB: xhci: Make endpoint interval debugging clearer. USB: Fix usb_fill_int_urb for SuperSpeed devices USB: cp210x: Remove double usb_control_msg from cp210x_set_config USB: Remove last bit of CONFIG_USB_BERRY_CHARGE USB: gadget: add gadget controller number for s3c-hsotg driver USB: ftdi_sio: Fix locking for change_speed() function USB: g_mass_storage: fixed module name in Kconfig USB: gadget: f_mass_storage::fsg_bind(): fix error handling USB: g_mass_storage: fix section mismatch warnings USB: gadget: fix Blackfin builds after gadget cleansing USB: goku_udc: remove potential null dereference USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff USB: serial: Fix module name typo for qcaux Kconfig entry. usb: cdc-wdm: Fix deadlock between write and resume usb: cdc-wdm: Fix order in disconnect and fix locking usb: cdc-wdm:Fix loss of data due to autosuspend usb: cdc-wdm: Fix submission of URB after suspension usb: cdc-wdm: Fix race between disconnect and debug messages ... commit 17cf4442497cb2551eae1dedee638515db47c23e Author: Jeff Garzik Date: Fri Mar 19 14:25:45 2010 -0400 Delete zero-length file drivers/mtd/maps/omap_nor.c The content was deleted in cc87edb173effdf74e680ee6d622a935ff0c1d6f, but the file remained as a zero-length file. Signed-off-by: Jeff Garzik commit fc7f99cf36ebae853639dabb43bc2f0098c59aef Merge: 0a492fd f1a3d57 Author: Linus Torvalds Date: Fri Mar 19 09:43:06 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (205 commits) ceph: update for write_inode API change ceph: reset osd after relevant messages timed out ceph: fix flush_dirty_caps race with caps migration ceph: include migrating caps in issued set ceph: fix osdmap decoding when pools include (removed) snaps ceph: return EBADF if waiting for caps on closed file ceph: set osd request message front length correctly ceph: reset front len on return to msgpool; BUG on mismatched front iov ceph: fix snaptrace decoding on cap migration between mds ceph: use single osd op reply msg ceph: reset bits on connection close ceph: remove bogus mds forward warning ceph: remove fragile __map_osds optimization ceph: fix connection fault STANDBY check ceph: invalidate_authorizer without con->mutex held ceph: don't clobber write return value when using O_SYNC ceph: fix client_request_forward decoding ceph: drop messages on unregistered mds sessions; cleanup ceph: fix comments, locking in destroy_inode ceph: move dereference after NULL test ... Fix trivial conflicts in Documentation/ioctl/ioctl-number.txt commit 0a492fdef8aa241f6139e6455e852cc710ae8ed1 Merge: 3971047 8212cf7 Author: Linus Torvalds Date: Fri Mar 19 09:36:18 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: trivial white space [CIFS] checkpatch cleanup cifs: add cifs_revalidate_file cifs: add a CIFSSMBUnixQFileInfo function cifs: add a CIFSSMBQFileInfo function cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry commit 4cb80cda51ff950614701fb30c9d4e583fe5a31f Author: Peter Korsgaard Date: Fri Mar 12 12:33:15 2010 +0100 USB: gadget/multi: cdc_do_config: remove redundant check cdc_do_config() had a double ret check after fsg_add(). Signed-off-by: Peter Korsgaard Signed-off-by: Greg Kroah-Hartman commit d835933436ac0d1e8f5b35fe809fd4e767e55d6e Author: Yoshihiro Shimoda Date: Tue Mar 16 12:29:35 2010 +0900 usb: r8a66597-hcd: fix removed from an attached hub fix the problem that when a USB hub is attached to the r8a66597-hcd and a device is removed from that hub, it's likely that a kernel panic follows. Reported-by: Markus Pietrek Signed-off-by: Yoshihiro Shimoda Cc: stable Signed-off-by: Greg Kroah-Hartman commit 9ce669a8924c61b7321d6e2f27ed67bcd46c1fbb Author: Sarah Sharp Date: Tue Mar 16 12:59:24 2010 -0700 USB: xhci: Make endpoint interval debugging clearer. The xHCI hardware can only handle polling intervals that are a power of two. When we add a new endpoint during a bandwidth allocation, and the polling interval is rounded down to a power of two, print the original polling interval in the endpoint descriptor. Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit f09a15e6e69884cedec4d1c022089a973aa01f1e Author: Matthew Wilcox Date: Tue Mar 16 12:55:44 2010 -0700 USB: Fix usb_fill_int_urb for SuperSpeed devices USB 3 and Wireless USB specify a logarithmic encoding of the endpoint interval that matches the USB 2 specification. usb_fill_int_urb() didn't know that and was filling in the interval as if it was USB 1.1. Fix usb_fill_int_urb() for SuperSpeed devices, but leave the wireless case alone, because David Vrabel wants to keep the old encoding. Update the struct urb kernel doc to note that SuperSpeed URBs must have urb->interval specified in microframes. Add a missing break statement in the usb_submit_urb() interrupt URB checking, since wireless USB and SuperSpeed USB encode urb->interval differently. This allows xHCI roothubs to actually register with khubd. Signed-off-by: Matthew Wilcox Signed-off-by: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit e549a17f698e266373f6757bd068d1e98397b4c0 Author: Michael Brunner Date: Wed Mar 10 23:26:37 2010 +0100 USB: cp210x: Remove double usb_control_msg from cp210x_set_config This patch removes a double usb_control_msg that sets the cp210x configuration registers a second time when calling cp210x_set_config. For data sizes >2 the second write gets corrupted. The patch has been created against 2.6.34-rc1, but all cp210x driver revisions are affected. Signed-off-by: Michael Brunner Signed-off-by: Greg Kroah-Hartman commit 7f56cfd253d929c06ce4ed5bfb99a8c6805075c9 Author: Christoph Egger Date: Wed Mar 10 12:33:11 2010 +0100 USB: Remove last bit of CONFIG_USB_BERRY_CHARGE One last bit was missed while removing the USB_BERRY_CHARGE config option in a8d4211f33a9573f7b1bdcfd9c9c48631d1515ee which gets dropped by this patch. Signed-off-by: Christoph Egger Signed-off-by: Greg Kroah-Hartman commit 83ba11d93434e6f0cc2e060336b0b19a3f687fa3 Author: Maurus Cuelenaere Date: Mon Mar 8 18:20:59 2010 +0100 USB: gadget: add gadget controller number for s3c-hsotg driver This prevents some drivers from complaining that no bcdDevice id was set. Signed-off-by: Maurus Cuelenaere Signed-off-by: Greg Kroah-Hartman commit 9c67d28e4e7683b4f667fa4c7b6f9aee92b44b5c Author: Alessio Igor Bogani Date: Sat Mar 13 18:35:14 2010 +0100 USB: ftdi_sio: Fix locking for change_speed() function The change_speed() function should be serialized against multiple calls. Use the cfg_lock mutex to do this. Signed-off-by: Alessio Igor Bogani Signed-off-by: Greg Kroah-Hartman commit 11b10d999469dc0514447a15e88c7ef14ec0761d Author: Michal Nazarewicz Date: Mon Mar 15 11:10:23 2010 +0100 USB: g_mass_storage: fixed module name in Kconfig The Kconfig help message for Mass Storage Gadget claimed the module will be named "g_file_storage" whereas it should be "g_mass_storage". Signed-off-by: Michal Nazarewicz Cc: Kyungmin Park Signed-off-by: Greg Kroah-Hartman commit f479d70b4f7674083c2e3c3e603b15811713fb18 Author: Peter Korsgaard Date: Fri Mar 12 15:55:28 2010 +0100 USB: gadget: f_mass_storage::fsg_bind(): fix error handling Contrary to the comment in fsg_add, fsg_bind calls fsg_unbind on errors, which decreases refcount and frees the fsg_dev structure, causing trouble when fsg_add does the same. Fix it by simply leaving up cleanup to fsg_add(). Signed-off-by: Peter Korsgaard Acked-by: Michal Nazarewicz Signed-off-by: Greg Kroah-Hartman commit f88f6691b73a35b0c6dcabb9e587aa4c63d09010 Author: Mike Frysinger Date: Sun Mar 7 10:36:27 2010 -0500 USB: g_mass_storage: fix section mismatch warnings The recent commit (0e530b45783f75) that moved usb_ep_autoconfig from the __devinit section to the __init section missed the mass storage device. Its fsg_bind() function uses the usb_ep_autoconfig() function from non __init context leading to: WARNING: drivers/usb/gadget/g_mass_storage.o(.text): Section mismatch in reference from the function _fsg_bind() to the function .init.text:_usb_ep_autoconfig() So move fsg_bind() into __init as well. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit f2984a333fb5e325d478950c9d8af3693869e69c Author: Mike Frysinger Date: Tue Mar 9 00:35:22 2010 -0500 USB: gadget: fix Blackfin builds after gadget cleansing The recent change to clean out dead gadget drivers (90f7976880bbbf99) missed the call to gadget_is_musbhsfc() behind CONFIG_BLACKFIN. This causes Blackfin gadget builds to fail since the function no longer exists anywhere. Signed-off-by: Mike Frysinger Signed-off-by: Greg Kroah-Hartman commit 872f8b42544c58dfa241956d220ada115a8e93c7 Author: Dan Carpenter Date: Sat Mar 6 14:08:56 2010 +0300 USB: goku_udc: remove potential null dereference "dev" is always null here. In the end it's only used to get the pci_name() of "pdev" which is redundant information and so I removed it. Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman commit 33c387529b7931248c6637bf9720ac7504a0b28b Author: spark Date: Fri Mar 5 14:18:05 2010 +0800 USB: option.c: Add Pirelli VID/PID and indicate Pirelli's modem interface is 0xff Signed-off-by: spark Signed-off-by: Greg Kroah-Hartman commit 510607db7e2ad5078c554911418a71b469886076 Author: Stefan Schmidt Date: Wed Mar 3 19:37:12 2010 +0100 USB: serial: Fix module name typo for qcaux Kconfig entry. The module is called qcaux and not moto_modem. Also use help instead of ---help-- to be in sync with the other Kconfig entries. Signed-off-by: Stefan Schmidt Signed-off-by: Greg Kroah-Hartman commit 338124c1f18c2c737656ac58735f040d90b23d8c Author: Oliver Neukum Date: Sat Feb 27 20:57:12 2010 +0100 usb: cdc-wdm: Fix deadlock between write and resume The new runtime PM scheme allows resume() to have no locks. This fixes the deadlock. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d93d16e9aa58887feadd999ea26b7b8139e98b56 Author: Oliver Neukum Date: Sat Feb 27 20:56:47 2010 +0100 usb: cdc-wdm: Fix order in disconnect and fix locking - as the callback can schedule work, URBs must be killed first - if the driver causes an autoresume, the caller must handle locking Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 62e6685470fb04fb7688ecef96c39160498721d5 Author: Oliver Neukum Date: Sat Feb 27 20:56:22 2010 +0100 usb: cdc-wdm:Fix loss of data due to autosuspend The guarding flag must be set and tested under spinlock and cleared before the URBs are resubmitted in resume. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit beb1d35f1690fe27694472a010a8e4a9ae11cc50 Author: Oliver Neukum Date: Sat Feb 27 20:55:52 2010 +0100 usb: cdc-wdm: Fix submission of URB after suspension There's a window under which cdc-wdm may submit an URB to a device about to be suspended. This introduces a flag to prevent it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit d855fe2e9c19edaa47baba0e7f95e17f7a24dba8 Author: Oliver Neukum Date: Sat Feb 27 20:55:26 2010 +0100 usb: cdc-wdm: Fix race between disconnect and debug messages dev_dbg() and dev_err() cannot be used to report failures that may have been caused by a device's removal Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 922a5eadd5a3aa0b806be0c18694b618d41d0784 Author: Oliver Neukum Date: Sat Feb 27 20:54:59 2010 +0100 usb: cdc-wdm: Fix race between autosuspend and reading from the device While an available response is read the device must not be autosuspended. This requires a flag dedicated to that purpose. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 860e41a71c1731e79e1920dc42676bafc925af5e Author: Oliver Neukum Date: Sat Feb 27 20:54:24 2010 +0100 usb: cdc-wdm: Fix race between write and disconnect Unify mutexes to fix a race between write and disconnect and shift the test for disconnection to always report it. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit aa4714560b4ea359bb7830188ebd06bce71bcdea Author: Felipe Balbi Date: Fri Mar 12 10:27:24 2010 +0200 usb: musb: core: declare mbase only where it's used ... and avoid a compilation if we disable host side of musb. Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 7f4bca4049941ba8dac35775fe462d4ef9f0dce4 Author: Mike Frysinger Date: Fri Mar 12 10:27:23 2010 +0200 USB: musb: fix warnings in Blackfin regs The recent commit "usb: musb: Add context save and restore support" added some stubs for the Blackfin code so things would compile, but it also added a bunch of warnings due to missing return statements. Signed-off-by: Mike Frysinger Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit adb3ee421d6d39fbfadadf7093a587461ac4597e Author: Mike Frysinger Date: Fri Mar 12 10:27:21 2010 +0200 usb: musb: abstract out ULPI_BUSCONTROL register reads/writes The USB PHY on current Blackfin processors is a UTMI+ level 2 PHY. However, it has no ULPI support - so there are no registers at all. That means accesses to ULPI_BUSCONTROL have to be abstracted away like other MUSB registers. This fixes building for Blackfin parts again. Signed-off-by: Mike Frysinger Acked-by: Anand Gadiyar Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit 9957dd97ec5e98dd334f87ade1d9a0b24d1f86eb Author: Tony Lindgren Date: Fri Mar 12 10:35:20 2010 +0200 usb: musb: Fix compile error for omaps for musb_hdrc CONFIG_ARCH_OMAP34XX is now CONFIG_ARCH_OMAP3. But since drivers/usb/musb/omap2430.c use CONFIG_PM for these registers and functions, do the same for the header. Otherwise we get the following for most omap3 defconfigs: drivers/usb/musb/omap2430.c:261: error: expected identifier or '(' before 'do' drivers/usb/musb/omap2430.c:261: error: expected identifier or '(' before 'while' drivers/usb/musb/omap2430.c:268: error: expected identifier or '(' before 'do' drivers/usb/musb/omap2430.c:268: error: expected identifier or '(' before 'while' Signed-off-by: Tony Lindgren Signed-off-by: Felipe Balbi Signed-off-by: Greg Kroah-Hartman commit fa7bf3424ead0a496f5176abb3253b8176bb2935 Author: Grant Likely Date: Thu Mar 11 15:06:54 2010 -0700 usb/gadget: fix compile error on r8a66597-udc.c C file uses IS_ERR and PTR_ERR, but doesn't include Signed-off-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 1e63ef0e0c2cfb5deb9331420c9857fbe04bea73 Author: Oliver Neukum Date: Fri Mar 12 11:27:21 2010 +0100 USB: Fix documentation for avoid_reset_quirk The name used in the documentation doesn't match reality. Signed-off-by: Oliver Neukum Signed-off-by: Greg Kroah-Hartman commit 3b04872aa75006e2a4adaaec21e9c9ede8b8ad9d Author: Nathaniel McCallum Date: Thu Mar 11 13:09:26 2010 -0500 USB: option: add support for a new CMOTECH device to usb/serial/option Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit bb73ed2a268a29ab1b7d8cc50b5f248578e7e188 Author: Nathaniel McCallum Date: Thu Mar 11 13:01:17 2010 -0500 USB: option: move hardcoded PID to a macro in usb/serial/option Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit eaff4cdc978f414cf7b5441a333de3070d80e9c7 Author: Nathaniel McCallum Date: Thu Mar 11 13:09:24 2010 -0500 USB: option: fix incorrect manufacturer name in usb/serial/option: MAXON->CMOTECH Signed-off-by: Nathaniel McCallum Cc: stable Signed-off-by: Greg Kroah-Hartman commit dee5658b482e9e2ac7d6205dc876fc11d4008138 Author: Daniel Sangorrin Date: Thu Mar 11 14:10:58 2010 -0800 USB: serial: ftdi: add CONTEC vendor and product id This is a patch to ftdi_sio_ids.h and ftdi_sio.c that adds identifiers for CONTEC USB serial converter. I tested it with the device COM-1(USB)H [akpm@linux-foundation.org: keep the VIDs sorted a bit] Signed-off-by: Daniel Sangorrin Cc: Andreas Mohr Cc: Radek Liboska Cc: stable Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 1d68064a7d80da4a7334cab0356162e36229c1a1 Author: Andiry Xu Date: Fri Mar 12 17:10:04 2010 +0800 USB: xHCI: re-initialize cmd_completion When a signal interrupts a Configure Endpoint command, the cmd_completion used in xhci_configure_endpoint() is not re-initialized and the wait_for_completion_interruptible_timeout() will return failure. Initialize cmd_completion in xhci_configure_endpoint(). Signed-off-by: Andiry Xu Signed-off-by: Sarah Sharp Cc: stable Signed-off-by: Greg Kroah-Hartman commit bc75fa3825cdbbdeee3a65d91cc5583bdfe41edf Author: Alex Chiang Date: Tue Mar 16 14:48:45 2010 -0600 USB: xhci: rename driver to xhci_hcd Naming consistency with other USB HCDs. Signed-off-by: Alex Chiang Cc: Sarah Sharp Signed-off-by: Greg Kroah-Hartman commit ae926976ac362efc9db2365a07891cc52414f2ec Author: Sonic Zhang Date: Mon Mar 8 11:26:01 2010 -0500 USB: musb: fix build error introduced by isoc change The recent commit "usb: musb: Fix for isochronous IN transfer" (f82a689fa) seems to have been against an older kernel version. It uses the old style naming of variables. Unfortunately, this breaks building for most MUSB users out there since "bDesiredMode" has been renamed to "desired_mode". Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger Acked-by: Felipe Balbi Acked-by: Anand Gadiyar Signed-off-by: Greg Kroah-Hartman commit 0725e95ea56698774e893edb7e7276b1d6890954 Author: Bernhard Rosenkraenzer Date: Wed Mar 10 12:36:43 2010 +0100 USB: qcserial: add new device ids This patch adds various USB device IDs for Gobi 2000 devices, as found in the drivers available at https://www.codeaurora.org/wiki/GOBI_Releases Signed-off-by: Bernhard Rosenkraenzer Cc: stable Signed-off-by: Greg Kroah-Hartman commit f0730924e9e32bb8935c60040a26d94179355088 Author: Oliver Neukum Date: Wed Mar 3 00:37:56 2010 +0100 USB: cdc-acm: Fix stupid NULL pointer in resume() Stupid logic bug passing a just nulled pointer Signed-off-by: Oliver Neukum Cc: stable Signed-off-by: Greg Kroah-Hartman commit 1082f57abfa26590b60c43f503afb24102a37016 Author: Clemens Ladisch Date: Mon Mar 1 17:18:56 2010 +0100 USB: EHCI: adjust ehci_iso_stream for changes in ehci_qh The EHCI driver stores in usb_host_endpoint.hcpriv a pointer to either an ehci_qh or an ehci_iso_stream structure, and uses the contents of the hw_info1 field to distinguish the two cases. After ehci_qh was split into hw and sw parts, ehci_iso_stream must also be adjusted so that it again looks like an ehci_qh structure. This fixes a NULL pointer access in ehci_endpoint_disable() when it tries to access qh->hw->hw_info1. Signed-off-by: Clemens Ladisch Reported-by: Colin Fletcher Cc: stable Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman commit 92bc3648e6027384479852b770a542722fadee7c Author: Clemens Ladisch Date: Mon Mar 1 09:12:50 2010 +0100 USB: EHCI: fix ITD list order When isochronous URBs are shorter than one frame and when more than one ITD in a frame has been completed before the interrupt can be handled, scan_periodic() completes the URBs in the order in which they are found in the descriptor list. Therefore, the descriptor list must contain the ITDs in the correct order, i.e., a new ITD must be linked in after any previous ITDs of the same endpoint. This should fix garbled capture data in the USB audio drivers. Signed-off-by: Clemens Ladisch Reported-by: Colin Fletcher Cc: stable Signed-off-by: Greg Kroah-Hartman commit bf162019b7f5bda9eb3241ae22de831df2126132 Author: Huang Ying Date: Sun Feb 28 13:51:29 2010 +0800 USB: Option: Add support for a variant of DLink DWM 652 U5 I found a DLink DWM 652 U5 USB 3G modem has product ID 0xce1e instead of orignal 0xce16. The new ID is added. And I found there are two entries for 0xce16, one has raw number, the other has symbol DLINK_PRODUCT_DWM_652_U5. This is fixed too. Signed-off-by: Huang Ying Signed-off-by: Greg Kroah-Hartman commit cd0e8aa1f4d36ece677b8ecf270ba921843dc6ca Author: Ondrej Zary Date: Sat Feb 27 22:56:28 2010 +0100 USB: unusual_devs.h: Fix capacity for SL11R-IDE 2.6c SL11R-IDE 2.6c (at least) reports wrong capacity (one sector more). Reading that last sector causes the device not to work anymore (and looks like HAL or something does that automatically after plugging in): sd 5:0:0:0: [sdc] Device not ready sd 5:0:0:0: [sdc] Result: hostbyte=0x00 driverbyte=0x08 sd 5:0:0:0: [sdc] Sense Key : 0x2 [current] sd 5:0:0:0: [sdc] ASC=0x0 ASCQ=0x0 sd 5:0:0:0: [sdc] CDB: cdb[0]=0x28: 28 00 04 a8 b5 70 00 00 01 00 Add unusual_devs entry to fix the capacity. Signed-off-by: Ondrej Zary Signed-off-by: Phil Dibowitz Signed-off-by: Greg Kroah-Hartman commit eb8878a881c306ff3eab6e741ab8fc94096f4e1a Author: Johan Hovold Date: Sat Feb 27 16:24:49 2010 +0100 USB: serial: use port endpoint size to determine if ep is available It is possible to have a multi-port device with a port lacking an in or out bulk endpoint. Only checking for num_bulk_in or num_bulk_out is thus not sufficient to determine whether a specific port has an in or out bulk endpoint. This fixes potential null pointer dereferences in the generic open and write routines, as well as access to uninitialised fifo in write_room and chars_in_buffer. Also let write fail with ENODEV (instead of 0) on missing out endpoint (also on zero-length writes). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 6313620228624ff4dcb78b1dbd459d0c208df126 Author: Johan Hovold Date: Sat Feb 27 14:06:07 2010 +0100 USB: serial: fix softint not being called on errors Make sure usb_serial_port_softint is called on errors also when using multi urb writes. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 0ae1474367a15e1b65a9deed3a73a14475a419fc Author: Johan Hovold Date: Sat Feb 27 14:05:46 2010 +0100 USB: serial: fix error message on close in generic driver Resubmitting read urb fails with -EPERM if completion handler runs while urb is being killed on close. This should not be reported as an error. Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman commit 7152b592593b9d48b33f8997b1dfd6df9143f7ec Author: Alan Stern Date: Sat Mar 6 15:04:03 2010 -0500 USB: fix usbfs regression This patch (as1352) fixes a bug in the way isochronous input data is returned to userspace for usbfs transfers. The entire buffer must be copied, not just the first actual_length bytes, because the individual packets will be discontiguous if any of them are short. Reported-by: Markus Rechberger Signed-off-by: Alan Stern CC: stable Signed-off-by: Greg Kroah-Hartman commit 336cee42dd52824e360ab419eab4e8888eb054ec Author: Jason Wessel Date: Mon Mar 8 21:50:11 2010 -0600 tty_port,usb-console: Fix usb serial console open/close regression Commit e1108a63e10d344284011cccc06328b2cd3e5da3 ("usb_serial: Use the shutdown() operation") breaks the ability to use a usb console starting in 2.6.33. This was observed when using console=ttyUSB0,115200 as a boot argument with an FTDI device. The error is: ftdi_sio ttyUSB0: ftdi_submit_read_urb - failed submitting read urb, error -22 The handling of the ASYNCB_INITIALIZED changed in 2.6.32 such that in tty_port_shutdown() it always clears the flag if it is set. The fix is to add a variable to the tty_port struct to indicate when the tty port is a console. CC: Alan Cox CC: Alan Stern CC: Oliver Neukum CC: Andrew Morton Signed-off-by: Jason Wessel Signed-off-by: Greg Kroah-Hartman commit 231443665882a02214c3748b9f86615a3ce9e5c2 Author: Tobias Klauser Date: Thu Mar 11 14:08:18 2010 -0800 tty: cpm_uart: use resource_size() Use the resource_size function instead of manually calculating the resource size. This reduces the chance of introducing off-by-one errors. Signed-off-by: Tobias Klauser Cc: Alan Cox Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit d4bee0a677cfa5a32f964ffa420e27406c65e605 Author: Fang Wenqi Date: Tue Mar 9 18:54:28 2010 +0800 tty_buffer: Fix distinct type warning CC drivers/char/tty_buffer.o drivers/char/tty_buffer.c: In function ‘tty_insert_flip_string_fixed_flag’: drivers/char/tty_buffer.c:251: warning: comparison of distinct pointer types lacks a cast drivers/char/tty_buffer.c: In function ‘tty_insert_flip_string_flags’: drivers/char/tty_buffer.c:288: warning: comparison of distinct pointer types lacks a cast Fix it by replacing min() with min_t() in tty_insert_flip_string_flags and tty_insert_flip_string_fixed_flag(). Signed-off-by: Fang Wenqi Signed-off-by: Greg Kroah-Hartman commit e74d098c66543d0731de62eb747ccd5b636a6f4c Author: Amit Shah Date: Fri Mar 12 11:53:15 2010 +0530 hvc_console: Fix race between hvc_close and hvc_remove Alan pointed out a race in the code where hvc_remove is invoked. The recent virtio_console work is the first user of hvc_remove(). Alan describes it thus: The hvc_console assumes that a close and remove call can't occur at the same time. In addition tty_hangup(tty) is problematic as tty_hangup is asynchronous itself.... So this can happen hvc_close hvc_remove hung up ? - no lock tty = hp->tty unlock lock hp->tty = NULL unlock notify del kref_put the hvc struct close completes tty is destroyed tty_hangup dead tty tty->ops will be NULL NULL->... This patch adds some tty krefs and also converts to using tty_vhangup(). Reported-by: Alan Cox Signed-off-by: Amit Shah CC: Alan Cox CC: linuxppc-dev@ozlabs.org CC: Rusty Russell Signed-off-by: Greg Kroah-Hartman commit f157b58511e56d418eb582de96fedc4ea03d8061 Author: David Miller Date: Wed Mar 3 02:50:26 2010 -0800 uartlite: Fix build on sparc. We can get this driver enabled via MFD_TIMBERDALE which only requires GPIO to be on. But the of_address_to_resource() function is only present on powerpc and microblaze, so we have to conditionalize the CONFIG_OF probing bits on that. Signed-off-by: David S. Miller Acked-by: Grant Likely Signed-off-by: Greg Kroah-Hartman commit 352fa6ad16b89f8ffd1a93b4419b1a8f2259feab Author: Mel Gorman Date: Tue Mar 2 22:24:19 2010 +0000 tty: Take a 256 byte padding into account when buffering below sub-page units The TTY layer takes some care to ensure that only sub-page allocations are made with interrupts disabled. It does this by setting a goal of "TTY_BUFFER_PAGE" to allocate. Unfortunately, while TTY_BUFFER_PAGE takes the size of tty_buffer into account, it fails to account that tty_buffer_find() rounds the buffer size out to the next 256 byte boundary before adding on the size of the tty_buffer. This patch adjusts the TTY_BUFFER_PAGE calculation to take into account the size of the tty_buffer and the padding. Once applied, tty_buffer_alloc() should not require high-order allocations. Signed-off-by: Mel Gorman Cc: stable Signed-off-by: Greg Kroah-Hartman commit 87a6aca504d65f242589583e04df5e74b5eae1fe Author: Greg Kroah-Hartman Date: Mon Mar 15 17:14:15 2010 -0700 Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call" This reverts commit eec9fe7d1ab4a0dfac4cb43047a7657fffd0002f. Ari writes as the reason this should be reverted: The problems with this patch include: 1. There's at least one subtlety I overlooked - switching between X servers (i.e. from one X VT to another) still requires the cooperation of both X servers. I was assuming that KMS eliminated this. 2. It hasn't been tested at all (no X server patch exists which uses the new mode). As he was the original author of the patch, I'll revert it. Cc: Ari Entlich Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman commit 12ee3c0a0ac42bed0939420468fd35f5cdceae4f Author: David Rientjes Date: Wed Mar 10 14:50:21 2010 -0800 driver core: numa: fix BUILD_BUG_ON for node_read_distance node_read_distance() has a BUILD_BUG_ON() to prevent buffer overruns when the number of nodes printed will exceed the buffer length. Each node only needs four chars: three for distance (maximum distance is 255) and one for a seperating space or a trailing newline. Signed-off-by: David Rientjes Cc: Ingo Molnar Signed-off-by: Greg Kroah-Hartman commit f0eae0ed3b7d4182a6b4dd03540a738518ea3163 Author: Jani Nikula Date: Thu Mar 11 18:11:45 2010 +0200 driver-core: document ERR_PTR() return values A number of functions in the driver core return ERR_PTR() values on error. Document this in the kernel-doc of the functions. Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman commit 178a5b35b2777346206d4b577b36d10061732f8c Author: Robert P. J. Day Date: Fri Mar 12 07:30:35 2010 -0500 kobject: documentation: Update to refer to kset-example.c. Signed-off-by: Robert P. J. Day Signed-off-by: Greg Kroah-Hartman commit 67fc233f4fb67907861b4077cea5294035f80dc7 Author: Stephen Rothwell Date: Tue Mar 16 10:33:32 2010 +1100 sysdev: the cpu probe/release attributes should be sysdev_class_attributes This fixes these warnings: drivers/base/cpu.c:264: warning: initialization from incompatible pointer type drivers/base/cpu.c:265: warning: initialization from incompatible pointer type Cc: Andi Kleen Signed-off-by: Stephen Rothwell Signed-off-by: Greg Kroah-Hartman commit 462bd295a3d74c7d1641501bda549bccf404be5b Author: Robert P. J. Day Date: Thu Mar 11 07:59:09 2010 -0500 kobject: documentation: Fix erroneous example in kobject doc. Replace uio_mem example for kobjects with uio_map, since the uio_mem struct no longer contains a kobject. Signed-off-by: Robert P. J. Day Signed-off-by: Greg Kroah-Hartman commit e59817bf089a3893e05a059026c668fb65f8c748 Author: Randy Dunlap Date: Wed Mar 10 11:47:58 2010 -0800 driver-core: fix missing kernel-doc in firmware_class Fix kernel-doc warning in firmware_class.c: Warning(drivers/base/firmware_class.c:94): No description found for parameter 'attr' Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 4d26e139f0b7d4c0700d6993506f1f60e2f2caa5 Author: Magnus Damm Date: Wed Mar 10 20:50:38 2010 +0900 Driver core: Early platform kernel-doc update This patch updates the kernel-doc notation for early platform functions. Signed-off-by: Magnus Damm Acked-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman commit 3691c964fa1a8f0eb5e5f00c644ef1bdd7e35a95 Author: Greg Kroah-Hartman Date: Mon Mar 15 14:01:55 2010 -0700 sysfs: fix sysfs lockdep warning in mlx4 code This fixes a sysfs lockdep warning in the mlx4 code. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit 21e3bde964e873bb5d3b1dfef68294b1437fe678 Author: Greg Kroah-Hartman Date: Mon Mar 15 14:01:25 2010 -0700 sysfs: fix sysfs lockdep warning in infiniband code This fixes a sysfs lockdep warning in the infiniband code. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit c7df670bf702d1c25ae22b4cd49deb05c1e55ecc Author: Greg Kroah-Hartman Date: Mon Mar 15 13:59:51 2010 -0700 sysfs: fix sysfs lockdep warning in ipmi code This fixes a sysfs lockdep warning in the ipmi code. Thanks to Eric Biederman and Yinghai Lu for the original versions of the patch, unfortunatly they did not submit them in a form they could be applied in. Cc: Yinghai Lu Cc: Eric Biederman Signed-off-by: Greg Kroah-Hartman commit 6757eca348fbbdd4ab1020e565f325cd6a6b2698 Author: Mel Gorman Date: Wed Mar 10 22:48:34 2010 +0000 sysfs: Initialised pci bus legacy_mem field before use PPC64 is failing to boot the latest mmotm due to an uninitialised pointer in pci_create_legacy_files(). The surprise is that machines boot at all and it would appear to affect current mainline as well. This patch fixes the problem. Signed-off-by: Mel Gorman Signed-off-by: Greg Kroah-Hartman commit e1955ca0ee55286cbc65a8ed7471d540ae83dac8 Author: Jiri Kosina Date: Tue Mar 9 19:30:28 2010 +0100 sysfs: use sysfs_bin_attr_init in firmware class driver Annotate dynamic sysfs attribute in fw_setup_device(). This gets rid of the following lockdep warning: bnx2 0000:08:00.0: firmware: requesting bnx2/bnx2-mips-06-5.0.0.j6.fw BUG: key ffff880008293470 not in .data! ------------[ cut here ]------------ WARNING: at kernel/lockdep.c:2706 lockdep_init_map+0x562/0x620() Modules linked in: bnx2(+) sg tpm_bios floppy rtc_lib usb_storage i2c_piix4 joydev button container shpchp i2c_core sr_mod cdrom pci_hotplug usbhid hid ohci_hcd ehci_hcd sd_mod usbcore edd ext3 mbcache jbd fan ata_generic sata_svw pata_serverworks libata scsi_mod thermal processor Pid: 1915, comm: work_for_cpu Not tainted 2.6.34-rc1-default #81 Call Trace: [] ? lockdep_init_map+0x562/0x620 [] warn_slowpath_common+0x78/0xd0 [] warn_slowpath_null+0xf/0x20 [] lockdep_init_map+0x562/0x620 [] ? sysfs_new_dirent+0x76/0x120 [] ? put_device+0x12/0x20 [] sysfs_add_file_mode+0x6c/0xd0 [] sysfs_add_file+0xc/0x10 [] sysfs_create_bin_file+0x21/0x30 [] _request_firmware+0x2f1/0x650 [] request_firmware+0xe/0x10 [] bnx2_init_one+0x8f5/0x177e [bnx2] [] ? _raw_spin_unlock_irq+0x2b/0x40 [] ? finish_task_switch+0x69/0x100 [] ? finish_task_switch+0x0/0x100 [] ? do_work_for_cpu+0x0/0x30 [] local_pci_probe+0x12/0x20 [] do_work_for_cpu+0x13/0x30 [] ? do_work_for_cpu+0x0/0x30 [] kthread+0x96/0xa0 [] kernel_thread_helper+0x4/0x10 [] ? restore_args+0x0/0x30 [] ? kthread+0x0/0xa0 [] ? kernel_thread_helper+0x0/0x10 ---[ end trace a2ecee9c9602d195 ]--- Cc: Eric W. Biederman Cc: Greg Kroah-Hartman Signed-off-by: Jiri Kosina Signed-off-by: Greg Kroah-Hartman commit 191aee58b6568cf8143901bfa3f57a9b8faa6f1c Author: FUJITA Tomonori Date: Tue Mar 2 14:25:38 2010 +0000 powerpc: Remove IOMMU_VMERGE config option The description says: Cause IO segments sent to a device for DMA to be merged virtually by the IOMMU when they happen to have been allocated contiguously. This doesn't add pressure to the IOMMU allocator. However, some drivers don't support getting large merged segments coming back from *_map_sg(). Most drivers don't have this problem; it is safe to say Y here. It's out of date. Long ago, drivers didn't have a way to tell IOMMUs about their segment length limit (that is, the maximum segment length that they can handle). So IOMMUs merged as many segments as possible and gave too large segments to drivers. dma_get_max_seg_size() was introduced to solve the above problem. Device drives can use the API to tell IOMMU about the maximum segment length that they can handle. In addition, the default limit (64K) should be safe for everyone. So this config option seems to be unnecessary. Note that this config option just enables users to disable the virtual merging by default. Users can still disable the virtual merging by the boot parameter. Signed-off-by: FUJITA Tomonori Signed-off-by: Benjamin Herrenschmidt commit a93272969c6b1d59883fcbb04845420bd72c9a20 Author: FUJITA Tomonori Date: Tue Mar 16 13:16:25 2010 +0000 powerpc: Fix swiotlb to respect the boot option powerpc initializes swiotlb before parsing the kernel boot options so swiotlb options (e.g. specifying the swiotlb buffer size) are ignored. Any time before freeing bootmem works for swiotlb so this patch moves powerpc's swiotlb initialization after parsing the kernel boot options, mem_init (as x86 does). Signed-off-by: FUJITA Tomonori Tested-by: Becky Bruce Tested-by: Albert Herranz Signed-off-by: Benjamin Herrenschmidt commit 09156a7a409cf93d1ca2706bf05d714879a5b7ea Author: Márton Németh Date: Sat Mar 6 22:43:55 2010 +0000 powerpc: Do not call prink when CONFIG_PRINTK is not defined When printk() is disabled (CONFIG_PRINTK) at menu item General setup -> Configure standard kernel features (for small systems) -> Enable support for printk then there should be no printk() calls at all. Signed-off-by: Márton Németh Signed-off-by: Benjamin Herrenschmidt commit 409d241b7bb2cf0278186040ace1c4704fb2a82f Author: Nathan Lynch Date: Fri Mar 12 13:16:02 2010 +0000 powerpc: Use correct ccr bit for syscall error status The powerpc implementations of syscall_get_error and syscall_set_return_value should use CCR0:S0 (0x10000000) for testing and setting syscall error status. Fortunately these APIs don't seem to be used at the moment. Signed-off-by: Nathan Lynch Signed-off-by: Benjamin Herrenschmidt commit d6a8536a93a3d14b6e5e3e3a59b9fb2bca6e8df2 Merge: bca14dd 9d296cf Author: Benjamin Herrenschmidt Date: Fri Mar 19 16:23:55 2010 +1100 Merge commit 'kumar/merge' into merge commit 5286944d75cbe21dd21b0d57335cc6206622b62a Author: FUJITA Tomonori Date: Thu Mar 18 22:35:28 2010 -0400 alpha: fix compile errors in dma-mapping-common.h The commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 leads to the following errors with CONFIG_ALPHA_{TSUNAMI, TITAN, RAWHIDE, MARVEL}: /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h: In function `dma_map_sg_attrs': /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:49: error: implicit declaration of function `for_each_sg' /home/fujita/git/linux-2.6/include/asm-generic/dma-mapping-common.h:50: error: syntax error before "kmemcheck_mark_initialized" Signed-off-by: FUJITA Tomonori Reported-by: Michael Cree Signed-off-by: Matt Turner commit 7f2d889c9cdcd33e8942a23765623adbd468cf04 Author: Frans Pop Date: Mon Mar 1 13:29:14 2010 -0500 alpha: remove trailing spaces in messages Signed-off-by: Frans Pop Cc: linux-alpha@vger.kernel.org Signed-off-by: Matt Turner commit 2a238a96358dde09aa52de9b9f97a383165ca651 Author: Akinobu Mita Date: Mon Mar 1 13:25:49 2010 -0500 alpha: use __ratelimit Replace open-coded rate limiting logic with __ratelimit(). Signed-off-by: Akinobu Mita Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: linux-alpha@vger.kernel.org Signed-off-by: Matt Turner commit 39710479303fd3affb3e204e9a7a75cc676977b5 Merge: 9d20593 eb63e5d Author: Linus Torvalds Date: Thu Mar 18 17:02:35 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (96 commits) Blackfin: stop cleaning include/asm/asm-offsets.h Blackfin: scale calibration when cpu freq changes Blackfin: eat spurious space in asm/dpmc.h Blackfin: fix anomaly 283 handling with exact hardware error Blackfin: bf537-stamp: add example ADXL346 orientation resources Blackfin: bf537-stamp: add example AD2S1210 IIO resources Blackfin: don't support keypad wakeup from hibernate Blackfin: bf537-stamp: add example AD7416 IIO resources Blackfin: bf537-stamp: add example ADP8860 backlight/led resources Blackfin: bf537-stamp: add example AD7414 temp sensor resources Blackfin: rename AD1836 to AD183X in board files Blackfin: bf537-stamp: add example AD2S120x resources Blackfin: add support for the on-chip MAC status interrupts Blackfin: asm/page.h: pull in asm-generic headers Blackfin: mark gpio lib functions static Blackfin: bf537-stamp: add example ADAU1361 resources Blackfin: GPIO: implement to_irq handler Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources Blackfin: bf537-stamp: add example AD2S90 resources Blackfin: bf537-stamp: add example AD5398 power regulator resources ... commit 9d20593a722c2dab7a5ab74f5d8c9b604aca52f9 Merge: 9b59a0a 9205124 Author: Linus Torvalds Date: Thu Mar 18 17:01:19 2010 -0700 Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6 * 'merge' of git://git.secretlab.ca/git/linux-2.6: powerpc/5200: Build fix for mpc52xx watchdog timer code of: Fix comparison of "compatible" properties powerpc/52xx: update defconfigs spi/omap2_mcspi: Use transaction speed if provided spi/omap2_mcspi: fix NULL pointer dereference uartlite: Fix build on sparc. commit 9b59a0a4eefa132a3899b6e8d362f92559c67844 Merge: c3a0bd7 29b2ee5 Author: Linus Torvalds Date: Thu Mar 18 16:59:30 2010 -0700 Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: ARM/OMAP: Remove the +x bit from a couple of source files omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values OMAP4: fix temporary hacks that break multi-omap PM OMAP2: cpu_is_omap2*: fix compile-time removal of unused code omap3: pandora: add missing i2c3 board_info omap: mach-omap2/io.c: fix function declarations omap: Fix gpio_resume_after_retention omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board omap: Checkpatch cleanup for blizzard.h omap: pass the reboot command to the boot loader omap2/3/4: mailbox: remove compiler warning OMAP2: serial.c: Fix number of uarts in early_init omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors omap2: Update n8x0 defconfig to test multi-omap and DMA api changes omap2: add USB initialization for tusb6010 omap4: Fix build break by moving omap_smc1 into a separate .S omap2/3/4: ehci: avoid compiler error with touchbook omap3: Fix compile for Touch Book early_param commit c3a0bd7515c682f4529a35318b6712c9ae456edc Merge: a41842f 0d5e6f7 Author: Linus Torvalds Date: Thu Mar 18 16:59:10 2010 -0700 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (23 commits) ARM: Fix RiscPC decompressor build errors ARM: Fix sorting of platform group config options and includes ARM: 5991/1: Fix regression in restore_user_regs macro ARM: 5989/1: ARM: KGDB: add support for SMP platforms ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush ARM: Add final piece to fix XIP decompressor in read-only memory video: enable sh_mobile_lcdc on SH-Mobile ARM ARM: mach-shmobile: ap4evb SDHI0 platform data V2 ARM: mach-shmobile: sh7372 SDHI vector merge ARM: mach-shmobile: sh7377 SDHI vector merge ARM: mach-shmobile: sh7367 SDHI vector merge ARM: mach-shmobile: G4EVM KEYSC platform data mtd: enable sh_flctl on SH-Mobile ARM ARM: mach-shmobile: G3EVM FLCTL platform data ARM: mach-shmobile: G3EVM KEYSC platform data Video: ARM CLCD: Better fix for swapped IENB and CNTL registers ARM: Add L2 cache handling to smp boot support ARM: 5960/1: ARM: perf-events: fix v7 event selection mask ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds ... commit a41842f70d6d6b0cfde3d21e163add81c4318ebd Merge: 7228744 0e17226 Author: Linus Torvalds Date: Thu Mar 18 16:58:42 2010 -0700 Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux * 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux: ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362 ARM: SAMSUNG: Fix build error from stale define in ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. commit 722874465e3cd3268387b96e02220f84b35a8d98 Merge: 31cc1dd 841d6e8 Author: Linus Torvalds Date: Thu Mar 18 16:57:24 2010 -0700 Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze * 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (27 commits) microblaze: entry.S use delay slot for return handlers microblaze: Save current task directly microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap microblaze: PCI early support for noMMU system microblaze: Fix dma alloc and free coherent dma functions microblaze: Add consistent code microblaze: pgtable.h: move consistent functions microblaze: Remove ancient Kconfig option for consistent mapping microblaze: Remove VMALLOC_VMADDR microblaze: Add define for ASM_LOOP microblaze: Preliminary support for dma drivers microblaze: remove trailing space in messages microblaze: Use generic show_mem() microblaze: Change temp register for cmdline microblaze: Preliminary support for dma drivers microblaze: Move cache function to cache.c microblaze: Add support from PREEMPT microblaze: Add support for Xilinx PCI host bridge microblaze: Enable PCI, missing files microblaze: Add core PCI files ... commit 31cc1dd344d941358345bd02f24c629dada9b08c Merge: 961cde9 627a2d3 Author: Linus Torvalds Date: Thu Mar 18 16:55:24 2010 -0700 Merge branch 'for-linus' of git://neil.brown.name/md * 'for-linus' of git://neil.brown.name/md: md: deal with merge_bvec_fn in component devices better. commit 961cde93dee2658000ead32abffb8ddf0727abe0 Merge: f82c37e 0d9dc7c Author: Linus Torvalds Date: Thu Mar 18 16:54:31 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (69 commits) [SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport [SCSI] bfa: Update the driver version to 2.1.2.1. [SCSI] bfa: Remove unused header files and did some cleanup. [SCSI] bfa: Handle SCSI IO underrun case. [SCSI] bfa: FCS and include file changes. [SCSI] bfa: Modified the portstats get/clear logic [SCSI] bfa: Replace bfa_get_attr() with specific APIs [SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO). [SCSI] bfa: Rename pport to fcport in BFA FCS. [SCSI] bfa: IOC fixes, check for IOC down condition. [SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state. [SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt. [SCSI] bfa: IOC recovery fix in fcmode. [SCSI] bfa: AEN and byte alignment fixes. [SCSI] bfa: Introduce a link notification state machine. [SCSI] bfa: Added firmware save clear feature for BFA driver. [SCSI] bfa: FCS authentication related changes. [SCSI] bfa: PCI VPD, FIP and include file changes. [SCSI] bfa: Fix to copy fpma MAC when requested by user space application. [SCSI] bfa: RPORT state machine: direct attach mode fix. ... commit f82c37e7bb4c4d9b6a476c642d5c2d2efbd6f240 Merge: c6b9e73 dcd5c16 Author: Linus Torvalds Date: Thu Mar 18 16:52:46 2010 -0700 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (35 commits) perf: Fix unexported generic perf_arch_fetch_caller_regs perf record: Don't try to find buildids in a zero sized file perf: export perf_trace_regs and perf_arch_fetch_caller_regs perf, x86: Fix hw_perf_enable() event assignment perf, ppc: Fix compile error due to new cpu notifiers perf: Make the install relative to DESTDIR if specified kprobes: Calculate the index correctly when freeing the out-of-line execution slot perf tools: Fix sparse CPU numbering related bugs perf_event: Fix oops triggered by cpu offline/online perf: Drop the obsolete profile naming for trace events perf: Take a hot regs snapshot for trace events perf: Introduce new perf_fetch_caller_regs() for hot regs snapshot perf/x86-64: Use frame pointer to walk on irq and process stacks lockdep: Move lock events under lockdep recursion protection perf report: Print the map table just after samples for which no map was found perf report: Add multiple event support perf session: Change perf_session post processing functions to take histogram tree perf session: Add storage for seperating event types in report perf session: Change add_hist_entry to take the tree root instead of session perf record: Add ID and to recorded event data when recording multiple events ... commit c6b9e73f2fee8bb86058f296de808b326473456b Merge: 441f405 e639ba4 Author: Linus Torvalds Date: Thu Mar 18 16:52:31 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: HID: avoid '\0' in hid debugfs events file HID: Add RGT Clutch Wheel clutch device id HID: ntrig: fix touch events HID: add quirk for UC-Logik WP4030 tablet HID: magicmouse: fix oops after device removal commit 441f4058a04b2943685ff94e0f5f1992b0b3649e Merge: 7c34691 8ad6fca Author: Linus Torvalds Date: Thu Mar 18 16:50:55 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: (30 commits) Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree Btrfs: allow treeid==0 in the inode lookup ioctl Btrfs: return keys for large items to the search ioctl Btrfs: fix key checks and advance in the search ioctl Btrfs: buffer results in the space_info ioctl Btrfs: use __u64 types in ioctl.h Btrfs: fix search_ioctl key advance Btrfs: fix gfp flags masking in the compression code Btrfs: don't look at bio flags after submit_bio btrfs: using btrfs_stack_device_id() get devid btrfs: use memparse Btrfs: add a "df" ioctl for btrfs Btrfs: cache the extent state everywhere we possibly can V2 Btrfs: cache ordered extent when completing io Btrfs: cache extent state in find_delalloc_range Btrfs: change the ordered tree to use a spinlock instead of a mutex Btrfs: finish read pages in the order they are submitted btrfs: fix btrfs_mkdir goto for no free objectids Btrfs: flush data on snapshot creation Btrfs: make df be a little bit more understandable ... commit 7c34691abe23741bfc7d2514efd5a39f0e0ecb06 Merge: 5f87e54 cfbc068 Author: Linus Torvalds Date: Thu Mar 18 16:50:09 2010 -0700 Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: ensure bdi_unregister is called on mount failure. NFS: Avoid a deadlock in nfs_release_page NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() nfs4: Make the v4 callback service hidden nfs: fix unlikely memory leak rpc client can not deal with ENOSOCK, so translate it into ENOCONN commit 5f87e54d7d6f58e8f15819cf8901860d9512e8b4 Merge: 01da470 5db5b02 Author: Linus Torvalds Date: Thu Mar 18 16:49:24 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: ahci: pp->active_link is not reliable when FBS is enabled ahci: use BIOS date in broken_suspend list ahci: add missing nv IDs commit 01da47059ab54544a508b217598fb0e73b73e7a8 Merge: 61d7180 e04dd2d Author: Linus Torvalds Date: Thu Mar 18 16:48:19 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: sound: sequencer: clean up remove bogus check ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212 ALSA: hda - Disable MSI for Nvidia controller ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 ALSA: hda - Fix secondary ADC of ALC260 basic model ALSA: hda - Add an error message for invalid mapping NID ALSA: hda - New Intel HDA controller commit 61d718076e95eb461fd4c3692b702a82e2be0df4 Merge: 5dbc2f5 ec57af9 Author: Linus Torvalds Date: Thu Mar 18 16:48:00 2010 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight * 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight: backlight: panasonic-laptop - Fix incomplete registration failure handling backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling backlight: blackfin - Fix missing registration failure handling backlight: classmate-laptop - Fix missing registration failure handling backlight: mbp_nvidia_bl - add five more MacBook variants backlight: Allow properties to be passed at registration backlight: Add backlight_device parameter to check_fb video: backlight/progear, fix pci device refcounting backlight: l4f00242t03: Fix module licence absence. backlight: Revert some const qualifiers backlight: Add Epson L4F00242T03 LCD driver commit 5dbc2f543d2eb5499f3839d1abb72105cf0c03af Merge: 01d61d0 14b5d6d Author: Linus Torvalds Date: Thu Mar 18 16:47:04 2010 -0700 Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds * 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds: leds: Fix race between LED device uevent and actual attributes creation leds-gpio: fix default state handling on OF platforms leds: Add Dell Business Class Netbook LED driver leds: Kconfig cleanup leds: led-class.c - Quiet boot messages leds: make PCI device id constant leds: ALIX2: Add dependency to !GPIO_CS5335 commit 01d61d0d64065b591a3c1502d42b350b10764c54 Merge: 2e0c17d e8c3753 Author: Linus Torvalds Date: Thu Mar 18 16:46:05 2010 -0700 Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs * 'for-linus' of git://oss.sgi.com/xfs/xfs: xfs: don't warn about page discards on shutdown xfs: use scalable vmap API xfs: remove old vmap cache commit 2e0c17d100c35e843dac1e99daf19b5e2b3fe168 Merge: 7de4a9a 22001a1 Author: Linus Torvalds Date: Thu Mar 18 16:45:01 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: (39 commits) gigaset: fix build failure bridge: Make first arg to deliver_clone const. bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping. route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() bridge br_multicast: Fix skb leakage in error path. bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message. NET: netpoll, fix potential NULL ptr dereference tipc: fix lockdep warning on address assignment l2tp: Fix UDP socket reference count bugs in the pppol2tp driver smsc95xx: wait for PHY to complete reset during init l2tp: Fix oops in pppol2tp_xmit smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver ne: Do not use slashes in irq name string NET: ksz884x, fix lock imbalance gigaset: correct range checking off by one error bridge: Fix br_forward crash in promiscuous mode bridge: Move NULL mdb check into br_mdb_ip_get ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation myri: remove dead code ... commit 7de4a9a73563e5f6f3c153015fadee433a443241 Merge: 1097d7c f04e879 Author: Linus Torvalds Date: Thu Mar 18 16:44:47 2010 -0700 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sunxvr1000: Add missing FB=y depenency. MAINTAINERS: Add entry for sparc serial drivers. drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields commit 1097d7cef683c30f9768007daae2e961a0686a10 Merge: 57b552b 4e06e24 Author: Linus Torvalds Date: Thu Mar 18 11:04:59 2010 -0700 Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: PCMCIA: resource, fix lock imbalance pcmcia: add important if statement pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket pcmcia: honor saved flags in yenta_socket's I365_CSCINT register pcmcia: revert "irq probe can be done without risking an IRQ storm" pcmcia: pd6729, i82092: use parent (PCI) resources pcmcia/vrc4171: use local spinlock for device local lock. commit 8ad6fcab564c5bc956bdc3dfa440ab152b6e780f Author: Chris Mason Date: Thu Mar 18 12:23:10 2010 -0400 Btrfs: fix the inode ref searches done by btrfs_search_path_in_tree This is used by the inode lookup ioctl to follow all the backrefs up to the subvol root. But the search being done would sometimes land one past the last item in the leaf instead of finding the backref. This changes the search to look for the highest possible backref and hop back one item. It also fixes a leaked path on failure to find the root. Signed-off-by: Chris Mason commit 1b53ac4d1b75b23bdc2b54ace787b8f718a987ef Author: Chris Mason Date: Thu Mar 18 12:17:05 2010 -0400 Btrfs: allow treeid==0 in the inode lookup ioctl When a root id of 0 is sent to the inode lookup ioctl, it will use the root of the file we're ioctling and pass the root id back to userland along with the results. This allows userland to do searches based on that root later on. Signed-off-by: Chris Mason commit 90fdde147fd32d18a20be5b498d5f26e56cca8a3 Author: Chris Mason Date: Thu Mar 18 12:14:54 2010 -0400 Btrfs: return keys for large items to the search ioctl The search ioctl was skipping large items entirely (ones that are too big for the results buffer). This changes things to at least copy the item header so that we can send information about the item back to userland. Signed-off-by: Chris Mason commit abc6e1341bda974e2d0eddb75f57a20ac18e9b33 Author: Chris Mason Date: Thu Mar 18 12:10:08 2010 -0400 Btrfs: fix key checks and advance in the search ioctl The search ioctl was working well for finding tree roots, but using it for generic searches requires a few changes to how the keys are advanced. This treats the search control min fields for objectid, type and offset more like a key, where we drop the offset to zero once we bump the type, etc. The downside of this is that we are changing the min_type and min_offset fields during the search, and so the ioctl caller needs extra checks to make sure the keys in the result are the ones it wanted. This also changes key_in_sk to use btrfs_comp_cpu_keys, just to make things more readable. Signed-off-by: Chris Mason commit 9205124c66a69664c6825501cb062ebd2acd3b3a Author: Grant Likely Date: Thu Mar 18 14:01:18 2010 -0600 powerpc/5200: Build fix for mpc52xx watchdog timer code mpc52xx_gpt_wdt_setup is defined as 0, which causes the following build failure with gcc 4.5, since it's built with -Werror. arch/powerpc/platforms/52xx/mpc52xx_gpt.c:761:3: error: statement with no effect Changing it to a static inline fixes the problem. Reported-by: Jeff Mahoney Signed-off-by: Grant Likely commit 1976152fd8e706135deed6cf333e347c08416056 Author: Grant Likely Date: Thu Mar 18 07:30:31 2010 -0600 of: Fix comparison of "compatible" properties Commit 7c7b60cb87547b1664a4385c187f029bf514a737 "of: put default string compare and #a/s-cell values into common header" Breaks various things on powerpc due to using strncasecmp instead of strcasecmp for comparing against "compatible" strings. This causes things like the 4xx PCI code to fail miserably due to the partial matches in code like this: for_each_compatible_node(np, NULL, "ibm,plb-pcix") ppc4xx_probe_pcix_bridge(np); for_each_compatible_node(np, NULL, "ibm,plb-pci") ppc4xx_probe_pci_bridge(np); It's not quite right to do partial name match. Entries in a compatible list are meant to be matched whole. If a device is compatible with both "foo" and "foo1", then the device should have both strings in its "compatible" property. This patch reverts powerpc and microblaze us to use strcasecmp. Signed-off-by: Benjamin Herrenschmidt (for patch description) Signed-off-by: Grant Likely Acked-by: David S. Miller Acked-by: Michal Simek commit 57b552ba0b2faf7cce66d476ef8ce7f6210c62fd Author: Heiko Carstens Date: Mon Mar 15 00:35:05 2010 -0400 memory hotplug/s390: set phys_device Implement arch specific arch_get_memory_phys_device function and initialize phys_device for each memory section. That way we finally can tell which piece of memory belongs to which physical device. This makes s390's /sys/devices/system/memory/memoryX/phys_device display the correct thing? Signed-off-by: Heiko Carstens Cc: Dave Hansen Cc: Gerald Schaefer Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bc32df00894f0e1dbf583cc3dab210d2969b078a Author: Heiko Carstens Date: Mon Mar 15 00:35:03 2010 -0400 memory hotplug: allow setting of phys_device /sys/devices/system/memory/memoryX/phys_device is supposed to contain the number of the physical device that the corresponding piece of memory belongs to. In case a physical device should be replaced or taken offline for whatever reason it is necessary to set all corresponding memory pieces offline. The current implementation always sets phys_device to '0' and there is no way or hook to change that. Seems like there was a plan to implement that but it wasn't finished for whatever reason. So add a weak function which architectures can override to actually set the phys_device from within add_memory_block(). Signed-off-by: Heiko Carstens Cc: Dave Hansen Cc: Gerald Schaefer Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5d6151115aee73825c1752aff7cd09adfece839 Author: Akinobu Mita Date: Mon Mar 15 00:35:01 2010 -0400 hpet: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Clemens Ladisch Cc: Bob Picco Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4af96449e20f9245cf3d904098db508cdebcda8 Author: Akinobu Mita Date: Mon Mar 15 00:35:00 2010 -0400 ntfs: use bitmap_weight Use bitmap_weight() instead of doing hweight32() for each u32 element in the page. Signed-off-by: Akinobu Mita Cc: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcc54e2a6d8e93ff83ec398511930b0a73e19151 Author: Venkatesh Pallipadi Date: Mon Mar 15 00:34:59 2010 -0400 jffs2: fix up rb_root initializations to use RB_ROOT jffs2 uses rb_node = NULL; to zero rb_root. The problem with this is that 17d9ddc72fb8bba0d4f678 ("rbtree: Add support for augmented rbtrees") in the linux-next tree adds a new field to that struct which needs to be NULL as well. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd. Signed-off-by: Venkatesh Pallipadi Cc: Eric Paris Acked-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9e58a4ec3b1086d1ed8c915311aef1ae55454fd Author: KAMEZAWA Hiroyuki Date: Mon Mar 15 00:34:57 2010 -0400 memcg: avoid use cmpxchg in swap cgroup maintainance swap_cgroup uses 2bytes data and uses cmpxchg in a new operation. 2byte cmpxchg/xchg is not available on some archs. This patch replaces cmpxchg/xchg with operations under lock. Signed-off-by: KAMEZAWA Hiroyuki Reported-by: Sachin Sant wrote: Acked-by: Balbir Singh Acked-by: Daisuke Nishimura Cc: Li Zefan Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 22001a13d09d82772e831dcdac0553994a4bac5d Author: Tilman Schmidt Date: Wed Mar 17 14:22:07 2010 -0700 gigaset: fix build failure Update the dummy LL interface to the LL interface change introduced by commit daab433c03c15fd642c71c94eb51bdd3f32602c8. This fixes the build failure occurring after that commit when enabling ISDN_DRV_GIGASET but neither ISDN_I4L nor ISDN_CAPI. Impact: bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit 5db5b0215af94a36d4bf10900ff9707b6d5c1610 Author: Shane Huang Date: Tue Mar 16 18:08:55 2010 +0800 ahci: pp->active_link is not reliable when FBS is enabled pp->active_link is not reliable when FBS is enabled. Both PORT_SCR_ACT and PORT_CMD_ISSUE should be checked because mixed NCQ and non-NCQ commands may be in flight. Signed-off-by: Shane Huang Signed-off-by: Jeff Garzik commit 9deb343189b3cf45e84dd08480f330575ffe2004 Author: Tejun Heo Date: Tue Mar 16 09:50:26 2010 +0900 ahci: use BIOS date in broken_suspend list HP is recycling both DMI_PRODUCT_NAME and DMI_BIOS_VERSION making ahci_broken_suspend() trigger for later products which are not affected by the original problems. Match BIOS date instead of version and add references to bko's so that full information can be found easier later. This fixes http://bugzilla.kernel.org/show_bug.cgi?id=15462 Signed-off-by: Tejun Heo Reported-by: tigerfishdaisy@gmail.com Signed-off-by: Jeff Garzik commit 603037c3d1a42d5013f035355a2c60b0006a9fdf Author: Tejun Heo Date: Thu Mar 11 11:37:16 2010 +0900 ahci: add missing nv IDs bko#15481 shows that we're missing some NVIDIA ahci PCI IDs. Peer Chen confirms that IDs 0x580-0x58f are reserved for cases where Linux ID option is selected in the BIOS and are only used for mcp65-73. Add 0x0581-0x058f. http://bugzilla.kernel.org/show_bug.cgi?id=15481 Signed-off-by: Tejun Heo Cc: Peer Chen Signed-off-by: Jeff Garzik commit dcd5c1662db59a6b82942f47fb6ac9dd63f6d3dd Author: Frederic Weisbecker Date: Tue Mar 16 01:05:02 2010 +0100 perf: Fix unexported generic perf_arch_fetch_caller_regs perf_arch_fetch_caller_regs() is exported for the overriden x86 version, but not for the generic weak version. As a general rule, weak functions should not have their symbol exported in the same file they are defined. So let's export it on trace_event_perf.c as it is used by trace events only. This fixes: ERROR: ".perf_arch_fetch_caller_regs" [fs/xfs/xfs.ko] undefined! ERROR: ".perf_arch_fetch_caller_regs" [arch/powerpc/platforms/cell/spufs/spufs.ko] undefined! -v2: And also only build it if trace events are enabled. -v3: Fix changelog mistake Reported-by: Stephen Rothwell Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Xiao Guangrong Cc: Paul Mackerras LKML-Reference: <1268697902-9518-1-git-send-regression-fweisbec@gmail.com> Signed-off-by: Ingo Molnar commit e04dd2d21bb70dd707d569d4ac843149b9acfb27 Merge: 2a5e00e 572c0e3 Author: Takashi Iwai Date: Wed Mar 17 09:01:38 2010 +0100 Merge branch 'fix/hda' into for-linus commit 2a5e00ed14e27908dae698900473a65cc53ccd82 Merge: 0e49887 fb40b49 Author: Takashi Iwai Date: Wed Mar 17 09:01:33 2010 +0100 Merge branch 'fix/misc' into for-linus commit 9d296cfa69b3d4abc9d556986d544f0727988eed Author: Kumar Gala Date: Tue Mar 16 23:39:56 2010 -0500 powerpc/fsl-booke: Get coherent bit from PTE We shouldn't be always setting 'M' in the TLB entry since its reasonable for somethings to be mapped non-coherent. The PTE should have 'M' set properly. Signed-off-by: Kumar Gala commit d6ccb1f55ddf5146219707c0e71b85e3a52179b4 Author: Kumar Gala Date: Wed Mar 10 23:33:25 2010 -0600 powerpc/85xx: Make sure lwarx hint isn't set on ppc32 e500v1/v2 based chips will treat any reserved field being set in an opcode as illegal. Thus always setting the hint in the opcode is a bad idea. Anton should be kept away from the powerpc opcode map. Signed-off-by: Kumar Gala commit f04e879bf296d136bcafd8c5a26e95599b141671 Author: David S. Miller Date: Tue Mar 16 14:40:42 2010 -0700 sunxvr1000: Add missing FB=y depenency. Signed-off-by: David S. Miller commit 87faf3ccf1c939938600ab57c6c9ed5bd2e5f4cc Author: David S. Miller Date: Tue Mar 16 14:37:47 2010 -0700 bridge: Make first arg to deliver_clone const. Otherwise we get a warning from the call in br_forward(). Signed-off-by: David S. Miller commit 32dec5dd0233ebffa9cae25ce7ba6daeb7df4467 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 21:51:18 2010 +0000 bridge br_multicast: Don't refer to BR_INPUT_SKB_CB(skb)->mrouters_only without IGMP snooping. Without CONFIG_BRIDGE_IGMP_SNOOPING, BR_INPUT_SKB_CB(skb)->mrouters_only is not appropriately initialized, so we can see garbage. A clear option to fix this is to set it even without that config, but we cannot optimize out the branch. Let's introduce a macro that returns value of mrouters_only and let it return 0 without CONFIG_BRIDGE_IGMP_SNOOPING. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 858a18a6a2f74e8f0e5b2e9671d4b74694aba708 Author: Vitaliy Gusev Date: Tue Mar 16 01:07:51 2010 +0000 route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() route: Fix caught BUG_ON during rt_secret_rebuild_oneshot() Call rt_secret_rebuild can cause BUG_ON(timer_pending(&net->ipv4.rt_secret_timer)) in add_timer as there is not any synchronization for call rt_secret_rebuild_oneshot() for the same net namespace. Also this issue affects to rt_secret_reschedule(). Thus use mod_timer enstead. Signed-off-by: Vitaliy Gusev Acked-by: Neil Horman Signed-off-by: David S. Miller commit 8440853bb70010f2f8edc26cb0f7af60da8b2c5a Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 19:26:56 2010 +0000 bridge br_multicast: Fix skb leakage in error path. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 0ba8c9ec25465cd0680b80c0f5836f558e3b972d Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Mon Mar 15 19:27:00 2010 +0000 bridge br_multicast: Fix handling of Max Response Code in IGMPv3 message. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 21edbb223ed2af88b090e7945af7d91d672e3aa6 Author: Jiri Slaby Date: Tue Mar 16 05:29:54 2010 +0000 NET: netpoll, fix potential NULL ptr dereference Stanse found that one error path in netpoll_setup dereferences npinfo even though it is NULL. Avoid that by adding new label and go to that instead. Signed-off-by: Jiri Slaby Cc: Daniel Borkmann Cc: David S. Miller Acked-by: chavey@google.com Acked-by: Matt Mackall Signed-off-by: David S. Miller commit a2f46ee1ba5ee249ce2ca1ee7a7a0ac46529fb4f Author: Neil Horman Date: Tue Mar 16 08:14:33 2010 +0000 tipc: fix lockdep warning on address assignment So in the forward porting of various tipc packages, I was constantly getting this lockdep warning everytime I used tipc-config to set a network address for the protocol: [ INFO: possible circular locking dependency detected ] 2.6.33 #1 tipc-config/1326 is trying to acquire lock: (ref_table_lock){+.-...}, at: [] tipc_ref_discard+0x53/0xd4 [tipc] but task is already holding lock: (&(&entry->lock)->rlock#2){+.-...}, at: [] tipc_ref_lock+0x43/0x63 [tipc] which lock already depends on the new lock. the existing dependency chain (in reverse order) is: -> #1 (&(&entry->lock)->rlock#2){+.-...}: [] __lock_acquire+0xb67/0xd0f [] lock_acquire+0xdc/0x102 [] _raw_spin_lock_bh+0x3b/0x6e [] tipc_ref_acquire+0xe8/0x11b [tipc] [] tipc_createport_raw+0x78/0x1b9 [tipc] [] tipc_createport+0x8b/0x125 [tipc] [] tipc_subscr_start+0xce/0x126 [tipc] [] process_signal_queue+0x47/0x7d [tipc] [] tasklet_action+0x8c/0xf4 [] __do_softirq+0xf8/0x1cd [] call_softirq+0x1c/0x30 [] _local_bh_enable_ip+0xb8/0xd7 [] local_bh_enable_ip+0xe/0x10 [] _raw_spin_unlock_bh+0x34/0x39 [] spin_unlock_bh.clone.0+0x15/0x17 [tipc] [] tipc_k_signal+0x8d/0xb1 [tipc] [] tipc_core_start+0x8a/0xad [tipc] [] 0xffffffffa01b1087 [] do_one_initcall+0x72/0x18a [] sys_init_module+0xd8/0x23a [] system_call_fastpath+0x16/0x1b -> #0 (ref_table_lock){+.-...}: [] __lock_acquire+0xa11/0xd0f [] lock_acquire+0xdc/0x102 [] _raw_write_lock_bh+0x3b/0x6e [] tipc_ref_discard+0x53/0xd4 [tipc] [] tipc_deleteport+0x40/0x119 [tipc] [] release+0xeb/0x137 [tipc] [] sock_release+0x1f/0x6f [] sock_close+0x27/0x2b [] __fput+0x12a/0x1df [] fput+0x1a/0x1c [] filp_close+0x68/0x72 [] sys_close+0xad/0xe7 [] system_call_fastpath+0x16/0x1b Finally decided I should fix this. Its a straightforward inversion, tipc_ref_acquire takes two locks in this order: ref_table_lock entry->lock while tipc_deleteport takes them in this order: entry->lock (via tipc_port_lock()) ref_table_lock (via tipc_ref_discard()) when the same entry is referenced, we get the above warning. The fix is equally straightforward. Theres no real relation between the entry->lock and the ref_table_lock (they just are needed at the same time), so move the entry->lock aquisition in tipc_ref_acquire down, after we unlock ref_table_lock (this is safe since the ref_table_lock guards changes to the reference table, and we've already claimed a slot there. I've tested the below fix and confirmed that it clears up the lockdep issue Signed-off-by: Neil Horman CC: Allan Stephens Signed-off-by: David S. Miller commit c3259c8a7060d480e8eb2166da0a99d6879146b4 Author: James Chapman Date: Tue Mar 16 06:29:20 2010 +0000 l2tp: Fix UDP socket reference count bugs in the pppol2tp driver This patch fixes UDP socket refcnt bugs in the pppol2tp driver. A bug can cause a kernel stack trace when a tunnel socket is closed. A way to reproduce the issue is to prepare the UDP socket for L2TP (by opening a tunnel pppol2tp socket) and then close it before any L2TP sessions are added to it. The sequence is Create UDP socket Create tunnel pppol2tp socket to prepare UDP socket for L2TP pppol2tp_connect: session_id=0, peer_session_id=0 L2TP SCCRP control frame received (tunnel_id==0) pppol2tp_recv_core: sock_hold() pppol2tp_recv_core: sock_put L2TP ZLB control frame received (tunnel_id=nnn) pppol2tp_recv_core: sock_hold() pppol2tp_recv_core: sock_put Close tunnel management socket pppol2tp_release: session_id=0, peer_session_id=0 Close UDP socket udp_lib_close: BUG The addition of sock_hold() in pppol2tp_connect() solves the problem. For data frames, two sock_put() calls were added to plug a refcnt leak per received data frame. The ref that is grabbed at the top of pppol2tp_recv_core() must always be released, but this wasn't done for accepted data frames or data frames discarded because of bad UDP checksums. This leak meant that any UDP socket that had passed L2TP data traffic (i.e. L2TP data frames, not just L2TP control frames) using pppol2tp would not be released by the kernel. WARNING: at include/net/sock.h:435 udp_lib_unhash+0x117/0x120() Pid: 1086, comm: openl2tpd Not tainted 2.6.33-rc1 #8 Call Trace: [] ? udp_lib_unhash+0x117/0x120 [] ? warn_slowpath_common+0x71/0xd0 [] ? udp_lib_unhash+0x117/0x120 [] ? warn_slowpath_null+0x13/0x20 [] ? udp_lib_unhash+0x117/0x120 [] ? sk_common_release+0x17/0x90 [] ? inet_release+0x33/0x60 [] ? sock_release+0x10/0x60 [] ? sock_close+0xf/0x30 [] ? __fput+0x52/0x150 [] ? filp_close+0x3e/0x70 [] ? put_files_struct+0x62/0xb0 [] ? do_exit+0x5e7/0x650 [] ? mntput_no_expire+0x13/0x70 [] ? filp_close+0x3e/0x70 [] ? do_group_exit+0x2a/0x70 [] ? sys_exit_group+0x11/0x20 [] ? sysenter_do_call+0x12/0x26 Signed-off-by: James Chapman Signed-off-by: David S. Miller commit db443c441e204cecc1bcec490d40997db988ce3a Author: Steve Glendinning Date: Tue Mar 16 09:03:06 2010 +0000 smsc95xx: wait for PHY to complete reset during init This patch ensures the PHY correctly completes its reset before setting register values. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit 3feec9095d12e311b7d4eb7fe7e5dfa75d4a72a5 Author: James Chapman Date: Tue Mar 16 06:46:31 2010 +0000 l2tp: Fix oops in pppol2tp_xmit When transmitting L2TP frames, we derive the outgoing interface's UDP checksum hardware assist capabilities from the tunnel dst dev. This can sometimes be NULL, especially when routing protocols are used and routing changes occur. This patch just checks for NULL dst or dev pointers when checking for netdev hardware assist features. BUG: unable to handle kernel NULL pointer dereference at 0000000c IP: [] pppol2tp_xmit+0x341/0x4da [pppol2tp] *pde = 00000000 Oops: 0000 [#1] SMP last sysfs file: /sys/class/net/lo/operstate Modules linked in: pppol2tp pppox ppp_generic slhc ipv6 dummy loop snd_hda_codec_atihdmi snd_hda_intel snd_hda_codec snd_pcm snd_timer snd soundcore snd_page_alloc evdev psmouse serio_raw processor button i2c_piix4 i2c_core ati_agp agpgart pcspkr ext3 jbd mbcache sd_mod ide_pci_generic atiixp ide_core ahci ata_generic floppy ehci_hcd ohci_hcd libata e1000e scsi_mod usbcore nls_base thermal fan thermal_sys [last unloaded: scsi_wait_scan] Pid: 0, comm: swapper Not tainted (2.6.32.8 #1) EIP: 0060:[] EFLAGS: 00010297 CPU: 3 EIP is at pppol2tp_xmit+0x341/0x4da [pppol2tp] EAX: 00000000 EBX: f64d1680 ECX: 000005b9 EDX: 00000000 ESI: f6b91850 EDI: f64d16ac EBP: f6a0c4c0 ESP: f70a9cac DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068 Process swapper (pid: 0, ti=f70a8000 task=f70a31c0 task.ti=f70a8000) Stack: 000005a9 000005b9 f734c400 f66652c0 f7352e00 f67dc800 00000000 f6b91800 <0> 000005a3 f70ef6c4 f67dcda9 000005a3 f89b192e 00000246 000005a3 f64d1680 <0> f63633e0 f6363320 f64d1680 f65a7320 f65a7364 f65856c0 f64d1680 f679f02f Call Trace: [] ? ppp_push+0x459/0x50e [ppp_generic] [] ? ppp_xmit_process+0x3b6/0x430 [ppp_generic] [] ? ppp_start_xmit+0x10d/0x120 [ppp_generic] [] ? dev_hard_start_xmit+0x21f/0x2b2 [] ? sch_direct_xmit+0x48/0x10e [] ? dev_queue_xmit+0x263/0x3a6 [] ? ip_finish_output+0x1f7/0x221 [] ? ip_forward_finish+0x2e/0x30 [] ? ip_rcv_finish+0x295/0x2a9 [] ? netif_receive_skb+0x3e9/0x404 [] ? e1000_clean_rx_irq+0x253/0x2fc [e1000e] [] ? e1000_clean+0x63/0x1fc [e1000e] [] ? sched_clock_local+0x15/0x11b [] ? net_rx_action+0x96/0x195 [] ? __do_softirq+0xaa/0x151 [] ? do_softirq+0x31/0x3c [] ? irq_exit+0x26/0x58 [] ? do_IRQ+0x78/0x89 [] ? common_interrupt+0x29/0x30 [] ? native_safe_halt+0x2/0x3 [] ? default_idle+0x55/0x75 [] ? c1e_idle+0xd2/0xd5 [] ? cpu_idle+0x46/0x62 Code: 8d 45 08 f0 ff 45 08 89 6b 08 c7 43 68 7e fb 9c f8 8a 45 24 83 e0 0c 3c 04 75 09 80 63 64 f3 e9 b4 00 00 00 8b 43 18 8b 4c 24 04 <8b> 40 0c 8d 79 11 f6 40 44 0e 8a 43 64 75 51 6a 00 8b 4c 24 08 EIP: [] pppol2tp_xmit+0x341/0x4da [pppol2tp] SS:ESP 0068:f70a9cac CR2: 000000000000000c Signed-off-by: James Chapman Signed-off-by: David S. Miller commit d0cad871703b898a442e4049c532ec39168e5b57 Author: Steve Glendinning Date: Tue Mar 16 08:46:46 2010 +0000 smsc75xx: SMSC LAN75xx USB gigabit ethernet adapter driver This patch adds a driver for SMSC's LAN7500 family of USB 2.0 to gigabit ethernet adapters. It's loosely based on the smsc95xx driver but the device registers for LAN7500 are completely different. Signed-off-by: Steve Glendinning Signed-off-by: David S. Miller commit c5e49fb5189dbce00bc37f27c83ab0f9e4748bc6 Author: Atsushi Nemoto Date: Tue Mar 16 05:27:40 2010 +0000 ne: Do not use slashes in irq name string This patch fixes following warning introduced by commit 12bac0d9f4dbf3445a0319beee848d15fa32775e ("proc: warn on non-existing proc entries"): WARNING: at /work/mips-linux/make/linux/fs/proc/generic.c:316 __xlate_proc_name+0xe0/0xe8() name 'RBHMA4X00/RTL8019' Signed-off-by: Atsushi Nemoto Signed-off-by: David S. Miller commit edee39321be9f88c47627379e8abadfce0508768 Author: Jiri Slaby Date: Tue Mar 16 04:53:50 2010 +0000 NET: ksz884x, fix lock imbalance Stanse found that one error path (when alloc_skb fails) in netdev_tx omits to unlock hw_priv->hwlock. Fix that. Signed-off-by: Jiri Slaby Cc: Tristram Ha Cc: David S. Miller Signed-off-by: David S. Miller commit 6ad34145cf809384359fe513481d6e16638a57a3 Author: Tilman Schmidt Date: Tue Mar 16 07:04:01 2010 +0000 gigaset: correct range checking off by one error Correct a potential array overrun due to an off by one error in the range check on the CAPI CONNECT_REQ CIPValue parameter. Found and reported by Dan Carpenter using smatch. Impact: bugfix Signed-off-by: Tilman Schmidt Signed-off-by: David S. Miller commit e8c3753ce4cd6a805ebcfdb3aa6d30e6f4b8b3e0 Author: Dave Chinner Date: Mon Mar 15 02:36:35 2010 +0000 xfs: don't warn about page discards on shutdown If we are doing a forced shutdown, we can get lots of noise about delalloc pages being discarded. This is happens by design during a forced shutdown, so don't spam the logs with these messages. Signed-off-by: Dave Chinner Reviewed-by: Christoph Hellwig Signed-off-by: Alex Elder commit 8a262e573d30187b32b5534ec489446931239cc5 Author: Alex Elder Date: Tue Mar 16 18:55:56 2010 +0000 xfs: use scalable vmap API Re-apply a commit that had been reverted due to regressions that have since been fixed. From 95f8e302c04c0b0c6de35ab399a5551605eeb006 Mon Sep 17 00:00:00 2001 From: Nick Piggin Date: Tue, 6 Jan 2009 14:43:09 +1100 Implement XFS's large buffer support with the new vmap APIs. See the vmap rewrite (db64fe02) for some numbers. The biggest improvement that comes from using the new APIs is avoiding the global KVA allocation lock on every call. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy Only modifications here were a minor reformat, plus making the patch apply given the new use of xfs_buf_is_vmapped(). Modified-by: Alex Elder Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit cd9640a70d542ca026a812ac34733799da0a39c9 Author: Alex Elder Date: Tue Mar 16 18:55:54 2010 +0000 xfs: remove old vmap cache Re-apply a commit that had been reverted due to regressions that have since been fixed. Original commit: d2859751cd0bf586941ffa7308635a293f943c17 Author: Nick Piggin Date: Tue, 6 Jan 2009 14:40:44 +1100 XFS's vmap batching simply defers a number (up to 64) of vunmaps, and keeps track of them in a list. To purge the batch, it just goes through the list and calls vunamp on each one. This is pretty poor: a global TLB flush is generally still performed on each vunmap, with the most expensive parts of the operation being the broadcast IPIs and locking involved in the SMP callouts, and the locking involved in the vmap management -- none of these are avoided by just batching up the calls. I'm actually surprised it ever made much difference. (Now that the lazy vmap allocator is upstream, this description is not quite right, but the vunmap batching still doesn't seem to do much). Rip all this logic out of XFS completely. I will improve vmap performance and scalability directly in subsequent patch. Signed-off-by: Nick Piggin Reviewed-by: Christoph Hellwig Signed-off-by: Lachlan McIlroy The only change I made was to use the "new" xfs_buf_is_vmapped() function in a place it had been open-coded in the original. Modified-by: Alex Elder Signed-off-by: Christoph Hellwig Signed-off-by: Alex Elder commit 14b5d6dd40b3091cb5f566568baa4a74dc619286 Author: Florian Fainelli Date: Wed Mar 10 18:32:18 2010 +0100 leds: Fix race between LED device uevent and actual attributes creation If we were to dynamically register/unregister leds and have udev or other daemons handle the leds class uevents, we would be notified of the adding of a new LED and if the daemon immediately tries to open one of the attributes of the led device, it would fail with a "no such file or directory" error since this the attributes are not yet created. Fix this by switching attributes to be class-wide, such that the driver core will register these attributes with device_add_attrs and then emit the kobject_uevent ADD signal. Signed-off-by: Fainelli Signed-off-by: Richard Purdie commit ec57af9c2ece22ae6234189972105d777ff5f939 Author: Bruno Prémont Date: Fri Feb 26 13:20:10 2010 +0100 backlight: panasonic-laptop - Fix incomplete registration failure handling Properly return backlight registration error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Acked-by: Harald Welte (registration failure) Signed-off-by: Richard Purdie commit 28d85873cd6d8d3176e30e02b941b1329df1024c Author: Bruno Prémont Date: Fri Feb 26 13:17:16 2010 +0100 backlight: msi-laptop, msi-wmi: fix incomplete registration failure handling Properly return backlight registration error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Reviewed-by: Anisse Astier Signed-off-by: Richard Purdie commit fa11de0a33e214a00e205494c27fb5a7bb71a5fa Author: Bruno Prémont Date: Fri Feb 26 13:04:54 2010 +0100 backlight: blackfin - Fix missing registration failure handling Check newly registered backlight_device for error and properly return error to parent Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Acked-by: Mike Frysinger (constify struct backlight_ops) Signed-off-by: Richard Purdie commit f0af78991363d704694a3618b638662c97d8a110 Author: Bruno Prémont Date: Fri Feb 26 12:59:39 2010 +0100 backlight: classmate-laptop - Fix missing registration failure handling Check newly registered backlight_device for error and properly return error to parent. Mark struct backlight_ops as const. Signed-off-by: Bruno Prémont Signed-off-by: Richard Purdie commit 36bc5ee6a8d13333980fa54e97d3469d3d4cda98 Author: Evan McClain Date: Tue Mar 9 19:20:58 2010 -0500 backlight: mbp_nvidia_bl - add five more MacBook variants This adds the MacBook 1,1 2,1 3,1 4,1 and 4,2 to the DMI tables. Signed-off-by: Evan McClain Signed-off-by: Richard Purdie commit 0493a4ff10959ff4c8e0d65efee25b7ffd4fa5db Author: Anton Vorontsov Date: Thu Mar 11 13:58:47 2010 -0800 leds-gpio: fix default state handling on OF platforms The driver wrongly sets default state for LEDs that don't specify default-state property. Currently the driver handles default state this way: memset(&led, 0, sizeof(led)); for_each_child_of_node(np, child) { state = of_get_property(child, "default-state", NULL); if (state) { if (!strcmp(state, "keep")) led.default_state = LEDS_GPIO_DEFSTATE_KEEP; ... } ret = create_gpio_led(&led, ...); } Which means that all LEDs that do not specify default-state will inherit the last value of the default-state property, which is wrong. This patch fixes the issue by moving LED's template initialization into the loop body. Signed-off-by: Anton Vorontsov Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit 72dcd8d08aca4ac6154dc37243880ee306c7ea73 Author: Bob Rodgers Date: Wed Feb 17 15:23:31 2010 -0600 leds: Add Dell Business Class Netbook LED driver This patch adds an LED driver to support the Dell Activity LED on the Dell Latitude 2100 netbook and future products to come. The Activity LED is visible externally in the lid so classroom instructors can observe it from a distance. The driver uses the sysfs led_class and provides a standard LED interface. Signed-off by: Bob Rodgers Signed-off-by: Louis Davis Signed-off-by: Jim Dailey , Developers Acked-by: Matthew Garrett Acked-by: Dmitry Torokhov Signed-off-by: Richard Purdie commit d09e16664be88dc8463fe7508a2123460bf6d676 Author: H Hartley Sweeten Date: Wed Jan 20 16:08:30 2010 -0700 leds: Kconfig cleanup Remove the need for "depends on LEDS_CLASS" by wrapping the affected config options in an if/endif block. Similar for "depends on LEDS_TRIGGERS". LEDS_COBALT_RAQ still has a "depends on LEDS_CLASS=y" since it cannot be selected to build as a module. Signed-off-by: H Hartley Sweeten Signed-off-by: Richard Purdie commit bb9b6ef70f08f256ab4b8ec127c17ee629b85350 Author: H Hartley Sweeten Date: Wed Jan 6 15:34:55 2010 -0700 leds: led-class.c - Quiet boot messages As each led device gets registered a kernel message gets printed. In an embedded system with a number of leds this can produce a lot of output that just looks like noise. Change the message type to KERN_DEBUG since it might be useful in the dmesg output "after" booting. Signed-off-by: H Hartley Sweeten Signed-off-by: Richard Purdie commit 5e89a3484dea8a3d962f83fe497d064fbcde4e55 Author: Márton Németh Date: Sun Jan 10 01:11:03 2010 +0100 leds: make PCI device id constant The id_table field of the struct pci_driver is constant in so it is worth to make pci_device_id also constant. The semantic match that finds this kind of pattern is as follows: (http://coccinelle.lip6.fr/) // @r@ disable decl_init,const_decl_init; identifier I1, I2, x; @@ struct I1 { ... const struct I2 *x; ... }; @s@ identifier r.I1, y; identifier r.x, E; @@ struct I1 y = { .x = E, }; @c@ identifier r.I2; identifier s.E; @@ const struct I2 E[] = ... ; @depends on !c@ identifier r.I2; identifier s.E; @@ + const struct I2 E[] = ...; // Signed-off-by: Márton Németh Signed-off-by: Richard Purdie commit 936034026280facd7050c96c3b28339f28b09cdd Author: Daniel Mack Date: Sun Jan 10 13:27:54 2010 +0100 leds: ALIX2: Add dependency to !GPIO_CS5335 The ALIX2 LED driver and the CS5535 GPIO drivers share the same I/O range which causes a conflict if they're both enabled. Fix this for now by adding Kconfig dependencies. While at it, also drop the EXPERIMENTAL flag, as the code has been around for awhile already. Note that this is a hack. At some point, a real platform support for this board should be added which handles the LEDs via the leds-gpio driver. Signed-off-by: Daniel Mack Signed-off-by: Richard Purdie commit a19a6ee6cad2b20292a774c2f56ba8039b0fac9c Author: Matthew Garrett Date: Wed Feb 17 16:39:44 2010 -0500 backlight: Allow properties to be passed at registration Values such as max_brightness should be set before backlights are registered, but the current API doesn't allow that. Add a parameter to backlight_device_register and update drivers to ensure that they set this correctly. Signed-off-by: Matthew Garrett Signed-off-by: Richard Purdie commit 57e148b6a975980944f4466ccb669b1d02dfc6a1 Author: Bruno Prémont Date: Sun Feb 21 00:20:01 2010 +0100 backlight: Add backlight_device parameter to check_fb check_fb from backlight_ops lacks a reference to the backlight_device that's being referred to. Add this parameter so a backlight_device can be mapped to a single framebuffer, especially if the same driver handles multiple devices on a single system. Signed-off-by: Bruno Prémont Signed-off-by: Richard Purdie commit a4ebb780e194e8751dc22deeabcddd3fdc8f18f0 Author: Jiri Slaby Date: Tue Feb 2 14:44:50 2010 -0800 video: backlight/progear, fix pci device refcounting Stanse found an ommitted pci_dev_puts on error path in progearbl_probe. pmu_dev and sb_dev are gotten, but never put when backlight_device_register fails. So unify fail paths and put the devs when the failure occurs. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Richard Purdie commit c3cf2e44d3bbc694eccef33b0f2fe8e2d89baae7 Author: Alberto Panizzo Date: Tue Jan 19 09:30:50 2010 +0100 backlight: l4f00242t03: Fix module licence absence. Signed-off-by: Alberto Panizzo Signed-off-by: Richard Purdie commit b4144e4f6e3b448d322095ca08af393682a69e33 Author: Richard Purdie Date: Mon Jan 18 14:16:07 2010 +0000 backlight: Revert some const qualifiers 9905a43b2d563e6f89e4c63c4278ada03f2ebb14 went a little to far with const qualifiers as there are legitiment cases where the function pointers can change (machine specific setup code for example). Signed-off-by: Richard Purdie commit e7fb9c4ad351a8da7c09e182bd2e7ccd043daf08 Author: Alberto Panizzo Date: Fri Dec 18 16:42:11 2009 +0100 backlight: Add Epson L4F00242T03 LCD driver The Epson LCD L4F00242T03 is mounted on the Freescale i.MX31 PDK board. Based upon Marek Vasut work in l4f00242t03.c, this driver provides basic init and power on/off functionality for this device through the sysfs lcd interface. Unfortunately Datasheet for this device are not available and all the control sequences sent to the display were copied from the freescale driver that in the i.MX31 Linux BSP. As in the i.MX31PDK board the core and io suppliers are voltage regulators, that functionality is embedded here, but not strict. Signed-off-by: Alberto Panizzo Signed-off-by: Richard Purdie commit 7fde62bffb576d384ea49a3aed3403d5609ee5bc Author: Chris Mason Date: Tue Mar 16 15:40:10 2010 -0400 Btrfs: buffer results in the space_info ioctl The space_info ioctl was using copy_to_user inside rcu_read_lock. This commit changes things to copy into a buffer first and then dump the result down to userland. Signed-off-by: Chris Mason commit ce769a2904bf5a9110ef534a7702397e38e2b3e9 Author: Sage Weil Date: Tue Mar 16 00:02:26 2010 +0000 Btrfs: use __u64 types in ioctl.h Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit 854d2c3531e6d32e76b94ca5e096ea54c7497e40 Author: Sage Weil Date: Tue Mar 16 00:02:25 2010 +0000 Btrfs: fix search_ioctl key advance key->type is u8, not u64. fs/btrfs/ioctl.c: In function 'copy_to_sk': fs/btrfs/ioctl.c:1024: warning: comparison is always true due to limited range of data type Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit 4e06e240dcbb803433ee31bfe89a3e785a77cd3b Author: Jiri Slaby Date: Tue Mar 16 15:57:44 2010 +0100 PCMCIA: resource, fix lock imbalance Stanse found that one error path (when alloc_skb fails) in netdev_tx omits to unlock hw_priv->hwlock. Fix that by moving away from unlock in each fail path. Unlock at one place instead. Introduced in 94a819f80297e1f635a7cde4ed5317612e512ba7 (pcmcia: assert locking to struct pcmcia_device) Signed-off-by: Jiri Slaby Signed-off-by: Dominik Brodowski commit e639ba481b76e445df354acd6e29d859a9b1657f Author: Bruno Prémont Date: Mon Mar 15 19:00:27 2010 +0100 HID: avoid '\0' in hid debugfs events file When dumping /sys/kernel/debug/hid/$device/events '\0' characters show up (invisible if cat to console but shown by less or while looking at a dump file). These are due to hid_debug_event() adding strlen()+1 bytes to the ring buffer (e.g. including the trailing '\0'). Any roll-over causes a '\0' as well as hid_debug_event() handles the ring buffers with HID_DEBUG_BUFSIZE-1 size while hid_debug_events_read() handles it with full HID_DEBUG_BUFSIZE size. Signed-off-by: Bruno Prémont Signed-off-by: Jiri Kosina commit 6404fccafa3bfdc0602130a87f4d93baf928bea4 Author: David S. Miller Date: Tue Mar 16 01:00:17 2010 -0700 MAINTAINERS: Add entry for sparc serial drivers. Signed-off-by: David S. Miller commit 935050daad4c0ce687f7111995ed7791796deff9 Author: Julia Lawall Date: Tue Mar 16 00:33:37 2010 -0700 drivers/serial/sunsab.c: adjust the constant used to initialize the interrupt_mask0 fields From: Julia Lawall SAB82532_ISR0_TCD is declared in drivers/serial/subsab.h as relating to a status register, while SAB82532_IMR0_TCD is declared in the same file as relating to a mask register. The latter seems more appropriate for the interrupt_mask0 field, and follows the strategy for initializing this field elsewhere in the same file. Both SAB82532_ISR0_TCD and SAB82532_IMR0_TCD have the same value. Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 7f7708f0055e49e331f267700aa8b2ee879f004c Author: Michael Braun Date: Tue Mar 16 00:26:22 2010 -0700 bridge: Fix br_forward crash in promiscuous mode From: Michael Braun bridge: Fix br_forward crash in promiscuous mode It's a linux-next kernel from 2010-03-12 on an x86 system and it OOPs in the bridge module in br_pass_frame_up (called by br_handle_frame_finish) because brdev cannot be dereferenced (its set to a non-null value). Adding some BUG_ON statements revealed that BR_INPUT_SKB_CB(skb)->brdev == br-dev (as set in br_handle_frame_finish first) only holds until br_forward is called. The next call to br_pass_frame_up then fails. Digging deeper it seems that br_forward either frees the skb or passes it to NF_HOOK which will in turn take care of freeing the skb. The same is holds for br_pass_frame_ip. So it seems as if two independent skb allocations are required. As far as I can see, commit b33084be192ee1e347d98bb5c9e38a53d98d35e2 ("bridge: Avoid unnecessary clone on forward path") removed skb duplication and so likely causes this crash. This crash does not happen on 2.6.33. I've therefore modified br_forward the same way br_flood has been modified so that the skb is not freed if skb0 is going to be used and I can confirm that the attached patch resolves the issue for me. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit fb40b496ad8bbe60a60c25eb2fce20f3cc114679 Author: Dan Carpenter Date: Tue Mar 16 09:46:23 2010 +0300 sound: sequencer: clean up remove bogus check A few lines earlier bend is limited to 2399. So semitones is always less than 24 here. Signed-off-by: Dan Carpenter Signed-off-by: Takashi Iwai commit a9104f989916aac5d92bfa2c51915d5985fb2e6c Merge: ad6cfc2 89c0ac7 Author: Takashi Iwai Date: Tue Mar 16 07:50:49 2010 +0100 Merge branch 'topic/misc' into fix/misc commit 572c0e3c73341755f3e7dfaaef6b26df12bd709c Author: Daniel T Chen Date: Sun Mar 14 23:44:03 2010 -0400 ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212 BugLink: https://bugs.launchpad.net/bugs/538895 The OR has verified that both position_fix=1 and model=6stack-dig are necessary to have capture function properly. (The existing 3stack-6ch model quirk seems to be incorrect.) Reported-by: Reuben Bailey Tested-by: Reuben Bailey Cc: Signed-off-by: Daniel T Chen Signed-off-by: Takashi Iwai commit 627a2d3c29427637f4c5d31ccc7fcbd8d312cd71 Author: NeilBrown Date: Mon Mar 8 16:44:38 2010 +1100 md: deal with merge_bvec_fn in component devices better. If a component device has a merge_bvec_fn then as we never call it we must ensure we never need to. Currently this is done by setting max_sector to 1 PAGE, however this does not stop a bio being created with several sub-page iovecs that would violate the merge_bvec_fn. So instead set max_segments to 1 and set the segment boundary to the same as a page boundary to ensure there is only ever one single-page segment of IO requested at a time. This can particularly be an issue when 'xen' is used as it is known to submit multiple small buffers in a single bio. Signed-off-by: NeilBrown Cc: stable@kernel.org commit 0821ec55bb1382dd3b9476dc15d5dbbb19f0c3fd Author: Herbert Xu Date: Mon Mar 15 20:38:25 2010 -0700 bridge: Move NULL mdb check into br_mdb_ip_get Since all callers of br_mdb_ip_get need to check whether the hash table is NULL, this patch moves the check into the function. This fixes the two callers (query/leave handler) that didn't check it. Reported-by: Michael Braun Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d00561a2f64b381aefb41f4a140ff5dc373b52e7 Author: Lars Ellenberg Date: Mon Mar 15 19:09:28 2010 -0700 ISDN: Add PCI ID for HFC-2S/4S Beronet Card PCIe A few subdevice IDs seem to have been dropped when hfc_multi was included upstream, just compare the list at http://www.openvox.cn/viewvc/misdn/trunk/hfc_multi.c?revision=75&view=annotate#l175 with the IDs in drivers/isdn/hardware/mISDN/hfcmulti.c Added PCIe 2 Port card and LED settings (same as PCI) Do not use /KKe Signed-off-by: Lars Ellenberg Signed-off-by: Karsten Keil Signed-off-by: David S. Miller commit 4961e02f1999e1c3468c09b2669c94d7c3ae82a8 Merge: d14a0eb a3d3203 Author: David S. Miller Date: Mon Mar 15 16:23:54 2010 -0700 Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ commit 0e17226f7cd289504724466f4298abc9bdfca3fe Author: Ben Dooks Date: Mon Mar 15 23:08:03 2010 +0000 ARM: SAMSUNG: Fixup commit 4e6d488af37980d224cbf298224db6173673f362 Commit 4e6d488af37980d224cbf298224db6173673f362 either missed out the following machine files or somehow managed to clash between merges. Fixup the three files missing the second parameter to addruart macro to allow them to build. Fixes the following warnings in arch/arm/kernel/debug.c: arch/arm/kernel/debug.S: Assembler messages: arch/arm/kernel/debug.S:167: Error: too many positional arguments arch/arm/kernel/debug.S:183: Error: too many positional arguments Signed-off-by: Ben Dooks commit d14a0ebda7d3daede1a99c01527affb9ceaa4c22 Author: Gerrit Renker Date: Sun Mar 14 20:13:19 2010 +0000 net-2.6 [Bug-Fix][dccp]: fix oops caused after failed initialisation dccp: fix panic caused by failed initialisation This fixes a kernel panic reported thanks to Andre Noll: if DCCP is compiled into the kernel and any out of the initialisation steps in net/dccp/proto.c:dccp_init() fail, a subsequent attempt to create a SOCK_DCCP socket will panic, since inet{,6}_create() are not prevented from creating DCCP sockets. This patch fixes the problem by propagating a failure in dccp_init() to dccp_v{4,6}_init_net(), and from there to dccp_v{4,6}_init(), so that the DCCP protocol is not made available if its initialisation fails. Signed-off-by: Gerrit Renker Signed-off-by: David S. Miller commit b8d689743106bab5c49dda87080e76aa78db8a56 Author: Dan Carpenter Date: Sun Mar 14 22:24:08 2010 +0000 myri: remove dead code We can never reach the return statement. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 873a69a358a6b393fd8d9d92e193ec8895cac4d7 Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: prune use of tty_buffer_request_room Calling tty_buffer_request_room() before tty_insert_flip_string() is unnecessary, costs CPU and for big buffers can mess up the multi-page allocation avoidance. Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: Alan Cox , stable@kernel.org Signed-off-by: David S. Miller commit 3a0a3a6b92edf181f849ebd8417122392ba73a96 Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: correct clearing of at_state strings on RING In RING handling, clear the table of received parameter strings in a loop like everywhere else, instead of by enumeration which had already gotten out of sync. Impact: minor bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: stable@kernel.org Signed-off-by: David S. Miller commit bc35b4e347c047fb1c665bb761ddb22482539f7f Author: Tilman Schmidt Date: Sun Mar 14 12:58:05 2010 +0000 gigaset: avoid registering CAPI driver more than once Registering/unregistering the Gigaset CAPI driver when a device is connected/disconnected causes an Oops when disconnecting two Gigaset devices in a row, because the same capi_driver structure gets unregistered twice. Fix by making driver registration/unregistration a separate operation (empty in the ISDN4Linux case) called when the main module is loaded/unloaded. Impact: bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil CC: stable@kernel.org Signed-off-by: David S. Miller commit 4d823be98c5b24d94c7f41a384a4bb60d7848ad5 Author: Christoph Egger Date: Thu Mar 11 12:07:54 2010 +0000 obsolete config in kernel source: HSO_AUTOPM CONFIG_HSO_AUTOPM is set by KConfig / set in the Kernel source, makefiles and won't be ever set this way, therefor simply removing the protected code. Signed-off-by: Christoph Egger Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 6329da5f258ae752d1f33b549bae4f8a20b6871a Author: Christoph Egger Date: Thu Mar 11 12:07:52 2010 +0000 obsolete config in kernel source: USE_INTERNAL_TIMER CONFIG_USE_INTERNAL_TIMER seems to be the remainings of some experiment. It is explicitely #undef-ed as not working, only referenced from one source file and rather aged. Hereby cleaning it from the kernel tree. Signed-off-by: Christoph Egger Acked-by: Roel Kluin Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit d287d66ee460b8d90b9ac840dd37f524a289bf97 Author: Akinobu Mita Date: Thu Mar 11 12:07:50 2010 +0000 atm: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Chas Williams Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit a1ca14ac54675d3bf48d442b5a7b9eba133f1888 Author: Akinobu Mita Date: Thu Mar 11 12:07:49 2010 +0000 phonet: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: "David S. Miller" Signed-off-by: Andrew Morton Acked-by: Rémi Denis-Courmont Signed-off-by: David S. Miller commit f28f9e43b3d81d1e69da0ebf77c8a6780cb5e0c8 Author: Randy Dunlap Date: Fri Mar 12 19:23:27 2010 +0000 timestamping: fix example build Fix Makefiles so that Documentation/networking/timestamping/timestamping.c will build when using the CONFIG_BUILD_DOCSRC kconfig option. (timestamping.c does not build currently with its simple Makefile.) Also fix printf format warnings. Signed-off-by: Randy Dunlap Cc: Patrick Ohly Signed-off-by: David S. Miller commit 65e543f12cb7f98cb041a759a21685569eec8695 Author: Ben Dooks Date: Mon Mar 15 22:57:18 2010 +0000 ARM: SAMSUNG: Fix build error from stale define in The decleration of error() as static in the platform specific uncompress code in arch/arm/plat-samsung/include/plat/uncomopress.h causes the build of the uncompressor to break. Remove it, as it is no longer needed. arch/arm/boot/compressed/decompress.o: In function `gunzip': /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:67: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:73: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:80: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:95: undefined reference to `error' /var/tmp/kernel-orig/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:152: undefined reference to `error' Signed-off-by: Ben Dooks commit 876e956f207373f974f2808c36aabcd4e32c9ee4 Author: Julia Lawall Date: Tue Mar 9 11:14:11 2010 +0000 drivers/net: drop redundant memset The region set by the call to memset is immediately overwritten by the subsequent call to memcpy. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression e1,e2,e3,e4; @@ - memset(e1,e2,e3); memcpy(e1,e4,e3); // Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit 255f5c327ec3a1d77fe54ef5773ef5eaf7c35a3e Author: Ian Munsie Date: Thu Mar 11 12:07:25 2010 +0000 i4l: change magic numbers in Eicon DIVA ISDN driver to symbolic names Replace references to the '20' magic number found throughout the Eicon ISDN driver for the length of the station_id field in the T30_INFO struct with the T30_MAX_STATION_ID_LENGTH symbolic constant. Signed-off-by: Ian Munsie Cc: Armin Schindler Cc: Karsten Keil Cc: Stoyan Gaydarov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 8b4017d8c191822f1c93744e7876c9020e6209aa Author: Ian Munsie Date: Thu Mar 11 12:07:24 2010 +0000 i4l: silence compiler warnings for array access in Eicon DIVA ISDN driver When compiling this driver, the compiler throws the following warnings: drivers/isdn/hardware/eicon/message.c:8426: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8427: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8434: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8435: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8436: warning: array subscript is above array bounds drivers/isdn/hardware/eicon/message.c:8447: warning: array subscript is above array bounds This arises from the particular semantics the driver is using to write to the nlc array (static byte[256]). The array has a length in byte 0 followed by a T30_INFO struct starting at byte 1. The T30_INFO struct has a number of variable length strings after the station_id entry, which cannot be explicitly defined in the struct and the driver accesses them with an array index to station_id beyond the length of station_id. This patch merely changes the semantics that the driver uses to access the entries after the station_id entry to use the original 256 byte nlc array taking the offset and length of the station_id entry to calculate where to write in the array, thereby silencing the warning. Signed-off-by: Ian Munsie Cc: Armin Schindler Cc: Karsten Keil Cc: Stoyan Gaydarov Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit dec9951b8ad86c591af7b452966bf48b307a4010 Author: Roel Kluin Date: Thu Mar 11 12:07:22 2010 +0000 isdn: misplaced parenthesis in pof_handle_data() The parenthesis was misplaced. Signed-off-by: Roel Kluin Cc: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 9baddeb8c6c7faa7da8706ad629f09ca221850c1 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:02 2010 +0000 bnx2x: change smp_mb() comment to conform the true Access to fp->tx_bp_prod is protected by __netif_tx_lock, smp_mb() is not needed for that. Signed-off-by: Stanislaw Gruszka Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 0efc22f3afa5d8f070a33fea06162d7d9d518e38 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:01 2010 +0000 bnx2x: remove not necessary compiler barrier Access to fp->tx_bd_prod is protected by __netif_tx_lock, so we do not need any barrier for that. Update of fp->tx_bd_cons in bnx2x_tx_int() is not protected by lock, but barrier() nor smb_mb() in bnx2x_tx_avail() not guarantee we will see values that is written on other cpu. Ordering issues between netif_tx_stop_queue(), netif_tx_queue_stopped(), fp->tx_bd_cons = bd_cons and bnx2x_tx_avail() are already handled by smp_mb() in bnx2x_tx_int() and bnx2x_start_xmit(). Signed-off-by: Stanislaw Gruszka Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 2d99cf16f42b1979a2c498bb6d09498dbd689978 Author: Stanislaw Gruszka Date: Tue Mar 9 06:55:00 2010 +0000 bnx2x: use smp_mb() to keep ordering of read write operations Since we want to keep ordering of write to fp->bd_tx_cons and netif_tx_queue_stopped(txq), what is read of txq->state, we have to use general memory barrier. Signed-off-by: Stanislaw Gruszka Signed-off-by: David S. Miller commit d4a2ac3e802d9f598453a7854d0fdf67371ac2dd Author: Ajit Khaparde Date: Thu Mar 11 01:35:59 2010 +0000 be2net: fix mccq create for big endian architectures The request to create an mccq was being dispatched without doing a byte swap of num_pages. This byte swap is necessary for Big Endian systems like PPC. Not having this fix leads mccq create to fail on BE ASICs running newer version of firmware, thereby causing driver initialization failure. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit d4fdcd923daf9d03d2e1b956d66f05c3f2ca4c43 Author: chaithrika@ti.com Date: Wed Mar 10 22:37:56 2010 +0000 TI DaVinci EMAC: Convert to dev_pm_ops Migrate from the legacy PM hooks to use dev_pm_ops structure. Signed-off-by: Chaithrika U S Acked-by: Kevin Hilman Signed-off-by: David S. Miller commit be5bce2bf5cfe021bc6bdff4d49fa18776bc293d Author: Sekhar Nori Date: Tue Mar 9 01:20:37 2010 +0000 net: davinci emac: use dma_{map, unmap}_single API for cache coherency The davinci emac driver uses some ARM specific DMA APIs for cache coherency which have been removed from kernel with the 2.6.34 merge. Modify the driver to use the dma_{map, unmap}_single() APIs defined in dma-mapping.h Without this fix, the driver fails to compile on Linus's tree. Tested on DM365 and OMAP-L138 EVMs. Signed-off-by: Sekhar Nori Acked-by: Kevin Hilman Signed-off-by: David S. Miller commit e79032aa75af76a14e2cdd973b199855e7761881 Author: Vasily Khoruzhick Date: Mon Mar 15 16:27:08 2010 +0200 ARM: SAMSUNG: Add suspend/resume support for S3C PWM driver Reset period_ns and duty_ns values in suspend handler to avoid skip of configuration if same values passed to pwm_config; Restore invertion bit in resume handler. Without this patch PWM works incorrectly after resume from suspend. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 664e87e47e086962a832f9a613a8fd4042a02ac1 Author: Vasily Khoruzhick Date: Sun Mar 14 16:32:28 2010 +0200 ARM: S3C2440: Fix s3c2440 cpufreq compilation post move. Fix compilation issue by moving s3c2440-cpufreq.c into mach-s3c2440 directory Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 211a0d941b1924e667483f822a55e2cc694cd212 Author: David S. Miller Date: Mon Mar 15 15:23:30 2010 -0700 e100: Fix ring parameter change handling regression. When the PCI pool changes were added to fix resume failures: commit 98468efddb101f8a29af974101c17ba513b07be1 e100: Use pci pool to work around GFP_ATOMIC order 5 memory allocation failu and commit 70abc8cb90e679d8519721e2761d8366a18212a6 e100: Fix broken cbs accounting due to missing memset. This introduced a problem that can happen if the TX ring size is increased. We need to size the PCI pool using cbs->max instead of the default cbs->count value. Signed-off-by: David S. Miller commit 0d5e6f7ae8609b944c08e8a2f63f7d169c548134 Author: Russell King Date: Mon Mar 15 22:04:24 2010 +0000 ARM: Fix RiscPC decompressor build errors arch/arm/boot/compressed/decompress.o: In function `do_decompress': decompress.c:(.text+0x26e8): undefined reference to `error' decompress.c:(.text+0x2760): undefined reference to `error' decompress.c:(.text+0x27d8): undefined reference to `error' decompress.c:(.text+0x2824): undefined reference to `error' decompress.c:(.text+0x28f0): undefined reference to `error' Signed-off-by: Russell King commit cfbc0683af235106e7dabe92003870b82ad6f0ba Author: NeilBrown Date: Thu Mar 11 11:20:17 2010 +1100 NFS: ensure bdi_unregister is called on mount failure. bdi_unregister is called by nfs_put_super which is only called by generic_shutdown_super if ->s_root is not NULL. So if we error out in a circumstance where we called nfs_bdi_register (i.e. server != NULL) but have not set s_root, then we need to call bdi_unregister explicitly in nfs_get_sb and various other *_get_sb() functions. Signed-off-by: NeilBrown Signed-off-by: Trond Myklebust commit ccf50e2341c4174d5579315e184ea312081acec6 Author: Russell King Date: Mon Mar 15 19:03:06 2010 +0000 ARM: Fix sorting of platform group config options and includes ... and document the sorting criteria to help future additions. Signed-off-by: Russell King commit 8e4971f2fb2380ce66196136e113d04196b80fcd Author: Anders Grafström Date: Mon Mar 15 16:04:14 2010 +0100 ARM: 5991/1: Fix regression in restore_user_regs macro ARMv5T and earlier require that a ldm {}^ instruction is not followed by an instruction that accesses banked registers. This patch restores the nop that was lost in commit b86040a59feb255a8193173caa4d5199464433d5. Signed-off-by: Anders Grafström Signed-off-by: Russell King commit 8212cf7583a5ba5d213d9c9180be808222a2813f Author: Dan Carpenter Date: Mon Mar 15 11:22:26 2010 +0300 cifs: trivial white space I fixed the indent level. Signed-off-by: Dan Carpenter Signed-off-by: Steve French commit ef5780c018ed169a77b623f87c4ba52faa8ad0fe Author: Nick Piggin Date: Mon Mar 15 11:05:29 2010 -0400 Btrfs: fix gfp flags masking in the compression code GFP_FS must be masked out, NOFS can't be or'd in. Signed-off-by: Chris Mason commit 5ff7ba3a797a8ffd5299b8477df2dca3c3ebd34e Author: Chris Mason Date: Mon Mar 15 10:21:30 2010 -0400 Btrfs: don't look at bio flags after submit_bio After callling submit_bio, the bio can be freed at any time. The btrfs submission thread helper was checking the bio flags too late, which might not give the correct answer. When CONFIG_DEBUG_PAGE_ALLOC is turned on, it can lead to oopsen. Signed-off-by: Chris Mason commit a343832f1a55c74791a8a37053fc02ad80640710 Author: Xiao Guangrong Date: Wed Jan 6 11:48:18 2010 +0000 btrfs: using btrfs_stack_device_id() get devid We can use btrfs_stack_device_id() to get dev_item->devid Signed-off-by: Xiao Guangrong Signed-off-by: Chris Mason commit 91748467a5c5884e44ad5cf58630c0c28474f1f6 Author: Akinobu Mita Date: Sun Feb 28 10:59:11 2010 +0000 btrfs: use memparse Use memparse() instead of its own private implementation. Signed-off-by: Akinobu Mita Cc: Chris Mason Cc: linux-btrfs@vger.kernel.org Signed-off-by: Chris Mason commit 1406e4327be3a533a2b18582f715ce2cfbcf6804 Author: Josef Bacik Date: Wed Jan 13 18:19:06 2010 +0000 Btrfs: add a "df" ioctl for btrfs df is a very loaded question in btrfs. This gives us a way to get the per-space usage information so we can tell exactly what is in use where. This will help us figure out ENOSPC problems, and help users better understand where their disk space is going. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 2ac55d41b5d6bf49e76bc85db5431240617e2f8f Author: Josef Bacik Date: Wed Feb 3 19:33:23 2010 +0000 Btrfs: cache the extent state everywhere we possibly can V2 This patch just goes through and fixes everybody that does lock_extent() blah unlock_extent() to use lock_extent_bits() blah unlock_extent_cached() and pass around a extent_state so we only have to do the searches once per function. This gives me about a 3 mb/s boots on my random write test. I have not converted some things, like the relocation and ioctl's, since they aren't heavily used and the relocation stuff is in the middle of being re-written. I also changed the clear_extent_bit() to only unset the cached state if we are clearing EXTENT_LOCKED and related stuff, so we can do things like this lock_extent_bits() clear delalloc bits unlock_extent_cached() without losing our cached state. I tested this thoroughly and turned on LEAK_DEBUG to make sure we weren't leaking extent states, everything worked out fine. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 5a1a3df1f6c86926cfe8657e6f9b4b4c2f467d60 Author: Josef Bacik Date: Tue Feb 2 20:51:14 2010 +0000 Btrfs: cache ordered extent when completing io When finishing io we run btrfs_dec_test_ordered_pending, and then immediately run btrfs_lookup_ordered_extent, but btrfs_dec_test_ordered_pending does that already, so we're searching twice when we don't have to. This patch lets us pass a btrfs_ordered_extent in to btrfs_dec_test_ordered_pending so if we do complete io on that ordered extent we can just use the one we found then instead of having to do another btrfs_lookup_ordered_extent. This made my fio job with the other patch go from 24 mb/s to 29 mb/s. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit c2a128d28a2e78e159e17e8c9274d0a9d9492555 Author: Josef Bacik Date: Tue Feb 2 21:19:11 2010 +0000 Btrfs: cache extent state in find_delalloc_range This patch makes us cache the extent state we find in find_delalloc_range since we'll have to lock the extent later on in the function. This will keep us from re-searching for the rang when we try to lock the extent. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 49958fd7dbb83cd4d65179d025940e01fe1fbacd Author: Josef Bacik Date: Tue Feb 2 21:48:28 2010 +0000 Btrfs: change the ordered tree to use a spinlock instead of a mutex The ordered tree used to need a mutex, but currently all we use it for is to protect the rb_tree, and a spin_lock is just fine for that. Using a spin_lock instead makes dbench run a little faster, 58 mb/s instead of 51 mb/s, and have less latency, 3445.138 ms instead of 3820.633 ms. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 4125bf761cd0786e1163e024c7c809ce2cc625bc Author: Chris Mason Date: Wed Feb 3 18:18:45 2010 +0000 Btrfs: finish read pages in the order they are submitted The endio is done at reverse order of bio vectors. That means for a sequential read, the page first submitted will finish last in a bio. Considering we will do checksum (making cache hot) for every page, this does introduce delay (and chance to squeeze cache used soon) for pages submitted at the begining. I don't observe obvious performance difference with below patch at my simple test, but seems more natural to finish read in the order they are submitted. Signed-off-by: Shaohua Li Signed-off-by: Chris Mason commit 0be2e98173f8badd5ccc7c2e994891746ba1caf4 Author: Miao Xie Date: Thu Feb 11 08:06:58 2010 +0000 btrfs: fix btrfs_mkdir goto for no free objectids btrfs_mkdir() must jump to the place of ending transaction after btrfs_find_free_objectid() failed. Or this transaction can't end. Signed-off-by: Miao Xie Signed-off-by: Chris Mason commit 0bdb1db297ab36865a63ee722d35ff0a1f0ae522 Author: Sage Weil Date: Fri Feb 19 14:13:50 2010 -0800 Btrfs: flush data on snapshot creation Flush any delalloc extents when we create a snapshot, so that recently written file data is always included in the snapshot. A later commit will add the ability to snapshot without the flush, but most people expect flushing. Signed-off-by: Sage Weil Signed-off-by: Chris Mason commit bd4d10888990f7e3f8029205d27eb155202d6969 Author: Josef Bacik Date: Fri Mar 5 21:59:21 2010 +0000 Btrfs: make df be a little bit more understandable The way we report df usage is way confusing for everybody, including some other utilities (bacula for one). So this patch makes df a little bit more understandable. First we make used actually count the total amount of used space in all space info's. This will give us a real view of how much disk space is in use. Second, for blocks available, only count data space. This makes things like bacula work because it says 0 when you can no longer write anymore data to the disk. I think this is a nice compromise, since you will end up with something like the following [root@alpha ~]# df -h Filesystem Size Used Avail Use% Mounted on /dev/mapper/VolGroup-lv_root 148G 30G 111G 21% / /dev/sda1 194M 116M 68M 64% /boot tmpfs 985M 12K 985M 1% /dev/shm /dev/mapper/VolGroup-LogVol02 145G 140G 0 100% /mnt/btrfs-test Compare this with btrfsctl -i output [root@alpha btrfs-progs-unstable]# ./btrfsctl -i /mnt/btrfs-test/ Metadata, DUP: total=4.62GB, used=2.46GB System, DUP: total=8.00MB, used=24.00KB Data: total=134.80GB, used=134.80GB Metadata: total=8.00MB, used=0.00 System: total=4.00MB, used=0.00 operation complete This way we show that there is no more data space to be used, but we have another 5GB of space left for metadata. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 3a0524dc054791688177544fe510d2868ee20d9f Author: TARUISI Hiroaki Date: Tue Feb 9 06:36:45 2010 +0000 btrfs: Update existing btrfs_device for renaming device When we scan devices in a multi-device filesystem, we memorize the original name. If the device gets a new name, later scans don't update the in-kernel structures related to it, and we're not able to mount the filesystem. This patch updates device name during scaning. Signed-off-by: TARUISI Hiroaki Signed-off-by: Chris Mason commit 1e701a3292e25a6c4939cad9f24951dc6b6ad853 Author: Chris Mason Date: Thu Mar 11 09:42:04 2010 -0500 Btrfs: add new defrag-range ioctl. The btrfs defrag ioctl was limited to doing the entire file. This commit adds a new interface that can defrag a specific range inside the file. It can also force compression on the file, allowing you to selectively compress individual files after they were created, even when mount -o compress isn't turned on. Signed-off-by: Chris Mason commit 940100a4a7b78b27e60a3e72340fb9b5397dcdb2 Author: Chris Mason Date: Wed Mar 10 10:52:59 2010 -0500 Btrfs: be more selective in the defrag ioctl The btrfs defrag ioctl had some bugs around delalloc accounting, and it wasn't properly skipping pages that were not in the mapping. It wasn't properly clearing the page checked flag, which could make the writeback code ignore the page forever while pinning it as dirty. This commit fixes those problems and makes defrag a little smarter. It skips holes and it doesn't waste time defragging large extents. If a tiny extent comes before a very large extent, it will defrag both of them to make sure the tiny extent ends up next to something big. Signed-off-by: Chris Mason commit 51684082b11c304829ea22193d4d96a5b1663b97 Author: Chris Mason Date: Wed Mar 10 15:33:32 2010 -0500 Btrfs: run the backing dev more often in the submit_bio helper The submit_bio helper thread can decide to loop back around to service more bios. This commit forces it to unplug first, which helps reduce the latency seen by submitters. Signed-off-by: Chris Mason commit 4849f01d153be0f52b8191ee1be0ce492aa96811 Author: Josef Bacik Date: Mon Dec 14 19:18:38 2009 +0000 Btrfs: make subvolid=0 mount the original default root Since theres not a good way to make sure the user sees the original default root tree id, and not to mention it's 5 so is way different than any other volume, just make subvol=0 mount the original default root. This makes it a bit easier for users to handle in the long run. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 6ef5ed0d386be5c43ec66d6f2999919c0893558b Author: Josef Bacik Date: Fri Dec 11 21:11:29 2009 +0000 Btrfs: add ioctl and incompat flag to set the default mount subvol This patch needs to go along with my previous patch. This lets us set the default dir item's location to whatever root we want to use as our default mounting subvol. With this we don't have to use mount -o subvol= anymore to mount a different subvol, we can just set the new one and it will just magically work. I've done some moderate testing with this, mostly just switching the default mount around, mounting subvols and the default mount at the same time and such, everything seems to work. Thanks, Older kernels would generally be able to still mount the filesystem with the default subvolume set, but it would result in a different volume being mounted, which could be an even more unpleasant suprise for users. So if you set your default subvolume, you can't go back to older kernels. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 73f73415caddbc01d9f10c03e0a677d5b3d11569 Author: Josef Bacik Date: Fri Dec 4 17:38:27 2009 +0000 Btrfs: change how we mount subvolumes This work is in preperation for being able to set a different root as the default mounting root. There is currently a problem with how we mount subvolumes. We cannot currently mount a subvolume of a subvolume, you can only mount subvolumes/snapshots of the default subvolume. So say you take a snapshot of the default subvolume and call it snap1, and then take a snapshot of snap1 and call it snap2, so now you have / /snap1 /snap1/snap2 as your available volumes. Currently you can only mount / and /snap1, you cannot mount /snap1/snap2. To fix this problem instead of passing subvolid= you must pass in subvolid=, where is the tree id that gets spit out via the subvolume listing you get from the subvolume listing patches (btrfs filesystem list). This allows us to mount /, /snap1 and /snap1/snap2 as the root volume. In addition to the above, we also now read the default dir item in the tree root to get the root key that it points to. For now this just points at what has always been the default subvolme, but later on I plan to change it to point at whatever root you want to be the new default root, so you can just set the default mount and not have to mount with -o subvolid=. I tested this out with the above scenario and it worked perfectly. Thanks, mount -o subvol operates inside the selected subvolid. For example: mount -o subvol=snap1,subvolid=256 /dev/xxx /mnt /mnt will have the snap1 directory for the subvolume with id 256. mount -o subvol=snap /dev/xxx /mnt /mnt will be the snap directory of whatever the default subvolume is. Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit 12534832cb7b0abc7369298246e8b7af03b863ca Author: Josef Bacik Date: Thu Dec 17 21:32:27 2009 +0000 Btrfs: make set/get functions for the super compat_ro flags use compat_ro Our set/get functions for compat_ro_flags actually look at compat_flags. This will mess any attempt to use compat flags up. The fix is obvious. Thanks, Signed-off-by: Josef Bacik Signed-off-by: Chris Mason commit ac8e9819d71f907a0532b01b22c26b56bbbcbd21 Author: Chris Mason Date: Sun Feb 28 15:39:26 2010 -0500 Btrfs: add search and inode lookup ioctls The search ioctl is a generic tool for doing btree searches from userland applications. The first user of the search ioctl is a subvolume listing feature, but we'll also use it to find new files in a subvolume. The search ioctl allows you to specify min and max keys to search for, along with min and max transid. It returns the items along with a header that includes the item key. Signed-off-by: Chris Mason commit 98d377a0894e6bcca44eafd4d2eee74e8af4db83 Author: TARUISI Hiroaki Date: Wed Nov 18 05:42:14 2009 +0000 Btrfs: add a function to lookup a directory path by following backrefs This will be used by the inode lookup ioctl. Signed-off-by: TARUISI Hiroaki Signed-off-by: Chris Mason commit 80c43ed724797627d8f86855248c497a6161a214 Author: Takashi Iwai Date: Mon Mar 15 15:51:53 2010 +0100 ALSA: hda - Disable MSI for Nvidia controller Judging from the member of enable_msi white-list, Nvidia controller seems to cause troubles with MSI enabled, e.g. boot hang up or other serious issue may come up. It's safer to disable MSI as default for Nvidia controllers again for now. Signed-off-by: Takashi Iwai Cc: commit 5d8614cc5d6c5c02b7995ed97303481d4e3a8cc7 Author: Will Deacon Date: Fri Mar 12 11:03:58 2010 +0100 ARM: 5989/1: ARM: KGDB: add support for SMP platforms To support SMP platforms, KGDB requires the architecture backend to implement the kgdb_roundup_cpus function. This patch, taken against 2.6.33, implements the function for ARM based on the MIPS port. Cc: Jason Wessel Cc: Jean-Michel Hautbois Cc: KGDB Mailing List Signed-off-by: Will Deacon Signed-off-by: Russell King commit 75216859d96f66856a0ee78c2de5b02115ff65f3 Author: Sascha Hauer Date: Mon Mar 15 15:14:50 2010 +0100 ARM: 5990/1: ARM: use __armv5tej_mmu_cache_flush for V5TEJ instead of __armv4_mmu_cache_flush This got broken with commit 0e056f20 Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit b89ebadc3421f8ff85030768ec14144794984877 Author: Russell King Date: Mon Mar 15 14:29:22 2010 +0000 ARM: Add final piece to fix XIP decompressor in read-only memory This defines STATIC_RW_DATA, which prevents the read/write malloc management data being declared with a static attribute. Signed-off-by: Russell King commit 2d3b5fa3a39d16c880bda3cf2bd9dd6ed5a01f74 Merge: 3f17522 7278a22 Author: Russell King Date: Mon Mar 15 14:27:06 2010 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 commit e794c01b7de40d180417eacbd910e8f31f2fafeb Author: Dan Carpenter Date: Mon Mar 15 11:25:10 2010 +0300 pcmcia: add important if statement There was a problem introduced in Jul 2008 by: 0e6f9d270840 pcmcia: use pcmcia_loop_config in scsi pcmcia drivers Signed-off-by: Dan Carpenter Signed-off-by: Dominik Brodowski commit 0d3a940de51c47a3d6322537c8dce925db755477 Author: Jens Künzer Date: Sat Mar 6 08:27:22 2010 +0100 pcmcia: re-route Cardbus IRQ to ISA on ti1130 bridges if necessary As the PCI irq pin of the ti1130 pcmcia bridge is not connected (at least on some old IBM Thinkpad 760ED notebooks), the Cardbus IRQ has to be routed to an ISA irq. Part 3 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message, cleanup] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit ba8819e991ac507fcbfa080eacdff3e7eea4dc03 Author: Jens Künzer Date: Sat Mar 6 08:02:24 2010 +0100 pcmcia: allow for cb_irq to differ from pci_dev's irq in yenta_socket cb_irq is presumed to be the same as the pci_dev's irq. This won't be true any more as soon as we allow the ISA irq to be used for Cardbus devices. Therefore, use the pci_dev's irq explicitely whenever we care about it. Part 2 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit 28ca8dd71fc170090edca62cb8129625d01b7760 Author: Jens Künzer Date: Sat Mar 6 07:46:16 2010 +0100 pcmcia: honor saved flags in yenta_socket's I365_CSCINT register Instead of overwriting the I365_CSCINT register, save the old value and merely change the bits we care about. Part 1 of a series to allow the ISA irq to be used for Cardbus devices if the socket's PCI irq is unusable. [linux@dominikbrodowski.net: split up the original patch, commit message] Signed-off-by: Jens Kuenzer Signed-off-by: Dominik Brodowski commit b416cd8efb6ce2661f8f98f603972f0b8f796ee4 Author: Dominik Brodowski Date: Tue Mar 9 17:17:36 2010 +0100 pcmcia: revert "irq probe can be done without risking an IRQ storm" This reverts commit 635416ef393e8cec5a89fc6c1de710ee9596a51e. The argument passed to request_irq() only affects action->flags (IRQF_*), but IRQ_NOAUTOEN relates to desc->status. Reported-by: Jan Beulich CC: Alan Cox Signed-off-by: Dominik Brodowski commit 7a96e87d6e58a07235a2bc3eff9b093af4937a72 Author: Dominik Brodowski Date: Sat Mar 13 17:42:39 2010 +0100 pcmcia: pd6729, i82092: use parent (PCI) resources A newly added parent resource entry for the root PCI bus, such as 40000000-ffffffff : PCI Bus #00 means that the pd6729 and i82092 drivers cannot allocate iomem as freely as before, unless they do so as PCI devices. Therefore, set socket->cb_dev so that rsrc_nonstatic.c does the right thing. Reported-by: Komuro Signed-off-by: Dominik Brodowski commit 7a410e8d4d97457c8c381e2de9cdc7bd3306badc Author: Yoichi Yuasa Date: Wed Mar 10 15:57:56 2010 +0900 pcmcia/vrc4171: use local spinlock for device local lock. struct pcmcia_socket lock had been used before. Signed-off-by: Yoichi Yuasa Signed-off-by: Dominik Brodowski commit b43f6e5e258d67acae5961896d10bbe38c271070 Author: Anisse Astier Date: Wed Mar 10 19:17:46 2010 +0100 ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220 This should make the speakers and jack detection work on MSI all-in-one computers NetOn AP1900 and Wind Top AE2220. Signed-off-by: Anisse Astier Cc: Signed-off-by: Takashi Iwai commit 9c4cc0bdede1c39bde60a0d5d9251aac71fbe719 Author: Takashi Iwai Date: Mon Mar 15 09:07:52 2010 +0100 ALSA: hda - Fix secondary ADC of ALC260 basic model Fix adc_nids[] for ALC260 basic model to match with num_adc_nids. Otherwise you get an invalid NID in the secondary "Input Source" mixer element. Signed-off-by: Takashi Iwai Cc: commit 28d1a85e136985982448b2f9b1342bae85ad1c98 Author: Takashi Iwai Date: Mon Mar 15 09:05:46 2010 +0100 ALSA: hda - Add an error message for invalid mapping NID Add an error message to snd_hda_add_nid() for invalid mapping NID to make easier to hunt the buggy code. Also added a missing space to the error message in snd_hda_build_controls() Signed-off-by: Takashi Iwai commit c602c8ad45d6ee6ad91fc544513cc96f70790983 Author: Vitaliy Kulikov Date: Mon Mar 15 09:01:26 2010 +0100 ALSA: hda - New Intel HDA controller Added a PCI controller id on new Dell laptops. Signed-off-by: Vitaliy Kulikov Signed-off-by: Takashi Iwai commit a3d3203e4bb40f253b1541e310dc0f9305be7c84 Merge: f937331 ec28dcc Author: Linus Torvalds Date: Sun Mar 14 20:29:21 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: (34 commits) ACPI: processor: push file static MADT pointer into internal map_madt_entry() ACPI: processor: refactor internal map_lsapic_id() ACPI: processor: refactor internal map_x2apic_id() ACPI: processor: refactor internal map_lapic_id() ACPI: processor: driver doesn't need to evaluate _PDC ACPI: processor: remove early _PDC optin quirks ACPI: processor: add internal processor_physically_present() ACPI: processor: move acpi_get_cpuid into processor_core.c ACPI: processor: export acpi_get_cpuid() ACPI: processor: mv processor_pdc.c processor_core.c ACPI: processor: mv processor_core.c processor_driver.c ACPI: plan to delete "acpi=ht" boot option ACPI: remove "acpi=ht" DMI blacklist PNPACPI: add bus number support PNPACPI: add window support resource: add window support resource: add bus number support resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type acpiphp: Execute ACPI _REG method for hotadded devices ACPI video: Be more liberal in validating _BQC behaviour ... commit f937331b3f92cb2f67bc81baa1b8cc5198c439e5 Author: Wolfram Sang Date: Mon Mar 15 01:29:41 2010 +0100 init dynamic bin_attribute structures Commit 6992f5334995af474c2b58d010d08bc597f0f2fe ("sysfs: Use one lockdep class per sysfs attribute.") introduced this requirement. First, at25 was fixed manually. Then, other occurences were found with coccinelle and the following semantic patch. Results were reviewed and fixed up: @ init @ identifier struct_name, bin; @@ struct struct_name { ... struct bin_attribute bin; ... }; @ main extends init @ expression E; statement S; identifier name, err; @@ ( struct struct_name *name; | - struct struct_name *name = NULL; + struct struct_name *name; ) ... ( sysfs_bin_attr_init(&name->bin); | + sysfs_bin_attr_init(&name->bin); if (sysfs_create_bin_file(E, &name->bin)) S | + sysfs_bin_attr_init(&name->bin); err = sysfs_create_bin_file(E, &name->bin); ) Signed-off-by: Wolfram Sang Cc: Eric W. Biederman Signed-off-by: Linus Torvalds commit 7278a22143b003e9af7b9ca1b5f1c40ae4b55d98 Author: Magnus Damm Date: Wed Mar 10 11:33:10 2010 +0000 video: enable sh_mobile_lcdc on SH-Mobile ARM This patch enables the sh_mobile_lcdc driver on SH-Mobile ARM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 3a14d0397732b6aaa541348b5a8e8f639ecd02b7 Author: Magnus Damm Date: Wed Mar 10 09:26:44 2010 +0000 ARM: mach-shmobile: ap4evb SDHI0 platform data V2 Add SDHI0 platform data for the AP4EVB board V2. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c57a31abf0b469b9cab6810f4e1895bb7ef1c482 Author: Magnus Damm Date: Wed Mar 10 05:17:24 2010 +0000 ARM: mach-shmobile: sh7372 SDHI vector merge Merge the SDHI vectors for sh7372 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c148abfc2d807b2734e7ecd0e00c71ef7d4b7f42 Author: Magnus Damm Date: Wed Mar 10 05:15:16 2010 +0000 ARM: mach-shmobile: sh7377 SDHI vector merge Merge the SDHI vectors for sh7377 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 9615b37c5c8fed963811c100053d495c412880fb Author: Magnus Damm Date: Wed Mar 10 05:13:12 2010 +0000 ARM: mach-shmobile: sh7367 SDHI vector merge Merge the SDHI vectors for sh7367 using the recently merged INTC force_enable/disable feature. With this in place SDHI hotplug is supported using the drivers sh_mobile_sdhi and tmio_mmc. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6676a1701b0b135dacbb7cfeef48004315300df0 Author: NISHIMOTO Hiroki Date: Tue Feb 23 10:55:10 2010 +0000 ARM: mach-shmobile: G4EVM KEYSC platform data This patch adds KEYSC platform data for the G4EVM board. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 3e862c05ca1bf5bd4cb703bc257d180a4583bc41 Author: Magnus Damm Date: Fri Feb 19 10:01:22 2010 +0000 mtd: enable sh_flctl on SH-Mobile ARM Update the Kconfig entry for the sh_flctl driver to enable build on SH-Mobile ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 143f3b833f98271341379d813cb72deb1657a380 Author: Magnus Damm Date: Fri Feb 19 09:54:06 2010 +0000 ARM: mach-shmobile: G3EVM FLCTL platform data This patch adds FLCTL platform data for the G3EVM board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 03fb256df9c960b10c0e01b7e92d2f31433675fe Author: Magnus Damm Date: Tue Feb 16 10:48:15 2010 +0000 ARM: mach-shmobile: G3EVM KEYSC platform data This patch adds KEYSC platform data for the G3EVM board. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit ec28dcc6b4c00b78ad269ad5b85ebd5c2d504825 Merge: c67fcd6 d060705 f6bb13a 0c99c52 4c81ba4 7e0e9c0 149fe9c cffdde9 fa80945 8b7ef6d 70287db 38bcb37 Author: Len Brown Date: Sun Mar 14 21:30:17 2010 -0400 Merge branches 'battery-2.6.34', 'bugzilla-10805', 'bugzilla-14668', 'bugzilla-531916-power-state', 'ht-warn-2.6.34', 'pnp', 'processor-rename', 'sony-2.6.34', 'suse-bugzilla-531547', 'tz-check', 'video' and 'misc-2.6.34' into release commit 149fe9c293f76803206648270ca24fc2604d5f01 Author: Alex Chiang Date: Mon Feb 22 12:12:00 2010 -0700 ACPI: processor: push file static MADT pointer into internal map_madt_entry() There's no real need for a pointer to the MADT to be global. The only function who uses it is map_madt_entry. This allows us to remove some more ugly #ifdefs. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit eae701ceadf5aa3fc3b334029ef71f6885ef1cde Author: Alex Chiang Date: Mon Feb 22 12:11:55 2010 -0700 ACPI: processor: refactor internal map_lsapic_id() Un-nest the if statements for readability. Remove comments that re-state the obvious. Change the control flow so that we no longer need a temp variable. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit d67420956b7b1dcffb894b2f1f81b9408fca1b4c Author: Alex Chiang Date: Mon Feb 22 12:11:50 2010 -0700 ACPI: processor: refactor internal map_x2apic_id() Untangle the nested if conditions to make this function look more similar to the other map_*apic_id() functions. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 11130736c99c37e253f45b2d3fd30b07313f83c6 Author: Alex Chiang Date: Mon Feb 22 12:11:44 2010 -0700 ACPI: processor: refactor internal map_lapic_id() Untangle the if() statement a little for readability. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit d8191fa4a33fdc817277da4f2b7f771ff605a41c Author: Alex Chiang Date: Mon Feb 22 12:11:39 2010 -0700 ACPI: processor: driver doesn't need to evaluate _PDC Now that the early _PDC evaluation path knows how to correctly evaluate _PDC on only physically present processors, there's no need for the processor driver to evaluate it later when it loads. To cover the hotplug case, push _PDC evaluation down into the hotplug paths. Cc: x86@kernel.org Cc: Tony Luck Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 3b1da4c5d1032ebc29fec8bd8f592ba6589be8ed Author: Alex Chiang Date: Mon Feb 22 12:11:34 2010 -0700 ACPI: processor: remove early _PDC optin quirks Now that we check for physically present processors before blindly evaluating _PDC, we no longer need to maintain a DMI opt-in table nor a kernel param. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 5d554a7bb0643a6151a84319bfeba8270bf5269e Author: Alex Chiang Date: Mon Feb 22 12:11:29 2010 -0700 ACPI: processor: add internal processor_physically_present() Detect if a processor is physically present before evaluating _PDC. We want this because some BIOS will provide a _PDC even for processors that are not present. These bogus _PDC methods then attempt to load non-existent tables, which causes problems. Avoid those bogus landmines. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 78ed8bd2944b6400f742306e5fe9d1b9b6bf18ba Author: Alex Chiang Date: Mon Feb 22 12:11:24 2010 -0700 ACPI: processor: move acpi_get_cpuid into processor_core.c Enumerating processors (via MADT/_MAT) belongs in the processor core, which is always built-in, rather than living in the processor driver which may not be built. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 2e9d5e4efa0beeca03ad550bda28027826e83e42 Author: Alex Chiang Date: Mon Feb 22 12:11:19 2010 -0700 ACPI: processor: export acpi_get_cpuid() Rename static get_cpu_id() to acpi_get_cpuid() and export it. This change also gives us an opportunity to remove the #ifndef CONFIG_SMP from processor_driver.c and into a header file where it properly belongs. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 4d5d4cd88c542ff56cf7feacd29cc907f2abbfbb Author: Alex Chiang Date: Mon Feb 22 12:11:14 2010 -0700 ACPI: processor: mv processor_pdc.c processor_core.c We've renamed the old processor_core.c to processor_driver.c, to convey the idea that it can be built modular and has driver-like bits. Now let's re-create a processor_core.c for the bits needed statically by the rest of the kernel. The contents of processor_pdc.c are a good starting spot, so let's just rename that file and complete our three card monte. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 0131aa3dd7dcf41c66784b96ff351f63ee3ef348 Author: Alex Chiang Date: Mon Feb 22 12:11:08 2010 -0700 ACPI: processor: mv processor_core.c processor_driver.c The ACPI processor driver can be built as a module. But it has pieces of code that should always be built statically into the kernel. The plan is for processor_core.c to contain the static bits while processor_driver.c contains the module-like bits. Since the bulk of the code in the current processor_core.c is module-like, first step is to rename the file to processor_driver.c Next step will re-create processor_core.c and cherry-pick out the static bits. Acked-by: Venkatesh Pallipadi Signed-off-by: Alex Chiang Signed-off-by: Len Brown commit 4c81ba4900ab4eb24c7d2ba1aca594c644b6ce4c Author: Len Brown Date: Sun Mar 14 16:28:46 2010 -0400 ACPI: plan to delete "acpi=ht" boot option Signed-off-by: Len Brown commit 8144c880397d502d12af4ef721f3eac50163fa39 Author: Len Brown Date: Thu Feb 18 23:42:47 2010 -0500 ACPI: remove "acpi=ht" DMI blacklist SuSE added these entries when deploying ACPI in Linux-2.4. I pulled them into Linux-2.6 on 2003-08-09. Over the last 6+ years, several entries have proven to be unnecessary and deleted, while no new entries have been added. Matthew suggests that they now have negative value, and I agree. Based-on-patch-by: Matthew Garrett Signed-off-by: Len Brown commit 7e0e9c042790d4ea44c6a00ddaad8b8bbcc3f17f Author: Bjorn Helgaas Date: Fri Mar 5 10:47:57 2010 -0700 PNPACPI: add bus number support Add support for bus number resources. This is for bridges with a range of bus numbers behind them. Previously, PNP ignored bus number resources. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit fa35b49260b615d634bfa1f767aa315fa323c2e9 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:52 2010 -0700 PNPACPI: add window support Add support for resource windows. This is for bridge resources, i.e., regions where a bridge forwards transactions from the primary to the secondary side. This does not add support for *setting* windows via the /proc interface. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 9d7cca04211d4eb104eaaa424b98f650bc29c730 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:47 2010 -0700 resource: add window support Add support for resource windows. This is for bridge resources, i.e., regions where a bridge forwards transactions from the primary to the secondary side. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 0f4050c7d3ba0275e5f39513c0670a717d43048c Author: Bjorn Helgaas Date: Fri Mar 5 10:47:42 2010 -0700 resource: add bus number support Add support for bus number resources. This is for bridges with a range of bus numbers behind them. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit cd7e9fcd1f7c9c397f747cf506c66f7dca11d1c6 Author: Bjorn Helgaas Date: Fri Mar 5 10:47:26 2010 -0700 resource: expand IORESOURCE_TYPE_BITS to make room for bus resource type No functional change; this just makes room for another resource type. Signed-off-by: Bjorn Helgaas Signed-off-by: Len Brown commit 181427a7e01beab76c789414334375839f026128 Author: Dan Carpenter Date: Sat Mar 13 14:14:22 2010 +0300 tomoyo: fix potential use after free The original code returns a freed pointer. This function is expected to return NULL on errors. Signed-off-by: Dan Carpenter Acked-by: Tetsuo Handa Signed-off-by: James Morris commit d06070509147c948a06056da619c9dc2ed349805 Author: Shaohua Li Date: Thu Feb 25 10:59:34 2010 +0800 acpiphp: Execute ACPI _REG method for hotadded devices Per ACPI spec, _ERG method should be executed before device driver gets control for hotpluged device. Firmware might do some configuration there. See http://bugzilla.kernel.org/show_bug.cgi?id=10805. In this machine, _REG method of docked device will configure cardbus bridge. Signed-off-by: Shaohua Li Tested-by: Paul Martin Signed-off-by: Len Brown commit 70287db87cfc968fe78bf82a489833cc77b84352 Author: Matthew Garrett Date: Tue Feb 16 16:53:50 2010 -0500 ACPI video: Be more liberal in validating _BQC behaviour Right now, if _BQC returns a value we don't understand we immediately invalidate it. Change this behaviour so we only invalidate it if it continues to give an invalid answer after we've already set a brightness. Signed-off-by: Matthew Garrett Acked-by: Zhang Rui Signed-off-by: Len Brown commit 3f17522ce461a31e7ced6311b28fcf5b8a763316 Author: Russell King Date: Fri Feb 12 14:32:01 2010 +0000 Video: ARM CLCD: Better fix for swapped IENB and CNTL registers On PL111, as found on Realview and other platforms, these registers are always arranged as CNTL then IENB. On PL110, these registers are IENB then CNTL, except on Versatile platforms. Re-arrange the handling of these register swaps so that PL111 always gets it right without resorting to ifdefs, leaving the only case needing special handling being PL110 on Versatile. Fill out amba/clcd.h with the PL110/PL111 register definition differences in case someone tries to use the PL110 specific definitions on PL111. Signed-off-by: Russell King commit 1027247f6eb727db6c600b9eb02796f0766ae704 Author: Russell King Date: Fri Feb 12 14:36:24 2010 +0000 ARM: Add L2 cache handling to smp boot support The page table and secondary data which we're asking the secondary CPU to make use of has to hit RAM to ensure that the secondary CPU can see it since it may not be taking part in coherency or cache searches at this point. Acked-by: Santosh Shilimkar Signed-off-by: Russell King commit bca14dd14f3b0c5e3e2d1d314679f85b67871365 Merge: 02ca6c4 2aa2b50 Author: Linus Torvalds Date: Sun Mar 14 11:15:45 2010 -0700 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y commit 02ca6c407e0d43e6de5d646d26d87fc2eaa7a98b Author: Randy Dunlap Date: Thu Feb 4 12:11:09 2010 -0800 Add include to i2c-xii.c to fix build error drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay' Signed-off-by: Randy Dunlap Cc: "Richard Röjfors" Cc: "Ben Dooks (embedded platforms)" Cc: linux-i2c@vger.kernel.org Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit 3f995f317f7070e81e8e38bb11357d6671ab6969 Author: Richard Röjfors Date: Tue Mar 9 09:17:36 2010 +0100 Add the platform data include for the Xilinx XPS IIC Bus Interface This file was missed in the original patch that went into Linus' tree. Cc: "Ben Dooks (embedded platforms)" Cc: linux-i2c@vger.kernel.org Signed-off-by: Richard Röjfors Signed-off-by: Stephen Rothwell Signed-off-by: Linus Torvalds commit a818d8e43147f40864363456b37a00b819439307 Merge: f901e75 31968ec Author: Linus Torvalds Date: Sun Mar 14 11:13:54 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: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table Input: ALPS - fix stuck buttons on some touchpads Input: wm831x-on - convert to use genirq Input: ads7846 - add wakeup support Input: appletouch - fix integer overflow issue Input: ad7877 - increase pen up imeout Input: ads7846 - add support for AD7843 parts Input: bf54x-keys - fix system hang when pressing a key Input: alps - add support for the touchpad on Toshiba Tecra A11-11L Input: remove BKL, fix input_open_file() locking Input: serio_raw - remove BKL Input: mousedev - remove BKL Input: add driver for TWL4030 vibrator device Input: enable remote wakeup for PNP i8042 keyboard ports Input: scancode in get/set_keycodes should be unsigned Input: i8042 - use platfrom_create_bundle() helper Input: wacom - merge out and in prox events Input: gamecon - fix off by one range check Input: wacom - replace WACOM_PKGLEN_PENABLED commit f901e753923192a7793e5d7591e2c03dcb252d68 Merge: bced863 c91cea1 Author: Linus Torvalds Date: Sun Mar 14 11:13:24 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2: nilfs2: remove whitespaces before quoted newlines nilfs2: remove spaces before tabs nilfs2: fix various typos in comments nilfs2: fix typo "cout" -> "count" in error message nilfs2: fix function name typos in docbook comments nilfs2: fix discrepancy in use of static specifier commit bced86359918326a65258b1be245834e5c493c88 Merge: ceb804c 0a9c147 Author: Linus Torvalds Date: Sun Mar 14 11:13:04 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-algo-bit: Add pre- and post-xfer hooks at24: Init dynamic bin_attribute structures i2c: Drop configure option I2C_DEBUG_CHIP tsl2550: Move from i2c/chips to misc i2c-i801: Don't use the block buffer for I2C block writes i2c-powermac: Be less verbose in the absence of real errors. i2c-smbus: Use device_lock/device_unlock commit ceb804cd0f63b0e0a87b81913b66add6de03043d Merge: 3474cbd f78233d Author: Linus Torvalds Date: Sun Mar 14 11:11:08 2010 -0700 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs: 9p: Skip check for mandatory locks when unlocking 9p: Fixes a simple bug enabling writes beyond 2GB. 9p: Change the name of new protocol from 9p2010.L to 9p2000.L fs/9p: re-init the wstat in readdir loop net/9p: Add sysfs mount_tag file for virtio 9P device net/9p: Use the tag name in the config space for identifying mount point commit 2aa2b50dd62b5d0675bd7453fbeb5732dc2d7866 Author: Ingo Molnar Date: Sun Mar 14 08:57:03 2010 +0100 x86/mce: Fix build bug with CONFIG_PROVE_LOCKING=y && CONFIG_X86_MCE_INTEL=y Commit f56e8a076 "x86/mce: Fix RCU lockdep splats" introduced the following build bug: arch/x86/kernel/cpu/mcheck/mce.c: In function 'mce_log': arch/x86/kernel/cpu/mcheck/mce.c:166: error: 'mce_read_mutex' undeclared (first use in this function) arch/x86/kernel/cpu/mcheck/mce.c:166: error: (Each undeclared identifier is reported only once arch/x86/kernel/cpu/mcheck/mce.c:166: error: for each function it appears in.) Move the in-the-middle-of-file lock variable up to the variable definition section, the top of the .c file. Cc: Paul E. McKenney Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 31968ecf584330b51a25b7bf881c2b632a02a3fb Author: Christoph Fritz Date: Sat Mar 13 22:26:23 2010 -0800 Input: i8042 - add ALDI/MEDION netbook E1222 to qurik reset table ALDI/MEDION netbook E1222 needs to be in the reset quirk list for its touchpad's proper function. Reported-by: Michael Fischer Signed-off-by: Christoph Fritz Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit c91ed059a080c6f9a7ba525e5027c65d19115d15 Author: Martin Buck Date: Sat Mar 13 22:23:58 2010 -0800 Input: ALPS - fix stuck buttons on some touchpads Enable button release event redirection to the device that got the button press not only for touchpads with interleaved protocols, but unconditionally for all Alps touchpads. This is required at least for the touchpads in Dell Inspiron 8200 and Latitude d630. Signed-off-by: Martin Buck Signed-off-by: Dmitry Torokhov commit 3474cbd11df8cdd6413781ea95bd51dd469098ff Merge: d89b218 2d378b9 Author: Linus Torvalds Date: Sat Mar 13 21:29:38 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Add very basic XVR-1000 framebuffer driver. qlogicpti: Remove slash in QlogicPTI irq name commit c91cea11dfec65968ff9d1b4239c1eab63bf72fd Author: Ryusuke Konishi Date: Sun Mar 14 04:01:27 2010 +0900 nilfs2: remove whitespaces before quoted newlines This kills the following checkpatch warnings: WARNING: unnecessary whitespace before a quoted newline #869: FILE: super.c:869: + "remount to a different snapshot. \n", WARNING: unnecessary whitespace before a quoted newline #389: FILE: the_nilfs.c:389: + printk(KERN_ERR "NILFS: too short segment. \n"); Signed-off-by: Ryusuke Konishi commit 55480a06e9ee8d05d0e580bf46611df489653c76 Author: Ryusuke Konishi Date: Sun Mar 14 03:55:56 2010 +0900 nilfs2: remove spaces before tabs This kills the following checkpatch warnings: WARNING: please, no space before tabs #74: FILE: segment.h:74: +^Iunsigned ^I^Iflags;$ WARNING: please, no space before tabs #35: FILE: segbuf.c:35: +^Iint ^I^I^Istart, end; /* The region to be submitted */$ Signed-off-by: Ryusuke Konishi commit 7a65004bbaa6a21a0438aac9c64814e46084dc3f Author: Ryusuke Konishi Date: Sun Mar 14 03:32:40 2010 +0900 nilfs2: fix various typos in comments This fixes various typos I found in comments of nilfs2. Signed-off-by: Ryusuke Konishi commit 1621562b6ac55aa69239895d90276577547a5f62 Author: Ryusuke Konishi Date: Sun Mar 14 03:17:45 2010 +0900 nilfs2: fix typo "cout" -> "count" in error message Signed-off-by: Ryusuke Konishi commit 9ccf56c13831c5fe0edecd8c1184c9a6fe805d23 Author: Ryusuke Konishi Date: Sun Mar 14 03:01:03 2010 +0900 nilfs2: fix function name typos in docbook comments Fixes the following typos in docbook comments: nilfs_detroy_transaction_cache -> nilfs_destroy_transaction_cache nilfs_secgtor_start_timer -> nilfs_segctor_start_timer Signed-off-by: Ryusuke Konishi commit 6c477d44a7dad43a2783b4dea7f4ca3882d77126 Author: Ryusuke Konishi Date: Sun Mar 14 02:01:51 2010 +0900 nilfs2: fix discrepancy in use of static specifier Two segbuf functions, nilfs_segbuf_write and nilfs_segbuf_wait, are declared with the static storage class specifier, but their implementations are not. This fixes the discrepancy. Signed-off-by: Ryusuke Konishi commit 2d378b9179881b46a0faf11430efb421fe03ddd8 Author: David S. Miller Date: Sat Mar 13 16:25:03 2010 -0800 sparc64: Add very basic XVR-1000 framebuffer driver. Signed-off-by: David S. Miller Acked-by: Frans van Berckel commit d89b218b801fd93ea95880f1c7fde348cbcc51c5 Merge: 80a1860 bec68ff Author: Linus Torvalds Date: Sat Mar 13 14:50:18 2010 -0800 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: (108 commits) bridge: ensure to unlock in error path in br_multicast_query(). drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages sky2: Avoid rtnl_unlock without rtnl_lock ipv6: Send netlink notification when DAD fails drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant ipconfig: Handle devices which take some time to come up. mac80211: Fix memory leak in ieee80211_if_write() mac80211: Fix (dynamic) power save entry ipw2200: use kmalloc for large local variables ath5k: read eeprom IQ calibration values correctly for G mode ath5k: fix I/Q calibration (for real) ath5k: fix TSF reset ath5k: use fixed antenna for tx descriptors libipw: split ieee->networks into small pieces mac80211: Fix sta_mtx unlocking on insert STA failure path rt2x00: remove KSEG1ADDR define from rt2x00soc.h net: add ColdFire support to the smc91x driver asix: fix setting mac address for AX88772 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. net: Fix dev_mc_add() ... commit 80a186074e72e2cd61f6716d90cf32ce54981a56 Merge: 15c989d 3d07467 Author: Linus Torvalds Date: Sat Mar 13 14:46:18 2010 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix pick_next_highest_task_rt() for cgroups sched: Cleanup: remove unused variable in try_to_wake_up() x86: Fix sched_clock_cpu for systems with unsynchronized TSC commit 15c989d4d14b82f43cae7efc6a7794cdd556f274 Merge: 4e3eadd 0e152cd Author: Linus Torvalds Date: Sat Mar 13 14:45:49 2010 -0800 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, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems x86, UV: Fix target_cpus() in x2apic_uv_x.c x86: Reduce per cpu warning boot up messages x86: Reduce per cpu MCA boot up messages x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already commit 4e3eaddd142e2142c048c5052a0a9d2604fccfc6 Merge: 8655e7e b97c4bc Author: Linus Torvalds Date: Sat Mar 13 14:43:01 2010 -0800 Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: locking: Make sparse work with inline spinlocks and rwlocks x86/mce: Fix RCU lockdep splats rcu: Increase RCU CPU stall timeouts if PROVE_RCU ftrace: Replace read_barrier_depends() with rcu_dereference_raw() rcu: Suppress RCU lockdep warnings during early boot rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() rcu: Suppress __mpol_dup() false positive from RCU lockdep rcu: Make rcu_read_lock_sched_held() handle !PREEMPT rcu: Add control variables to lockdep_rcu_dereference() diagnostics rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU rcu: Use wrapper function instead of exporting tasklist_lock sched, rcu: Fix rcu_dereference() for RCU-lockdep rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU x86/gart: Unexport gart_iommu_aperture Fix trivial conflicts in kernel/trace/ftrace.c commit 8655e7e3ddec60603c4f6c14cdf642e2ba198df8 Merge: 461d208 b634587 Author: Linus Torvalds Date: Sat Mar 13 14:40:50 2010 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: tracing: Do not record user stack trace from NMI context tracing: Disable buffer switching when starting or stopping trace tracing: Use same local variable when resetting the ring buffer function-graph: Init curr_ret_stack with ret_stack ring-buffer: Move disabled check into preempt disable section function-graph: Add tracing_thresh support to function_graph tracer tracing: Update the comm field in the right variable in update_max_tr function-graph: Use comment notation for func names of dangling '}' function-graph: Fix unused reference to ftrace_set_func() tracing: Fix warning in s_next of trace file ops tracing: Include irqflags headers from trace clock commit 461d208cfbd1f0af26027b2c35ded515e54b1ee6 Merge: 9fdfbc2 0e49887 Author: Linus Torvalds Date: Sat Mar 13 14:39:54 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 sound: fix opti92x-ad1848 build ALSA: hda - Fix input source elements of secondary ADCs on Realtek ALSA: hda - Fix wrong model range check for ALC268 commit 9fdfbc2bff587f454dd95e2caa6d147c9abe39e4 Merge: 8cea4eb dc1d628 Author: Linus Torvalds Date: Sat Mar 13 14:39:42 2010 -0800 Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: perf: Provide generic perf_sample_data initialization MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer perf trace: Don't use pager if scripting perf trace/scripting: Remove extraneous header read perf, ARM: Modify kuser rmb() call to compile for Thumb-2 x86/stacktrace: Don't dereference bad frame pointers perf archive: Don't try to collect files without a build-id perf_events, x86: Fixup fixed counter constraints perf, x86: Restrict the ANY flag perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE perf, x86: add some IBS macros to perf_event.h perf, x86: make IBS macros available in perf_event.h hw-breakpoints: Remove stub unthrottle callback x86/hw-breakpoints: Remove the name field perf: Remove pointless breakpoint union perf lock: Drop the buffers multiplexing dependency perf lock: Fix and add misc documentally things percpu: Add __percpu sparse annotations to hw_breakpoint commit 8cea4eb642890a1de58980e7e1617d1765ef8f7c Merge: 122ce87 720e774 Author: Linus Torvalds Date: Sat Mar 13 14:38:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes: GFS2: Skip check for mandatory locks when unlocking GFS2: Allow the number of committed revokes to temporarily be negative GFS2: do not select QUOTA commit 122ce878dc189860a380539bde19498bf93443a7 Merge: daf9fe2 0636b33 Author: Linus Torvalds Date: Sat Mar 13 14:38:31 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: RDMA/nes: Fix CX4 link problem in back-to-back configuration RDMA/nes: Clear stall bit before destroying NIC QP RDMA/nes: Set assume_aligned_header bit RDMA/cxgb3: Wait at least one schedule cycle during device removal IB/mad: Ignore iWARP devices on device removal IPoIB: Include return code in trace message for ib_post_send() failures IPoIB: Fix TX queue lockup with mixed UD/CM traffic commit 3ee8f0a2b1c81f0472b25d40aa5c1c7c6a0edc2a Author: Markus Rathgeb Date: Sat Mar 13 17:29:43 2010 +0100 HID: Add RGT Clutch Wheel clutch device id This patch enables force feedback for the "RGT Force Feedback CLUTCH Racing Wheel". It only modifies hid-core.c (hid_blacklist) and hid-tmff.c to add the new USB IDs. Signed-off-by: Markus Rathgeb Signed-off-by: Jiri Kosina commit bec68ff1637ca00bb1585a03a7be8a13380084de Author: YOSHIFUJI Hideaki Date: Sat Mar 13 12:27:21 2010 -0800 bridge: ensure to unlock in error path in br_multicast_query(). Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit c251c7f738cd94eb3a1febda318078c661eccb4d Author: Joe Perches Date: Sat Mar 13 12:26:15 2010 -0800 drivers/net/tulip/eeprom.c: fix bogus "(null)" in tulip init messages On Wed, 2010-03-10 at 08:41 -0800, David Miller wrote: > From: Mikael Pettersson > Date: Wed, 10 Mar 2010 16:33:28 +0100 > > Booting 2.6.34-rc1 on a machine with a tulip nic I see > > a number of kernel messages that include "(null)" where > > previous kernels included the string "tulip0": > CC:'ing the guilty party :-) It's one of the following > commits: Thanks Mikael. Anonymity has some good attributes. Blame avoidance is one of them. I've broad shoulders. It's me, then Dwight Howard... There might be another few of these where ->name or ->dev was used before struct device or net_device was registered. I'll go back and check. tulip_core has: if (tp->flags & HAS_MEDIA_TABLE) { sprintf(dev->name, DRV_NAME "%d", board_idx); /* hack */ tulip_parse_eeprom(dev); strcpy(dev->name, "eth%d"); /* un-hack */ } So I don't feel _too_ bad. tulip_parse_eeprom is done before register_netdev so the logging there can not use netdev_ or dev_(&dev->dev Signed-off-by: Joe Perches Tested-by: Mikael Pettersson Signed-off-by: David S. Miller commit 2a40018984c5c9647df1c18489449a3a227d9136 Author: Mike McCormack Date: Sat Mar 13 12:24:18 2010 -0800 sky2: Avoid rtnl_unlock without rtnl_lock Make sure we always call rtnl_lock before going down the error path in sky2_resume, which unlocks the rtnl lock. Signed-off-by: Mike McCormack Signed-off-by: David S. Miller commit e2577a065832f2c6d108de2e027891bdb2d78924 Author: Herbert Xu Date: Sat Mar 13 12:23:29 2010 -0800 ipv6: Send netlink notification when DAD fails If we are managing IPv6 addresses using DHCP, it would be nice for user-space to be notified if an address configured through DHCP fails DAD. Otherwise user-space would have to poll to see whether DAD succeeds. This patch uses the existing notification mechanism and simply hooks it into the DAD failure code path. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 3f07d1295191cfa41125e4e61ee2064790070071 Author: Julia Lawall Date: Sat Mar 13 12:22:16 2010 -0800 drivers/net/tg3.c: change the field used with the TG3_FLAG_10_100_ONLY constant The constant TG3_FLAG_10_100_ONLY should be used with the tg3_flags field, not the tg3_flags2 field, as done elsewhere in the same file. Signed-off-by: Julia Lawall Signed-off-by: David S. Miller commit a003460b21323ddb29479505d9555f0985b8b2f1 Merge: 964ad81 dee6026 Author: David S. Miller Date: Sat Mar 13 12:17:09 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 commit 0a9c14751377a1407f5e35791e13651d2fc7801c Author: Jean Delvare Date: Sat Mar 13 20:56:56 2010 +0100 i2c-algo-bit: Add pre- and post-xfer hooks Drivers might have to do random things before and/or after I2C transfers. Add hooks to the i2c-algo-bit implementation to let them do so. Signed-off-by: Jean Delvare Cc: Alex Deucher commit d07b56b3098b9f32ae6dedeacbc594bd01dcfcd1 Author: Wolfram Sang Date: Sat Mar 13 20:56:55 2010 +0100 at24: Init dynamic bin_attribute structures Commit 6992f5334995af474c2b58d010d08bc597f0f2fe introduced this requirement. Reported-by: Albrecht Dress Signed-off-by: Wolfram Sang Signed-off-by: Eric W. Biederman Signed-off-by: Jean Delvare commit e77482d735efa2606c1f2afeebd53e1119d0e5c6 Author: Jean Delvare Date: Sat Mar 13 20:56:55 2010 +0100 i2c: Drop configure option I2C_DEBUG_CHIP Now that directory drivers/i2c/chips is gone, configuration option I2C_DEBUG_CHIP no longer has any effect, so we can drop it. Signed-off-by: Jean Delvare Acked-by: Wolfram Sang commit 6a9bcced518b98a7e52b9e8e96af228b171e0498 Author: Jean Delvare Date: Sat Mar 13 20:56:54 2010 +0100 tsl2550: Move from i2c/chips to misc Move the last remaining driver from i2c/chips to misc. Good ridance! Signed-off-by: Jean Delvare Acked-by: Wolfram Sang Acked-by: Jonathan Cameron commit c074c39d62306efa5ba7c69c1a1531bc7333d252 Author: Jean Delvare Date: Sat Mar 13 20:56:53 2010 +0100 i2c-i801: Don't use the block buffer for I2C block writes Experience has shown that the block buffer can only be used for SMBus (not I2C) block transactions, even though the datasheet doesn't mention this limitation. Reported-by: Felix Rubinstein Signed-off-by: Jean Delvare Cc: Oleg Ryjkov Cc: stable@kernel.org commit 8e4b980c28c91cfe9d0ce0431bc0af56e146b49e Author: Jean Delvare Date: Sat Mar 13 20:56:52 2010 +0100 i2c-powermac: Be less verbose in the absence of real errors. Be less verbose in the absence of real errors. We don't have to report failed probes to the users, it's only confusing them. Signed-off-by: Jean Delvare Tested-by: Andrey Gusev Cc: Benjamin Herrenschmidt Cc: stable@kernel.org commit f635a1e74bd6001f06fe1df53d32daf2b28bf04b Author: Stephen Rothwell Date: Mon Mar 1 16:04:45 2010 +1100 i2c-smbus: Use device_lock/device_unlock Use the new device locking/unlocking API. Signed-off-by: Stephen Rothwell Signed-off-by: Jean Delvare commit f78233dd44a110c574fe760ad6f9c1e8741a0d00 Author: Sachin Prabhu Date: Sat Mar 13 09:03:55 2010 -0600 9p: Skip check for mandatory locks when unlocking While investigating a bug, I came across a possible bug in v9fs. The problem is similar to the one reported for NFS by ASANO Masahiro in http://lkml.org/lkml/2005/12/21/334. v9fs_file_lock() will skip locks on file which has mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped during unlock and the machine will end up with a BUG in locks_remove_flock(). v9fs_file_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Eric Van Hensbergen commit fc0f296126433e61600539325975b6c30681c07e Author: jvrao Date: Mon Mar 8 22:07:02 2010 +0000 9p: Fixes a simple bug enabling writes beyond 2GB. Fixes a simple bug so that large files beyond 2GB can be created. Signed-off-by: Venkateswararao Jujjuri Signed-off-by: Badari Pulavarty Signed-off-by: Eric Van Hensbergen commit 45bc21edb52fa71dbb1324c6f573aa880e95519d Author: Sripathi Kodi Date: Mon Mar 8 17:33:04 2010 +0000 9p: Change the name of new protocol from 9p2010.L to 9p2000.L This patch changes the name of the new 9P protocol from 9p2010.L to 9p2000.u. This is because we learnt that the name 9p2010 is already being used by others. Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit fae4528b2341f2ab0c86c191e24d9cdd93624c60 Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:16 2010 +0000 fs/9p: re-init the wstat in readdir loop This ensure that on failure when we free the stat buf we don't end up freeing an already freed pointer in the earlier loop Signed-off-by: Aneesh Kumar K.V Signed-off-by: Sripathi Kodi Signed-off-by: Eric Van Hensbergen commit 86c8437383acd85c05ec7c9a004f59fe7ac9821a Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:15 2010 +0000 net/9p: Add sysfs mount_tag file for virtio 9P device This adds a new file for virtio 9P device. The file contain details of the mount device name that should be used to mount the 9P file system. Ex: /sys/devices/virtio-pci/virtio1/mount_tag file now contian the tag name to be used to mount the 9P file system. Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit 97ee9b0257402f4731b55dfea42f24d26d793ddf Author: Aneesh Kumar K.V Date: Sat Mar 6 04:44:14 2010 +0000 net/9p: Use the tag name in the config space for identifying mount point This patch use the tag name in the config space to identify the mount device. The the virtio device name depend on the enumeration order of the device and may not remain the same across multiple boots So we use the tag name which is set via qemu option to uniquely identify the mount device Signed-off-by: Aneesh Kumar K.V Signed-off-by: Eric Van Hensbergen commit d10fca9f39238b07cc670b441d2b423de30359d2 Author: Will Deacon Date: Fri Feb 26 10:46:15 2010 +0100 ARM: 5960/1: ARM: perf-events: fix v7 event selection mask The event selection mask for ARMv7 cores [ARMV7_EVTSEL_MASK] is incorrectly set to 0x7f. This means that the top bit of an event ID is ignored, so counting branch misses (id=0x10) and ISBs (id=0x90) give the same results. This patch sets the event selection mask to the correct value of 0xff. Signed-off-by: Jean Pihet Signed-off-by: Will Deacon Signed-off-by: Russell King commit ddee87f208b6229d2910dd5930c87089dc56c87e Author: Will Deacon Date: Thu Feb 25 15:04:14 2010 +0100 ARM: 5959/1: ARM: perf-events: request PMU interrupts with IRQF_NOBALANCING If IRQ balancing is used on a multicore ARM system, PMU interrupt lines may be relocated onto CPUs other than the one causing the counter overflow. This can result in misattribution of events to the wrong core and, in the case that the CPU handling the interrupt has not experience counter overflow, the interrupt can be disabled because the handler returns IRQ_NONE. This patch adds the IRQF_NOBALANCING flag to the request_irq call in perf_events.c. Acked-by: Jamie Iles Signed-off-by: Will Deacon Signed-off-by: Russell King commit a91ed072d6135926c296a42b0b46de35e6347845 Author: Greg Ungerer Date: Fri Mar 12 06:19:25 2010 +0100 ARM: 5988/1: pgprot_dmacoherent() for non-mmu builds Commit 26a26d329688ab018e068b412b03d43d7c299f0a ("dma-mapping: switch ARMv7 DMA mappings to retain 'memory' attribute") added a new macro, pgprot_dmacoherent(), to correctly map DMA memory. The non-mmu pgtable support code also needs to implement this macro, otherwise when compiling you get: CC arch/arm/mm/dma-mapping.o arch/arm/mm/dma-mapping.c: In function 'dma_alloc_coherent': arch/arm/mm/dma-mapping.c:320: error: implicit declaration of function 'pgprot_dmacoherent' arch/arm/mm/dma-mapping.c:320: error: 'pgprot_kernel' undeclared (first use in this function) arch/arm/mm/dma-mapping.c:320: error: (Each undeclared identifier is reported only once arch/arm/mm/dma-mapping.c:320: error: for each function it appears in.) Signed-off-by: Greg Ungerer Signed-off-by: Russell King commit bb35579b45bcb0b74167a2165d3ea973f640bf00 Author: Mikael Pettersson Date: Thu Mar 11 12:28:31 2010 +0100 ARM: 5987/1: fix warning in kernel/elfcore.c from ARM's elf.h 2.6.34-rc1 added kernel/elfcore.c which includes . On ARM, this results in: In file included from include/linux/elf.h:7, from kernel/elfcore.c:1: /tmp/linux-2.6.34-rc1/arch/arm/include/asm/elf.h:101: warning: 'struct task_struct' declared inside parameter list /tmp/linux-2.6.34-rc1/arch/arm/include/asm/elf.h:101: warning: its scope is only this definition or declaration, which is probably not what you want Including seems a bit heavyweight, so this patch just adds a tentative declaration of struct task_struct in . Signed-off-by: Mikael Pettersson Signed-off-by: Russell King commit 438ff39d7813515d3aac20f53b5b95aaa58b38f9 Author: Rob Alley Date: Thu Mar 11 02:15:04 2010 +0100 ARM: 5986/1: at91sam9g20-ek: Correct braces in I2C registration code The change introduced in patch 5596/1 used incorrect bracing which resulted in the AT24 EEPROM no longer being registered. This patch corrects the bracing and allows both the WM8731 audio device and AT24 EEPROM device to be registered. Signed-off-by: Rob Alley Signed-off-by: Russell King commit a2302b45d8ab41a55e84c39a6c6f813586ad8493 Author: Mark Brown Date: Wed Mar 10 19:10:28 2010 +0100 ARM: 5985/2: ARM: Fix Samsung build after "ARM: Eliminate decompressor -Dstatic= PIC hack" Commit 5de813b6 (ARM: Eliminate decompressor -Dstatic= PIC hack) among other things changed the declared type of the error() function to an extern, conflicting with the forward declartion in the Samsung plat/uncompress.h which appears to have been relying on the static being defined away, causing build failures since error() ends up with a GOT relocation but the linker script discards all GOT relocated data and functions: arch/arm/boot/compressed/decompress.o: In function `gunzip': /home/broonie/git/linux-2.6/arch/arm/boot/compressed/../../../../lib/decompress_ +inflate.c:68: undefined reference to `error' and so on. Fix this by moving the declaration into uncompress/misc.c where it is shared with the rest of the code, correcting the definition as we go. Signed-off-by: Mark Brown Signed-off-by: Russell King commit 0e152cd7c16832bd5cadee0c2e41d9959bc9b6f9 Author: Borislav Petkov Date: Fri Mar 12 15:43:03 2010 +0100 x86, k8 nb: Fix boot crash: enable k8_northbridges unconditionally on AMD systems de957628ce7c84764ff41331111036b3ae5bad0f changed setting of the x86_init.iommu.iommu_init function ptr only when GART IOMMU is found. One side effect of it is that num_k8_northbridges is not initialized anymore if not explicitly called. This resulted in uninitialized pointers in , for example, which uses the num_k8_northbridges thing through node_to_k8_nb_misc(). Fix that through an initcall that runs right after the PCI subsystem and does all the scanning. Then, remove initialization in gart_iommu_init() which is a rootfs_initcall and we're running before that. What is more, since num_k8_northbridges is being used in other places beside GART IOMMU, include it whenever we add AMD CPU support. The previous dependency chain in kconfig contained K8_NB depends on AGP_AMD64|GART_IOMMU which was clearly incorrect. The more natural way in terms of hardware dependency should be AGP_AMD64|GART_IOMMU depends on K8_NB depends on CPU_SUP_AMD && PCI. Make it so Number One! Signed-off-by: Borislav Petkov Cc: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100312144303.GA29262@aftab> Signed-off-by: Ingo Molnar Tested-by: Joerg Roedel commit b6345879ccbd9b92864fbd7eb8ac48acdb4d6b15 Author: Steven Rostedt Date: Fri Mar 12 20:03:30 2010 -0500 tracing: Do not record user stack trace from NMI context A bug was found with Li Zefan's ftrace_stress_test that caused applications to segfault during the test. Placing a tracing_off() in the segfault code, and examining several traces, I found that the following was always the case. The lock tracer was enabled (lockdep being required) and userstack was enabled. Testing this out, I just enabled the two, but that was not good enough. I needed to run something else that could trigger it. Running a load like hackbench did not work, but executing a new program would. The following would trigger the segfault within seconds: # echo 1 > /debug/tracing/options/userstacktrace # echo 1 > /debug/tracing/events/lock/enable # while :; do ls > /dev/null ; done Enabling the function graph tracer and looking at what was happening I finally noticed that all cashes happened just after an NMI. 1) | copy_user_handle_tail() { 1) | bad_area_nosemaphore() { 1) | __bad_area_nosemaphore() { 1) | no_context() { 1) | fixup_exception() { 1) 0.319 us | search_exception_tables(); 1) 0.873 us | } [...] 1) 0.314 us | __rcu_read_unlock(); 1) 0.325 us | native_apic_mem_write(); 1) 0.943 us | } 1) 0.304 us | rcu_nmi_exit(); [...] 1) 0.479 us | find_vma(); 1) | bad_area() { 1) | __bad_area() { After capturing several traces of failures, all of them happened after an NMI. Curious about this, I added a trace_printk() to the NMI handler to read the regs->ip to see where the NMI happened. In which I found out it was here: ffffffff8135b660 : ffffffff8135b660: 48 83 ec 78 sub $0x78,%rsp ffffffff8135b664: e8 97 01 00 00 callq ffffffff8135b800 What was happening is that the NMI would happen at the place that a page fault occurred. It would call rcu_read_lock() which was traced by the lock events, and the user_stack_trace would run. This would trigger a page fault inside the NMI. I do not see where the CR2 register is saved or restored in NMI handling. This means that it would corrupt the page fault handling that the NMI interrupted. The reason the while loop of ls helped trigger the bug, was that each execution of ls would cause lots of pages to be faulted in, and increase the chances of the race happening. The simple solution is to not allow user stack traces in NMI context. After this patch, I ran the above "ls" test for a couple of hours without any issues. Without this patch, the bug would trigger in less than a minute. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Steven Rostedt commit a2f8071428ed9a0f06865f417c962421c9a6b488 Author: Steven Rostedt Date: Fri Mar 12 19:56:00 2010 -0500 tracing: Disable buffer switching when starting or stopping trace When the trace iterator is read, tracing_start() and tracing_stop() is called to stop tracing while the iterator is processing the trace output. These functions disable both the standard buffer and the max latency buffer. But if the wakeup tracer is running, it can switch these buffers between the two disables: buffer = global_trace.buffer; if (buffer) ring_buffer_record_disable(buffer); <<<--------- swap happens here buffer = max_tr.buffer; if (buffer) ring_buffer_record_disable(buffer); What happens is that we disabled the same buffer twice. On tracing_start() we can enable the same buffer twice. All ring_buffer_record_disable() must be matched with a ring_buffer_record_enable() or the buffer can be disable permanently, or enable prematurely, and cause a bug where a reset happens while a trace is commiting. This patch protects these two by taking the ftrace_max_lock to prevent a switch from occurring. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit 283740c619d211e34572cc93c8cdba92ccbdb9cc Author: Steven Rostedt Date: Fri Mar 12 19:48:41 2010 -0500 tracing: Use same local variable when resetting the ring buffer In the ftrace code that resets the ring buffer it references the buffer with a local variable, but then uses the tr->buffer as the parameter to reset. If the wakeup tracer is running, which can switch the tr->buffer with the max saved buffer, this can break the requirement of disabling the buffer before the reset. buffer = tr->buffer; ring_buffer_record_disable(buffer); synchronize_sched(); __tracing_reset(tr->buffer, cpu); If the tr->buffer is swapped, then the reset is not happening to the buffer that was disabled. This will cause the ring buffer to fail. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Reported-by: Lai Jiangshan Signed-off-by: Steven Rostedt commit ea14eb714041d40fcc5180b5a586034503650149 Author: Steven Rostedt Date: Fri Mar 12 19:41:23 2010 -0500 function-graph: Init curr_ret_stack with ret_stack If the graph tracer is active, and a task is forked but the allocating of the processes graph stack fails, it can cause crash later on. This is due to the temporary stack being NULL, but the curr_ret_stack variable is copied from the parent. If it is not -1, then in ftrace_graph_probe_sched_switch() the following: for (index = next->curr_ret_stack; index >= 0; index--) next->ret_stack[index].calltime += timestamp; Will cause a kernel OOPS. Found with Li Zefan's ftrace_stress_test. Cc: stable@kernel.org Signed-off-by: Steven Rostedt commit 52fbe9cde7fdb5c6fac196d7ebd2d92d05ef3cd4 Author: Lai Jiangshan Date: Mon Mar 8 14:50:43 2010 +0800 ring-buffer: Move disabled check into preempt disable section The ring buffer resizing and resetting relies on a schedule RCU action. The buffers are disabled, a synchronize_sched() is called and then the resize or reset takes place. But this only works if the disabling of the buffers are within the preempt disabled section, otherwise a window exists that the buffers can be written to while a reset or resize takes place. Cc: stable@kernel.org Reported-by: Li Zefan Signed-off-by: Lai Jiangshan LKML-Reference: <4B949E43.2010906@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit daf9fe2ee9a203c4fc555cfe5c5f3d9f660e743c Merge: 9d85929 8d002bd Author: Linus Torvalds Date: Fri Mar 12 16:41:09 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: mfd: Several MFD drivers should depend on GENERIC_HARDIRQS mfd: Fix sm501 requested region size commit 9d85929fefd040ca84a5e04ee704d043efcc3c2e Merge: 6db823c eeb5b4a Author: Linus Torvalds Date: Fri Mar 12 16:35:21 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 * git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6: fat: Fix stat->f_namelen fat: Fix vfat_lookup() commit 6db823cf4b44f235b5e1da8ec1fe3c3cd63647fe Author: Linus Torvalds Date: Fri Mar 12 16:30:23 2010 -0800 Fix up .gitignore for top-level file patterns Some of the gitignore file patters were explicitly meant to be only for the top level, but weren't marked that way, so they would trigger recursively in subdirectories too. Normally that was harmless, but at least "linux" happened to trigger elsewhere too. Fix it up. And other patterns in that section weren't necessarily top-level at all. Reported-by: Jiri Slaby Signed-off-by: Linus Torvalds commit 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2 Merge: 3836a03 ad6759f Author: Linus Torvalds Date: Fri Mar 12 16:27:08 2010 -0800 Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timekeeping: Prevent oops when GENERIC_TIME=n commit 3836a03d978e68b0ae00d3589089343c998cd4ff Author: Eric Paris Date: Tue Mar 9 22:23:01 2010 -0500 anon_inodes: mark the anon inode private Inotify was switched to use anon_inode instead of its own private filesystem which only had one inode in commit c44dcc56d2b5c7 "switch inotify_user to anon_inode" The problem with this is that now the inotify inode is not a distinct inode which can be managed by LSMs. userspace tools which use inotify were allowed to use the inotify inode but may not have had permission to do read/write type operations on the anon_inode. After looking at the anon_inode and its users it looks like the best solution is to just mark the anon_inode as S_PRIVATE so the security system will ignore it. Signed-off-by: Eric Paris Acked-by: James Morris Signed-off-by: Linus Torvalds commit 83c0fb6500b13c9b7564fe453b76356dc58415d4 Merge: 11bfe2e 3a065fc Author: Linus Torvalds Date: Fri Mar 12 16:22:50 2010 -0800 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6: udf: use ext2_find_next_bit udf: Do not read inode before writing it udf: Fix unalloc space handling in udf_update_inode commit 11bfe2ea732c6499c46c4f3a63d567c05b9dbafd Merge: b6fedfd 5b8a2fb Author: Linus Torvalds Date: Fri Mar 12 16:21:24 2010 -0800 Merge branch 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm * 'msm-mmc_sdcc' of git://codeaurora.org/quic/kernel/dwalker/linux-msm: msm_sdcc.c: missing brackets in msmsdcc_resume() commit b97c4bc16734a2e597dac7f91ee9eb78f4aeef9a Author: Luca Barbieri Date: Thu Mar 11 14:08:45 2010 -0800 locking: Make sparse work with inline spinlocks and rwlocks Currently sparse does not work with inline spinlock and rwlock functions. The problem is that they do not use the __acquires/__releases out-of-line functions, but use inline functions with no sparse annotations. This patch adds the appropriate annotations to make it work properly. Signed-off-by: Luca Barbieri Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Thomas Gleixner commit b6fedfd2a18a489d31246312f7279f82e3cc6b37 Merge: c32da02 30124d1 Author: Linus Torvalds Date: Fri Mar 12 16:06:51 2010 -0800 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/booke: Fix breakpoint/watchpoint one-shot behavior powerpc: Reduce printk from pseries_mach_cpu_die() powerpc: Move checks in pseries_mach_cpu_die() powerpc: Reset kernel stack on cpu online from cede state powerpc: Fix G5 thermal shutdown powerpc/pseries: Pass CPPR value to H_XIRR hcall powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc: Fix SMP build with disabled CPU hotplugging. powerpc: Dynamically allocate pacas powerpc/perf: e500 support powerpc/perf: Build callchain code regardless of hardware event support. powerpc/cpm2: Checkpatch cleanup powerpc/86xx: Renaming following split of GE Fanuc joint venture powerpc/86xx: Convert gef_pic_lock to raw_spinlock powerpc/qe: Convert qe_ic_lock to raw_spinlock powerpc/82xx: Convert pci_pic_lock to raw_spinlock powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock commit c32da02342b7521df25fefc2ef20aee0e61cf887 Merge: dca1d9f 318ae2e Author: Linus Torvalds Date: Fri Mar 12 16:04:50 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits) doc: fix typo in comment explaining rb_tree usage Remove fs/ntfs/ChangeLog doc: fix console doc typo doc: cpuset: Update the cpuset flag file Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed Remove drivers/parport/ChangeLog Remove drivers/char/ChangeLog doc: typo - Table 1-2 should refer to "status", not "statm" tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h devres/irq: Fix devm_irq_match comment Remove reference to kthread_create_on_cpu tree-wide: Assorted spelling fixes tree-wide: fix 'lenght' typo in comments and code drm/kms: fix spelling in error message doc: capitalization and other minor fixes in pnp doc devres: typo fix s/dev/devm/ Remove redundant trailing semicolons from macros fix typo "definetly" -> "definitely" in comment tree-wide: s/widht/width/g typo in comments ... Fix trivial conflict in Documentation/laptops/00-INDEX commit dca1d9f6d7ae428c193f32bd3e9a4ca13176648b Merge: 9ff9933 91e0138 Author: Linus Torvalds Date: Fri Mar 12 16:00:54 2010 -0800 Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm * 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (370 commits) ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock ARM: S3C2443: Remove #if 0 for clk_mpll ARM: S3C2443: Update notes on MPLLREF clock ARM: S3C2443: Further clksrc-clk conversions ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation USB: Fix s3c-hsotg build following Samsung platform header moves ARM: S3C64XX: Reintroduce unconditional build of audio device ARM: 5961/1: ux500: fix CLKRST addresses ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted ASoC: Fix S3C64xx IIS driver for Samsung header reorg ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support [ARM] pxa: fix typo in mxm8x10.h [ARM] pxa/raumfeld: set GPIO drive bits for LED pins [ARM] pxa/zeus: Add support for mcp2515 CAN bus [ARM] pxa/zeus: Add support for onboard max6369 watchdog [ARM] pxa/zeus: Add Eurotech as the manufacturer [ARM] pxa/zeus: Correct the USB host initialisation flags [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress [ARM] pxa: refactor uncompress.h for non-PXA uarts [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs ... commit 9ff99339447de403a46be5e3f23d0c794d540b06 Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: poll Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move epoll_table extern declaration to linux/poll.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2edf5e49800846a2b2b6461d99cdae18067c440f Author: Dave Young Date: Wed Mar 10 15:24:10 2010 -0800 sysctl extern cleanup: lockdep Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move lockdep extern declarations to linux/lockdep.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f0e056fdebc15d3f4724ebc7bbf323158add1d7 Author: Dave Young Date: Wed Mar 10 15:24:09 2010 -0800 sysctl extern cleanup: rtmutex Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move max_lock_depth extern declaration to linux/rtmutex.h Signed-off-by: Dave Young Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c55b7c3e82d0ad58f35a0785faaaf2f70b9b6cd3 Author: Dave Young Date: Wed Mar 10 15:24:08 2010 -0800 sysctl extern cleanup: acct Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move acct_parm extern declaration to linux/acct.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15485a4682d1d3bfee2aa78b4b1a5d36f5746b64 Author: Dave Young Date: Wed Mar 10 15:24:07 2010 -0800 sysctl extern cleanup: sg Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move sg_big_buff extern declaration to scsi/sg.h Signed-off-by: Dave Young Acked-by: Doug Gilbert Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ed109103d73b0bafc92e860cead56725231384d Author: Dave Young Date: Wed Mar 10 15:24:06 2010 -0800 sysctl extern cleanup: module Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move modprobe_path extern declaration to linux/kmod.h Move modules_disabled extern declaration to linux/module.h Signed-off-by: Dave Young Cc: Rusty Russell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5ab67726f33b50f40db0ccf271ceb3c658554d5 Author: Dave Young Date: Wed Mar 10 15:24:05 2010 -0800 sysctl extern cleanup: rcu Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move rcutorture_runnable extern declaration to linux/rcupdate.h Signed-off-by: Dave Young Acked-by: Josh Triplett Reviewed-by: "Paul E. McKenney" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d33ed52d57e794eba55cea3f5eab3c8f80b6cb5a Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: signal Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move print_fatal_signals extern declaration to linux/signal.h Signed-off-by: Dave Young Cc: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit eb5572fed55f4c2b7dbc42582bc82dcb47632380 Author: Dave Young Date: Wed Mar 10 15:23:59 2010 -0800 sysctl extern cleanup: C_A_D Extern declarations in sysctl.c should be moved to their own header file, and then include them in relavant .c files. Move C_A_D extern variable declaration to linux/reboot.h Signed-off-by: Dave Young Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d759c3745e62c36fd7efee7a2ce2a327f22e9056 Author: Vladimir Zapolskiy Date: Wed Mar 10 15:23:57 2010 -0800 mxcmmc: fixed max_seg_size value on initialization This unpleasant typo appeared while porting the driver from Freescale original sources, where anyone can easily find the correct version. Current incorrect version potentially can influence segment and merge handling in block subsystem via MMC request queue settings. Signed-off-by: Vladimir Zapolskiy Cc: Sascha Hauer Cc: Pierre Ossman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51ea3f6a4571e9283e2ff79b74bcedfc2986dbe2 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:57 2010 -0800 inflate_fast: sout is already a short so ptr arith was off by one. inflate_fast() can do either POST INC or PRE INC on its pointers walking the memory to decompress. Default is PRE INC. The sout pointer offset was miscalculated in one case as the calculation assumed sout was a char * This breaks inflate_fast() iff configured to do POST INC. Signed-off-by: Joakim Tjernlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e69eae65523b457a3ac4262a66cfff57f2c924a9 Author: Joakim Tjernlund Date: Wed Mar 10 15:23:55 2010 -0800 zlib: make new optimized inflate endian independent Commit 6846ee5ca68d81e6baccf0d56221d7a00c1be18b ("zlib: Fix build of powerpc boot wrapper") made the new optimized inflate only available on arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS. This patch will again enable the optimization for all arch's by defining our own endian independent version of unaligned access. As an added bonus, arch's that define CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS do a plain load instead. Signed-off-by: Joakim Tjernlund Cc: Anton Blanchard Cc: Benjamin Herrenschmidt Cc: David Woodhouse Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ceaa2f39bfa73c4398cd01e78f1c3ebde3d3383 Author: Russell King Date: Wed Mar 10 15:23:53 2010 -0800 decompress: fix new decompressor for PIC The ARM kernel decompressor wants to be able to relocate r/w data independently from the rest of the image, and we do this by ensuring that r/w data has global visibility. Define STATIC_RW_DATA to be empty to achieve this. Signed-off-by: Russell King Cc: Alain Knaff Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c1840f15feecb6961f480cad1a7a8e53a3f2ba6 Author: Akinobu Mita Date: Wed Mar 10 15:23:52 2010 -0800 sgi-gru: use for_each_set_bit() Replace open-coded loop with for_each_set_bit(). Signed-off-by: Akinobu Mita Cc: Jack Steiner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0fbcae222b8aa3a47034a484e02e7fc14050c783 Author: Julia Lawall Date: Wed Mar 10 15:23:52 2010 -0800 drivers/char/mmtimer.c: eliminate useless code The variable x is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Stefan observed: The next x = rb_entry(mn->next, struct mmtimer, list); is preceded by a test whether mn->next is NULL. Unless that test is redundant too, your patch fixes a potential NULL pointer dereference, introduced by commit cbacdd95 "SGI Altix mmtimer: allow larger number of timers per node" in 2.6.26. Signed-off-by: Julia Lawall Cc: Stefan Richter Cc: Dimitri Sivanich Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 582ef52a5d5650931f6d76c81d824bd98419ac8a Author: Alberto Panizzo Date: Wed Mar 10 15:23:50 2010 -0800 w1: mxc_w1: move probe() and remove() to the dev* text area This fixes the section mismatch warning for mxc_w1_probe() Cc: Evgeniy Polyakov Cc: Sascha Hauer Acked-by: Uwe Kleine-König Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6786073927c3ff3eb7fc3d2192e761e86fa0d352 Author: Roel Kluin Date: Wed Mar 10 15:23:49 2010 -0800 w1: fix test in ds2482_wait_1wire_idle() With `while (++retries < DS2482_WAIT_IDLE_TIMEOUT)' retries reaches DS2482_WAIT_IDLE_TIMEOUT after the loop Signed-off-by: Roel Kluin Cc: Evgeniy Polyakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ed63d5eb4c0de0321f5c0a7328e132a78f9fafe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial amba-pl010: enable PPS support Function pl010_enable_ms() is automagically called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc77f161aa5e81ddaf38390094c4f2ca3814e6b1 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:48 2010 -0800 serial 8250: enable PPS support Automagically function serial8250_enable_ms() is called when PPS ldisc is selected. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0880df0ccde8d551fc4d88c455acb2ee0801e26 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:47 2010 -0800 pps: serial clients support Adds support, by using the PPS line discipline, for the PPS sources connected with the CD (Carrier Detect) pin of a serial port. [akpm@linux-foundation.org: fix cast size warnings] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 572b9adbd40b5565dc413db04af9cc234f72bf19 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:46 2010 -0800 ldisc n_tty: add new method n_tty_inherit_ops() This new method can be used to init a new struct tty_ldisc_ops as the default tty_ldisc_N_TTY struct. Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3e63afe8a74c0134d05a551cc74facc3b3ec0d7 Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 ldisc: new dcd_change() method for line disciplines Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 697fb85fcf21b5229a3072440222d14b05ef2abe Author: Rodolfo Giometti Date: Wed Mar 10 15:23:45 2010 -0800 pps: LinuxPPS clients support Each PPS source can be registered/deregistered into the system by using special modules called "clients". They simply define the PPS sources' attributes and implement the time signal registration mechanism. This patch adds a special directory for such clients and adds a dummy client that can be useful to test system integrity on real systems. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Rodolfo Giometti Cc: David Woodhouse Cc: Greg KH Cc: Alan Cox Cc: Alexander Gordeev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 51e7364ef281e540371f084008732b13292622f0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:44 2010 -0800 Documentation: rename PCI-DMA-mapping.txt to DMA-API-HOWTO.txt Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Cc: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f5a69f4c1319c03b946e1e99a590b6002aa3e5ef Author: FUJITA Tomonori Date: Wed Mar 10 15:23:43 2010 -0800 Documentation: remove the PCI DMA API description in DMA-API.txt - remove the PCI DMA API description in DMA-API.txt - remove the descriptions of dma_unmap macros since PCI-DMA-mapping.txt has the same description. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 216bf58f4092df33262bea498f0460657f4842a4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:42 2010 -0800 Documentation: convert PCI-DMA-mapping.txt to use the generic DMA API - replace the PCI DMA API (i.e. pci_dma_*) with the generic DMA API. - make the document more generic (use the PCI specific explanation as an example). [akpm@linux-foundation.org: fix things Randy noticed] Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: "David S. Miller" Reviewed-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5f3cd1e0bb452c31a306a3e764514ea2eaf7d2e0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:41 2010 -0800 dma-mapping: pci: move pci_set_dma_mask and pci_set_consistent_dma_mask to pci-dma-compat.h We can use pci-dma-compat.h to implement pci_set_dma_mask and pci_set_consistent_dma_mask as we do with the other PCI DMA API. We can remove HAVE_ARCH_PCI_SET_DMA_MASK too. Signed-off-by: FUJITA Tomonori Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6fee48cd330c68332f9712bc968d934a1a84a32a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: arm: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts arm to the generic pci_set_dma_mask and pci_set_consistent_dma_mask (removes HAVE_ARCH_PCI_SET_DMA_MASK for dmabounce). Signed-off-by: FUJITA Tomonori Looked-over-by: Russell King Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e6c70e6910d21443ab0f894bab52b9ea653ef27 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:40 2010 -0800 dma-mapping: powerpc: use generic pci_set_dma_mask and pci_set_consistent_dma_mask This converts powerpc to use the generic pci_set_dma_mask and pci_set_consistent_dma_mask (drivers/pci/pci.c). The generic pci_set_dma_mask does what powerpc's pci_set_dma_mask does. Unlike powerpc's pci_set_consistent_dma_mask, the gneric pci_set_consistent_dma_mask sets only coherent_dma_mask. It doesn't work for powerpc? pci_set_consistent_dma_mask API should set only coherent_dma_mask? Signed-off-by: FUJITA Tomonori Acked-by: Benjamin Herrenschmidt Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a1961f49ee8d7339ea2454443dfc0460e0b2748 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:39 2010 -0800 dma-mapping: dma-mapping.h: add dma_set_coherent_mask dma_set_coherent_mask corresponds to pci_set_consistent_dma_mask. This is necessary to move to the generic device model DMA API from the PCI bus specific API in the long term. dma_set_coherent_mask works in the exact same way that pci_set_consistent_dma_mask does. So this patch also changes pci_set_consistent_dma_mask to call dma_set_coherent_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e3c4bccabaf3e5c13f4b307c7737cbe8d0cecd02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:38 2010 -0800 dma-mapping: pci: convert pci_set_dma_mask to call dma_set_mask This changes pci_set_dma_mask to call the generic DMA API, dma_set_mask. pci_set_dma_mask (in drivers/pci/pci.c) does the same things that dma_set_mask does on all the architectures that use pci_set_dma_mask; calls dma_supprted and sets dev->dma_mask. So we safely change pci_set_dma_mask to simply call dma_set_mask. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Acked-by: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c186caca3dbe7f44da624cb4f9d78e1b1dfb13b8 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:37 2010 -0800 dma-mapping: alpha: use include/linux/pci-dma-compat.h This converts Alpha to use include/linux/pci-dma-compat.h. Alpha is the only architecutre that implements the PCI DMA API in the own way. That makes it difficult to implement the generic DMA API via the PCI bus specific DMA API. The generic DMA API calls the PCI DMA API implementation in arch/alpha/kernel/pci_iommu.c on non Jensen systems. It calls the DMA API in arch/alpha/kernel/pci-noop.c on Jensen systems. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Jesse Barnes Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 349004294c365cb99a0ee84149286d6f29b1e6b9 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:35 2010 -0800 dma-mapping: sparc: unify 32bit and 64bit dma_set_mask This patchset transforms the PCI DMA API into the generic device model. It's one of the reasons why we introduced the generic DMA API long ago; driver writers are always able to use the generic DMA API with any bus instead of using bus specific DMA APIs such as pci_map_single, sbus_map_single, etc (only two bus specific APIs exist now; pci and ssb). Some of the PCI DMA API are already implented on the top of the generic DMA API (include/asm-generic/pci-dma-compat.h). But there are some exceptions. This patchset finishes the transformation. This patch: sparc has two dma_set_mask implementations for 32bit and 64bit. They are same except for the error returned value. We can safely unify them since the error returned value doesn't matter as long as it is negative (as DMA-API.txt describes). This patch also changes dma_set_mask not to call pci_set_dma_mask. Instead, dma_set_mask does the same thing that pci_set_dma_mask does. This change enables ut to change pci_set_dma_mask to call dma_set_mask; we can implement pci_set_dma_mask as pci-dma-compat.h does. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: James Bottomley Cc: Jesse Barnes Cc: Benjamin Herrenschmidt Cc: Russell King Cc: Greg KH Cc: Kay Sievers Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 06db881b4f1b5fb8fff563423f76b7361de8281a Author: FUJITA Tomonori Date: Wed Mar 10 15:23:33 2010 -0800 dma-mapping: mn10300: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Koichi Yasutake Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2b4f767af73d50ab9ce3a92f254eb290f5e5507c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: blackfin: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and the same comments are in other files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: Mike Frysinger Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 027491f4b2ff15fe5cc36c900cb2d1fdb35cefdd Author: FUJITA Tomonori Date: Wed Mar 10 15:23:32 2010 -0800 dma-mapping: frv: remove the obsolete and unnecessary DMA API comments pci_dma_sync_single was obsoleted long ago. All the comments are generic, not architecture specific, simply describes some of the DMA-API (and frv has the same comments in three files). Documentation/DMA-API.txt have more detailed descriptions. This removes the above obsolete and unnecessary DMA API comments. Let's describe the DMA API in only Documentation/DMA-API.txt. Signed-off-by: FUJITA Tomonori Cc: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0acedc124aca35f5cce9d4ee288dc372bf517e09 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:31 2010 -0800 dma-mapping.h: add the dma_unmap state API Adds the following macros: DECLARE_DMA_UNMAP_ADDR(ADDR_NAME) DECLARE_DMA_UNMAP_LEN(LEN_NAME) dma_unmap_addr(PTR, ADDR_NAME) dma_unmap_addr_set(PTR, ADDR_NAME, VAL) dma_unmap_len(PTR, LEN_NAME) dma_unmap_len_set(PTR, LEN_NAME, VAL) The API corresponds to the pci_unmap state API. We'll move to this new generic API from the PCI specific API in the long term. As include/asm-generic/pci-dma-compat.h does, the pci_unmap API simply calls the new generic API for some time. Signed-off-by: FUJITA Tomonori Cc: James Bottomley Cc: David S. Miller Cc: Jesse Barnes Cc: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f41b177157718abe9a93868bb76e47d4a6f3681d Author: FUJITA Tomonori Date: Wed Mar 10 15:23:30 2010 -0800 pci-dma: add linux/pci-dma.h to linux/pci.h All the architectures properly set NEED_DMA_MAP_STATE now so we can safely add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h inclusion in arch's asm/pci.h Signed-off-by: FUJITA Tomonori Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c7e67ac1f329fa28b6a411335787c786de618cba Author: FUJITA Tomonori Date: Wed Mar 10 15:23:29 2010 -0800 pci-dma: cris: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Mikael Starvik Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 479ea1e90c2b052de793a80ecc5eceab480f44ff Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: xtensa: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Chris Zankel Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d15b51be6f3a04762522c8ee9ac6a3a02752c0ed Author: FUJITA Tomonori Date: Wed Mar 10 15:23:28 2010 -0800 pci-dma: sparc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cabbb6277286adf973fbb30aca9b194922a316e Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: sh: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Paul Mundt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit af407c6db16aa9ca63559076dbe620220a822580 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:27 2010 -0800 pci-dma: powerpc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Benjamin Herrenschmidt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a0bd66a3f78cb993144aaf336ce115017a0b5c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:26 2010 -0800 pci-dma: parisc: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e1e02b329d64353e67af070516a9bd14caff8bb0 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: mips: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ralf Baechle Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed5ef8b44374def8461a0a05d4afc34d4ad684 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:25 2010 -0800 pci-dma: ia64: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Tony Luck Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272ecbe5919d057388bbbea751fad5471aaf3f02 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:24 2010 -0800 pci-dma: frv: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: arm: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Acked-by: Russell King Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 08d925badd63a4e335905066152d96b83266987c Author: FUJITA Tomonori Date: Wed Mar 10 15:23:23 2010 -0800 pci-dma: alpha: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3bc4e4590de89c2dfcfb1000344cd072574c9ad4 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:22 2010 -0800 pci-dma: x86: use include/linux/pci-dma.h Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5637f2df8d56b64697c1ee5c96cf0d6b650b30cb Author: FUJITA Tomonori Date: Wed Mar 10 15:23:21 2010 -0800 pci-dma: add include/linux/pci-dma.h This patch adds include/linux/pci-dma.h that defines the pci_unmap state API: DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) DECLARE_PCI_UNMAP_LEN(LEN_NAME) pci_unmap_addr(PTR, ADDR_NAME) pci_unmap_addr_set(PTR, ADDR_NAME, VAL) pci_unmap_len(PTR, LEN_NAME) pci_unmap_len_set(PTR, LEN_NAME, VAL) This enables us to remove lots of the duplication in architecture implementations since there are only two ways to define the API. If architectures define CONFIG_NEED_DMA_MAP_STATE, they get the real definition of pci_unmap state API. If not, they get the noop definition. In the long term, it's better to replace the API with the generic device model API such as DECLARE_DMA_UNMAP_ADDR. We can map the API to the generic one (like dma-mapping-compat.h does). This patch also makes the migration process easier. We can remove this file after the migration. It might be simpler to add the API to include/linux/pci.h but looks it's already too large. We'll remove pci-dma.h after finishing moving to the generic device model. So I put the API to a separate file. Signed-off-by: FUJITA Tomonori Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Acked-by: Russell King Acked-by: David Howells Cc: Tony Luck Cc: Ralf Baechle Cc: Kyle McMartin Cc: Helge Deller Cc: James Bottomley Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: David S. Miller Cc: Chris Zankel Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 771cb3ecfb4d2858a7583be83caf27726f6c3002 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 um: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Jeff Dike Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d2efd0800ee7a7c71ae8748d759bb5eb4b71839 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:19 2010 -0800 alpha: remove dma_sync_single_range dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Cc: Richard Henderson Cc: Ivan Kokshaysky Acked-by: Matt Turner Acked-by: David S. Miller Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8127bfc5645db0e050468e0ff971b4081f73ddcf Author: FUJITA Tomonori Date: Wed Mar 10 15:23:18 2010 -0800 DMA-API.txt: remove dma_sync_single_range description dma_sync_single_for_cpu/for_device supports a partial sync so there is no point to have dma_sync_single_range (also dma_sync_single was obsoleted long ago, replaced with dma_sync_single_for_cpu/for_device). There is no user of dma_sync_single_range() in mainline and only Alpha architecture supports dma_sync_single_range(). So it's unlikely that someone out of the tree uses it. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9705ef7ec8c67a62474291bb4b235927bdf702db Author: FUJITA Tomonori Date: Wed Mar 10 15:23:17 2010 -0800 DMA-API.txt: add dma_sync_single/sg API description This adds the description of the following eight function: dma_sync_single_for_cpu pci_dma_sync_single_for_cpu dma_sync_single_for_device pci_dma_sync_single_for_device dma_sync_sg_for_cpu pci_dma_sync_sg_for_cpu dma_sync_sg_for_device pci_dma_sync_sg_for_device It was unclear that the API permits a partial sync (some network drivers already do though). I made it clear that the sync_single API can do a partial sync but the sync_sg API can't. We could do a partial sync with the sync_sg API too, however, it's difficult for driver writers to correctly use the sync_sg API for a partial sync since the scatterlists passed in to the mapping API can't be modified. It's unlikely that driver writers want to do a partial sync with the sync_sg API (because the sync_sg API are usually used for block drivers). So I think that it's better to forbid a partial sync with the sync_sg API. Signed-off-by: FUJITA Tomonori Acked-by: David Miller Acked-by: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 039956e9199b71ea673954e025f52f319110ca58 Author: FUJITA Tomonori Date: Wed Mar 10 15:23:15 2010 -0800 Documentation/DMA-API.txt: remove deprecated function descriptions dma_sync_single(), pci_dma_sync_single(), dma_sync_sg(), and pci_dma_sync_sg() are deprecated. We should not advertise them. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: Joerg Roedel Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8004fd2ad6042ae24d3913cf5089909781db3a25 Author: Peter Tyser Date: Wed Mar 10 15:23:15 2010 -0800 edac: e752x: add dram scrubbing support Add support to scrub DRAM using the e752x integrated memory scrubbing engine. The e7320/7520/e7525 chipsets support scrubbing at one rate while the i3100 chipset supports a normal and fast rate. A similar patch was originally sent back in 2008: http://sourceforge.net/mailarchive/forum.php?thread_name=1204835866.25206.70.camel@localhost.localdomain&forum_name=bluesmoke-devel This version has the following updates: - Use 16-bit PCI config cycles to access MCHSCRB register e7320/7520/e7525 docs say register is 16bits wide, i3100 says 8. I tested 16bits on the i3100 to be safe. - Recalcuate and round actual scrub rates The changes have been tested on an i3100-based board. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8de5c1a165be5624a1003ce17877299e04b2afd6 Author: Konstantin Olifer Date: Wed Mar 10 15:23:14 2010 -0800 edac: e752x fsb ecc FSB parity is only supported on the Xeon processor. Previously it was incorrectly enabled for the Celeron as well. Signed-off-by: Konstantin Olifer Signed-off-by: Doug Thompson Cc: Peter Tyser Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 66ed3f7516da31205aed9b47a13348c0d982c4f5 Author: H Hartley Sweeten Date: Wed Mar 10 15:23:13 2010 -0800 edac: mpc85xx use resource_size instead of raw math Use resource_size() instead of arithmetic. Signed-off-by: H Hartley Sweeten Signed-off-by: Doug Thompson Acked-by: Dave Jiang Cc: Peter Tyser Cc: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcca7c3d003ce61ed71b412f645cfbe7bd8e882e Author: Peter Tyser Date: Wed Mar 10 15:23:12 2010 -0800 edac: mpc85xx improve SDRAM error reporting Add the ability to detect the specific data line or ECC line which failed when printing out SDRAM single-bit errors. An example of a single-bit SDRAM ECC error is below: EDAC MPC85xx MC1: Err Detect Register: 0x80000004 EDAC MPC85xx MC1: Faulty data bit: 59 EDAC MPC85xx MC1: Expected Data / ECC: 0x7f80d000_409effa0 / 0x6d EDAC MPC85xx MC1: Captured Data / ECC: 0x7780d000_409effa0 / 0x6d EDAC MPC85xx MC1: Err addr: 0x00031ca0 EDAC MPC85xx MC1: PFN: 0x00000031 Knowning which specific data or ECC line caused an error can be useful in tracking down hardware issues such as improperly terminated signals, loose pins, etc. Note that this feature is only currently enabled for 64-bit wide data buses, 32-bit wide bus support should be added. I don't have any 32-bit wide systems to test on. If someone has one and is willing to give this patch a shot with the check for a 64-bit data bus removed it would be much appreciated and I can re-submit with both 32 and 64 bit buses supported. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21768639be419d00275ac4e58b863361d0c24ee4 Author: Peter Tyser Date: Wed Mar 10 15:23:11 2010 -0800 edac: mpc85xx mask ecc syndrome correctly With a 64-bit wide data bus only the lowest 8-bits of the ECC syndrome are relevant. With a 32-bit wide data bus only the lowest 16-bits are relevant on most architectures. Without this change, the ECC syndrome displayed can be mildly confusing, eg: EDAC MPC85xx MC1: syndrome: 0x25252525 When in reality the ECC syndrome is 0x25. A variety of Freescale manuals say a variety of different things about how to decode the CAPTURE_ECC (syndrome) register. I don't have a system with a 32-bit bus to test on, but I believe the change is correct. It'd be good to get an ACK from someone at Freescale about this change though. Signed-off-by: Peter Tyser Signed-off-by: Doug Thompson Cc: Kumar Gala Cc: Dave Jiang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8467005da3ef6104b89a4cc5e9c9d9445b75565f Author: Alexey Dobriyan Date: Wed Mar 10 15:23:10 2010 -0800 nsproxy: remove INIT_NSPROXY() Remove INIT_NSPROXY(), use C99 initializer. Remove INIT_IPC_NS(), INIT_NET_NS() while I'm at it. Note: headers trim will be done later, now it's quite pointless because results will be invalidated by merge window. Signed-off-by: Alexey Dobriyan Acked-by: Serge Hallyn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13aa9a6b0f2371d2ce0de57c2ede62ab7a787157 Author: Oleg Nesterov Date: Wed Mar 10 15:23:09 2010 -0800 pid_ns: zap_pid_ns_processes: use SEND_SIG_NOINFO instead of force_sig() zap_pid_ns_processes() uses force_sig(SIGKILL) to ensure SIGKILL will be delivered to sub-namespace inits as well. This is correct, but we are going to change force_sig_info() semantics. See http://bugzilla.kernel.org/show_bug.cgi?id=15395#c31 We can use send_sig_info(SEND_SIG_NOINFO) instead, since 614c517d7c00af1b26ded20646b329397d6f51a1 ("signals: SEND_SIG_NOINFO should be considered as SI_FROMUSER()") SEND_SIG_NOINFO means "from user" and therefore send_signal() will get the correct from_ancestor_ns = T flag. Signed-off-by: Oleg Nesterov Acked-by: Serge Hallyn Acked-by: Linus Torvalds Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6edb6764409392836b44a61b06d94954efd6200f Author: Corey Minyard Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: remove ipmi_smi.h self-include There is no need for linux/ipmi_smi.h to include itself. Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2f95d51308a72288d877c3c8dc4597c9a93f7344 Author: Bela Lubkin Date: Wed Mar 10 15:23:07 2010 -0800 ipmi: fix slave_addrs setting to actually work Actually use the slave_addrs module parameter if it is specified, and make things consistent about passing zero in for the slave address for the default. Signed-off-by: Bela Lubkin Signed-off-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ae74e823cb7d4cd476f623fce9a38f625f6c09a8 Author: Martin Wilck Date: Wed Mar 10 15:23:06 2010 -0800 ipmi: add parameter to limit CPU usage in kipmid In some cases kipmid can use a lot of CPU. This adds a way to tune the CPU used by kipmid to help in those cases. By setting kipmid_max_busy_us to a value between 100 and 500, it is possible to bring down kipmid CPU load to practically 0 without loosing too much ipmi throughput performance. Not setting the value, or setting the value to zero, operation is unaffected. Signed-off-by: Martin Wilck Signed-off-by: Corey Minyard Cc: Jean Delvare Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1eb1332b8f07e937add24c6fd2ac40b8737a2f4 Author: Jiri Slaby Date: Wed Mar 10 15:23:05 2010 -0800 ipc: use rlimit helpers Make sure compiler won't do weird things with limits. E.g. fetching them twice may return 2 different values after writable limits are implemented. I.e. either use rlimit helpers added in 3e10e716abf3c71bdb5d86b8f507f9e72236c9cd ("resource: add helpers for fetching rlimits") or ACCESS_ONCE if not applicable. Signed-off-by: Jiri Slaby Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6db2ade10852b7c665b361239c3411abaa880b5 Author: Veaceslav Falico Date: Wed Mar 10 15:23:04 2010 -0800 copy_signal() cleanup: clean tty_audit_fork() Remove unneeded initialization in tty_audit_fork(). It is called only via copy_signal() and is useless after the kmem_cache_zalloc() was used. Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93c59907c6f247d09239135caecf294a106a2ae0 Author: Veaceslav Falico Date: Wed Mar 10 15:23:03 2010 -0800 copy_signal() cleanup: clean thread_group_cputime_init() Remove unneeded initializations in thread_group_cputime_init() and in posix_cpu_timers_init_group(). They are useless after kmem_cache_zalloc() was used in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4dd66e69d472f0ba5355a2529364d0db9a18a02b Author: Veaceslav Falico Date: Wed Mar 10 15:23:02 2010 -0800 copy_signal() cleanup: kill taskstats_tgid_init() and acct_init_pacct() Kill unused functions taskstats_tgid_init() and acct_init_pacct() because we don't use them anywhere after using kmem_cache_zalloc() in copy_signal(). Signed-off-by: Veaceslav Falico Cc: Roland McGrath Cc: Oleg Nesterov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a56704ef6b0c5796c9ff38cc78aa232dfb9644d7 Author: Veaceslav Falico Date: Wed Mar 10 15:23:01 2010 -0800 copy_signal() cleanup: use zalloc and remove initializations Use kmem_cache_zalloc() on signal creation and remove unneeded initialization lines in copy_signal(). Signed-off-by: Veaceslav Falico Acked-by: Oleg Nesterov Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e34112e3966fc466ced2698e6c196bb50b1ee20e Author: Christoph Hellwig Date: Wed Mar 10 15:23:01 2010 -0800 m32r: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. The old code only disables the breakpoints on PTRACE_KILL, while after this patch this also happens for PTRACE_CONT and PTRACE_SYSCALL which matches the behaviour of the other architetures. I think this is a bugfixes, but please double verify this is correct. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Hirokazu Takata Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 290ba3aef58ff21c977585ff6b687e457f80bf54 Author: Christoph Hellwig Date: Wed Mar 10 15:23:00 2010 -0800 cris arch-v32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. The way breakpoints are disabled is entirely inconsistent currently, I tried to make some sense of it, but I suspect all of the content of ptrace_disable should be moved into user_disable_single_step, this defintively needs some revisting as the current patch changes behaviour in not quite designed ways. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8313809ef3bfa8fa366d416add2150787235f192 Author: Christoph Hellwig Date: Wed Mar 10 15:22:58 2010 -0800 cris arch-v10: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Mikael Starvik Cc: Jesper Nilsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6d75ca10225be4c7509026f9b61c740b22e734e4 Author: Christoph Hellwig Date: Wed Mar 10 15:22:57 2010 -0800 xtensa: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Chris Zankel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1bd095083558928cc3b36b826422d69bcd743dca Author: Christoph Hellwig Date: Wed Mar 10 15:22:56 2010 -0800 um: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. XXX: I'm not sure arch_has_single_step() is placed in the exactly correct location, please verify in which of the ptrace headers it should really be. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55436c91652b45be576b91ec96a8d65f6b7447fa Author: Christoph Hellwig Date: Wed Mar 10 15:22:55 2010 -0800 mips: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa1ac57a317f927b8fb901e6270fc41fdaae8e1c Author: Christoph Hellwig Date: Wed Mar 10 15:22:54 2010 -0800 microblaze: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT and PTRACE_KILL. This also makes PTRACE_SINGLESTEP return -EIO while it previously succeeded despite not actually causing any kind of single stepping. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Michal Simek Cc: John Williams Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a0fde8b3b16fcfb2bb4a136c53918f1ca9b35cc Author: Christoph Hellwig Date: Wed Mar 10 15:22:53 2010 -0800 m68knommu: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. m68knommu already defines the nessecary user_enable_single_step and user_disable_single_step functions for this. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Greg Ungerer Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 857fb252a1858ccded2e31ee98c6c0ab79c07999 Author: Christoph Hellwig Date: Wed Mar 10 15:22:52 2010 -0800 h8300: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Yoshinori Sato Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8393171b1f6c30a889fd7cb16fc193f689923c Author: Christoph Hellwig Date: Wed Mar 10 15:22:51 2010 -0800 avr32: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Currently avr32 doesn't implement any code to disable single stepping when one of the non-syscall requests is called which seems wrong, but I've left it as-is for now. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 440e6ca79aebdc274ce4c625a6f42c8bf3c7bc91 Author: Christoph Hellwig Date: Wed Mar 10 15:22:50 2010 -0800 arm: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't and the single stepping disable only happens if the tracee process isn't a zombie yet, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd341abba65e3d93fc24c132e4c0278d18b6d2fc Author: Christoph Hellwig Date: Wed Mar 10 15:22:47 2010 -0800 alpha: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't, which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: Matt Turner Cc: Ivan Kokshaysky Cc: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dacbe41f776db0a5a9aee1e41594f405c95778a5 Author: Christoph Hellwig Date: Wed Mar 10 15:22:46 2010 -0800 ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h While in theory user_enable_single_step/user_disable_single_step/ user_enable_blockstep could also be provided as an inline or macro there's no good reason to do so, and having the prototype in one places keeps code size and confusion down. Roland said: The original thought there was that user_enable_single_step() et al might well be only an instruction or three on a sane machine (as if we have any of those!), and since there is only one call site inlining would be beneficial. But I agree that there is no strong reason to care about inlining it. As to the arch changes, there is only one thought I'd add to the record. It was always my thinking that for an arch where PTRACE_SINGLESTEP does text-modifying breakpoint insertion, user_enable_single_step() should not be provided. That is, arch_has_single_step()=>true means that there is an arch facility with "pure" semantics that does not have any unexpected side effects. Inserting a breakpoint might do very unexpected strange things in multi-threaded situations. Aside from that, it is a peculiar side effect that user_{enable,disable}_single_step() should cause COW de-sharing of text pages and so forth. For PTRACE_SINGLESTEP, all these peculiarities are the status quo ante for that arch, so having arch_ptrace() itself do those is one thing. But for building other things in the future, it is nicer to have a uniform "pure" semantics that arch-independent code can expect. OTOH, all such arch issues are really up to the arch maintainer. As of today, there is nothing but ptrace using user_enable_single_step() et al so it's a distinction without a practical difference. If/when there are other facilities that use user_enable_single_step() and might care, the affected arch's can revisit the question when someone cares about the quality of the arch support for said new facility. Signed-off-by: Christoph Hellwig Cc: Oleg Nesterov Cc: Roland McGrath Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3c1e01a09d6af2dd7811a066ffcfc5171be2bed Author: Christoph Hellwig Date: Wed Mar 10 15:22:44 2010 -0800 ptrace: use ptrace_request() in the remaining architectures Use ptrace_request() in the three remaining architectures that didn't use it (m68knommu, h8300, microblaze). This means: - ptrace_request now handles PTRACE_{PEEK,POKE}{TEXT,DATA} and PTRACE_DETATCH calls that were previously called directly, or in case of h8300 even open coded. - adds new support for PTRACE_SETOPTIONS/PTRACE_GETEVENTMSG/ PTRACE_GETSIGINFO/PTRACE_SETSIGINFO Signed-off-by: Christoph Hellwig Cc: Geert Uytterhoeven Cc: Yoshinori Sato Cc: Oleg Nesterov Cc: Michal Simek Acked-by: Greg Ungerer Acked-by: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7baab93f9297da3e42a8cecfbf91d5f22f415500 Author: Miao Xie Date: Wed Mar 10 15:22:42 2010 -0800 nodemask: fix the declaration of NODEMASK_ALLOC() we can't declarate two variable at the same scope by NODEMASK_ALLOC(). This patch fixes it. Signed-off-by: Miao Xie Cc: David Rientjes Cc: Lee Schermerhorn Cc: Nick Piggin Cc: Paul Menage Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a38374b8bd482b1e7c25f830772e9b73337ec2ed Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:40 2010 -0800 memcg: update maintainer list Nishimura-san have been working for memcg very good. His review and tests give us much improvements and account migraiton which he is now challenging is really important. He is a stakeholder. Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Acked-by: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 867578cbccb0893cc14fc29c670f7185809c90d6 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:39 2010 -0800 memcg: fix oom kill behavior In current page-fault code, handle_mm_fault() -> ... -> mem_cgroup_charge() -> map page or handle error. -> check return code. If page fault's return code is VM_FAULT_OOM, page_fault_out_of_memory() is called. But if it's caused by memcg, OOM should have been already invoked. Then, I added a patch: a636b327f731143ccc544b966cfd8de6cb6d72c6. That patch records last_oom_jiffies for memcg's sub-hierarchy and prevents page_fault_out_of_memory from being invoked in near future. But Nishimura-san reported that check by jiffies is not enough when the system is terribly heavy. This patch changes memcg's oom logic as. * If memcg causes OOM-kill, continue to retry. * remove jiffies check which is used now. * add memcg-oom-lock which works like perzone oom lock. * If current is killed(as a process), bypass charge. Something more sophisticated can be added but this pactch does fundamental things. TODO: - add oom notifier - add permemcg disable-oom-kill flag and freezer at oom. - more chances for wake up oom waiter (when changing memory limit etc..) Reviewed-by: Daisuke Nishimura Tested-by: Daisuke Nishimura Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Signed-off-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0263c12c12ccc90edc9d856fa839f8936183e6d1 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:37 2010 -0800 memcg: fix typos in memcg_test.txt Signed-off-by: Kirill A. Shutemov Reviewed-by: Balbir Singh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e111452d457ceedec8a57fc3d45b1312e736fba Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:36 2010 -0800 memcg: update memcg_test.txt to describe memory thresholds Decription of sanity check for memory thresholds. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1d8fd973a41942bc760dd21581e24117bc1dd063 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:35 2010 -0800 cgroups: add simple listener of cgroup events to documentation An example of cgroup notification API usage. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a4db548edcce067c1201ef25cf2bc29f32dca4 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: remove events before destroying subsystem state objects Events should be removed after rmdir of cgroup directory, but before destroying subsystem state objects. Let's take reference to cgroup directory dentry to do that. Signed-off-by: Kirill A. Shutemov Acked-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab78683c17d739c2a2077141dcf81a02b7fb57e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:34 2010 -0800 cgroups: fix race between userspace and kernelspace Notify userspace about cgroup removing only after rmdir of cgroup directory to avoid race between userspace and kernelspace. eventfd are used to notify about two types of event: - control file-specific, like crossing memory threshold; - cgroup removing. To understand what really happen, userspace can check if the cgroup still exists. To avoid race beetween userspace and kernelspace we have to notify userspace about cgroup removing only after rmdir of cgroup directory. Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Cc: Paul Menage Acked-by: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daaf1e68874c078a15ae6ae827751839c4d81739 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:32 2010 -0800 memcg: handle panic_on_oom=always case Presently, if panic_on_oom=2, the whole system panics even if the oom happend in some special situation (as cpuset, mempolicy....). Then, panic_on_oom=2 means painc_on_oom_always. Now, memcg doesn't check panic_on_oom flag. This patch adds a check. BTW, how it's useful ? kdump+panic_on_oom=2 is the last tool to investigate what happens in oom-ed system. When a task is killed, the sysytem recovers and there will be few hint to know what happnes. In mission critical system, oom should never happen. Then, panic_on_oom=2+kdump is useful to avoid next OOM by knowing precise information via snapshot. TODO: - For memcg, it's for isolate system's memory usage, oom-notiifer and freeze_at_oom (or rest_at_oom) should be implemented. Then, management daemon can do similar jobs (as kdump) or taking snapshot per cgroup. Signed-off-by: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: David Rientjes Cc: Nick Piggin Reviewed-by: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1080d7a30304d03b1d9fd530aacd8aece2d702a2 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:31 2010 -0800 memcg: update memcg_test.txt Update memcg_test.txt to describe how to test the move-charge feature. Signed-off-by: Daisuke Nishimura Acked-by: KAMEZAWA Hiroyuki Acked-by: Balbir Singh Cc: "Kirill A. Shutemov" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d2265e6fa3f220ea5fd37522d13390e9675adcf7 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:31 2010 -0800 memcg : share event counter rather than duplicate Memcg has 2 eventcountes which counts "the same" event. Just usages are different from each other. This patch tries to reduce event counter. Now logic uses "only increment, no reset" counter and masks for each checks. Softlimit chesk was done per 1000 evetns. So, the similar check can be done by !(new_counter & 0x3ff). Threshold check was done per 100 events. So, the similar check can be done by (!new_counter & 0x7f) ALL event checks are done right after EVENT percpu counter is updated. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 430e48631e72aeab74d844c57b441f98a2e36eee Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:30 2010 -0800 memcg: update threshold and softlimit at commit Presently, move_task does "batched" precharge. Because res_counter or css's refcnt are not-scalable jobs for memcg, try_charge_().. tend to be done in batched manner if allowed. Now, softlimit and threshold check their event counter in try_charge, but the charge is not a per-page event. And event counter is not updated at charge(). Moreover, precharge doesn't pass "page" to try_charge() and softlimit tree will be never updated until uncharge() causes an event." So the best place to check the event counter is commit_charge(). This is per-page event by its nature. This patch move checks to there. Signed-off-by: KAMEZAWA Hiroyuki Cc: Kirill A. Shutemov Cc: Balbir Singh Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c62b1a3b31b5e27a6c5c2e91cc5ce05fdb6344d0 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:22:29 2010 -0800 memcg: use generic percpu instead of private implementation When per-cpu counter for memcg was implemneted, dynamic percpu allocator was not very good. But now, we have good one and useful macros. This patch replaces memcg's private percpu counter implementation with generic dynamic percpu allocator. The benefits are - We can remove private implementation. - The counters will be NUMA-aware. (Current one is not...) - This patch makes sizeof struct mem_cgroup smaller. Then, struct mem_cgroup may be fit in page size on small config. - About basic performance aspects, see below. [Before] # size mm/memcontrol.o text data bss dec hex filename 24373 2528 4132 31033 7939 mm/memcontrol.o [page-fault-throuput test on 8cpu/SMP in root cgroup] # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 45878618 page-faults ( +- 0.110% ) 602635826 cache-misses ( +- 0.105% ) 61.005373262 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 13.14 [After] #size mm/memcontrol.o text data bss dec hex filename 23913 2528 4132 30573 776d mm/memcontrol.o # /root/bin/perf stat -a -e page-faults,cache-misses --repeat 5 ./multi-fault-fork 8 Performance counter stats for './multi-fault-fork 8' (5 runs): 48179400 page-faults ( +- 0.271% ) 588628407 cache-misses ( +- 0.136% ) 61.004615021 seconds time elapsed ( +- 0.004% ) Then cache-miss/page fault = 12.22 Text size is reduced. This performance improvement is not big and will be invisible in real world applications. But this result shows this patch has some good effect even on (small) SMP. Here is a test program I used. 1. fork() processes on each cpus. 2. do page fault repeatedly on each process. 3. after 60secs, kill all childredn and exit. (3 is necessary for getting stable data, this is improvement from previous one.) #define _GNU_SOURCE #include #include #include #include #include #include #include #include /* * For avoiding contention in page table lock, FAULT area is * sparse. If FAULT_LENGTH is too large for your cpus, decrease it. */ #define FAULT_LENGTH (2 * 1024 * 1024) #define PAGE_SIZE 4096 #define MAXNUM (128) void alarm_handler(int sig) { } void *worker(int cpu, int ppid) { void *start, *end; char *c; cpu_set_t set; int i; CPU_ZERO(&set); CPU_SET(cpu, &set); sched_setaffinity(0, sizeof(set), &set); start = mmap(NULL, FAULT_LENGTH, PROT_READ|PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0); if (start == MAP_FAILED) { perror("mmap"); exit(1); } end = start + FAULT_LENGTH; pause(); //fprintf(stderr, "run%d", cpu); while (1) { for (c = (char*)start; (void *)c < end; c += PAGE_SIZE) *c = 0; madvise(start, FAULT_LENGTH, MADV_DONTNEED); } return NULL; } int main(int argc, char *argv[]) { int num, i, ret, pid, status; int pids[MAXNUM]; if (argc < 2) return 0; setpgid(0, 0); signal(SIGALRM, alarm_handler); num = atoi(argv[1]); pid = getpid(); for (i = 0; i < num; ++i) { ret = fork(); if (!ret) { worker(i, pid); exit(0); } pids[i] = ret; } sleep(1); kill(-pid, SIGALRM); sleep(60); for (i = 0; i < num; i++) kill(pids[i], SIGKILL); for (i = 0; i < num; i++) waitpid(pids[i], &status, 0); return 0; } Signed-off-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Cc: Balbir Singh Cc: Pavel Emelyanov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6a6135b64fda39d931a79090f4da37f1c6da4a8c Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:25 2010 -0800 memcg: typo in comment to mem_cgroup_print_oom_info() s/mem_cgroup_print_mem_info/mem_cgroup_print_oom_info/ Signed-off-by: Kirill A. Shutemov Cc: Balbir Singh Cc: Pavel Emelyanov Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e72b6347c9459e6cff5634ddc815485bae6985f Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:24 2010 -0800 memcg: implement memory thresholds It allows to register multiple memory and memsw thresholds and gets notifications when it crosses. To register a threshold application need: - create an eventfd; - open memory.usage_in_bytes or memory.memsw.usage_in_bytes; - write string like " " to cgroup.event_control. Application will be notified through eventfd when memory usage crosses threshold in any direction. It's applicable for root and non-root cgroup. It uses stats to track memory usage, simmilar to soft limits. It checks if we need to send event to userspace on every 100 page in/out. I guess it's good compromise between performance and accuracy of thresholds. [akpm@linux-foundation.org: coding-style fixes] [nishimura@mxp.nes.nec.co.jp: fix documentation merge issue] Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 378ce724bc2a0ef1243e11c09d58a70bb6be007a Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:23 2010 -0800 memcg: rework usage of stats by soft limit Instead of incrementing counter on each page in/out and comparing it with constant, we set counter to constant, decrement counter on each page in/out and compare it with zero. We want to make comparing as fast as possible. On many RISC systems (probably not only RISC) comparing with zero is more effective than comparing with a constant, since not every constant can be immediate operand for compare instruction. Also, I've renamed MEM_CGROUP_STAT_EVENTS to MEM_CGROUP_STAT_SOFTLIMIT, since really it's not a generic counter. Signed-off-by: Kirill A. Shutemov Cc: Li Zefan Cc: KAMEZAWA Hiroyuki Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 104f39284e830f425085886ef72c49aee6631575 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:21 2010 -0800 memcg: extract mem_group_usage() from mem_cgroup_read() Helper to get memory or mem+swap usage of the cgroup. Signed-off-by: Kirill A. Shutemov Acked-by: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0dea116876eefc9c7ca9c5d74fe665481e499fa3 Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:20 2010 -0800 cgroup: implement eventfd-based generic API for notifications This patchset introduces eventfd-based API for notifications in cgroups and implements memory notifications on top of it. It uses statistics in memory controler to track memory usage. Output of time(1) on building kernel on tmpfs: Root cgroup before changes: make -j2 506.37 user 60.93s system 193% cpu 4:52.77 total Non-root cgroup before changes: make -j2 507.14 user 62.66s system 193% cpu 4:54.74 total Root cgroup after changes (0 thresholds): make -j2 507.13 user 62.20s system 193% cpu 4:53.55 total Non-root cgroup after changes (0 thresholds): make -j2 507.70 user 64.20s system 193% cpu 4:55.70 total Root cgroup after changes (1 thresholds, never crossed): make -j2 506.97 user 62.20s system 193% cpu 4:53.90 total Non-root cgroup after changes (1 thresholds, never crossed): make -j2 507.55 user 64.08s system 193% cpu 4:55.63 total This patch: Introduce the write-only file "cgroup.event_control" in every cgroup. To register new notification handler you need: - create an eventfd; - open a control file to be monitored. Callbacks register_event() and unregister_event() must be defined for the control file; - write " " to cgroup.event_control. Interpretation of args is defined by control file implementation; eventfd will be woken up by control file implementation or when the cgroup is removed. To unregister notification handler just close eventfd. If you need notification functionality for a control file you have to implement callbacks register_event() and unregister_event() in the struct cftype. [kamezawa.hiroyu@jp.fujitsu.com: Kconfig fix] Signed-off-by: Kirill A. Shutemov Reviewed-by: KAMEZAWA Hiroyuki Paul Menage Cc: Li Zefan Cc: Balbir Singh Cc: Pavel Emelyanov Cc: Dan Malek Cc: Vladislav Buzov Cc: Daisuke Nishimura Cc: Alexander Shishkin Cc: Davide Libenzi Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 483c30b514bd3037fa3f19fa42327c94c10f51c8 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:18 2010 -0800 memcg: improve performance in moving swap charge Try to reduce overheads in moving swap charge by: - Adds a new function(__mem_cgroup_put), which takes "count" as a arg and decrement mem->refcnt by "count". - Removed res_counter_uncharge, css_put, and mem_cgroup_put from the path of moving swap account, and consolidate all of them into mem_cgroup_clear_mc. We cannot do that about mc.to->refcnt. These changes reduces the overhead from 1.35sec to 0.9sec to move charges of 1G anonymous memory(including 500MB swap) in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 024914477e15ef8b17f271ec47f1bb8a589f0806 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:17 2010 -0800 memcg: move charges of anonymous swap This patch is another core part of this move-charge-at-task-migration feature. It enables moving charges of anonymous swaps. To move the charge of swap, we need to exchange swap_cgroup's record. In current implementation, swap_cgroup's record is protected by: - page lock: if the entry is on swap cache. - swap_lock: if the entry is not on swap cache. This works well in usual swap-in/out activity. But this behavior make the feature of moving swap charge check many conditions to exchange swap_cgroup's record safely. So I changed modification of swap_cgroup's recored(swap_cgroup_record()) to use xchg, and define a new function to cmpxchg swap_cgroup's record. This patch also enables moving charge of non pte_present but not uncharged swap caches, which can be exist on swap-out path, by getting the target pages via find_get_page() as do_mincore() does. [kosaki.motohiro@jp.fujitsu.com: fix ia64 build] [akpm@linux-foundation.org: fix typos] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8033b97c9b5ef063e3f4bf2efe1cd0a22093aaff Author: Daisuke Nishimura Date: Wed Mar 10 15:22:16 2010 -0800 memcg: avoid oom during moving charge This move-charge-at-task-migration feature has extra charges on "to"(pre-charges) and "from"(left-over charges) during moving charge. This means unnecessary oom can happen. This patch tries to avoid such oom. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 854ffa8d104e44111fec96764c0e0cb29223d54c Author: Daisuke Nishimura Date: Wed Mar 10 15:22:15 2010 -0800 memcg: improve performance in moving charge Try to reduce overheads in moving charge by: - Instead of calling res_counter_uncharge() against the old cgroup in __mem_cgroup_move_account() everytime, call res_counter_uncharge() at the end of task migration once. - removed css_get(&to->css) from __mem_cgroup_move_account() because callers should have already called css_get(). And removed css_put(&to->css) too, which was called by callers of move_account on success of move_account. - Instead of calling __mem_cgroup_try_charge(), i.e. res_counter_charge(), repeatedly, call res_counter_charge(PAGE_SIZE * count) in can_attach() if possible. - Instead of calling css_get()/css_put() repeatedly, make use of coalesce __css_get()/__css_put() if possible. These changes reduces the overhead from 1.7sec to 0.6sec to move charges of 1G anonymous memory in my test environment. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ffef5feff4e4240e767d2f1144b1634a41762e3 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:14 2010 -0800 memcg: move charges of anonymous page This patch is the core part of this move-charge-at-task-migration feature. It implements functions to move charges of anonymous pages mapped only by the target task. Implementation: - define struct move_charge_struct and a valuable of it(mc) to remember the count of pre-charges and other information. - At can_attach(), get anon_rss of the target mm, call __mem_cgroup_try_charge() repeatedly and count up mc.precharge. - At attach(), parse the page table, find a target page to be move, and call mem_cgroup_move_account() about the page. - Cancel all precharges if mc.precharge > 0 on failure or at the end of task move. [akpm@linux-foundation.org: a little simplification] Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7dc74be032bfcaa2f9d9e4296ff5bbddfa9e2f19 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:13 2010 -0800 memcg: add interface to move charge at task migration In current memcg, charges associated with a task aren't moved to the new cgroup at task migration. Some users feel this behavior to be strange. These patches are for this feature, that is, for charging to the new cgroup and, of course, uncharging from the old cgroup at task migration. This patch adds "memory.move_charge_at_immigrate" file, which is a flag file to determine whether charges should be moved to the new cgroup at task migration or not and what type of charges should be moved. This patch also adds read and write handlers of the file. This patch also adds no-op handlers for this feature. These handlers will be implemented in later patches. And you cannot write any values other than 0 to move_charge_at_immigrate yet. Signed-off-by: Daisuke Nishimura Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Paul Menage Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b70cc5fdb445a6929a01e9c406593265b136c99d Author: Li Zefan Date: Wed Mar 10 15:22:12 2010 -0800 cgroups: clean up cgroup_pidlist_find() a bit Don't call get_pid_ns() before we locate/alloc the ns. Signed-off-by: Li Zefan Cc: Serge Hallyn Acked-by: Paul Menage Cc: KAMEZAWA Hiroyuki Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 67523c48aa74d5637848edeccf285af1c60bf14a Author: Ben Blum Date: Wed Mar 10 15:22:11 2010 -0800 cgroups: blkio subsystem as module Modify the Block I/O cgroup subsystem to be able to be built as a module. As the CFQ disk scheduler optionally depends on blk-cgroup, config options in block/Kconfig, block/Kconfig.iosched, and block/blk-cgroup.h are enhanced to support the new module dependency. Signed-off-by: Ben Blum Cc: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Cc: Vivek Goyal Cc: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8ca712ea84728531d36841ca8f98f9e8680bcf4e Author: Kirill A. Shutemov Date: Wed Mar 10 15:22:10 2010 -0800 cgroups: fix CONTENTS in cgroups documentation Add a forgotten item into CONTENTS. Signed-off-by: Kirill A. Shutemov Acked-by: Paul Menage Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cf5d5941fda647fe3d2f2d00cf9e0245236a5f08 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module unloading Provides support for unloading modular subsystems. This patch adds a new function cgroup_unload_subsys which is to be used for removing a loaded subsystem during module deletion. Reference counting of the subsystems' modules is moved from once (at load time) to once per attached hierarchy (in parse_cgroupfs_options and rebind_subsystems) (i.e., 0 or 1). Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6a1105ba08b265023dd71a4174fb4a29ebc7083 Author: Ben Blum Date: Wed Mar 10 15:22:09 2010 -0800 cgroups: subsystem module loading interface Add interface between cgroups subsystem management and module loading This patch implements rudimentary module-loading support for cgroups - namely, a cgroup_load_subsys (similar to cgroup_init_subsys) for use as a module initcall, and a struct module pointer in struct cgroup_subsys. Several functions that might be wanted by modules have had EXPORT_SYMBOL added to them, but it's unclear exactly which functions want it and which won't. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aae8aab40367036931608fdaf9e2dc568b516f19 Author: Ben Blum Date: Wed Mar 10 15:22:07 2010 -0800 cgroups: revamp subsys array This patch series provides the ability for cgroup subsystems to be compiled as modules both within and outside the kernel tree. This is mainly useful for classifiers and subsystems that hook into components that are already modules. cls_cgroup and blkio-cgroup serve as the example use cases for this feature. It provides an interface cgroup_load_subsys() and cgroup_unload_subsys() which modular subsystems can use to register and depart during runtime. The net_cls classifier subsystem serves as the example for a subsystem which can be converted into a module using these changes. Patch #1 sets up the subsys[] array so its contents can be dynamic as modules appear and (eventually) disappear. Iterations over the array are modified to handle when subsystems are absent, and the dynamic section of the array is protected by cgroup_mutex. Patch #2 implements an interface for modules to load subsystems, called cgroup_load_subsys, similar to cgroup_init_subsys, and adds a module pointer in struct cgroup_subsys. Patch #3 adds a mechanism for unloading modular subsystems, which includes a more advanced rework of the rudimentary reference counting introduced in patch 2. Patch #4 modifies the net_cls subsystem, which already had some module declarations, to be configurable as a module, which also serves as a simple proof-of-concept. Part of implementing patches 2 and 4 involved updating css pointers in each css_set when the module appears or leaves. In doing this, it was discovered that css_sets always remain linked to the dummy cgroup, regardless of whether or not any subsystems are actually bound to it (i.e., not mounted on an actual hierarchy). The subsystem loading and unloading code therefore should keep in mind the special cases where the added subsystem is the only one in the dummy cgroup (and therefore all css_sets need to be linked back into it) and where the removed subsys was the only one in the dummy cgroup (and therefore all css_sets should be unlinked from it) - however, as all css_sets always stay attached to the dummy cgroup anyway, these cases are ignored. Any fix that addresses this issue should also make sure these cases are addressed in the subsystem loading and unloading code. This patch: Make subsys[] able to be dynamically populated to support modular subsystems This patch reworks the way the subsys[] array is used so that subsystems can register themselves after boot time, and enables the internals of cgroups to be able to handle when subsystems are not present or may appear/disappear. Signed-off-by: Ben Blum Acked-by: Li Zefan Cc: Paul Menage Cc: "David S. Miller" Cc: KAMEZAWA Hiroyuki Cc: Lai Jiangshan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b9fff711d5e8db8c844161c684017e556c38a0 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:05 2010 -0800 cgroup: introduce coalesce css_get() and css_put() Current css_get() and css_put() increment/decrement css->refcnt one by one. This patch add a new function __css_get(), which takes "count" as a arg and increment the css->refcnt by "count". And this patch also add a new arg("count") to __css_put() and change the function to decrement the css->refcnt by "count". These coalesce version of __css_get()/__css_put() will be used to improve performance of memcg's moving charge feature later, where instead of calling css_get()/css_put() repeatedly, these new functions will be used. No change is needed for current users of css_get()/css_put(). Signed-off-by: Daisuke Nishimura Acked-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Li Zefan Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2468c7234b366eeb799ee0648cb58f9cba394a54 Author: Daisuke Nishimura Date: Wed Mar 10 15:22:03 2010 -0800 cgroup: introduce cancel_attach() Add cancel_attach() operation to struct cgroup_subsys. cancel_attach() can be used when can_attach() operation prepares something for the subsys, but we should rollback what can_attach() operation has prepared if attach task fails after we've succeeded in can_attach(). Signed-off-by: Daisuke Nishimura Acked-by: Li Zefan Reviewed-by: Paul Menage Cc: Balbir Singh Acked-by: KAMEZAWA Hiroyuki Cc: Daisuke Nishimura Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ce9f07bf1bed9a1f9886373ad0b149294f84c25 Author: Dave Young Date: Wed Mar 10 15:22:02 2010 -0800 Documentation/email-clients.txt: update gmail information Gmail web gui does not work for sending patches now even with firefox "view source with" extension. It will use windows style line breaks to wrap lines automatically when sening email. Rewrite the gmail web gui part of email client documentation. Signed-off-by: Dave Young Cc: Randy Dunlap Cc: Martin Bligh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c98ecaf350737cd424eb94140e9e9f1a3408956 Author: Randy Dunlap Date: Wed Mar 10 15:22:02 2010 -0800 scripts/kernel-doc: fix empty function description section scripts/kernel-doc mishandles a function that has a multi-line function short description and no function parameters. The observed problem was from drivers/scsi/scsi_netlink.c: /** * scsi_netlink_init - Called by SCSI subsystem to intialize * the SCSI transport netlink interface * **/ kernel-doc treated the " * " line as a Description: section with only a newline character in the Description contents. This caused output_highlight() to complain: "output_highlight got called with no args?", plus produce a perl call stack backtrace. The fix is just to ignore Description sections if they only contain "\n". Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6b6e2b112cafcd63bdbebbffe97279f41e5ca62 Author: Bartlomiej Zolnierkiewicz Date: Wed Mar 10 15:22:00 2010 -0800 Documentation: remove obsolete voyager.txt file x86/Voyager support has been removed a year ago. Signed-off-by: Bartlomiej Zolnierkiewicz Inspired-by: Jonathan Corbet Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5247c854ed1cef30e0c7f4c6dfbf3c9d83bcf8e Author: Randy Dunlap Date: Wed Mar 10 15:21:59 2010 -0800 Documentation/SubmitChecklist: add rule #1 Add header file requirements. Compliments of Stephen Rothwell. Stephen calls this Rule #1, so I put it there, but I didn't want to demote any of the others in the list, so I made one of them number 2b. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bace8c1edefa700c7f7af522c5374ef63860ae Author: Randy Dunlap Date: Wed Mar 10 15:21:58 2010 -0800 Documentation/vm/: split txt and source files Documentation/vm/: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Also build the recently-added map_hugetlb.c. Make several functions static to prevent linker warnings. Signed-off-by: Randy Dunlap Acked-by: Eric B Munson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1e0051ae48a253685e4309256f9c1ec2bdb74b5d Author: Randy Dunlap Date: Wed Mar 10 15:21:57 2010 -0800 Documentation/fs/: split txt and source files Make dnotify_test.c source file and add it to Makefile so that bitrot can be prevented. Signed-off-by: Randy Dunlap Cc: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49129accc21ddb2e779d375dacafb612b1bd28d Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/laptop/: split txt and source files Documentation/laptops/laptop-mode.txt: Expose example and tool source files in the Documentation/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e61863099f58e458f08c101da87da752a1e009f5 Author: Randy Dunlap Date: Wed Mar 10 15:21:56 2010 -0800 Documentation/timers/: split txt and source files Documentation/timers/hpet.txt: Expose example and tool source files in the Documentation/timers/ directory in their own files instead of being buried (almost hidden) in readme/txt files. This should help to prevent bitrot. This will make them more visible/usable to users who may need to use them, to developers who may need to test with them, and to anyone who would fix/update them if they were more visible. Also, if any of these possibly should not be in the kernel tree at all, it will be clearer that they are here and we can discuss if they should be removed. Signed-off-by: Randy Dunlap Cc: Thomas Gleixner Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ad25ad979a309963e580015d57e4ec7da72bb7d4 Author: Evgeniy Dushistov Date: Wed Mar 10 15:21:55 2010 -0800 ufs: make solaris fsck happy Alex Viskovatoff let me know that after copying data to solaris's ufs from linux, solaris's fsck sees some errors in cylinder summary information. This is because of solaris expects find some data on another places, then curernt implementation save it. This patch fixes this issue. It is tested by me, and also Alex reported that it works for him. Signed-off-by: Evgeniy Dushistov Reported-by: Alex Viskovatoff Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b3a0fd4d877fe7692901b5867ba7cbd3f6d19d22 Author: Alex Viskovatoff Date: Wed Mar 10 15:21:53 2010 -0800 fs/ufs: recognize Solaris-specific file system state Recent releases of Solaris set the fs_clean state of an unmounted UFS file system as FSLOG ("logging fs"). However, the Linux kernel currently does not recognize the value which represents this state. Thus, attempting to mount such a file system rw produces the message kernel: ufs_read_super: can't grok fs_clean 0xfffffffd and the file system is mounted read-only. This patch makes the kernel recognize that value. Signed-off-by: Alex Viskovatoff Cc: Evgeniy Dushistov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7d4d849b4e3acc405ec222884936800ffb26d48 Author: Andrew Morton Date: Wed Mar 10 15:21:52 2010 -0800 drivers/char/mem.c: cleanups - fix switch statement layout - fix whitespace stuff - fix comment layout - remove unneeded inlining - use __weak - remove trailing whitespace - move uncached_access() inside `#ifndef __HAVE_PHYS_MEM_ACCESS_PROT' - it is otherwise unused. Cc: KAMEZAWA Hiroyuki Cc: OGAWA Hirofumi Cc: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcefafb6ac90ece8d68a6c203105f3d313e52da4 Author: Wu Fengguang Date: Wed Mar 10 15:21:51 2010 -0800 /dev/mem: dont allow seek to last page So as to return a uniform error -EOVERFLOW instead of a random one: # kmem-seek 0xfffffffffffffff0 seek /dev/kmem: Device or resource busy # kmem-seek 0xfffffffffffffff1 seek /dev/kmem: Block device required Suggested by OGAWA Hirofumi. Cc: OGAWA Hirofumi Reviewed-by: KAMEZAWA Hiroyuki Signed-off-by: Wu Fengguang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2cb9a75d13676d75bcc6fbc6f885403795581913 Author: Huang Weiyi Date: Wed Mar 10 15:21:51 2010 -0800 fbdev: bfin-lq035q1-fb: remove duplicated #include Remove duplicated #include('s) in drivers/video/bfin-lq035q1-fb.c Signed-off-by: Huang Weiyi Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a8b1925430339be1464a9a028754d94984dacfdb Author: Ben Hutchings Date: Wed Mar 10 15:21:49 2010 -0800 video: fix first line of kernel-doc for a few functions The function name must be followed by a space, hypen, space, and a short description. Signed-off-by: Ben Hutchings Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2164235da9153f1fbd5191bf71c86fae322c7dd7 Author: Christoph Egger Date: Wed Mar 10 15:21:49 2010 -0800 obsolete config in kernel source: LWMON5 There was some conditionalizing for the LWMON5 boards in kernel source. However infrastructure for enabling this isn't here so probably the special case code can go as well. Signed-off-by: Christoph Egger Acked-by: Alexander Shishkin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2c0e0c88422033c9b6162bf7875aecdd095130b7 Author: Joe Perches Date: Wed Mar 10 15:21:48 2010 -0800 drivers/video/via: fix continuation line formats String constants that are continued on subsequent lines with \ will cause spurious whitespace in the resulting output. Signed-off-by: Joe Perches Acked-by: Florian Tobias Schandinat Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8661970875d7d27e4de233d357327fffdb4a5e3d Author: Wang Qiang Date: Wed Mar 10 15:21:47 2010 -0800 NUC900 LCD Controller Driver An LCD controller driver for nuc900s. The Linux LOGO is just fine and the FB-Test application was ok, too. Signed-off-by: Wang Qiang Cc: Wang Zongshun Cc: Russell King Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 91d4e0a4c889e3e8078c26542b8f5a322b87adf4 Author: Christoph Egger Date: Wed Mar 10 15:21:46 2010 -0800 fbdev: remove obsolete CONFIG_FB_SOFT_CURSOR The config Option FB_SOFT_BUFFER was removed in c465e05a03209651078b95686158648fd7ed84c5 ("fbcon/fbdev: Move softcursor out of fbdev to fbcon"). While moving to fbcon this single driver has it left as a select in KConfig / #ifdef in source. This last occurence is removed here so the option is really gone Signed-off-by: Christoph Egger Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55a23c4af83df9c8fdf55690a09a3f0a92bd127b Author: Maik Broemme Date: Wed Mar 10 15:21:44 2010 -0800 intelfb: new maintainer It seems that Sylvain no longer maintain the intelfb driver. Two weeks ago I had a short mail conversation with Jean regarding who can replace him. Well I will do it, because I know the driver and use it very often. Attached is a patch which update the maintainer file to make bug reporting easier. Signed-off-by: Maik Broemme Sylvain Meyer Cc: Krzysztof Helt Cc: Dave Airlie Cc: Eric Anholt Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b32bfc3843f7fd090d30853d98866d923cfb8fff Author: Jaya Kumar Date: Wed Mar 10 15:21:43 2010 -0800 broadsheetfb: support storing waveform This patch adds waveform storing capability to broadsheetfb. It uses the firmware class to retrieve the waveform, and the request to initiate the waveform storing is done via a driver sysfs entry, loadstore_waveform. Broadsheet is a framebuffer device. It is slightly different from a typical framebuffer controller that drives a normal TFT-LCD display. Most E-Ink display panels require a waveform in order to function. That is, in order to drive the state of a pixel to black, gray, or white, a specific waveform is utilized. Basically, that waveform represents the specific E-field wiggling needed to get the pixel to its optimal state given current temperature, and its previous state. TN/IPS-LCDs use a similar concept but the driving waveform is sufficiently simple that it is internalized in the TFT source/gate driver. These E-Ink waveforms are specific to a production batch. That is, a batch of display films are produced, then they get characterized and a waveform is generated for that batch. Broadsheet, typically, is attached to its private SPI flash which is then flashed with this waveform. Users won't be able to see the waveform and typically won't ever need to know about it. If however, the display panel attached to broadsheet is changed out, then they will need to update their waveform. That would typically be done at a factory or repair facility rather than by a user. [akpm@linux-foundation.org: fix printk warning] Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2afb18981739a1426af2a6c952e03c5966b3dfc6 Author: Jaya Kumar Date: Wed Mar 10 15:21:41 2010 -0800 broadsheetfb: add MMIO hooks Allow boards with GP-MMIO controllers to provide hooks to broadsheetfb in order to offload cmd/data writes and data reads instead of relying only on host based GPIO wiggling. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e17cea3cece6d3ec47a5b358821505943abe6541 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:41 2010 -0800 viafb: support color depth 15 and 30 Add support for the color depth 15 on IGA1 and 30 on IGA1 and IGA2. To allow the usage of those the driver now refuses color depth that are totally off and otherwise the selection in viafb_check_var is used. Therefore the first call to this for the first framebuffer was delayed a bit. It only enables the new formats if they are requested exactly (viafb_bpp=15|30). As this is a new feature, no regressions are expected. The color depth 15 was successfully tested. Didn't get anything usable for 30 but that might be the programs fault. I would like to get some feedback whether it works as expected or not if somebody knows a program/configuration where it should. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 415559fbf2353f4271a4cd6e11259b8bbc97cc33 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:40 2010 -0800 viafb: rework color setting This is a rewritten version of viafb_setcolreg. The hardware register writes were split up and moved to hw.c where they belong as this is really low level stuff. It was made dual fb aware. Furthermore viafb_setcmap was removed as the problem with 8bpp originated from a bug in writing multiple color registers at once. The removal of viafb_setcmap might introduce a small performance regression but its certainly better to receive the correct result a bit slower than a garbled picture fast. It should give us a working 8bpp mode and is more extensible than the old hardcoded code. No other regressions are expected but as the hardware might be a bit picky it might cause some regressions in 8bpp mode on some hardware although I doubt that. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dbb7884be758ca9ac5ec84cbe7eb21f21bce9d8f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:39 2010 -0800 viafb: some virtual_xres handling fixes Do not require the virtual_xres to be aligned as line length is for such purposes. Calculate always the smallest line length required. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd140691bda491b417a6d1e81b03416b54cb8d8d Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:38 2010 -0800 viafb: rework color checking Make color checking a bit more tolerant in what values it allows and more fine grained to later support 15 and 30 bits formats. It splits the filling of the color information in var to a seperate function and sets some color related values in var that where previously untouched. This could be a bug fix but at least I don't know any applications that was fooled by not correctly setting the fields in var. At least no regressions are expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dba77f8409eb861b28d295211776d953a8255ec7 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:37 2010 -0800 viafb: make some variables a bit less global Move some variables closer to their usage. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4bbac05f8c0ab40dcc52ed6dff44e1b0d80fa6e3 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:36 2010 -0800 viafb: remove dead code due to IGA1_IGA2 Some code depended on IGA1_IGA2 which was never set (at least with the symbolic name). Remove this dead code although it might one day be useful to get a hint on how some things might work. However as this is dead it is likely full of bugs and would prevent a clean structure (as it has some very strange things). Dead code -> no regressions, at least if VIA doesn't do anything very ugly. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daacccd1657bdecae8f7c98a8e2b84367a8d4e87 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:35 2010 -0800 viafb: split color mode setting up This patch splits color mode setting up in seperate functions. Some hardware initialization that was previously mixed with it is moved to viafb_setmode. As are the calls to the newly created function. This is yet another little step towards controlling each IGA on its own. As this patch really aims too mimic the old behaviour no regressions are expected. However I noticed that 8bpp (or 6bpp?) seems actually a bit broken before and after the patch. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fe9aab8ec2d65378b0663c3287a67da4a892b54e Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: introduce strict parameter checking Refuse to work if wrong parameters are given. This should improve the user experience as it will be clear that something is wrong and not silently ignored. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c9443ed284fc6ec8a4f702c66e9ad6bdf912c05 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:34 2010 -0800 viafb: make viafb_set_par more dual framebuffer compatible This patch is an attempt to make viafb_set_par work correctly with more than one framebuffer. As modesetting is not (yet/easily) possible for each individual IGA it uses the (normally to be avoided) global variables viafbinfo{,1} to ensure that each function is called with the correct values. This patch (finally) allows usable dual framebuffer setups and should not affect non dual fb ones. It works in some (most?) configurations as sometimes the driver still gets device connections wrong. It can be worth to try the devices in reverse order (in viafb_active_dev). The user experience is still not very nice as: - on the second fb you'll normally have a garbled picture as long as no application draws to it goal: auto on/off devices depending on reference counting - as the whole machinery is always done you can see mode changes also in an unaffected framebuffer goal: split modesetting up for each individual IGA Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee79d54db45bb5e6da3eb76bae162c920aeb9763 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:32 2010 -0800 viafb: video address setting revisited Set always the correct video address. Especially do panning right on multiple IGAs. This should have no effect on single monitor mode (no SAMM, no dual fb). For SAMM without dual fb this might break something as I really cannot image what we are supposed to do for different resolutions with a single framebuffer as we can't get data out of nowhere (no, they are not set up in something one would call "expanded"). Previously I got for that funny colored pictures as the second IGA pointed to video memory that was never written to. After the patch it'll work as cloning if the first and second mode are identical (this was working already without SAMM). Finally for dual fb this should push us a step in the right direction. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7cf607923dee1898b9fc1e62568b79e7f785b995 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:31 2010 -0800 viafb: reorder initialization for dual framebuffer mode This patch reorders the initialization for dual framebuffer mode to not ignore the settings for the first mode. Previously they were overwritten with the settings for the second one before they were applied. This should have no effect on non dual framebuffer mode and do what the user intended (initalization to desired modes) in dual framebuffer mode. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d8566b29e86ef3906dd6c0ea4a02c2a925748da5 Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: yet another dead code removal Remove some functions that were never executed and a related undocumented module parameter. Signed-off-by: Florian Tobias Schandinat Cc: Scott Fang Cc: Joseph Chan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c5f06f5cddd6681b978ffdb53755e28eefccb1bb Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:30 2010 -0800 viafb: some dvi cleanup Remove some unused variables, move some dvi code around and store the detected maximum resolution for later use. The vertical resolution is handled as the old code did it but I hope it can be read from the hardware some day. No runtime change expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b24b00c364bb3bfa717ba2ead258a527b20cc5f Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:29 2010 -0800 viafb: remove the remaining VIA_RES_* uses Remove the rest of the VIA_RES_* use cases. Obviously this was no longer useful. Keep the related infrastructure/functions for later use. No runtime impact expected. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd73d6868b9ecb4841def0c6ff0a25da27db33ba Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:28 2010 -0800 viafb: split global index up This is the first step to remove an artificial global index that was used in two ways: 1. As a pseudo index in the mode table. Pseudo as you had to search through the table to find the referenced entry. This was replaced by using a pointer to the entry. 2. As a shortcut to compare a combination of horizontal and vertical resolution at the same time. This was replaced by a "(hres<<16) | vres" which is good enough for now and the near future. If vres or hres become greater than 2^16 this might indeed cause problems but this solution allows to split this indexing mess up without the requirement to do even more code changes. This is a big change that will allow more clean ups. It should be a bit faster but that is probably not relevant for normal operation. No regressions expected but as this is a relatively big step heavy testing is appreciated. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2365dfe99495159b3395dd0eddece2f0d58f527a Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:27 2010 -0800 viafb: remove dead code Remove a completly unused function. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc8b82f8c80e8b9e212e0102ee7af9972829e45c Author: Florian Tobias Schandinat Date: Wed Mar 10 15:21:26 2010 -0800 viafb: deprecate private ioctls Print a warning when viafb ioctls are called. Those should not be used as their exact meaning is sometimes unknown and they in parts duplicate functionality present in the framebuffer interface. There is no known user of these ioctls. Signed-off-by: Florian Tobias Schandinat Cc: Joseph Chan Cc: Scott Fang Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c1c341a060da1bd66a1982198b1a99765b07b8a2 Author: Jaya Kumar Date: Wed Mar 10 15:21:24 2010 -0800 broadsheetfb: add multiple panel type support Update broadsheetfb to add support for multiple panel types. The 3.7" and 6" are known to work but the 9.7" is untested due to lack of hardware. Signed-off-by: Jaya Kumar Cc: Geert Uytterhoeven Cc: Krzysztof Helt Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d40f29bff30a1a50d7ad69bd150c9cda1ce1ba9d Author: Michael Hennerich Date: Wed Mar 10 15:21:24 2010 -0800 fbdev: bf54x-lq043fb/bfin-t350mcqb-fb: drop custom mmap() handler The common Blackfin code implements the get_fb_unmapped_area() function, so we no longer need to have our own mmap() handler. The common fb code will take care of everything for us now. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d3580d40cc38bbaf63d0b2756931e0ae241a9ea Author: Roel Kluin Date: Wed Mar 10 15:21:23 2010 -0800 asiliantfb: fix test of unsigned in asiliant_calc_dclk2() Ftarget, Fret, n and m are unsigned so the tests did not work. Signed-off-by: Roel Kluin Cc: Andres Salomon Cc: Krzysztof Helt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6e3e37a5a7c91045497553bcbd6a5faea98b21b3 Author: André Goddard Rosa Date: Wed Mar 10 15:21:22 2010 -0800 coredump: plug a memory leak situation on dump_seek() After having started writing the coredump, if filesystem reports an error anytime while writing part of the core file, we would leak a memory page when bailing out. Signed-off-by: André Goddard Rosa Acked-by: KOSAKI Motohiro Cc: Alexander Viro Cc: Roland McGrath Cc: WANG Cong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5cacdb4add1b1e50fe75edc50ebbb7bddd9cf5e7 Author: Christoph Hellwig Date: Wed Mar 10 15:21:21 2010 -0800 Add generic sys_olduname() Add generic implementations of the old and really old uname system calls. Note that sh only implements sys_olduname but not sys_oldolduname, but I'm not going to bother with another ifdef for that special case. m32r implemented an old uname but never wired it up, so kill it, too. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e28cbf22933d0c0ccaf3c4c27a1a263b41f73859 Author: Christoph Hellwig Date: Wed Mar 10 15:21:19 2010 -0800 improve sys_newuname() for compat architectures On an architecture that supports 32-bit compat we need to override the reported machine in uname with the 32-bit value. Instead of doing this separately in every architecture introduce a COMPAT_UTS_MACHINE define in and apply it directly in sys_newuname(). Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670 Author: Christoph Hellwig Date: Wed Mar 10 15:21:18 2010 -0800 Add generic sys_ipc wrapper Add a generic implementation of the ipc demultiplexer syscall. Except for s390 and sparc64 all implementations of the sys_ipc are nearly identical. There are slight differences in the types of the parameters, where mips and powerpc as the only 64-bit architectures with sys_ipc use unsigned long for the "third" argument as it gets casted to a pointer later, while it traditionally is an "int" like most other paramters. frv goes even further and uses unsigned long for all parameters execept for "ptr" which is a pointer type everywhere. The change from int to unsigned long for "third" and back to "int" for the others on frv should be fine due to the in-register calling conventions for syscalls (we already had a similar issue with the generic sys_ptrace), but I'd prefer to have the arch maintainers looks over this in details. Except for that h8300, m68k and m68knommu lack an impplementation of the semtimedop sub call which this patch adds, and various architectures have gets used - at least on i386 it seems superflous as the compat code on x86-64 and ia64 doesn't even bother to implement it. [akpm@linux-foundation.org: add sys_ipc to sys_ni.c] Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: David Howells Acked-by: Kyle McMartin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a4679373cf4ee0e7792dc56205365732b725c2c1 Author: Christoph Hellwig Date: Wed Mar 10 15:21:15 2010 -0800 Add generic sys_old_mmap() Add a generic implementation of the old mmap() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Cc: Andreas Schwab Acked-by: Jesper Nilsson Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5d0e52830e9ae09b872567f4aca3dfb5b5918079 Author: Christoph Hellwig Date: Wed Mar 10 15:21:13 2010 -0800 Add generic sys_old_select() Add a generic implementation of the old select() syscall, which expects its argument in a memory block and switch all architectures over to use it. Signed-off-by: Christoph Hellwig Cc: Ralf Baechle Cc: Benjamin Herrenschmidt Cc: Paul Mundt Cc: Jeff Dike Cc: Hirokazu Takata Cc: Thomas Gleixner Cc: Ingo Molnar Reviewed-by: H. Peter Anvin Cc: Al Viro Cc: Arnd Bergmann Cc: Heiko Carstens Cc: Martin Schwidefsky Cc: "Luck, Tony" Cc: James Morris Acked-by: Andreas Schwab Acked-by: Russell King Acked-by: Greg Ungerer Acked-by: David Howells Cc: Andreas Schwab Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 724ee626f38feaea215a11790e1a0cb5d83b0628 Author: Joe Perches Date: Wed Mar 10 15:21:11 2010 -0800 drivers/block/floppy.c: remove unnecessary casting in fd_ioctl Convert outparam to const void *. Cast outparam to const char * for strlen(). Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0aad92cfea6fec14bd57dd9c283cc6eb023c97bd Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove misleading, used once FD_IOCTL_ALLOWED macro Just code the test directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 712e1de43ed572886d6913a86eee5e73b7de4318 Author: Joe Perches Date: Wed Mar 10 15:21:10 2010 -0800 drivers/block/floppy.c: remove obfuscating CODE2SIZE macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ded2863d09208b27baa4a6ad95bb7e5539e48c05 Author: Joe Perches Date: Wed Mar 10 15:21:09 2010 -0800 drivers/block/floppy.c: add __func__ to debugt Make debugt messages a little neater. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f2527174ab1ee7f4550c91be47b3f843ff1316d Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: convert raw_cmd_copyin from while(1) to label: goto Reduces indent. Makes a bit more readable and intelligible. Return value now at bottom of function. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ce2f11fe784f7999b82c7a71cdbcb86ad2653def Author: Joe Perches Date: Wed Mar 10 15:21:08 2010 -0800 drivers/block/floppy.c: remove some unnecessary casting Remove char/void __user * use. Remove kmalloc cast. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ebddd85a6a6ad793eca82d65fba4573d0e28042 Author: Joe Perches Date: Wed Mar 10 15:21:07 2010 -0800 drivers/block/floppy.c: use %pf in logging messages Print the function name not the pointer address where useful and possible Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 275176bc2a7bbd5c4446ba12b8f4353a69012053 Author: Joe Perches Date: Wed Mar 10 15:21:06 2010 -0800 drivers/block/floppy.c: use __func__ where appropriate Add and use __func__ to is_alive. Use __func__ in some DPRINTs. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 891eda80a5227a12956d7997baf9f4b54a9aa4f9 Author: Joe Perches Date: Wed Mar 10 15:21:05 2010 -0800 drivers/block/floppy.c: DPRINT neatening Move DPRINT macro definition above 1st use Consolidate a format string (>80 columns) Add a newline to an unterminated message Comment neatened Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1a23d133359eec2297ff4c72c260ccacb156d883 Author: Joe Perches Date: Wed Mar 10 15:21:04 2010 -0800 drivers/block/floppy.c: remove #define FLOPPY_SANITY_CHECK The code could not be compiled without the #define, so just remove it and the #ifdef/#endif lines. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 73507e6cd8dc6cd98a39164a9b775c7092faddb4 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: remove unnecessary argument from [__]reschedule_timeout Prior to patch "drivers/block/floppy.c: Use pr_" only reschedule_timeout(,"request done"...) printed a numeric value after a reschedule_timeout event message. Restore that behavior and remove the now unnecessary argument. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0da3132f90c01f532dd85c537b5c78a196a11e24 Author: Joe Perches Date: Wed Mar 10 15:21:03 2010 -0800 drivers/block/floppy.c: unclutter redo_fd_request logic Change for(;;) with continue; to label: goto label Reduces indentation and adds a bit of clarity. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 416d8d2888db392c562fb8afaf9136730ef0da9e Author: Joe Perches Date: Wed Mar 10 15:21:02 2010 -0800 drivers/block/floppy.c: remove REPEAT macro Macros with hidden flow changes aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 15b2630c587dcea931f563deb50d617af96b4edb Author: Joe Perches Date: Wed Mar 10 15:21:01 2010 -0800 drivers/block/floppy.c: remove unnecessary return and braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57584c5a3824a15f65d2b065d9f453fc1ae1dab7 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: add function is_ready_state Used a couple of times, might simplify the code a bit. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29f1c7848feb3954939b52fd5b7dca30dbce9426 Author: Joe Perches Date: Wed Mar 10 15:21:00 2010 -0800 drivers/block/floppy.c: convert int initialising to bool initialized Don't initialize initialized either. Default is false. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4d18ef09dfe4d1272446ad55ce5d7b06ff4b9ca8 Author: Joe Perches Date: Wed Mar 10 15:20:59 2010 -0800 drivers/block/floppy.c: remove #define DEVICE_NAME "floppy" Use it directly in the one place it's used. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c529730a98874fa951995d8a312c7fd606832eda Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: move leading && and || to preceding line Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74f63f469ed1cee8305840b7bbcee2f99797cd12 Author: Joe Perches Date: Wed Mar 10 15:20:58 2010 -0800 drivers/block/floppy.c: convert int 1/0 to bool true/false Various functions use int where bool is appropriate lock_fdc, wait_til_done, poll_drive, user_reset_fdc Convert to bool. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 55eee80c6233c67217a6238dd94f1fc765c723d1 Author: Joe Perches Date: Wed Mar 10 15:20:57 2010 -0800 drivers/block/floppy.c: remove macros CALL, WAIT and IWAIT Obfuscating macros with embedded returns are not nice Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86b12b48a29f4795e2e550f510d39931576bdf75 Author: Joe Perches Date: Wed Mar 10 15:20:56 2010 -0800 drivers/block/floppy.c: remove [_]COPYIN [_]COPYOUT and ECALL macros Remove these obfuscating macros with hidden returns Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4575b55281825d157573bbc5aa28b9144193ddd2 Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove most uses of CALL and ECALL macros Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e029853612ba5999caed4dbc833dab729aac75ba Author: Joe Perches Date: Wed Mar 10 15:20:55 2010 -0800 drivers/block/floppy.c: remove [U]CLEARF, [U]SETF, and [U]TESTF macros Use clear_bit, set_bit, and test_bit functions directly Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 87f530d8f1733651f3e34b81c801d6e1bb635936 Author: Joe Perches Date: Wed Mar 10 15:20:54 2010 -0800 drivers/block/floppy.c: add debug_dcl(...) macro Converted #ifdef DCL_DEBUG if (test) DPRINTK(...); #endif to debug_dcl(test, ...); Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 52a0d61f64123ab758d8b8cc8f8ca521733d2f32 Author: Joe Perches Date: Wed Mar 10 15:20:53 2010 -0800 drivers/block/floppy.c: remove macro LOCK_FDC Macros with hidden returns aren't nice. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0a52d67de6da21db0e549e38749b7a00029fea3 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove a few spaces from function casts Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da27365342868df88fdd5c217bf68ec10b14b5f0 Author: Joe Perches Date: Wed Mar 10 15:20:52 2010 -0800 drivers/block/floppy.c: remove IN/OUT macros, indent switch/case Remove ugly IN/OUT macros, use direct case and code Add missing semicolon after ECALL Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96534f1dd5bf9d324c2d31355cb69565381d1460 Author: Joe Perches Date: Wed Mar 10 15:20:51 2010 -0800 drivers/block/floppy.c: indent a comment Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b87c9e0a880f2992dc210eb4ea8b2da6c63883ca Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: remove CLEARSTRUCT macro, use memset Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bb57f0c662faa9879e8f265c9bc1f15bb238d2c7 Author: Joe Perches Date: Wed Mar 10 15:20:50 2010 -0800 drivers/block/floppy.c: comment neatening and remove naked ; Spacing, column alignment and a for loop with a naked semicolon converted to an assign and while Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2300f90e31178f44b0e903c12ea311df1297d7fa Author: Joe Perches Date: Wed Mar 10 15:20:49 2010 -0800 drivers/block/floppy.c: remove LAST_OUT macro Macros with hidden returns are not nice. Convert the 2 uses to use direct code. Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d7b2b2ecd88d06ae212d069a4e187ab690b1636f Author: Joe Perches Date: Wed Mar 10 15:20:48 2010 -0800 drivers/block/floppy.c: hoist assigns from if()s, neatening Move assigns above if()s Remove unnecessary parentheses from returns Use a temporary for a duplicated test Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 045f98363080ddbbcef6b8b8306ec58a818406a0 Author: Joe Perches Date: Wed Mar 10 15:20:47 2010 -0800 drivers/block/floppy.c: remove used once CHECK_READY macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a81ee5447157a4b9930bab8ec70cf77a55db64e8 Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: remove unnecessary braces Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b46df356de8c63882cfb1ee7501bd9c772a6981b Author: Joe Perches Date: Wed Mar 10 15:20:46 2010 -0800 drivers/block/floppy.c: use pr_ Convert bare printk to pr_info and pr_cont Convert printk(KERN_ERR to pr_err Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 48c8cee61f22fe5a2ea00488222b3415378469ad Author: Joe Perches Date: Wed Mar 10 15:20:45 2010 -0800 drivers/block/floppy.c: #define space and column neatening Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d49375434ec011dabcc8bfa5091f5327284e42ce Author: Joe Perches Date: Wed Mar 10 15:20:44 2010 -0800 drivers/block/floppy.c: convert some #include Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 718a38211bf4375c0a1efad3afbc5dbaef5d33f9 Author: Wu Fengguang Date: Wed Mar 10 15:20:43 2010 -0800 mm: introduce dump_page() and print symbolic flag names - introduce dump_page() to print the page info for debugging some error condition. - convert three mm users: bad_page(), print_bad_pte() and memory offline failure. - print an extra field: the symbolic names of page->flags Example dump_page() output: [ 157.521694] page:ffffea0000a7cba8 count:2 mapcount:1 mapping:ffff88001c901791 index:0x147 [ 157.525570] page flags: 0x100000000100068(uptodate|lru|active|swapbacked) Signed-off-by: Wu Fengguang Cc: Ingo Molnar Cc: Alex Chiang Cc: Rik van Riel Cc: Andi Kleen Cc: Mel Gorman Cc: Christoph Lameter Cc: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b3a6549b2602ca30f58715a0071e29f9898cae9 Author: Julia Lawall Date: Wed Mar 10 15:20:42 2010 -0800 drivers/scsi/ses.c: eliminate double free The few lines below the kfree of hdr_buf may go to the label err_free which will also free hdr_buf. The most straightforward solution seems to be to just move the kfree of hdr_buf after these gotos. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // @r@ identifier E; expression E1; iterator I; statement S; @@ *kfree(E); ... when != E = E1 when != I(E,...) S when != &E *kfree(E); // Signed-off-by: Julia Lawall Cc: James Bottomley Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d30a1f6315b8940537e8e98882c6038fbac9ba5 Author: Thomas Gleixner Date: Wed Mar 10 15:20:40 2010 -0800 mm: do not iterate over NR_CPUS in __zone_pcp_update() __zone_pcp_update() iterates over NR_CPUS instead of limiting the access to the possible cpus. This might result in access to uninitialized areas as the per cpu allocator only populates the per cpu memory for possible cpus. This problem was created as a result of the dynamic allocation of pagesets from percpu memory that went in during the merge window - commit 99dcc3e5a94ed491fbef402831d8c0bbb267f995 ("this_cpu: Page allocator conversion"). Signed-off-by: Thomas Gleixner Acked-by: Pekka Enberg Acked-by: Tejun Heo Acked-by: Christoph Lameter Acked-by: Mel Gorman Reviewed-by: KOSAKI Motohiro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bddb4e9f3f53df02a783751984ddeade71b085 Author: KAMEZAWA Hiroyuki Date: Wed Mar 10 15:20:38 2010 -0800 nommu: fix build breakage Commit 34e55232e59f7b19050267a05ff1226e5cd122a5 ("mm: avoid false sharing of mm_counter") added sync_mm_rss() for syncing loosely accounted rss counters. It's for CONFIG_MMU but sync_mm_rss is called even in NOMMU enviroment (kerne/exit.c, fs/exec.c). Above commit doesn't handle it well. This patch changes SPLIT_RSS_COUNTING depends on SPLIT_PTLOCKS && CONFIG_MMU And for avoid unnecessary function calls, sync_mm_rss changed to be inlined noop function in header file. Reported-by: David Howells Signed-off-by: KAMEZAWA Hiroyuki Signed-off-by: Mike Frysinger Signed-off-by: Michal Simek Signed-off-by: David Howells Cc: Greg Ungerer Cc: Geert Uytterhoeven Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 936ed49a540e2dce645da27e7e4032b24310a8e4 Author: Mike Frysinger Date: Wed Mar 10 15:20:38 2010 -0800 MAINTAINERS: add bfin_sdh driver Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 516a82422209e078345d0ca54b16793d7bfd4782 Author: Albert Herranz Date: Wed Mar 10 15:20:37 2010 -0800 sdio: recognize io card without powercycle SDIO Simplified Specification V2.00 states that it is strongly recommended that the host executes either a power reset or issues a CMD52 (I/O Reset) to re-initialize an I/O only card or the I/O portion of a combo card. Additionally, the CMD52 must be issued first because it cannot be issued after a CMD0. With this patch the Nintendo Wii SDIO-based WLAN card is detected after a system reset, without requiring a complete system powercycle. Signed-off-by: Albert Herranz Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0ab4a4d5094e5d17b103dc5073529a04f00a469 Author: Uwe Kleine-König Date: Wed Mar 10 15:20:35 2010 -0800 rtc/hctosys: only claim the RTC provided the system time if it did Without this patch /sys/class/rtc/$CONFIG_RTC_HCTOSYS_DEVICE/hctosys contains a 1 (meaning "This rtc was used to initialize the system clock") even if reading the time at bootup failed. Moreover change error handling in rtc_hctosys() to use goto and so reduce the indention level. Signed-off-by: Uwe Kleine-König Cc: Paul Gortmaker Acked-by: Alessandro Zummo Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 019b4d123aa7b9fc135b532e021cfde85db7665d Author: Richard Kennedy Date: Wed Mar 10 15:20:33 2010 -0800 fs: buffer_head: remove kmem_cache constructor to reduce memory usage under slub When using slub, having a kmem_cache constructor forces slub to add a free pointer to the size of the cached object, which can have a significant impact to the number of small objects that can fit into a slab. As buffer_head is relatively small and we can have large numbers of them, removing the constructor is a definite win. On x86_64 removing the constructor gives me 39 objects/slab, 3 more than without the patch. And on x86_32 73 objects/slab, which is 9 more. As alloc_buffer_head() already initializes each new object there is very little difference in actual code run. Signed-off-by: Richard Kennedy Cc: Alexander Viro Cc: Jens Axboe Acked-by: Nick Piggin Cc: "Theodore Ts'o" Reviewed-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 03affdef4fc85e416e3862abb0aa549c6034cdd0 Author: Joe Perches Date: Wed Mar 10 15:20:32 2010 -0800 fs/ocfs2/cluster/tcp.c: remove use of NIPQUAD, use %pI4 Signed-off-by: Joe Perches Cc: Mark Fasheh Acked-by: Joel Becker Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0636b33c5f2fac4e274464ae6867805f080fc433 Merge: 69960a2 a48f509 070e140 a72042c Author: Roland Dreier Date: Fri Mar 12 10:54:20 2010 -0800 Merge branches 'cxgb3', 'ipoib', 'misc' and 'nes' into for-next commit a72042c08a8ba3b685dc9cba62c57c48188ef2c8 Author: Chien Tung Date: Wed Mar 3 19:13:26 2010 +0000 RDMA/nes: Fix CX4 link problem in back-to-back configuration Commit 09124e19 ("RDMA/nes: Add support for KR device id 0x0110") took out too much code and broke CX4 link detection in back-to-back configuration. Put back the code that does the link check. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 29b2ee5af5f3a02846bd38a1e2121d62ee5f6aca Author: Andrew Clayton Date: Sat Mar 6 00:14:46 2010 +0000 ARM/OMAP: Remove the +x bit from a couple of source files Remove the +x bit from a couple of source files Signed-off-by: Andrew Clayton Signed-off-by: Tony Lindgren commit 0841cb826859a4f14c472cc75a782811310f010e Author: Janusz Krzysztofik Date: Tue Feb 23 15:50:38 2010 +0000 omap: McBSP: Drop unnecessary status/error bit clearing on reg_cacheretrieved register values The MsBSP register cache will never have any error/status flags set, since these flags are never written to the reg_cache. So it is kind of not necessary to clear these flags, which are actually always 0. In other words, clearing the status/error flags are not necessary, since the reg_cache will never got these bits set. We can just write back the register content from the cache as it is when clearing an error condition. Tested on Amstrad Delta. Reported-by: Peter Ujfalusi Signed-off-by: Janusz Krzysztofik Acked-by: Jarkko Nikula Signed-off-by: Tony Lindgren commit 8447b360a3897bdfb0677107564d1dd9ab6e63be Author: Jack Steiner Date: Thu Mar 11 12:43:29 2010 -0600 x86, UV: Fix target_cpus() in x2apic_uv_x.c target_cpu() should initially target all cpus, not just cpu 0. Otherwise systems with lots of disks can exhaust the interrupt vectors on cpu 0 if a large number of disks are discovered before the irq balancer is running. Note: UV code only... Signed-off-by: Jack Steiner LKML-Reference: <20100311184328.GA21433@sgi.com> Signed-off-by: Ingo Molnar commit 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd Author: Geert Uytterhoeven Date: Tue Dec 15 21:49:57 2009 +0100 mfd: Several MFD drivers should depend on GENERIC_HARDIRQS commit 5fb4d38b19d95a5f980f0a10adba798f5b92128c ("mfd: Move WM831x to generic IRQ") didn't take into account that genirq support depends on GENERIC_HARDIRQS. Additionally, 2.6.34-rc1 added: - commit 2afa62ea76027b00e472ddb672191e6e15425b43 ("mfd: Use genirq in 88pm860x"). - commit 760e4518788df6762700e6bb9dd8692379f11168 ("mfd: Convert WM8350 to genirq"). - commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e ("mfd: Update irq handler in max8925") Make all of them depend on GENERIC_HARDIRQS to avoid compile errors on architectures that don't support genirq yet. Signed-off-by: Geert Uytterhoeven Acked-by: Mark Brown Signed-off-by: Samuel Ortiz commit a5300dcbbd5d455a1a5978095b8f78af66c540a6 Author: Samuel Ortiz Date: Mon Mar 8 20:07:48 2010 +0100 mfd: Fix sm501 requested region size We should only request for the MFD used region, not the whole thing. Signed-off-by: Samuel Ortiz Tested-by: Paul Mundt Reviewed-by: H Hartley Sweeten commit 964ad81cbd933e5fa310faeec1e923c14651284b Author: David S. Miller Date: Fri Mar 12 00:00:17 2010 -0800 ipconfig: Handle devices which take some time to come up. Some network devices, particularly USB ones, take several seconds to fully init and appear in the device list. If the user turned ipconfig on, they are using it for NFS root or some other early booting purpose. So it makes no sense to just flat out fail immediately if the device isn't found. It also doesn't make sense to just jack up the initial wait to something crazy like 10 seconds. Instead, poll immediately, and then periodically once a second, waiting for a usable device to appear. Fail after 12 seconds. Signed-off-by: David S. Miller Tested-by: Christian Pellegrin commit aa4b1f6e83aaf20997edc4c10e03baf834343e5a Author: Kevin Hilman Date: Wed Mar 10 17:16:31 2010 +0000 OMAP4: fix temporary hacks that break multi-omap PM When building for multi-omap, and OMAP4 is enabled, CONFIG_ARCH_OMAP4 will be true and prevent included code from building/running for OMAP2/3 as well. This problem exists in io.c where some hwmod/PM/SDRC init code is prevented from running even on OMAP2/3 when OMAP4 is included in a multi-OMAP build. A quick glance suggests that this #ifndef is no longer needed in most of the cases. In the remaining cases, the function is wrapped with "if (cpu_is_omap24xx() || cpu_is_omap34xx())" which will be optimized out for OMAP4-only builds. Note that this is only a short-term fix. Longer-term, OMAP4 needs to create init functions for SDRC and hwmod late-init. Tested-by: Santosh Shilimkar Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 54c44fb7df4774280a2deb4ba191cbab84602413 Author: Kevin Hilman Date: Wed Mar 10 17:16:30 2010 +0000 OMAP2: cpu_is_omap2*: fix compile-time removal of unused code Currently if omap2420 is defined but not omap2430, cpu_is_omap2430() is still defined as a macro, instead of #define'd to zero. This results in conditional cpu_is_omap2430() code still being compiled, and leads to possible compile/link errors. In particular for hwmod init. To fix, add extra #ifdefs to CPU check macros to ensure that the is_omap* macros are zero for each OMAP2 if they are not configured into the kernel. Tested-by: Santosh Shilimkar Signed-off-by: Kevin Hilman Signed-off-by: Tony Lindgren commit 03d5671dde04a186471969d73cfc89ee02664c2c Author: Grazvydas Ignotas Date: Wed Mar 10 11:13:53 2010 +0000 omap3: pandora: add missing i2c3 board_info This will allow BQ27500 fuel gauge to function. Signed-off-by: Grazvydas Ignotas Signed-off-by: Tony Lindgren commit 8185e468446e1e2b383bd61210702fffaed3ddc0 Author: Aaro Koskinen Date: Wed Mar 3 16:24:53 2010 +0000 omap: mach-omap2/io.c: fix function declarations Get rid of the following warnings: warning: non-ANSI function declaration of function [...] Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 9f29006ae8c85746e5a52d557f689359149a0793 Author: Chien Tung Date: Wed Mar 3 19:13:28 2010 +0000 RDMA/nes: Clear stall bit before destroying NIC QP Clear the stall bit to drop any incoming packets while destroying NIC QP. This will prevent a chip resource leak. Signed-off-by: Chien Tung Signed-off-by: Roland Dreier commit 883c699241f48667ff59277d8c20790868fd4829 Author: Faisal Latif Date: Tue Mar 2 17:22:51 2010 -0600 RDMA/nes: Set assume_aligned_header bit Set assume_aligned_header bit in QP context as requested by hardware group. Signed-off-by: Faisal Latif Signed-off-by: Roland Dreier commit f00d649703fbedbdeb33d63c4c4731656e11297c Author: Sergio Aguirre Date: Wed Mar 3 16:21:08 2010 +0000 omap: Fix gpio_resume_after_retention For omap4 case, this was wrongly writing GPIO_LEVELDETECTx registers with OMAP24XX_ offset and OMAP4_ offset. Bug introduced in commit: commit 3f1686a9bfe74979c6ad538c78039730f665f77e Author: Tony Lindgren Date: Mon Feb 15 09:27:25 2010 -0800 omap: Fix gpio.c for multi-omap for omap4 Signed-off-by: Sergio Aguirre Signed-off-by: Tony Lindgren commit 228893f9d2b70a7416267050ce03bfd9eb624713 Author: Enric Balletbo i Serra Date: Mon Mar 1 11:18:08 2010 +0000 omap3: Fix support for the LEDs connected to GPIO outputs on IGEP v2board Select CONFIG_LEDS_GPIO to enable IGEP v2 LED support and control of supported LEDs from userspace. Otherwise GPIO LEDs are exported as GPIO 26, 27 and 28 using the gpiolib framework. Signed-off-by: Enric Balletbo i Serra Signed-off-by: Tony Lindgren commit 00df9384ccfa02c062449e381c051bcfe97cdf6f Author: Andrea Gelmini Date: Sat Feb 27 16:51:38 2010 +0000 omap: Checkpatch cleanup for blizzard.h arch/arm/plat-omap/include/plat/blizzard.h:9: ERROR: spaces prohibited around that ':' (ctx:WxW) Signed-off-by: Andrea Gelmini Signed-off-by: Tony Lindgren commit 29b9a218d0be8e207ddeacdc68eb1e4b7f54b85a Author: Aaro Koskinen Date: Fri Feb 26 10:25:28 2010 +0000 omap: pass the reboot command to the boot loader This patch follows the commit be093beb608edf821b45fe00a8a080fb5c6ed4af by Russell King: OMAP wishes to pass state to the boot loader upon reboot in order to instruct it whether to wait for USB-based reflashing or not. There is already a facility to do this via the reboot() syscall, except we ignore the string passed to machine_restart(). The patch adds the missing parameter to omap1_arch_reset() and omap_prcm_arch_reset(), and modifies the latter to pass the reboot command parameter to the boot loader instead of reboot mode (which is for kernel internal use only and cannot be modified by the userspace). Signed-off-by: Aaro Koskinen Signed-off-by: Tony Lindgren commit 26e4248359c6bf2da4a07767f6e12f1df426ab0a Author: Suman Anna Date: Mon Jan 25 18:27:21 2010 -0600 omap2/3/4: mailbox: remove compiler warning Remove a compiler warning in device-specific mailbox module. Signed-off-by: Suman Anna Signed-off-by: Tony Lindgren commit 21b90340207d324f92111e25ead1752533eeb9ca Author: Thomas Weber Date: Thu Feb 25 09:40:19 2010 +0000 OMAP2: serial.c: Fix number of uarts in early_init The omap_serial_early_init prints the following errors: Could not get uart4_ick Could not get uart4_fck because all the uarts available in omap_uart[] will be initialized. Only omap4430 and omap3630 have 4 uarts at the moment. This patch reduces the number of uarts when cpu is not omap4430 or omap3630. Signed-off-by: Thomas Weber Signed-off-by: Tony Lindgren commit 69960a275efc9d82797bbbe2460a2d6c9cace314 Author: Steve Wise Date: Wed Mar 3 15:06:34 2010 +0000 RDMA/cxgb3: Wait at least one schedule cycle during device removal During a hot-plug LLD removal event or an EEH error event, iw_cxgb3 must ensure that any/all threads that might be in a cxgb3 exported function must return from the function before iw_cxgb3 returns from its event processing. Do this by calling synchronize_net(). Signed-off-by: Steve Wise Signed-off-by: Roland Dreier commit 070e140c4c536df33a9870318791b2ca8f7dbfcf Author: Steve Wise Date: Thu Mar 4 18:18:18 2010 +0000 IB/mad: Ignore iWARP devices on device removal When an iWARP device is unloaded, the ib_mad module logs errors. It should be ignoring iWARP devices on device removal just like it does on device add. Signed-off-by: Steve Wise Acked-by: Sean Hefty Signed-off-by: Roland Dreier commit a48f509b26cec53338f4b0abd52ecea35e3974b8 Author: Or Gerlitz Date: Thu Mar 4 13:17:37 2010 +0000 IPoIB: Include return code in trace message for ib_post_send() failures Print the return code of ib_post_send() if it fails to make these debugging messages more useful. Signed-off-by: Or Gerlitz Signed-off-by: Roland Dreier commit f0dc117abdfa9a0e96c3d013d836460ef3cd08c7 Author: Eli Cohen Date: Wed Mar 3 12:27:52 2010 +0000 IPoIB: Fix TX queue lockup with mixed UD/CM traffic The IPoIB UD QP reports send completions to priv->send_cq, which is usually left unarmed; it only gets armed when the number of outstanding send requests reaches the size of the TX queue. This arming is done only in the send path for the UD QP. However, when sending CM packets, the net queue may be stopped for the same reasons but no measures are taken to recover the UD path from a lockup. Consider this scenario: a host sends high rate of both CM and UD packets, with a TX queue length of N. If at some time the number of outstanding UD packets is more than N/2 and the overall outstanding packets is N-1, and CM sends a packet (making the number of outstanding sends equal N), the TX queue will be stopped. When all the CM packets complete, the number of outstanding packets will still be higher than N/2 so the TX queue will not be restarted. Fix this by calling ib_req_notify_cq() when the queue is stopped in the CM path. Signed-off-by: Eli Cohen Signed-off-by: Roland Dreier commit 9e542f37ce20428170010baa36a0ecbfcc0b29bb Author: Tony Lindgren Date: Thu Mar 11 11:06:56 2010 -0800 omap: Enable PM_RUNTIME in defconfigs to avoid USB compile errors While waiting for the related USB patch, fix compile by enabling it in the defconfigs. As discussed at: http://thread.gmane.org/gmane.linux.usb.general/27432/focus=4460 Otherwise we'll get errors like: drivers/usb/core/hcd.c:1892: error: 'pm_wq' undeclared (first use in this function) drivers/usb/core/hcd.c:1892: error: (Each undeclared identifier is reported only once drivers/usb/core/hcd.c:1892: error: for each function it appears in.) Signed-off-by: Tony Lindgren commit 9f591fd76afdc0e5192e9ed00a36f8efc0b4dfe6 Author: Arnaldo Carvalho de Melo Date: Thu Mar 11 15:53:11 2010 -0300 perf record: Don't try to find buildids in a zero sized file Fixing this symptom: [acme@mica linux-2.6-tip]$ perf record -a -f Fatal: Permission error - are you root? Bus error [acme@mica linux-2.6-tip]$ I.e. if for some reason no data is collected, in this case a non root user trying to do systemwide profiling, no data will be collected, and then we end up trying to mmap a zero sized file and access the file header, b00m. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Cc: LKML-Reference: <1268333592-30872-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 79cf5bff25bc30c31fd7e4782c36947ec4bace7f Author: Tony Lindgren Date: Wed Mar 10 18:55:31 2010 -0800 omap2: Update n8x0 defconfig to test multi-omap and DMA api changes Recent DMA API changes broke compile for tusb6010. While testing the fixes for tusb6010, I had to update the n8x0 defconfig quite a bit. Might as well merge it while at it to make it more usable as we're using this to test the multi-omap booting between V6 and V7 ARMs. Also, anybody using n8x0 with a current kernel will most likely want to mount root on the MMC instead of the onenand to keep the Maemo install intact. Enable I2C, REGULATOR, MMC, MFD, PM, and USB. Also change the root to /dev/mmcblk0p2 instead of the onenand. Signed-off-by: Tony Lindgren commit 97b9ad1633ed3724e0563d250850763d20275da7 Author: Francisco Alecrim Date: Wed Mar 10 18:52:24 2010 -0800 omap2: add USB initialization for tusb6010 Based on Kalle's and Tony's patches. Some variables re-organized and unused code removed. Signed-off-by: Kalle Valo Signed-off-by: Francisco Alecrim [tony@atomide.com: this is needed to fix the related tusb6010 DMA API changes] Signed-off-by: Tony Lindgren commit d660f9a26ef81c3bbced92514ffbe82e1b882ee1 Author: Santosh Shilimkar Date: Thu Mar 11 07:33:46 2010 +0000 omap4: Fix build break by moving omap_smc1 into a separate .S This patch moves omap_smc1 function to a seperate omap44xx-smc.S file and sets compile flags as -Wa,-march=armv7-a. This fix was suggested by Tony Lindgren Signed-off-by: Santosh Shilimkar [tony@atomide.com: otherwise multi-omap build with V6 and V7 breaks] Signed-off-by: Tony Lindgren commit 6f69a1815a93722b360a1439934856e766509002 Author: Felipe Balbi Date: Thu Mar 4 09:45:53 2010 +0200 omap2/3/4: ehci: avoid compiler error with touchbook the early_param() call in board-omap3touchbook.c expands to: static const char __setup_str_early_touchbook_revision[] __section(.init.rodata) _aligned(1) = tbr; [...] and we have a non-const variable being added to the same section: static struct ehci_hcd_omap_platform_data ehci_pdata __section(.init.rodata); because of that, gcc generates a section type conflict which can (and actually should) be avoided by marking const every variable marked with __initconst. This patch fixes that for the ehci_hdc_omap_platform_data. Signed-off-by: Felipe Balbi Signed-off-by: Tony Lindgren commit 720e7749279bde0d08684b1bb4e7a2eedeec6394 Author: Sachin Prabhu Date: Thu Mar 11 12:24:45 2010 -0500 GFS2: Skip check for mandatory locks when unlocking gfs2_lock() will skip locks on file which have mode set to 02666. This is a problem in cases where the mode of the file is changed after a process has obtained a lock on the file. Such a lock will be skipped and will result in a BUG in locks_remove_flock(). gfs2_lock() should skip the check for mandatory locks when unlocking a file. Signed-off-by: Sachin Prabhu Signed-off-by: Steven Whitehouse commit 3d07467b7aa91623b31d7b5888a123a2c8c8e9cc Author: Peter Zijlstra Date: Wed Mar 10 17:07:24 2010 +0100 sched: Fix pick_next_highest_task_rt() for cgroups Since pick_next_highest_task_rt() already iterates all the cgroups and is really only interested in tasks, skip over the !task entries. Reported-by: Dhaval Giani Signed-off-by: Peter Zijlstra Tested-by: Dhaval Giani LKML-Reference: Signed-off-by: Ingo Molnar commit 639fe4b12f92b54c9c3b38c82cdafaa38cfd3e63 Author: Xiao Guangrong Date: Thu Mar 11 15:30:35 2010 +0800 perf: export perf_trace_regs and perf_arch_fetch_caller_regs Export perf_trace_regs and perf_arch_fetch_caller_regs since module will use these. Signed-off-by: Xiao Guangrong [ use EXPORT_PER_CPU_SYMBOL_GPL() ] Signed-off-by: Peter Zijlstra LKML-Reference: <4B989C1B.2090407@cn.fujitsu.com> Signed-off-by: Ingo Molnar commit 45e16a6834b6af098702e5ea6c9a40de42ff77d8 Author: Peter Zijlstra Date: Thu Mar 11 13:40:30 2010 +0100 perf, x86: Fix hw_perf_enable() event assignment What happens is that we schedule badly like: <...>-1987 [019] 280.252808: x86_pmu_start: event-46/1300c0: idx: 0 <...>-1987 [019] 280.252811: x86_pmu_start: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252812: x86_pmu_start: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252813: x86_pmu_start: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252814: x86_pmu_start: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252825: x86_pmu_stop: event-46/1300c0: idx: 0 <...>-1987 [019] 280.252826: x86_pmu_stop: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252827: x86_pmu_stop: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252828: x86_pmu_stop: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252829: x86_pmu_stop: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252834: x86_pmu_start: event-47/1300c0: idx: 1 <...>-1987 [019] 280.252834: x86_pmu_start: event-48/1300c0: idx: 2 <...>-1987 [019] 280.252835: x86_pmu_start: event-49/1300c0: idx: 3 <...>-1987 [019] 280.252836: x86_pmu_start: event-50/1300c0: idx: 32 <...>-1987 [019] 280.252837: x86_pmu_start: event-51/1300c0: idx: 32 *FAIL* This happens because we only iterate the n_running events in the first pass, and reset their index to -1 if they don't match to force a re-assignment. Now, in our RR example, n_running == 0 because we fully unscheduled, so event-50 will retain its idx==32, even though in scheduling it will have gotten idx=0, and we don't trigger the re-assign path. The easiest way to fix this is the below patch, which simply validates the full assignment in the second pass. Reported-by: Stephane Eranian Signed-off-by: Peter Zijlstra LKML-Reference: <1268311069.5037.31.camel@laptop> Signed-off-by: Ingo Molnar commit 85cfabbcd10f8d112feee6e2ec64ee78033b6d3c Author: Peter Zijlstra Date: Thu Mar 11 13:06:56 2010 +0100 perf, ppc: Fix compile error due to new cpu notifiers Fix: arch/powerpc/kernel/perf_event.c:1334: error: 'power_pmu_notifier' undeclared (first use in this function) arch/powerpc/kernel/perf_event.c:1334: error: (Each undeclared identifier is reported only once arch/powerpc/kernel/perf_event.c:1334: error: for each function it appears in.) arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'power_pmu_notifier' arch/powerpc/kernel/perf_event.c:1334: error: implicit declaration of function 'register_cpu_notifier' Due to commit 3f6da390 (perf: Rework and fix the arch CPU-hotplug hooks). Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit bb6fbc4548b9ae7ebbd06ef72f00229df259d217 Author: Trond Myklebust Date: Thu Mar 11 09:19:35 2010 -0500 NFS: Avoid a deadlock in nfs_release_page J.R. Okajima reports the following deadlock: INFO: task kswapd0:305 blocked for more than 120 seconds. "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. kswapd0 D 0000000000000001 0 305 2 0x00000000 ffff88001f21d4f0 0000000000000046 ffff88001fdea680 ffff88001f21c000 ffff88001f21dfd8 ffff88001f21c000 ffff88001f21dfd8 ffff88001f21dfd8 ffff88001fdea040 0000000000014c00 0000000000000001 ffff88001fdea040 Call Trace: [] io_schedule+0x4d/0x70 [] sync_page+0x65/0xa0 [] __wait_on_bit_lock+0x52/0xb0 [] ? sync_page+0x0/0xa0 [] __lock_page+0x64/0x70 [] ? wake_bit_function+0x0/0x40 [] truncate_inode_pages_range+0x344/0x4a0 [] truncate_inode_pages+0x10/0x20 [] generic_delete_inode+0x15e/0x190 [] generic_drop_inode+0x5d/0x80 [] iput+0x78/0x80 [] nfs_dentry_iput+0x38/0x50 [] dentry_iput+0x84/0x110 [] d_kill+0x2e/0x60 [] dput+0x7a/0x170 [] path_put+0x15/0x40 [] __put_nfs_open_context+0xa4/0xb0 [] ? nfs_free_request+0x0/0x50 [] put_nfs_open_context+0xb/0x10 [] nfs_free_request+0x29/0x50 [] kref_put+0x8e/0xe0 [] nfs_release_request+0x14/0x20 [] nfs_find_and_lock_request+0x89/0xa0 [] nfs_wb_page+0x80/0x110 [] nfs_release_page+0x70/0x90 [] try_to_release_page+0x5e/0x80 [] shrink_page_list+0x638/0x860 [] shrink_zone+0x63e/0xc40 We can fix this by making the call to put_nfs_open_context() happen when we actually remove the write request from the inode (which is done by the nfsiod thread in this case). Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit d6dd692168c049196f54edc2e8227c60702bb1d2 Author: Mike Travis Date: Fri Mar 5 13:10:38 2010 -0600 x86: Reduce per cpu warning boot up messages Reduce warning message output to one line only instead of per cpu. Signed-of-by: Mike Travis Cc: Rusty Russell Cc: Frederic Weisbecker Cc: Brian Gerst Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit 10fb7f1f2d311b4d2e5d881fe2d83f1c281100f9 Author: Mike Travis Date: Fri Mar 5 13:10:36 2010 -0600 x86: Reduce per cpu MCA boot up messages Don't write per cpu MCA boot up messages. Signed-of-by: Mike Travis Cc: Hidetoshi Seto Cc: x86@kernel.org Signed-off-by: Ingo Molnar commit 841d6e8c4e969b2cdd80f7216af34d932c41b1a6 Author: Michal Simek Date: Fri Jan 22 14:28:36 2010 +0100 microblaze: entry.S use delay slot for return handlers Signed-off-by: Michal Simek commit 8633bebc63ba5752254925f8b49a19102df1a0ff Author: Michal Simek Date: Mon Feb 22 13:24:43 2010 +0100 microblaze: Save current task directly Signed-off-by: Michal Simek commit b1d70c62fff3e8b6224699801c610c244882685a Author: Michal Simek Date: Fri Jan 22 10:24:06 2010 +0100 microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap There is possible to save r3/r4 at the beggining of user part before calling handlers and at the end restore it. Signed-off-by: Michal Simek commit 79bf3a137617e6deeac411c39f1660b7e91d6348 Author: Michal Simek Date: Wed Jan 20 15:17:08 2010 +0100 microblaze: PCI early support for noMMU system Signed-off-by: Michal Simek commit 1be53e084a5bd8f59850348e1066d25aa0200031 Author: Michal Simek Date: Thu Mar 11 14:15:48 2010 +0100 microblaze: Fix dma alloc and free coherent dma functions We have to use consistent code to be able to do coherent dma function. In consistent code is used cache inhibit page mapping. Xilinx reported that there is bug in Microblaze for WB and d-cache_always use option. Microblaze 7.30.a should be first version where is this bug removed. Signed-off-by: Michal Simek commit 3a0d7a4dd5b3a6545e5764735b48ab84e64af723 Author: Michal Simek Date: Mon Feb 22 12:16:08 2010 +0100 microblaze: Add consistent code Remove ancient Kconfig option for consistent code. MMU uses cache inhibit pages. noMMU uses UNCACHE SHADOW feature where is used double ram size. For example: Physical ram is 256MB and cache are setup to cover the same size. But if you setup in HW that size is 512MB and cache covers 256MB than you can use adresses from 256-512MB without caches and correspond with 0-256MB with cache. That's why I am using dcache base/high addresses to find out uncache area. Signed-off-by: Michal Simek commit ae8ee1505162f47f8b8cf7a44c26ea6b172e1445 Author: Michal Simek Date: Mon Feb 22 12:09:02 2010 +0100 microblaze: pgtable.h: move consistent functions Consistent functions will be used for noMMU and MMU kernels. Signed-off-by: Michal Simek commit b8a84059b5c3a3b9ba3973dcdab1e1d9cc4975e0 Author: Michal Simek Date: Mon Feb 22 11:33:07 2010 +0100 microblaze: Remove ancient Kconfig option for consistent mapping We don't use CONSISTENT option from Kconfig that's why I am removing them. Signed-off-by: Michal Simek commit cca5613f0278fb0ae0aba285a496add55d0cabab Author: Michal Simek Date: Mon Feb 22 11:27:27 2010 +0100 microblaze: Remove VMALLOC_VMADDR Signed-off-by: Michal Simek commit 22607a28213068af113b46862eafa785f00a482e Author: Michal Simek Date: Mon Feb 15 16:41:40 2010 +0100 microblaze: Add define for ASM_LOOP It is default option but both options must be measured. Signed-off-by: Michal Simek commit dcbae4be907488df5e1cc8a89b7df1a0565c257c Author: Michal Simek Date: Tue Feb 9 09:25:08 2010 +0100 microblaze: Preliminary support for dma drivers I found several problems for ll_temac driver and on system with WB. This early fix should fix it. I will clean this patch before I will add it to mainline Signed-off-by: Michal Simek commit 4c912c1a33abb67aefecb5ed8bd73d91887c4977 Author: Frans Pop Date: Sat Feb 6 18:47:12 2010 +0100 microblaze: remove trailing space in messages Signed-off-by: Frans Pop Cc: microblaze-uclinux@itee.uq.edu.au Cc: Michal Simek Signed-off-by: Michal Simek commit e786c6ad2ba7f1f9b9cc9d75d5e7ba7d9cdc550a Author: Michal Simek Date: Mon Feb 8 14:48:16 2010 +0100 microblaze: Use generic show_mem() Remove arch-specific show_mem() in favor of the generic version. It is based on powerpc patch. bda2fa535564ace56a395d5b65c6dc81305401fa Signed-off-by: Michal Simek commit 137d0795a72786fa33e6900cb2ac2eae81f4b6ee Author: Michal Simek Date: Thu Feb 4 11:42:24 2010 +0100 microblaze: Change temp register for cmdline For copy was used r7 register when CONFIG_CMDLINE_BOOL option is enabled. But r7 stores pointer to fdt that's why machine_early_init not detect compiled-in DTB. I also moved kernel PID setup to have TLB init in one block Signed-off-by: Michal Simek commit d79f3b06a9e40b382bd5d5ae8dea9b3210eda9ce Author: Michal Simek Date: Mon Feb 8 12:13:10 2010 +0100 microblaze: Preliminary support for dma drivers I found several problems for ll_temac driver and on system with WB. This early fix should fix it. I will clean this patch before I will add it to mainline Signed-off-by: Michal Simek commit 7ae5f21361fea11f58c398701da635f778635d13 Author: John Kacur Date: Thu Mar 11 13:57:00 2010 +0100 perf: Make the install relative to DESTDIR if specified Without this change, the install path is relative to prefix/DESTDIR where prefix is automatically set to $HOME. This can produce unexpected results. For example: make -C tools/perf DESTDIR=/home/jkacur/tmp install-man creates the directory: /home/jkacur/home/jkacur/tmp/share/... instead of the expected: /home/jkacur/tmp/share/... Signed-off-by: John Kacur Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Tom Zanussi Cc: Kyle McMartin Cc: LKML-Reference: <1268312220-12880-1-git-send-email-jkacur@redhat.com> Signed-off-by: Ingo Molnar commit 407c1da07d5afa001ed0fdb8f379c00bbd09990a Author: Michal Simek Date: Tue Jan 12 14:51:04 2010 +0100 microblaze: Move cache function to cache.c It is better to have init cache handling on one place. Signed-off-by: Michal Simek commit 777537905744c28b02c283692e7f75f5445c1afa Author: Michal Simek Date: Tue Jan 12 09:55:10 2010 +0100 microblaze: Add support from PREEMPT This patch add core PREEMPT support for Microblaze. I tried to trace it via tracers and I was able to see any output. I also added low level debug functions to see if that code is called. Signed-off-by: Michal Simek commit 83ff56f46a8532488ee364bb93a9cb2a59490d33 Author: Masami Hiramatsu Date: Tue Mar 9 10:22:19 2010 -0500 kprobes: Calculate the index correctly when freeing the out-of-line execution slot From : Ananth N Mavinakayanahalli When freeing the instruction slot, the arithmetic to calculate the index of the slot in the page needs to account for the total size of the instruction on the various architectures. Calculate the index correctly when freeing the out-of-line execution slot. Reported-by: Sachin Sant Reported-by: Heiko Carstens Signed-off-by: Ananth N Mavinakayanahalli Signed-off-by: Masami Hiramatsu LKML-Reference: <4B9667AB.9050507@redhat.com> Signed-off-by: Ingo Molnar commit 733cc2183116b216abb52e709709bb0e626c9a75 Author: Michal Simek Date: Mon Jan 18 15:27:11 2010 +0100 microblaze: Add support for Xilinx PCI host bridge This patch is based on powerpc patch 64f16502475ddf663169369fffff6da9b10ea9fb We did some cleanups and removed powerpc parts. There is one new debug early listing function too. Exclude function is only in Debug options. We tested in on custom board. Signed-off-by: Michal Simek commit a6475c132278c1be158a13872c233aeab8a00176 Author: Michal Simek Date: Mon Jan 18 15:27:10 2010 +0100 microblaze: Enable PCI, missing files There are two parts of changes. The first is just enable PCI in Makefiles and in Kconfig. The second is the rest of missing files. I didn't want to add it with previous patch because that patch is too big. Current Microblaze toolchain has problem with weak symbols that's why is necessary to apply this changes to be possible to compile pci support. Xilinx knows about this problem. Signed-off-by: Michal Simek commit d3afa58c20b65155af9f0d5eaa59fe2d367ac432 Author: Michal Simek Date: Mon Jan 18 14:42:34 2010 +0100 microblaze: Add core PCI files Add pci-common.h and pci32.c. Files are based on PPC version. There are removed ppc specific parts and the code was completely clean. Signed-off-by: Michal Simek commit 2ed975b43c1bf09652795a355c4e820e21c4ec44 Author: Michal Simek Date: Mon Jan 18 14:25:08 2010 +0100 microblaze: Add pci-bridge.h Add pci-bridge.h for Microblaze. It is based on powerpc header file. My changes: I removed PPC_ prefix from constants Removed ppc64 specifis parts Signed-off-by: Michal Simek commit 830980a0a83e0b5af97c31f24dc7f1b57aa9ccea Author: Michal Simek Date: Mon Jan 18 14:23:16 2010 +0100 microblaze: Add pci.h Add pci.h for microblaze. It is based on powerpc pci.h Signed-off-by: Michal Simek commit 2ddafeab6f159640299d17fb9b73b57f65011d85 Author: Michal Simek Date: Thu Jan 14 15:40:11 2010 +0100 microblaze: io.h include asm-generic/iomap.h I need to use generic/iomap.h for PCI that's why is necessary to include it and fix ioport_{map,unmap} functions. Signed-off-by: Michal Simek commit ab3b3aa5dd01b3aaa6b15caee113b21b1b6520c4 Author: Dan Carpenter Date: Sat Mar 6 14:17:52 2010 +0300 sched: Cleanup: remove unused variable in try_to_wake_up() We haven't used the "orig_rq" variable since 055a00865d "Fix/add missing update_rq_clock() calls" Signed-off-by: Dan Carpenter Cc: Peter Zijlstra Cc: Andreas Herrmann Cc: Gautham R Shenoy Cc: efault@gmx.de LKML-Reference: <20100306111752.GL4958@bicker> Signed-off-by: Ingo Molnar commit c6ba01a4c7806d134c8d483525997559071d0990 Author: Michal Simek Date: Thu Jan 14 15:16:31 2010 +0100 microblaze: Add irq_create_{of_,}mapping functions Support function for PCI. We don't use any advance mapping mechanism that's why implementation is simple. Signed-off-by: Michal Simek commit a84642a339235020e6dccc022de27055f1fa9340 Author: Michal Simek Date: Thu Jan 14 17:03:49 2010 +0100 microblaze: Add {z,}alloc_maybe_bootmem functions I will need {z,}alloc_maybe_bootmem functions for pci patches Signed-off-by: Michal Simek commit 2549edd353196d7de9c18e08146d7a8836f97235 Author: Michal Simek Date: Wed Jan 20 14:36:24 2010 +0100 microblaze: Implement __dma_sync_page There is necessary to do some cache handling for dma operations. Signed-off-by: Michal Simek commit ccfe27d7000668b02d10fc3e06aa49e3e3603162 Author: Michal Simek Date: Thu Jan 14 11:21:02 2010 +0100 microblaze: Support DMA Add DMA support for Microblaze. There are some part of this new feature: 1. Basic DMA support 2. Enable DMA debug option 3. Setup notifier Ad 1. dma-mapping come from powerpc and x86 version and it is based on generic dma-mapping-common.h Ad 2. DMA support debug features which is used in generic file. For more information please look at Documentation/DMA-API.txt Ad 3. notifier is very important to setup dma_ops. Without this part for example ll_temac driver failed because there are no setup dma operations. Signed-off-by: Michal Simek commit 915a0b575fdb2376135ed9334b3ccb1eb51db622 Merge: e02c4fd 0e95017 Author: Ingo Molnar Date: Thu Mar 11 13:39:33 2010 +0100 Merge branch 'tip/tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit f56e8a0765cc4374e02f4e3a79e2427b5096b075 Author: Paul E. McKenney Date: Fri Mar 5 15:03:27 2010 -0800 x86/mce: Fix RCU lockdep splats Create an rcu_dereference_check_mce() that checks for RCU-sched read side and mce_read_mutex being held on update side. Replace uses of rcu_dereference() in arch/x86/kernel/cpu/mcheck/mce.c with this new macro. Signed-off-by: Paul E. McKenney Cc: "H. Peter Anvin" Cc: x86@kernel.org Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 007b09243b099811124f69d492adeebe9e439f96 Author: Paul E. McKenney Date: Fri Mar 5 15:03:26 2010 -0800 rcu: Increase RCU CPU stall timeouts if PROVE_RCU CONFIG_PROVE_RCU imposes additional overhead on the kernel, so increase the RCU CPU stall timeouts in an attempt to allow for this effect. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3f379b03fbfddd20536389a85c6456f8233d1f8d Author: Paul E. McKenney Date: Fri Mar 5 15:03:25 2010 -0800 ftrace: Replace read_barrier_depends() with rcu_dereference_raw() Replace the calls to read_barrier_depends() in ftrace_list_func() with rcu_dereference_raw() to improve readability. The reason that we use rcu_dereference_raw() here is that removed entries are never freed, instead they are simply leaked. This is one of a very few cases where use of rcu_dereference_raw() is the long-term right answer. And I don't yet know of any others. ;-) Signed-off-by: Paul E. McKenney Acked-by: Steven Rostedt Cc: Frederic Weisbecker Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267830207-9474-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit a12b51c478899fe0b7e874a559b05ba35f1128ee Author: Paul Mackerras Date: Wed Mar 10 20:36:09 2010 +1100 perf tools: Fix sparse CPU numbering related bugs At present, the perf subcommands that do system-wide monitoring (perf stat, perf record and perf top) don't work properly unless the online cpus are numbered 0, 1, ..., N-1. These tools ask for the number of online cpus with sysconf(_SC_NPROCESSORS_ONLN) and then try to create events for cpus 0, 1, ..., N-1. This creates problems for systems where the online cpus are numbered sparsely. For example, a POWER6 system in single-threaded mode (i.e. only running 1 hardware thread per core) will have only even-numbered cpus online. This fixes the problem by reading the /sys/devices/system/cpu/online file to find out which cpus are online. The code that does that is in tools/perf/util/cpumap.[ch], and consists of a read_cpu_map() function that sets up a cpumap[] array and returns the number of online cpus. If /sys/devices/system/cpu/online can't be read or can't be parsed successfully, it falls back to using sysconf to ask how many cpus are online and sets up an identity map in cpumap[]. The perf record, perf stat and perf top code then calls read_cpu_map() in the system-wide monitoring case (instead of sysconf) and uses cpumap[] to get the cpu numbers to pass to perf_event_open. Signed-off-by: Paul Mackerras Cc: Anton Blanchard Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100310093609.GA3959@brick.ozlabs.ibm.com> Signed-off-by: Ingo Molnar commit 220b140b52ab6cc133f674a7ffec8fa792054f25 Author: Paul Mackerras Date: Wed Mar 10 20:45:52 2010 +1100 perf_event: Fix oops triggered by cpu offline/online Anton Blanchard found that he could reliably make the kernel hit a BUG_ON in the slab allocator by taking a cpu offline and then online while a system-wide perf record session was running. The reason is that when the cpu comes up, we completely reinitialize the ctx field of the struct perf_cpu_context for the cpu. If there is a system-wide perf record session running, then there will be a struct perf_event that has a reference to the context, so its refcount will be 2. (The perf_event has been removed from the context's group_entry and event_entry lists by perf_event_exit_cpu(), but that doesn't remove the perf_event's reference to the context and doesn't decrement the context's refcount.) When the cpu comes up, perf_event_init_cpu() gets called, and it calls __perf_event_init_context() on the cpu's context. That resets the refcount to 1. Then when the perf record session finishes and the perf_event is closed, the refcount gets decremented to 0 and the context gets kfreed after an RCU grace period. Since the context wasn't kmalloced -- it's part of a per-cpu variable -- bad things happen. In fact we don't need to completely reinitialize the context when the cpu comes up. It's sufficient to initialize the context once at boot, but we need to do it for all possible cpus. This moves the context initialization to happen at boot time. With this, we don't trash the refcount and the context never gets kfreed, and we don't hit the BUG_ON. Reported-by: Anton Blanchard Signed-off-by: Paul Mackerras Tested-by: Anton Blanchard Acked-by: Peter Zijlstra Cc: Signed-off-by: Ingo Molnar commit 2e95e3f668c85276ce699993596d3b52b0fcf4c5 Author: Benjamin Marzinski Date: Wed Mar 10 18:10:19 2010 -0600 GFS2: Allow the number of committed revokes to temporarily be negative GFS2 tracks the number of revokes and unrevokes that are part of committed transactions via sd_log_commited_revoke. It is possible for one process to add revokes during its transaction, while another process unrevokes them during its transaction. If the second process finishes its transaction first, sd_log_commited_revoke will be decremented by the number of unrevokes that the second process did, without first being incremented by the number of revokes the first process did. This is fine, since all started transactions must be completed before the journal can be flushed. However, sd_log_commited_revoke is an unsigned integer, and log_refund() causes an assertion failure if it would go negative at the end of a transaction. This patch makes sd_log_commited_revoke a signed integer and allows it to go negative. __gfs2_log_flush() still checks that it mataches the actual number of revokes. Signed-off-by: Benjamin Marzinski Signed-off-by: Steven Whitehouse commit afadb8e08c48d08b75f3caf8404742b13e6b3624 Author: Mark Brown Date: Wed Mar 10 23:41:33 2010 -0800 Input: wm831x-on - convert to use genirq Now that the WM831x core has been converted to use genirq for the interrupt controller there is no need for the client drivers to use a WM831x-specific API rather than just calling genirq directly. Also fixes a leak of the IRQ during init failure - the error path free_irq() was using NULL rather than the driver data as the data pointer so free_irq() wouldn't have matched. Signed-off-by: Mark Brown Signed-off-by: Dmitry Torokhov commit fdba2bb1f2eed85085a0fe154e1acb82de3239f7 Author: Ranjith Lohithakshan Date: Wed Mar 10 23:41:22 2010 -0800 Input: ads7846 - add wakeup support Add wakeup support to the ads7846 driver. Platforms can enable wakeup capability by setting the wakeup flag in ads7846_platform_data. With this patch the ads7846 driver can be used to wake the system from suspend. Signed-off-by: Ranjith Lohithakshan Signed-off-by: Dmitry Torokhov commit 04b4b88cca0ebe3813b4b6f014fb6a0db380b137 Author: Vadim Zaliva Date: Wed Mar 10 23:41:00 2010 -0800 Input: appletouch - fix integer overflow issue When reading data from Geyser 2 touchpads used on post Oct 2005 Apple PowerBooks the driver was casting X and Y coordinates values to 'signed char'. Testing on one of such PowerBooks I have noticed that touchpad always generates positive values, but some of them are greater that 127, and thus, when cast to 'signed char' being interpreted as a negative. Such bigger values have been observed infrequently, closer to the edges of a touchpad, so the problem was not very visible. Nevertheless, the patch would potentially improve touchpad driver accuracy. Signed-off-by: Vadim Zaliva Signed-off-by: Dmitry Torokhov commit acc6a0935e5958ad1a1b99a1c6f44a52264bedf0 Author: Grant Likely Date: Wed Mar 10 14:39:50 2010 -0700 powerpc/52xx: update defconfigs Signed-off-by: Grant Likely commit dee60269f0fe90927ce5095eef3a8723bbb9c53e Merge: 51f5f8c 1382c71 Author: John W. Linville Date: Wed Mar 10 16:34:38 2010 -0500 Merge branch 'wireless-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6 commit 51f5f8ca446d4c59041b9b6995821e13208897ea Author: Eric Dumazet Date: Wed Mar 10 17:13:36 2010 +0100 mac80211: Fix memory leak in ieee80211_if_write() Fix memory leak and use kmalloc() instead of kzalloc() as we are going to overwrite the allocated buffer. Signed-off-by: Eric Dumazet Signed-off-by: John W. Linville commit 2a13052fe495948e572839e514e0e0cd236c50b0 Author: Juuso Oikarinen Date: Tue Mar 9 14:25:02 2010 +0200 mac80211: Fix (dynamic) power save entry Currently hardware with !IEEE80211_HW_PS_NULLFUNC_STACK and IEEE80211_HW_REPORTS_TX_ACK_STATUS will never enter PSM due to the conditions in the power save entry functions. Fix those conditions. Signed-off-by: Juuso Oikarinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit 41093167ec6c1854903a4bc38a37b5740c028984 Author: Zhu Yi Date: Tue Mar 9 16:05:31 2010 +0800 ipw2200: use kmalloc for large local variables Fixed below compiler warning: drivers/net/wireless/ipw2x00/ipw2200.c: In function ‘ipw_load_firmware’: drivers/net/wireless/ipw2x00/ipw2200.c:3260: warning: the frame size of 1168 bytes is larger than 1024 bytes Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 9bd4517ddc51c803784778ab52e6f0bc03b77a52 Author: Scott Ellis Date: Wed Mar 10 14:23:13 2010 -0700 spi/omap2_mcspi: Use transaction speed if provided omap2_mcspi_transfer() gets called in omap2_mcspi_work() when the transaction speed_hz or bits_per_word fields are non-zero. omap2_mcspi_transfer() does not look at the speed_hz field so the override speed value is ignored. The code should probably change to one of these options. 1. Skip the call to omap2_mcsp_transfer() if the only reason was a non-zero speed_hz and it's not going to be used. 2. Use the new speed_hz value provided The patch below uses the speed_hz value. Signed-off-by: Scott Ellis Signed-off-by: Grant Likely commit 5e7749436d576a525d7b2a4bcffb17b3364b9e00 Author: Scott Ellis Date: Wed Mar 10 14:22:45 2010 -0700 spi/omap2_mcspi: fix NULL pointer dereference Check spi->controller_state before dereferencing. Shows up NULL here when using spi_alloc_device()/spi_add_device() and spi_add_device() fails before spi_setup(). Calling spi_dev_put() on the leftover spi_device results in the error. Signed-off-by: Scott Ellis Signed-off-by: Grant Likely commit 5f13bfac0718ce6f83ecba3755f224c3790e8d66 Author: Bruno Randolf Date: Tue Mar 9 16:56:10 2010 +0900 ath5k: read eeprom IQ calibration values correctly for G mode we read the IQ correction values (i_cal and q_cal) for G mode from a wrong location (the same shifts as for A mode is applied which is incorrect). use correct locations, matching the docs and HAL sources. also we should write IQ correction only when we have that information in the EEPROM, starting from version 4. also write it in the same way as we do in the periodic recalibration (enable last), just to be sure. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 86415d43efd4f7093979cfa8a80232114266f1a4 Author: Bruno Randolf Date: Tue Mar 9 16:56:05 2010 +0900 ath5k: fix I/Q calibration (for real) I/Q calibration was completely broken, resulting in a high number of CRC errors on received packets. before i could see around 10% to 20% CRC errors, with this patch they are between 0% and 3%. 1.) the removal of the mask in commit "ath5k: Fix I/Q calibration (f1cf2dbd0f798b71b1590e7aca6647f2caef1649)" resulted in no mask beeing used when writing the I/Q values into the register. additional errors in the calculation of the values (see 2.) resulted too high numbers, exceeding the masks, so wrong values like 0xfffffffe were written. to be safe we should always use the bitmask when writing parts of a register. 2.) using a (s32) cast for q_coff is a wrong conversion to signed, since we convert to a signed value later by substracting 128. this resulted in too low numbers for Q many times, which were limited to -16 by the boundary check later on. 3.) checked everything against the HAL sources and took over comments and minor optimizations from there. 4.) we can't use ENABLE_BITS when we want to write a number (the number can contain zeros). also always write the correction values first and set ENABLE bit last, like the HAL does. Signed-off-by: Bruno Randolf Cc: stable@kernel.org Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit a3b980fd1391e75068ae25f3817728b27bfdb04c Author: Bruno Randolf Date: Tue Mar 9 16:55:33 2010 +0900 ath5k: fix TSF reset to reset the TSF, AR5K_BEACON_RESET_TSF has to be 1, not 0. also we have a function for that so use it. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8bd8beab49fec3f7d014c328641bd94de3df744b Author: Bruno Randolf Date: Tue Mar 9 16:55:23 2010 +0900 ath5k: use fixed antenna for tx descriptors when using a fixed antenna we should use the antenna number in all tx descriptors, otherwise the hardware will sometimes send the frame out on the other antenna. it seems like the hardware does not always respect the default antenna and diversity settings (esp. AR5K_STA_ID1_DEFAULT_ANTENNA). also i would like to note that antenna diversity does not always work correctly on 5414 (at least) when only one antenna is connected: for example all frames might be received on antenna A but still the HW tries to send on antenna B some times, causing packet loss. this is both verified with the antenna statistics output of the previous patch and a spectrum analyzer. Signed-off-by: Bruno Randolf Acked-by: Nick Kossifidis Signed-off-by: John W. Linville commit 8e59340e4fb65cfd748eaa1e23db057c52520f35 Author: Zhu Yi Date: Mon Mar 8 13:18:03 2010 +0800 libipw: split ieee->networks into small pieces The ieee->networks consists of 128 struct libipw_network entries. If we allocate this chunk of memory altogether, it ends up with an order 4 page allocation. High order page allocation is likely to fail on system high load. This patch splits the big chunk memory allocation into small pieces, each is 344 bytes, allocates them with 128 times. The patch fixed bug http://bugzilla.kernel.org/show_bug.cgi?id=14989 Signed-off-by: Zhu Yi Signed-off-by: John W. Linville commit 38a679a52be13d5a0c766597ab823e06688d6e8e Author: Jouni Malinen Date: Sat Mar 6 18:35:08 2010 +0200 mac80211: Fix sta_mtx unlocking on insert STA failure path Commit 34e895075e21be3e21e71d6317440d1ee7969ad0 introduced sta_mtx locking into sta_info_insert() (now sta_info_insert_rcu), but forgot to unlock this mutex on one of the error paths. Fix this by adding the missing mutex_unlock() call for the case where STA insert fails due to an entry existing already. This may happen at least in AP mode when a STA roams between two BSSes (vifs). Signed-off-by: Jouni Malinen Signed-off-by: John W. Linville commit e5a9a35cb9c0d92d7c986cb3696fb794be100087 Author: Helmut Schaa Date: Fri Mar 5 17:44:22 2010 +0100 rt2x00: remove KSEG1ADDR define from rt2x00soc.h Remove the KSEG1ADDR define from rt2x00soc.h as it redefines and covers the correct one from the arch/mips/include/asm/addrspace.h. Otherwise the driver oopses on the target platform (Ralink rt3050 board). Signed-off-by: Helmut Schaa Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 07081fd8587478849b69d7b41596e81ff5a7f532 Author: David Miller Date: Wed Mar 10 14:05:35 2010 -0700 uartlite: Fix build on sparc. We can get this driver enabled via MFD_TIMBERDALE which only requires GPIO to be on. But the of_address_to_resource() function is only present on powerpc and microblaze, so we have to conditionalize the CONFIG_OF probing bits on that. Signed-off-by: David S. Miller Signed-off-by: Grant Likely commit b4d2314bb88b07e5a04e6c75b442a1dfcd60e340 Author: Trond Myklebust Date: Wed Mar 10 15:21:44 2010 -0500 NFSv4: Don't ignore the NFS_INO_REVAL_FORCED flag in nfs_revalidate_inode() If the NFS_INO_REVAL_FORCED flag is set, that means that we don't yet have an up to date attribute cache. Even if we hold a delegation, we must put a GETATTR on the wire. Signed-off-by: Trond Myklebust Cc: stable@kernel.org commit 717ea4b3474852057b1ce2c639ce219f4f8d3a8d Author: Greg Ungerer Date: Wed Mar 10 07:37:06 2010 -0800 net: add ColdFire support to the smc91x driver Some embedded ColdFire based boards use the SMC 91x family of ethernet devices. (For example the Freescale M5249C3 and MoretonBay NETtel). Add IO access support to the SMC91x driver, and allow this driver to be configured for ColdFire platforms. Signed-off-by: Greg Ungerer Signed-off-by: David S. Miller commit 7f29a3baa825725d29db399663790d15c78cddcf Author: Jussi Kivilinna Date: Tue Mar 9 12:24:38 2010 +0000 asix: fix setting mac address for AX88772 Setting new MAC address only worked when device was set to promiscuous mode. Fix MAC address by writing new address to device using undocumented command AX_CMD_READ_NODE_ID+1. Patch is tested with AX88772 device. Signed-off-by: Jussi Kivilinna Acked-by: David Hollis Signed-off-by: David S. Miller commit 2b4c32972b9bcfee29d5e2c1b6f261dda5ef2a21 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Tue Mar 9 16:47:52 2010 +0000 ipv6 ip6_tunnel: eliminate unused recursion field from ip6_tnl{}. Commit a43912ab19... ("tunnel: eliminate recursion field") eliminated use of recursion field from tunnel structures, but its definition still exists in ip6_tnl{}. Let's remove that unused field. Signed-off-by: YOSHIFUJI Hideaki Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 3041f5170751e3522aa1bd6e8ca5d98e846720b0 Author: Eric Dumazet Date: Tue Mar 9 19:09:08 2010 +0000 net: Fix dev_mc_add() Commit 6e17d45a (net: add addr len check to dev_mc_add) added a bug in dev_mc_add(), since it can now exit with a lock imbalance. Signed-off-by: Eric Dumazet CC: Jiri Pirko Signed-off-by: David S. Miller commit 0a141509ede48ac33ef756ac1640f4d3f46fa2db Author: Eric Dumazet Date: Tue Mar 9 19:40:54 2010 +0000 net: Annotates neigh_invalidate() Annotates neigh_invalidate() with __releases() and __acquires() for sparse sake. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit bb134d5d9580fc7b945e3bca3c4b263947022966 Author: Eric Dumazet Date: Tue Mar 9 05:55:56 2010 +0000 tcp: Fix tcp_v4_rcv() Commit d218d111 (tcp: Generalized TTL Security Mechanism) added a bug for TIMEWAIT sockets. We should not test min_ttl for TW sockets. Reported-by: Tetsuo Handa Signed-off-by: Eric Dumazet Acked-by: Stephen Hemminger Signed-off-by: David S. Miller commit fe234f0e5cbb880792d2d1ac0743cf8c07e9dde3 Author: Louis Rilling Date: Tue Mar 9 06:14:41 2010 +0000 tg3: Fix tg3_poll_controller() passing wrong pointer to tg3_interrupt() Commit 09943a1819a240ff4a72f924d0038818fcdd0a90 Author: Matt Carlson Date: Fri Aug 28 14:01:57 2009 +0000 tg3: Convert ISR parameter to tnapi forgot to update tg3_poll_controller(), leading to intermittent crashes with netpoll. Fix this. Signed-off-by: Louis Rilling Cc: stable@kernel.org Signed-off-by: David S. Miller commit 78cb27939ff4fd66d7f76cfe7c59c0fdf1b29ed8 Author: Frank Blaschka Date: Mon Mar 8 20:36:57 2010 +0000 qeth: change checksumming default for HiperSockets Deactivate inbound checksumming on HiperSocket is a valid but dangerous optimization in case the frame is routed from an OSA network to an HiperSockets network. To go for sure we change the default to software checksumming. Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 869da90b9ae39f0d5b9b5aa3a84502684a6aa1f4 Author: Ursula Braun Date: Mon Mar 8 20:36:56 2010 +0000 qeth: no recovery after layer mismatch (z/VM NICs) Depending on their definition in z/VM, virtual devices for z/VM VSWITCH or GuestLAN must be configured either in layer2 or in layer3 mode. If qeth detects a layer mismatch, device activation fails. Trying to recover from this error cannot help; thus scheduling a recovery should be avoided. In addition, since recovery is forbidden during online setting of a qeth device, existence of its network device is guaranteed for all dev_close() calls in qeth. The corresponding checks can be removed. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit a959189a978e0104e8aa7f1522f5eff42d891456 Author: Ursula Braun Date: Mon Mar 8 20:36:55 2010 +0000 qeth: set promisc off after trace disabling failure If HiperSockets Network Traffic Analyzer is switched off, but trace disabling fails somehow, the qeth driver does not switch off its promisc mode status. A following sniffer reactivation fails, since qeth does not see a need to reenable tracing. At the same time the code analyzing results of trace commands is restructured. Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 21fde749cbf71d03e8cf87a7a9a45349597e138a Author: Frank Blaschka Date: Mon Mar 8 20:36:54 2010 +0000 qeth: l3 send dhcp in non pass thru mode dhcp frames are valid IPv4 packets so there is no need to send them in pass thru mode. This allows dhcp packets to pass HiperSockets. Also the dhcp release frame is send out correctly with this patch. Signed-off-by: Frank Blaschka Signed-off-by: Martin Schwidefsky Signed-off-by: David S. Miller commit fe7a26257a4191de6047f7e1d38832472eb22f85 Author: Ursula Braun Date: Mon Mar 8 20:36:53 2010 +0000 qeth: enable kmsg hash processing in qeth_core_sys.c provide qeth kmsg definitions to enable hash string generation for kernel message created with dev_err(). Signed-off-by: Ursula Braun Signed-off-by: Frank Blaschka Signed-off-by: David S. Miller commit 2886539d5e649c22a6d2107eb431d3bee81e0e6d Author: Rafi Rubin Date: Wed Mar 10 16:10:28 2010 +0100 HID: ntrig: fix touch events This reinstates the lost unpressing of BTN_TOUCH. To prevent undesireably touch toggles this also deals with tip switch events. Added a trap to prevent going out of bounds for hidinputs with empty reports. Clear bits of unused buttons which result in misidentification. Signed-off-by: Rafi Rubin Signed-off-by: Jiri Kosina commit 97d5a22005f38057b4bc0d95f81cd26510268794 Author: Frederic Weisbecker Date: Fri Mar 5 05:35:37 2010 +0100 perf: Drop the obsolete profile naming for trace events Drop the obsolete "profile" naming used by perf for trace events. Perf can now do more than simple events counting, so generalize the API naming. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Masami Hiramatsu Cc: Jason Baron commit c530665c31c0140b74ca7689e7f836177796e5bd Author: Frederic Weisbecker Date: Wed Mar 3 07:16:16 2010 +0100 perf: Take a hot regs snapshot for trace events We are taking a wrong regs snapshot when a trace event triggers. Either we use get_irq_regs(), which gives us the interrupted registers if we are in an interrupt, or we use task_pt_regs() which gives us the state before we entered the kernel, assuming we are lucky enough to be no kernel thread, in which case task_pt_regs() returns the initial set of regs when the kernel thread was started. What we want is different. We need a hot snapshot of the regs, so that we can get the instruction pointer to record in the sample, the frame pointer for the callchain, and some other things. Let's use the new perf_fetch_caller_regs() for that. Comparison with perf record -e lock: -R -a -f -g Before: perf [kernel] [k] __do_softirq | --- __do_softirq | |--55.16%-- __open | --44.84%-- __write_nocancel After: perf [kernel] [k] perf_tp_event | --- perf_tp_event | |--41.07%-- lock_acquire | | | |--39.36%-- _raw_spin_lock | | | | | |--7.81%-- hrtimer_interrupt | | | smp_apic_timer_interrupt | | | apic_timer_interrupt The old case was producing unreliable callchains. Now having right frame and instruction pointers, we have the trace we want. Also syscalls and kprobe events already have the right regs, let's use them instead of wasting a retrieval. v2: Follow the rename perf_save_regs() -> perf_fetch_caller_regs() Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Jason Baron Cc: Archs commit 5331d7b84613b8325362dde53dc2bff2fb87d351 Author: Frederic Weisbecker Date: Thu Mar 4 21:15:56 2010 +0100 perf: Introduce new perf_fetch_caller_regs() for hot regs snapshot Events that trigger overflows by interrupting a context can use get_irq_regs() or task_pt_regs() to retrieve the state when the event triggered. But this is not the case for some other class of events like trace events as tracepoints are executed in the same context than the code that triggered the event. It means we need a different api to capture the regs there, namely we need a hot snapshot to get the most important informations for perf: the instruction pointer to get the event origin, the frame pointer for the callchain, the code segment for user_mode() tests (we always use __KERNEL_CS as trace events always occur from the kernel) and the eflags for further purposes. v2: rename perf_save_regs to perf_fetch_caller_regs as per Masami's suggestion. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: Arnaldo Carvalho de Melo Cc: Masami Hiramatsu Cc: Jason Baron Cc: Archs commit 61e67fb9d3ed13e6a7f58652ae4979b9c872fa57 Author: Frederic Weisbecker Date: Wed Mar 3 07:38:37 2010 +0100 perf/x86-64: Use frame pointer to walk on irq and process stacks We were using the frame pointer based stack walker on every contexts in x86-32, but not in x86-64 where we only use the seven-league boots on the exception stacks. Use it also on irq and process stacks. This utterly accelerate the captures. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo commit db2c4c7791cd04512093d05afc693c3511a65fd7 Author: Frederic Weisbecker Date: Tue Feb 2 23:34:40 2010 +0100 lockdep: Move lock events under lockdep recursion protection There are rcu locked read side areas in the path where we submit a trace event. And these rcu_read_(un)lock() trigger lock events, which create recursive events. One pair in do_perf_sw_event: __lock_acquire | |--96.11%-- lock_acquire | | | |--27.21%-- do_perf_sw_event | | perf_tp_event | | | | | |--49.62%-- ftrace_profile_lock_release | | | lock_release | | | | | | | |--33.85%-- _raw_spin_unlock Another pair in perf_output_begin/end: __lock_acquire |--23.40%-- perf_output_begin | | __perf_event_overflow | | perf_swevent_overflow | | perf_swevent_add | | perf_swevent_ctx_event | | do_perf_sw_event | | perf_tp_event | | | | | |--55.37%-- ftrace_profile_lock_acquire | | | lock_acquire | | | | | | | |--37.31%-- _raw_spin_lock The problem is not that much the trace recursion itself, as we have a recursion protection already (though it's always wasteful to recurse). But the trace events are outside the lockdep recursion protection, then each lockdep event triggers a lock trace, which will trigger two other lockdep events. Here the recursive lock trace event won't be taken because of the trace recursion, so the recursion stops there but lockdep will still analyse these new events: To sum up, for each lockdep events we have: lock_*() | trace lock_acquire | ----- rcu_read_lock() | | | lock_acquire() | | | trace_lock_acquire() (stopped) | | | lockdep analyze | ----- rcu_read_unlock() | lock_release | trace_lock_release() (stopped) | lockdep analyze And you can repeat the above two times as we have two rcu read side sections when we submit an event. This is fixed in this patch by moving the lock trace event under the lockdep recursion protection. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Li Zefan Cc: Lai Jiangshan Cc: Masami Hiramatsu Cc: Jens Axboe commit 65f2ed2b2fa6034ef9890b60c8fd39fbe76b9d37 Author: Arnaldo Carvalho de Melo Date: Tue Mar 9 15:58:17 2010 -0300 perf report: Print the map table just after samples for which no map was found If -vv is used just the map table will be printed, -vvv will print the symbol table too, with it we can see that we have a bug where some samples are not being resolved to a map when we get them in the perf.data stream, but after we have it all processed, we can find the right map, some reordering probably is happening. Upcoming patches will provide ways to ask for most PERF_SAMPLE_ conditional samples to be taken for !PERF_RECORD_SAMPLE events too, then we'll be able to ask for PERF_SAMPLE_TIME and PERF_SAMPLE_CPU to help diagnose this. Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1268161097-17761-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cbbc79a53278b83bf7f834127751459f9299e402 Author: Eric B Munson Date: Fri Mar 5 12:51:09 2010 -0300 perf report: Add multiple event support Perf report does not handle multiple events being reported, even though perf record stores them properly on disk. This patch addresses that issue by adding the logic to perf report to use the event stream id that is saved by record and the new data structures to seperate the event streams and report them individually. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-6-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit eefc465cdd49cb89a742083fac2807c718ddad31 Author: Eric B Munson Date: Fri Mar 5 12:51:08 2010 -0300 perf session: Change perf_session post processing functions to take histogram tree Now that report can store historgrams for multiple events we need to be able to do the post processing work for each histogram. This patch changes the post processing functions so that they can be called individually for each event's histogram. Signed-off-by: Eric B Munson [ Guarantee bisectabilty by fixing up builtin-report.c ] Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-5-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit cb8f09393646c5058056db771583c86e0ed1d92f Author: Eric B Munson Date: Fri Mar 5 12:51:07 2010 -0300 perf session: Add storage for seperating event types in report This patch adds the structures necessary to count each event type independently in perf report. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-4-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d403d0acc9c5afa679a3f61e71489530d7fa0606 Author: Eric B Munson Date: Fri Mar 5 12:51:06 2010 -0300 perf session: Change add_hist_entry to take the tree root instead of session In order to minimize the impact of storing multiple events in a report this function will now take the root of the histogram tree so that the logic for selecting the proper tree can be inserted before the call. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-3-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 8907fd607b66e36636469a2de9833db643869db8 Author: Eric B Munson Date: Fri Mar 5 12:51:05 2010 -0300 perf record: Add ID and to recorded event data when recording multiple events Currently perf record does not write the ID or the to disk for events. This doesn't allow report to tell if an event stream contains one or more types of events. This patch adds this entry to the list of data that record will write to disk if more than one event was requested. Signed-off-by: Eric B Munson Signed-off-by: Arnaldo Carvalho de Melo Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-2-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit accd3cc45a0e1d11090ea66888405987de77bdca Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 12:51:04 2010 -0300 perf probe: Add missing variable initialization cc1: warnings being treated as errors util/probe-finder.c: In function 'find_line_range': util/probe-finder.c:172: warning: 'src' may be used uninitialized in this function make: *** [util/probe-finder.o] Error 1 Signed-off-by: Arnaldo Carvalho de Melo Acked-by: Masami Hiramatsu Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267804269-22660-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit 1224550969e0bf18785786a1a9f801cd86d68586 Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 11:54:02 2010 -0300 perf tools: Don't trow away old map slices not overlapped by new maps Signed-off-by: Arnaldo Carvalho de Melo Cc: David S. Miller Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras LKML-Reference: <1267800842-22324-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar commit d4944a06666054707d23e11888e480af239e5abf Author: Peter Zijlstra Date: Mon Mar 8 13:51:20 2010 +0100 perf: Provide better condition for event rotation Try to avoid useless rotation and PMU disables. [ Could be improved by keeping a nr_runnable count to better account for the < PERF_STAT_INACTIVE counters ] Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit f3d46b2e6fa57547f9884330798792afc83f4b04 Author: Peter Zijlstra Date: Sat Mar 6 13:24:58 2010 +0100 perf, x86: Fix double enable calls hw_perf_enable() would enable already enabled events. This causes problems with code that assumes that ->enable/->disable calls are balanced (like the LBR code does). What happens is that events that were already running and left in place would get enabled again. Avoid this by only enabling new events that match their previous assignment. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 19925ce778f9fc371b9607625de3bff04c60121e Author: Peter Zijlstra Date: Sat Mar 6 13:20:40 2010 +0100 perf, x86: Fix double disable calls hw_perf_enable() would disable events that were not yet enabled. This causes problems with code that assumes that ->enable/->disable calls are balanced (like the LBR code does). What happens is that we disable newly added counters that match their previous assignment, even though they are not yet programmed on the hardware. Avoid this by only doing the first pass over the existing events. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 356e1f2e0ace2d4b100c8eda9d49b709e8323da5 Author: Peter Zijlstra Date: Sat Mar 6 13:49:56 2010 +0100 perf, x86: Properly account n_added Make sure n_added is properly accounted so that we can rely on the value to reflect the number of added counters. This is needed if its going to be used for more than a boolean check. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 71e2d2828046133ed985696a02e2e1499ca0bfb8 Author: Peter Zijlstra Date: Mon Mar 8 17:51:33 2010 +0100 perf, x86: Avoid double disable on throttle vs ioctl(PERF_IOC_DISABLE) Calling ioctl(PERF_EVENT_IOC_DISABLE) on a thottled counter would result in a double disable, cure this by using x86_pmu_{start,stop} for throttle/unthrottle and teach x86_pmu_stop() to check ->active_mask. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit c08053e627d23490a03431285b78b7a5b617fbad Author: Peter Zijlstra Date: Sat Mar 6 13:19:24 2010 +0100 perf, x86: Fix x86_pmu_start pmu::start should undo pmu::stop, make it so. Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 34538ee77b39a12702e0f4c3ed9e8fa2dd5eb92c Author: Peter Zijlstra Date: Tue Mar 2 21:16:55 2010 +0100 perf, x86: Use unlocked bitops There is no concurrency on these variables, so don't use LOCK'ed ops. As to the intel_pmu_handle_irq() status bit clean, nobody uses that so remove it all together. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.240023029@chello.nl> Signed-off-by: Ingo Molnar commit aff3d91a913c9ae0c2f56b65b27cbd00c7d27ee3 Author: Peter Zijlstra Date: Tue Mar 2 20:32:08 2010 +0100 perf, x86: Change x86_pmu.{enable,disable} calling convention Pass the full perf_event into the x86_pmu functions so that those may make use of more than the hw_perf_event, and while doing this, remove the superfluous second argument. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.165166129@chello.nl> Signed-off-by: Ingo Molnar commit cc2ad4ba8792b9d4ff893ae3b845d2c5a6206fc9 Author: Peter Zijlstra Date: Tue Mar 2 20:18:39 2010 +0100 perf, x86: Remove superfluous arguments to x86_perf_event_update() The second and third argument to x86_perf_event_update() are superfluous since they are simple expressions of the first argument. Hence remove them. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.089468871@chello.nl> Signed-off-by: Ingo Molnar commit 07088edb88164c2a2406cd2d9a7be19d8515214b Author: Peter Zijlstra Date: Tue Mar 2 20:16:01 2010 +0100 perf, x86: Remove superfluous arguments to x86_perf_event_set_period() The second and third argument to x86_perf_event_set_period() are superfluous since they are simple expressions of the first argument. Hence remove them. Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100304140100.006500906@chello.nl> Signed-off-by: Ingo Molnar commit 3fb2b8ddcc6a7aa62af6bd2cb939edfd4c460506 Author: Peter Zijlstra Date: Mon Mar 8 13:51:01 2010 +0100 perf, x86, Do not user perf_disable from NMI context Explicitly use intel_pmu_{disable,enable}_all() in intel_pmu_handle_irq() to avoid the NMI race conditions in perf_{disable,enable} Signed-off-by: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com LKML-Reference: Signed-off-by: Ingo Molnar commit 32975a4f114be52286f9a5bf6c230dbb8c0e1903 Author: Peter Zijlstra Date: Sat Mar 6 19:49:19 2010 +0100 perf: Optimize perf_disable Currently we always call hw_perf_disable(), even if its already disabled, this seems superflous, esp. since it cannot be made NMI safe (see further patches). Signed-off-by: Peter Zijlstra Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 3f6da3905398826d85731247e7fbcf53400c18bd Author: Peter Zijlstra Date: Fri Mar 5 13:01:18 2010 +0100 perf: Rework and fix the arch CPU-hotplug hooks Remove the hw_perf_event_*() hotplug hooks in favour of per PMU hotplug notifiers. This has the advantage of reducing the static weak interface as well as exposing all hotplug actions to the PMU. Use this to fix x86 hotplug usage where we did things in ONLINE which should have been done in UP_PREPARE or STARTING. Signed-off-by: Peter Zijlstra Cc: Paul Mundt Cc: paulus@samba.org Cc: eranian@google.com Cc: robert.richter@amd.com Cc: fweisbec@gmail.com Cc: Arnaldo Carvalho de Melo LKML-Reference: <20100305154128.736225361@chello.nl> Signed-off-by: Ingo Molnar commit dc1d628a67a8f042e711ea5accc0beedc3ef0092 Author: Peter Zijlstra Date: Wed Mar 3 15:55:04 2010 +0100 perf: Provide generic perf_sample_data initialization This makes it easier to extend perf_sample_data and fixes a bug on arm and sparc, which failed to set ->raw to NULL, which can cause crashes when combined with PERF_SAMPLE_RAW. It also optimizes PowerPC and tracepoint, because the struct initialization is forced to zero out the whole structure. Signed-off-by: Peter Zijlstra Acked-by: Jean Pihet Reviewed-by: Frederic Weisbecker Acked-by: David S. Miller Cc: Jamie Iles Cc: Paul Mackerras Cc: Stephane Eranian Cc: stable@kernel.org LKML-Reference: <20100304140100.315416040@chello.nl> Signed-off-by: Ingo Molnar commit 0e49887703015dd73667664c5abc9a6366641da9 Merge: 7d39cf6 89c0ac7 Author: Takashi Iwai Date: Wed Mar 10 09:01:30 2010 +0100 Merge branch 'topic/misc' into for-linus commit 7d39cf62242d52729ddff9a9ae195669f462d5c4 Merge: a3087ae ecd2162 Author: Takashi Iwai Date: Wed Mar 10 09:01:25 2010 +0100 Merge branch 'topic/hda' into for-linus commit 4eb6f91b95e7618eae0103b6cba7c7f01f9d40f3 Author: Michael Hennerich Date: Tue Mar 9 20:38:47 2010 -0800 Input: ad7877 - increase pen up imeout The time interval between consecutive interrupts depends on a number of tunables: first_conversion_delay, acquisition_time, averaging and foremost the pen_down_acc_interval. Since the mod_timer() action for the PEN UP event happens in the spi_async() callback function, latencies incurred by the spi bus drivers also need to be taken into account. So all in all, give the PEN UP event a bit more wiggle room and increase timeout to 100ms. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 06a09124b5ec65f81df66c56695d9a9ae04a0114 Author: Michael Hennerich Date: Tue Mar 9 20:38:45 2010 -0800 Input: ads7846 - add support for AD7843 parts The AD7873 is almost identical to the ADS7846; the only difference is related to the Power Management bits PD0 and PD1. This results in a slightly different PENIRQ enable behavior. For the AD7873, VREF should be turned off during differential measurements. So, add the AD7873/43 to the list of driver supported devices, and prevent VREF usage during differential/ratiometric conversion modes. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit 9e49f6c1339a7972e23a335c4c71a289b4c6f65b Author: Mike Frysinger Date: Tue Mar 9 20:38:45 2010 -0800 Input: bf54x-keys - fix system hang when pressing a key We need to use the nosync version of disable_irq so that we don't hang in the IRQ handler as we don't ACK the interrupt until later. This used to work regardless, but at some point, the IRQ behavior changed. Not sure when exactly. Signed-off-by: Mike Frysinger Signed-off-by: Dmitry Torokhov commit eb8bff85c5bd5caef7c374ff32b86545029efb56 Author: Thomas Bächler Date: Tue Mar 9 20:38:48 2010 -0800 Input: alps - add support for the touchpad on Toshiba Tecra A11-11L Signed-off-by: Thomas Bächler Cc: stable@kernel.org Signed-off-by: Dmitry Torokhov commit 2f2177c8dadbcb08c14f796ac983c5475eca1bd3 Author: Arnd Bergmann Date: Tue Mar 9 20:38:48 2010 -0800 Input: remove BKL, fix input_open_file() locking Holding the BKL in input_open_file seems pointless because it does not protect against updates of input_table, and all open functions from the underlying drivers have proper mutex locking. This makes input_open_file take the input_mutex when accessing the table and no lock when calling into the lower function. Signed-off-by: Arnd Bergmann Acked-by: Thadeu Lima de Souza Cascardo Signed-off-by: Dmitry Torokhov commit 77554b4d1fac6a66d4e624a6e36c020a4f5b6b64 Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 9 20:38:47 2010 -0800 Input: serio_raw - remove BKL serio_raw open function already uses a mutex. Also change formatting a bit. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Arnd Bergmann Signed-off-by: Dmitry Torokhov commit c90c6a885ac9827921e8f94f3ce4360ae11148f1 Author: Thadeu Lima de Souza Cascardo Date: Tue Mar 9 20:38:47 2010 -0800 Input: mousedev - remove BKL There's no need for BKL in mousedev, relevan protection is provided by a private mutex. Signed-off-by: Thadeu Lima de Souza Cascardo Acked-by: Arnd Bergmann Signed-off-by: Dmitry Torokhov commit d2197e1e6038bb01568367a220e4a4e040f8337d Author: Tony Lindgren Date: Tue Mar 9 14:59:48 2010 -0800 omap3: Fix compile for Touch Book early_param Commit 2b0d8c251b8876d530a6bf671eb5425838fa698a changed ARM to use the common early_param code. Fix compile for Touch Book accordingly. Signed-off-by: Tony Lindgren commit 1382c71c764540880d35485b033a44ce104d8e2e Author: Reinette Chatre Date: Thu Feb 25 10:02:19 2010 -0800 Revert "iwlwifi: Send broadcast probe request only when asked to" This reverts commit 21b2d8bd2f0d4e0f21ade147fd193c8b9c1fd2b9. As explained by Johannes: When we build a probe request frame in the buffer with the SSID, we could arrive over the limit of 200 bytes. When we build it in the buffer without the SSID (wildcard) we don't arrive over 200 bytes, but the ucode still allows direct probe in addition because it has an internal buffer that is larger when it inserts the SSID... Signed-off-by: Reinette Chatre commit 1d79e53c56afe0826a311c3bc1653ad938166c22 Author: Reinette Chatre Date: Fri Feb 26 11:01:36 2010 -0800 iwl3945: fix memory corruption Recent patch "iwlwifi: move 3945 clip groups to 3945 data" exposed a memory corruption problem. When initializing the clip groups the code was mistakenly using the iwlagn rate count, not the 3945 rate count. This resulted in more memory being written than was allocated. "iwlwifi: move 3945 clip groups to 3945 data" moved the location where the clip groups are stored and the impact is now severe in that the number of configured TX queues is modified. Previously the "temperature" field was overwritten, which did not seem to affect the operation. Fix this one instance where wrong rate count was used. I also noticed one more location where the iwlagn rate count was used to index an iwl3945 array, fix this. I also modified one location that modified the iwlagn rate count to obtain the iwl3945 rate count ... just use the iwl3945 rate count directly. This fixes http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2165 and http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2168 Signed-off-by: Reinette Chatre commit ff215713eb33c56301cf6bfec0143ddc7f22c138 Author: Steve French Date: Tue Mar 9 20:30:42 2010 +0000 [CIFS] checkpatch cleanup Signed-off-by: Steve French commit abab095d1fd25986b910d3c46289d8fa3582cdc5 Author: Jeff Layton Date: Fri Feb 12 07:44:18 2010 -0500 cifs: add cifs_revalidate_file ...to allow updating inode attributes on an existing inode by filehandle. Change mmap and llseek codepaths to use that instead of cifs_revalidate_dentry since they have a filehandle readily available. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit ecd216260f87dd8c14b2580a16f055554644bbea Author: Ralf Gerbig Date: Tue Mar 9 18:25:47 2010 +0100 ALSA: hda - Sound MSI fallout on a Asus mobo NVIDIA MCP55 without the following patch audio ssttuutteerrs on ASUS M2N32-SLI PREMIUM ACPI BIOS Revision 1304 the sound device is: 00:0e.1 Audio device: nVidia Corporation MCP55 High Definition Audio (rev a2) worked with 2.6.32 Signed-off-by: Ralf Gerbig Cc: Signed-off-by: Takashi Iwai commit 3a065fcf9efed42ba736da7be528f2d3dec4965a Author: Akinobu Mita Date: Tue Feb 23 23:11:13 2010 +0900 udf: use ext2_find_next_bit Use ext2_find_next_bit (generic_find_next_le_bit) to find the set bit in little endian bitmap region. Signed-off-by: Akinobu Mita Signed-off-by: Jan Kara commit 5833ded9b6d783b8446349bada08f0f5e4227895 Author: Jan Kara Date: Fri Jan 8 16:52:59 2010 +0100 udf: Do not read inode before writing it We needlessly read inode in udf_update_inode just before zeroing out the contents of the buffer. Fix it. Signed-off-by: Jan Kara commit aae917cd188f397e9223001d9f6c0adfb339fd64 Author: Jan Kara Date: Fri Jan 8 16:46:29 2010 +0100 udf: Fix unalloc space handling in udf_update_inode Writing of inode holding unallocated space info was broken because we first cleared the buffer and after that checked whether it contains a tag meaning the block holds unallocated space information. Fix the problem by checking appropriate in memory flag instead. Also cleanup the function a bit along the way - most importantly lock buffer when modifying its contents, check for buffer_write_io_error instead of !buffer_uptodate, etc.. Signed-off-by: Jan Kara commit 548b84166917d6f5e2296123b85ad24aecd3801d Merge: cfb581b 57d5488 Author: Ingo Molnar Date: Tue Mar 9 17:11:53 2010 +0100 Merge commit 'v2.6.34-rc1' into perf/urgent Conflicts: tools/perf/util/probe-event.c Merge reason: Pick up -rc1 and resolve the conflict as well. Signed-off-by: Ingo Molnar commit eb63e5d15758d2b1e607ddd5fb861b5596629380 Author: Mike Frysinger Date: Tue Mar 9 08:41:12 2010 -0500 Blackfin: stop cleaning include/asm/asm-offsets.h The file is no longer generated, so we don't want to clean it. Reported-by: Vivi Li Signed-off-by: Mike Frysinger commit eff7f270e9a05688066f40589d7b44e1dcf335dc Author: Andrej Gelenberg Date: Tue Mar 9 13:49:54 2010 +0100 HID: add quirk for UC-Logik WP4030 tablet Add HID_QUIRK_MULTI_INPUT for UC-Logik tablet. $ lsusb ... Bus 004 Device 002: ID 5543:0003 UC-Logic Technology Corp. Genius MousePen 4x3 Tablet/Aquila L1 Tablet Signed-off-by: Andrej Gelenberg Signed-off-by: Jiri Kosina commit 28918c211d86b6eeb70182c523800c7bc442960c Author: Michael Poole Date: Tue Mar 9 06:47:35 2010 -0500 HID: magicmouse: fix oops after device removal Ask the HID core not to register an input device for the mouse. Fix an oops after removing the device, due to leaving the new input device registered. Signed-off-by: Michael Poole Signed-off-by: Jiri Kosina commit e9edb1d8a345119c9baafa1b240eb1ec06a44662 Author: Christoph Hellwig Date: Wed Mar 3 08:53:51 2010 -0500 GFS2: do not select QUOTA gfs2 only needs the quotactl code, not the generic quota implementation. Signed-off-by: Christoph Hellwig Signed-off-by: Steven Whitehouse commit 3dd1b39497b6820219581af16e6a8831a582bb3a Author: Jari Vanhala Date: Tue Mar 9 00:29:46 2010 -0800 Input: add driver for TWL4030 vibrator device TWL4030 Vibrator implemented via Force Feedback interface. This uses MFD TWL4030 codec and own dynamic workqueue. Signed-off-by: Jari Vanhala Signed-off-by: Dmitry Torokhov commit 3e6e15a862a0bc20128497bbdc54254cdec21835 Author: Alan Stern Date: Mon Mar 8 23:42:46 2010 -0800 Input: enable remote wakeup for PNP i8042 keyboard ports This patch (as1355) enables remote wakeup by default on PNP i8042 keyboard ports. Signed-off-by: Alan Stern Signed-off-by: Dmitry Torokhov commit 58b939959d228681208ba997595411fddc860849 Author: Dmitry Torokhov Date: Mon Mar 8 22:37:10 2010 -0800 Input: scancode in get/set_keycodes should be unsigned The HID layer has some scan codes of the form 0xffbc0000 for logitech devices which do not work if scancode is typed as signed int, so we need to switch to unsigned it instead. While at it keycode being signed does not make much sense either. Acked-by: Márton Németh Acked-by: Matthew Garrett Acked-by: Jiri Kosina Signed-off-by: Dmitry Torokhov commit ec62e1c8dd2f9b2a833b48d4a2f58f0c5e07384c Author: Dmitry Torokhov Date: Mon Mar 8 22:37:09 2010 -0800 Input: i8042 - use platfrom_create_bundle() helper Signed-off-by: Dmitry Torokhov commit ce67eef6a112bb283c6db39f9195800f31f5599a Merge: 776943f 57d5488 Author: Dmitry Torokhov Date: Mon Mar 8 23:17:32 2010 -0800 Merge commit 'v2.6.34-rc1' into for-linus commit cfb581bcd4f8c158c6f2b48bf5e232bb9e6855c0 Author: Ingo Molnar Date: Mon Mar 8 15:20:50 2010 +0100 MAINTAINERS: Add Arnaldo as tools/perf/ co-maintainer Acked-by: Peter Zijlstra Acked-by: Paul Mackerras Acked-by: Arnaldo Carvalho de Melo LKML-Reference: Signed-off-by: Ingo Molnar commit 7998a8787a8b35fede689c2bb716f65b231e7492 Author: Graf Yang Date: Mon Mar 8 03:01:35 2010 +0000 Blackfin: scale calibration when cpu freq changes Need to make sure we update the loops_per_jiffy values when we start changing the core clock. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit f2b0cd61cf635cbdc110472f6edc97328322cb8b Author: Mike Frysinger Date: Thu Mar 4 07:35:30 2010 -0500 Blackfin: eat spurious space in asm/dpmc.h Signed-off-by: Mike Frysinger commit 2943bff69e3728cfd69841537120125f9373bb28 Author: Robin Getz Date: Thu Feb 25 18:16:52 2010 +0000 Blackfin: fix anomaly 283 handling with exact hardware error The exact hardware error handling code was added before the workaround for anomaly 283 which caused the anomaly to be triggered in some cases (an infinite core stall). So re-order the code to avoid this. Reported-by: Andrew Rook Signed-off-by: Robin Getz Signed-off-by: Mike Frysinger commit 6ba255f4a8a0785ea8a2b052837a7b91eeac1bb4 Author: Michael Hennerich Date: Tue Dec 8 11:34:07 2009 +0000 Blackfin: bf537-stamp: add example ADXL346 orientation resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 848c51ccee5c4d51b1dc1a029508cfbb73f8c260 Author: Graf Yang Date: Fri Feb 26 11:49:52 2010 +0000 Blackfin: bf537-stamp: add example AD2S1210 IIO resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit ae4a8c1903e5d0ec19dcb257ec922b888941abba Author: Michael Hennerich Date: Thu Feb 25 13:32:24 2010 +0000 Blackfin: don't support keypad wakeup from hibernate The on-chip keypad peripheral requires different registers to be setup depending on the standby type (standby vs hibernation). However, since the power management framework doesn't differentiate between these types, the driver doesn't know which registers to program and subsequently it avoids doing so. Always enabling the keyboard wakeup source causes misbehavior when the pins are not assigned to the keypad. If they happen to drive a certain level, they'll trigger a wake up event which is not wanted. So until the aforementioned issue can be sorted out, drop support for the wakeup source completely. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit ef8873e06efdc023ee2e7f708787c79b78df3fcd Author: Sonic Zhang Date: Thu Feb 25 10:27:48 2010 +0000 Blackfin: bf537-stamp: add example AD7416 IIO resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 72fa2e9204d5efe4732346f99465a01c380f5cd3 Author: Michael Hennerich Date: Wed Feb 24 21:05:35 2010 +0000 Blackfin: bf537-stamp: add example ADP8860 backlight/led resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 5f0225948ecc4bb21cc35839d3d447e22d40a71f Author: Sonic Zhang Date: Wed Feb 24 07:32:50 2010 +0000 Blackfin: bf537-stamp: add example AD7414 temp sensor resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit d40bd71f88e7be193ce4feb4b92572c70024b9c2 Author: Barry Song Date: Mon Feb 22 10:31:06 2010 +0000 Blackfin: rename AD1836 to AD183X in board files The ASoC codec driver was generalized and renamed, so update the board resources accordingly. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit df6a949b4666780969fd90a2f3ac3db3b62552d6 Author: Graf Yang Date: Sun Feb 21 10:23:07 2010 +0000 Blackfin: bf537-stamp: add example AD2S120x resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit aec59c911307639c77076bdc9d9b546a4a767a73 Author: Michael Hennerich Date: Fri Feb 19 15:09:10 2010 +0000 Blackfin: add support for the on-chip MAC status interrupts This patch provides infrastructure for MAC Wake-On-Lan and PHYINT use in phylib. New Interrupts added: IRQ_MAC_PHYINT /* PHY_INT Interrupt */ IRQ_MAC_MMCINT /* MMC Counter Interrupt */ IRQ_MAC_RXFSINT /* RX Frame-Status Interrupt */ IRQ_MAC_TXFSINT /* TX Frame-Status Interrupt */ IRQ_MAC_WAKEDET /* Wake-Up Interrupt */ IRQ_MAC_RXDMAERR /* RX DMA Direction Error Interrupt */ IRQ_MAC_TXDMAERR /* TX DMA Direction Error Interrupt */ IRQ_MAC_STMDONE /* Station Mgt. Transfer Done Interrupt */ On BF537/6 the implementation is not straight forward since there are now two chained chained_handlers. A cleaner approach would have been to add latter IRQs to the demux of IRQ_GENERIC_ERROR. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit b2740801457b2fbbe14812c0fda24bd689025886 Author: Mike Frysinger Date: Tue Feb 16 04:03:10 2010 -0500 Blackfin: asm/page.h: pull in asm-generic headers Signed-off-by: Mike Frysinger commit f9c29e872b1c468d09c04ed452dc58961914c9d7 Author: Joachim Eastwood Date: Thu Feb 11 12:41:11 2010 +0100 Blackfin: mark gpio lib functions static Signed-off-by: Joachim Eastwood Signed-off-by: Mike Frysinger commit c48d767569ec6449277bf4248295b4c165b57159 Author: Cliff Cai Date: Thu Feb 11 09:27:18 2010 +0000 Blackfin: bf537-stamp: add example ADAU1361 resources Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger commit 7f4f69f991146fa976cbc914a50285b2afc0ad93 Author: Joachim Eastwood Date: Wed Feb 10 12:31:41 2010 +0100 Blackfin: GPIO: implement to_irq handler This makes it possible to support IRQs coming from off-chip GPIO controllers. Signed-off-by: Joachim Eastwood Signed-off-by: Mike Frysinger commit f8e6dbffa7a6cb3da3bcaf1fde3039896e1ac764 Author: Sonic Zhang Date: Wed Feb 10 09:09:05 2010 +0000 Blackfin: bf537-stamp: add example ADP122/ADP150 power regulator resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit f5f9531c7e588ee62e3aeddb14613ea80e7c2ca2 Author: Graf Yang Date: Wed Feb 10 07:15:59 2010 +0000 Blackfin: bf537-stamp: add example AD2S90 resources Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit f32792d045e1bbd86c0af0a28a46ae87af1ae100 Author: Sonic Zhang Date: Tue Feb 9 02:47:09 2010 +0000 Blackfin: bf537-stamp: add example AD5398 power regulator resources Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 2bc4affe9c374983220c1a5d5566ce67c95384fc Author: Frans Pop Date: Sat Feb 6 18:47:18 2010 +0100 Blackfin: remove trailing space in messages Signed-off-by: Frans Pop Signed-off-by: Mike Frysinger commit fe5b25c09873faee44077ee6ff8f23eee61b0fa0 Author: Michael Hennerich Date: Thu Feb 4 14:41:39 2010 +0000 Blackfin: bf537-stamp: add example ADS7846 touchscreen resources Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit ddaebcabbc18811ac4ac6e84fb9c327e8393a1dc Author: Mike Frysinger Date: Fri Jan 29 01:33:54 2010 +0000 Blackfin: add support for restart_syscall() Signed-off-by: Mike Frysinger commit 9e228ee9eae97b533d3b3133f76478c70dbd4294 Author: Mike Frysinger Date: Fri Feb 12 07:24:34 2010 +0000 Blackfin: check for bad syscalls after tracing it We want to report all system calls (even invalid ones) to the tracing layers, so check the NR only after we've notified. Signed-off-by: Mike Frysinger commit 600482c13d3d3612d71f39d8aaec47f63aafa801 Author: Mike Frysinger Date: Wed Feb 17 10:44:22 2010 +0000 Blackfin: fix single stepping over system calls On Blackfin systems, the hardware single step exception triggers before the system call exception, so we need to save this info to process it later on. Otherwise, single stepping in userspace misses a few insns right after the system call. This is based a bit on the SuperH code added in commit 4b505db9c4c72dbd. Reported-by: Roland McGrath Signed-off-by: Mike Frysinger commit e8f263dfd32a784a816fe68956e564f8ede4a9fc Author: Mike Frysinger Date: Tue Jan 26 07:33:53 2010 +0000 Blackfin: initial tracehook support Signed-off-by: Mike Frysinger commit e50e2f25c5b90abd00a1e5871c45094cf5207afc Author: Mike Frysinger Date: Sun Feb 14 22:58:02 2010 +0000 Blackfin: initial regset support We don't support core dumps (yet?), but this should make things easier. Signed-off-by: Mike Frysinger commit f2ce48024a9a6d3e92a023ded0f7b1e99da1cd16 Author: Mike Frysinger Date: Sun Feb 14 22:56:24 2010 +0000 Blackfin: simplify PTRACE_{PEEK,POKE}USR in preperation for regset support Signed-off-by: Mike Frysinger commit 5f09c77d2ad69397498b6555f0d3cd697304253c Author: Mike Frysinger Date: Sun Feb 14 22:49:59 2010 +0000 Blackfin: simplify SYSCFG code a bit and ignore attempts to change it We don't want to let user space modify the SYSCFG register arbitrarily as the settings are system wide (SNEN/CNEN) and can cause misbehavior. The only other bit here (SSSTEP) has proper controls via PTRACE_SINGLESTEP. Signed-off-by: Mike Frysinger commit f5b99627a3065858ad5c678703ed7af5363dca39 Author: Christoph Hellwig Date: Wed Feb 3 09:15:57 2010 +0000 Blackfin: use generic ptrace_resume code Use the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT, PTRACE_KILL and PTRACE_SINGLESTEP. This implies defining arch_has_single_step in and implementing the user_enable_single_step and user_disable_single_step functions, which also causes the breakpoint information to be cleared on fork, which could be considered a bug fix. Also the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which it previously wasn't which is consistent with all architectures using the modern ptrace code. Signed-off-by: Christoph Hellwig Signed-off-by: Mike Frysinger commit ad6720c0b52ae1cde0bc567e57a71acde1a292aa Author: Barry Song Date: Wed Feb 3 09:15:31 2010 +0000 Blackfin: bf537-stamp: add example AD715{0,2}/AD774{5,6,7} IIO resources Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 718340f62900ed44046d2b0f74d0dec7cf844194 Author: Graf Yang Date: Mon Feb 1 06:07:50 2010 +0000 Blackfin: rewrite resync_core_{i,d}cache() SMP logic to avoid per_cpu data This functions are implicitly called by core functions like cpu_relax(), and since those functions may be called early on before common code has initialized the per-cpu data area, we need to tweak the stats gathering. Now the statistics are maintained in common bss which makes these funcs safe to use as soon as the C runtime env is setup. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 6c2b7072a7035837998da38809f98e4182e4c41c Author: Graf Yang Date: Wed Jan 27 11:16:32 2010 +0000 Blackfin: add support for cpufreq on SMP systems Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 3b82790c12f8122d3df07cc387d2d74355e54c75 Author: Barry Song Date: Wed Jan 27 09:01:36 2010 +0000 Blackfin: rename AD1938 to AD193X in board files The ASoC codec driver was generalized and renamed, so update the board resources accordingly. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 7136d9c5e874813ccbd1d438924c413b7305944c Author: Yi Li Date: Tue Jan 26 04:02:44 2010 +0000 Blackfin: add CALLER_ADDR ftrace macros Since GCC doesn't support __builtin_frame_address(n) where n!=0, add our own function to walk the stack frame pointers. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 652afdc3403cbccb93c7e6db582a1204a9e5e90a Author: Mike Frysinger Date: Mon Jan 25 22:12:32 2010 +0000 Blackfin: move KGDB selection to the way other arches do it Signed-off-by: Mike Frysinger commit 64b33a00dc39dceac04dbd7622ab14017e074712 Author: Graf Yang Date: Mon Jan 25 03:47:43 2010 +0000 Blackfin: split watchdog definitions into a dedicated header file This allows things to be shared between the different watchdog sources. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 4ab069e5356bae71dda2ce6bb2b2a62a34f2bf25 Author: Barry Song Date: Fri Jan 22 10:07:30 2010 +0000 Blackfin: add dma_disable_irq_nosync() API for irq handlers Some IRQ handlers need to disable a DMA channel without waiting. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 3750411fb7ca96dd11ce8a63f213b60bfe4b5c29 Author: Mike Frysinger Date: Fri Jan 22 09:11:20 2010 -0500 Blackfin: fix whitespace damage in thread_info.h Signed-off-by: Mike Frysinger commit b73faf74493fd1bc75a8938aa5d296facf50a650 Author: Mike Frysinger Date: Fri Jan 22 07:59:32 2010 -0500 Blackfin: support new ftrace frame pointer semantics Signed-off-by: Mike Frysinger commit aebfef03249819886a7f9c981940cbd48d82ea47 Author: Mike Frysinger Date: Fri Jan 22 07:35:20 2010 -0500 Blackfin: implement ftrace mcount test Signed-off-by: Mike Frysinger commit 6388d14eb2dd3af655cee28ca2a1c56881e63e56 Author: Barry Song Date: Thu Jan 21 07:20:44 2010 +0000 Blackfin: implement ndelay() Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 60ffdb36547da2397d6cfefe9c752ebad16524f6 Author: Graf Yang Date: Wed Jan 20 10:56:24 2010 +0000 Blackfin: implement nmi_watchdog for SMP on BF561 Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 726e96561e4704278bc5197238f6459e1a63aa77 Author: Barry Song Date: Wed Jan 20 07:25:31 2010 +0000 Blackfin: respect the L1 kconfig optimization in the MPU code Restore support for CONFIG_EXCPT_IRQ_SYSC_L1 in the MPU CPLB manager. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 336746ed8ee8ef503ba79bc4b6f0b5a40e8ab3ce Author: Barry Song Date: Tue Oct 13 09:19:18 2009 +0000 Blackfin: bf537-stamp/bf527-ezkit: move ASoC SPORT resources to boards file Rather than declaring pin resources in the drivers, do it in the board. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 439b486746df9f57524e002dfd6117bbc040e925 Author: Barry Song Date: Fri Nov 13 02:41:07 2009 +0000 Blackfin: bf548-ezkit: add ASoC CPU DAI resources Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit f3dec78333d6369161eb833dbd8c8f006f359fdf Author: Michael Hennerich Date: Tue Jan 19 14:45:38 2010 +0000 Blackfin: increase NR_IRQS beyond NR on-chip IRQs This makes room for off-chip IRQ controllers. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 5e8d3210b5bffbe64afca9152241284a46611c7e Author: Barry Song Date: Tue Jan 19 11:01:08 2010 +0000 Blackfin: fill out the signal si_addr when sending a SIGBUS/SIGSEGV Some userspace applications use this member in diagnosing crashes. It also makes some LTP tests pass (i.e. the Blackfin arch behaves more like everyone else). Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0531c467da6438f278e9420a30f73eea2fdb73bd Author: Mike Frysinger Date: Tue Jan 19 07:04:29 2010 +0000 Blackfin: bf537-stamp: move ADF7021 MAC storage into platform resources Just generate a random MAC on the demo board since the ADF702x lacks dedicated storage for such things. Signed-off-by: Mike Frysinger commit 441504df6b81302c06010083c8d63b1465ead405 Author: Yi Li Date: Tue Jan 19 04:35:28 2010 +0000 Blackfin: add support for irqflags tracing Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 5aff1642aee0fe3cb9be7339fcc09dd2bd1976f0 Author: Harald Krapfenbauer Date: Fri Jan 15 09:25:11 2010 +0000 Blackfin: tcm-bf518: new board port Signed-off-by: Harald Krapfenbauer Signed-off-by: Mike Frysinger commit 38e7673f24e6c19aba9ecff86760cb7981b91464 Author: Barry Song Date: Fri Jan 15 03:24:39 2010 +0000 Blackfin: bf537-stamp: declare parallel flash as ROM with XIP kernel When the kernel is executing out of parallel flash (XIP), we can't have the flash go into an erase/programming cycle, otherwise the instruction fetching steps fail and everything crashes. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 29bb3bc0c71d867d50b18a0277bf28cd8dd3fca7 Author: Cliff Cai Date: Thu Jan 14 08:28:38 2010 +0000 Blackfin: bf527-ezkit/bf537-stamp: add example SSM2602 I2C resources Signed-off-by: Cliff Cai Signed-off-by: Mike Frysinger commit c6669c223a409199a45bb8f31a2e160ee26d19cc Author: Graf Yang Date: Wed Jan 13 06:09:34 2010 +0000 Blackfin: fix up mm locking in address dumping The locking code in the address dumper needs to grab the mm's mmap_sem so that other CPUs do not get an inconsistent view. On UP systems this really wasn't a problem, but it is easy to trigger a race on SMP systems when another CPU removes a mapping. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 7e1082b7dbb60081b157d82106da33686cb9ea91 Author: Barry Song Date: Tue Jan 12 03:59:18 2010 +0000 Blackfin: bf533-{ezkit,stamp}: add sound platform devices Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 8d0177dbcbad26ffd451b607c8fa74295d81e7b9 Author: Mike Frysinger Date: Sat Jan 9 00:48:01 2010 +0000 Blackfin: kgdb: mark all local funcs/structs static Signed-off-by: Mike Frysinger commit 48a74f9d1b381471397097851531c4e392f97451 Author: Roel Kluin Date: Fri Jan 8 20:06:22 2010 +0100 Blackfin: fix decoding of opcodes 41-47 in decode_instruction() This condition allowed only decoding of opcode 0x0040 Signed-off-by: Roel Kluin Signed-off-by: Mike Frysinger commit d86bfb1600db38e8387beee0aaab4263cfd728a2 Author: Barry Song Date: Thu Jan 7 04:11:17 2010 +0000 Blackfin: initial XIP support Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit aad16f32284030907b4f105e92e5fb534fd272bc Author: Barry Song Date: Tue Jan 5 07:25:24 2010 +0000 Blackfin: fix initial stack pointer setup During very early init, the stack pointer is given a slightly incorrect value (&init_thread_union). The value is later adjusted to the right one during early init (&init_thread_union + THREAD_SIZE), but it is used a few times in between. While the few functions used don't actually put things onto the stack (due to optimization), it's best if we simply use the right value from the start. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 8916a1499d958fcb9086a2c49a5fa3000689bb81 Author: Barry Song Date: Tue Jan 5 07:16:32 2010 +0000 Blackfin: fix the section name of init_thread_union Use the common attribute rather than setting the section name directly. The common linker script defines expect the newer naming. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 6feda3a6530204ad73a2dc1713c051462a1d9c49 Author: Barry Song Date: Tue Jan 5 07:05:50 2010 +0000 Blackfin: replace harcoded define with proper THREAD_SIZE macro Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0afc272cc6044b7a4f1318eadbfb10c4be654441 Author: Jie Zhang Date: Tue Jan 5 04:22:33 2010 +0000 Blackfin: fix relocation errors with large initramfs images Since we are now discarding .exit.text at runtime instead of link time, we need to place all .text sections ahead of the .data sections. Otherwise, a really large attached initramfs may cause link errors as it pushes the PC relative relocations behind the limits of the Blackfin ISA (~16meg). The instructions in the .exit.text are unable to call back into the .text sections leading to a link failure. Signed-off-by: Jie Zhang Signed-off-by: Mike Frysinger commit cb191718fcca887fb4d5e3de833546ab12b433f9 Author: Yi Li Date: Wed Dec 30 07:12:50 2009 +0000 Blackfin: try to simplify interrupt ifdef ugliness Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 54536c5c6a807d0db7252c3b33638b88f34650ff Author: Yi Li Date: Wed Dec 30 04:04:07 2009 +0000 Blackfin: simplify SMP handling in SRAM code There is no need to use {get,put}_cpu() when we already have a spinlock to protect against multiple processors running simultaneously. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 0b39db28b953945232719e7ff6fb802aa8a2be5f Author: Graf Yang Date: Mon Dec 28 11:13:51 2009 +0000 Blackfin: SMP: add PM/CPU hotplug support Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 0d152c27e336b5fd777da7dd3e814617e7305afd Author: Yi Li Date: Mon Dec 28 10:21:49 2009 +0000 Blackfin: SMP: make core timers per-cpu clock events for HRT SMP systems require per-cpu local clock event devices in order to enable HRT support. One a BF561, we can use local core timer for this purpose. Originally, there was one global core-timer clock event device set up for core A. To accomplish this feat, we need to split the gptimer0/core timer logic so that each is a standalone clock event. There is no requirement that we only have one clock event source anyways. Once we have this, we just define per-cpu clock event devices for each local core timer. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 682f5dc4ed7cdef1f55e40ee505c4346dfa6fa91 Author: Graf Yang Date: Mon Dec 28 09:27:27 2009 +0000 Blackfin: drop cpu_callin_map on SMP systems Common API already provides functions for managing online CPUs. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 0325f25a919ed09d11b16ec8eccf95618dc36601 Author: Sonic Zhang Date: Mon Dec 28 07:29:57 2009 +0000 Blackfin: SMP: add support for IRQ affinity Now that the Blackfin IRQ controller supports this, drivers get the normal functionality of controlling which CPU to bind IRQs to. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 69e1d8a61d5aa9e03676dc21fdfb750c5a97bb34 Author: Mike Frysinger Date: Fri Dec 25 21:06:06 2009 +0000 Blackfin: unify MMR helpers Signed-off-by: Mike Frysinger commit f05ede3a9416b6eff6c997c12fd749044fb4fdac Author: Mike Frysinger Date: Fri Dec 25 15:34:08 2009 +0000 Blackfin: isram: add unlikely to sanity checks Don't want the compiler assuming the rare sanity checks are the norm and optimize for those paths. Signed-off-by: Mike Frysinger commit 0ea19c64e30f3688d1a890217c382db2b0ca411c Author: Sonic Zhang Date: Wed Dec 23 07:01:43 2009 +0000 Blackfin: update defconfigs Signed-off-by: Sonic Zhang Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 0f7b468b6eace87ecdc59b3ec8476d50b0561ac2 Author: Michael Hennerich Date: Tue Dec 22 11:32:06 2009 +0000 Blackfin: add optimized version of Hamming Weight functions Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 252077cf7d44f1f261a5fdaedab88057f8379859 Author: Valentin Yakovenkov Date: Tue Dec 22 09:02:10 2009 +0000 Blackfin: bf561-acvilon: save the smsc911x mac address Signed-off-by: Valentin Yakovenkov Signed-off-by: Mike Frysinger commit 7a9cc48907e05e61033b953a3860e55703625950 Author: Sonic Zhang Date: Tue Dec 22 04:47:04 2009 +0000 Blackfin: bf537-stamp: unify duplicated ADP5588 headers Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 01218654cd97a1e970034b1e080ec5459172c3f6 Author: Mike Frysinger Date: Mon Dec 21 15:07:43 2009 +0000 Blackfin: bf537-stamp: change CONFIG_USB_SL811_BFIN_IRQ to IRQ_PF4 The Kconfig option was never mainlined, so replace the define with the actual pin that it is hooked up to by default. Signed-off-by: Mike Frysinger commit 3b781de6dd96d64c133a7ed774f385d35129575b Author: Mike Frysinger Date: Mon Dec 21 15:04:03 2009 +0000 Blackfin: drop unused SL811 platform resources from bf527/pnav boards These platforms don't hook up to this USB controller, so no point in declaring resources for it. Signed-off-by: Mike Frysinger commit 1dafdc513a20410e328b22b6d25d4ac78557516a Author: Michael Hennerich Date: Fri Dec 18 12:30:04 2009 +0000 Blackfin: BF51x: fix L1 Instruction SRAM size The BF51x's Instruction SRAM is 32kB, not 48kB. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 244d34230b7447fba95221dbf39b39e94257939c Author: Michael Hennerich Date: Fri Dec 18 09:29:39 2009 +0000 Blackfin: update AD7879 resources to match the new gpiolib driver support Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit edd07992504e631b50d18d130c62addbcb16269e Author: Michael Hennerich Date: Wed Dec 16 08:45:17 2009 +0000 Blackfin: gpio: use shorter name The gpio label size is 16 char, but the current code uses a longer name resulting in chopped display. So use a shorter name. Reported-by: Peter Meerwald Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 15435a2a55a678b21b9bb75a7513b3c9ff69a68e Author: Michael Hennerich Date: Wed Dec 16 08:39:58 2009 +0000 Blackfin: pull in asm/bfin_can.h for interrupt masks Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit a3a6a590190ca77aedf9de871d941c1139a5a24c Author: Sonic Zhang Date: Wed Dec 16 07:52:52 2009 +0000 Blackfin: dma-mapping: fix thinko in constant optimization Make sure the non-constant version of the dma_sync functions actually complete instead of recursively calling itself forever. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 0c270807db7c6478d60ab2bc23511fd5868a7a80 Author: Mike Frysinger Date: Tue Dec 15 20:57:43 2009 +0000 Blackfin: drop duplicate HOTPLUG Kconfig option The option already exists for everyone in init/Kconfig. Signed-off-by: Mike Frysinger commit 0e64268ced7975ddcfed3e47a26b8df534f8e3ed Author: Mike Frysinger Date: Tue Dec 15 13:33:19 2009 +0000 Blackfin: merge common CAN defines into one headers Rather than copy and paste the MMR defines and register layout, consolidate everything in one place. Signed-off-by: Mike Frysinger commit 360adee8a5c249f221de43d7d46073391359a4ba Author: Mike Frysinger Date: Tue Dec 15 05:08:36 2009 +0000 Blackfin: wire up the various memory related syscalls These all just go to the stub syscall at the moment, so this is largely future proofing. Signed-off-by: Mike Frysinger commit ead9b1156d4b128db9f13ee8be32cbcd3f255db9 Author: Graf Yang Date: Mon Dec 14 08:01:08 2009 +0000 Blackfin: SMP: enable HAVE_LEGACY_PER_CPU_AREA The current Blackfin SMP code relies on the legacy cpu area code, so select it until we port things to the newer code. Signed-off-by: Graf Yang Signed-off-by: Mike Frysinger commit 5792ab2a0a22fdaef33056ca2b31847a28b1af60 Author: Sonic Zhang Date: Wed Dec 9 07:01:50 2009 +0000 Blackfin: MPU: handle caches for reserved memory We weren't handling the user-specified cache behavior for the reserved memory regions (via mem=/max_mem=). The no-MPU code already takes care of this, so add support to the MPU code as well. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit d94a1aa44ed6bfe8d8ab36c02de652d4fcf0d2c3 Author: Michael Hennerich Date: Tue Dec 8 11:45:55 2009 +0000 Blackfin: extend bfin-lq035q1-fb resources to include PPI mode This lets us support the new BF527-EZKIT V2.1 via platform resources tweaks only. Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit 6924dfb0588dab02a331a3a526f8a8fae7d1b3cc Author: Michael Hennerich Date: Mon Dec 7 13:41:28 2009 +0000 Blackfin: bf527-ezkit: add support for V2.1 boards Signed-off-by: Michael Hennerich Signed-off-by: Mike Frysinger commit e18e7dd33454f277b9438af66d25984362278021 Author: Barry Song Date: Mon Dec 7 10:05:58 2009 +0000 Blackfin: fix MPU page permission masks overflow when dealing with async memory Attempting to use the MPU while doing XIP out of parallel flash hooked up to the async memory bus would often result in random crashes as the MPU slowly corrupted memory. The fallout here is that the async banks gain MPU protection from user space too. So any accesses have to go through the mmap() interface rather than just using hardcoded pointers. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit c9784ebb23be1e2ef23f537d6df04e0ea0206802 Author: Yi Li Date: Fri Dec 4 06:56:21 2009 +0000 Blackfin: flush caches on SMP when one core calls another via IPI Sometimes a SMP system will randomly panic at boot. This is due to caches being out of sync when one core tries to signal the other. So when one core calls another via IPI, flush the data caches. Signed-off-by: Yi Li Signed-off-by: Mike Frysinger commit 3630ac34b0ab346ff0910401dbed7af624be7027 Author: Mike Frysinger Date: Tue Nov 17 04:26:22 2009 +0000 Blackfin: bfin_sport: unify & standardize SPORT masks Rather than have every SPORT driver copy & paste things, declare the C structure and MMR bitmasks in one place for everyone to use. Signed-off-by: Mike Frysinger commit c13ce9fd26c3a0e32b3bf0b00929181e66114ed2 Author: Sonic Zhang Date: Wed Sep 23 09:37:46 2009 +0000 Blackfin: add UART/SPORT early platform resources This lets people easily select the UART/SPORT consoles for early printk while leveraging the pins declared in the boards file. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit b635f1912da764c960c044ffd58ba27157aa2c85 Author: Sonic Zhang Date: Wed Sep 23 08:06:25 2009 +0000 Blackfin: allow boards to register early devices Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit df5de261306d9bfc1ed9121595593b10a7626b95 Author: Sonic Zhang Date: Wed Sep 23 05:01:56 2009 +0000 Blackfin: move SPORT UART resources to boards files Rather than keeping the pins in the actual driver and worrying about a mess of Kconfig options, declare all the desired pin resources in the boards file. This lets people easily select the specific pins/ports for the normal emulated UART as well as GPIOs for CTS/RTS. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 08a54bffaf7d5dc9391518323234ce9f9ea4be8e Author: Barry Song Date: Fri Sep 18 09:14:38 2009 +0000 Blackfin: bf537-stamp: ad1938: switch to GPIO CS Signed-off-by: Barry Song Signed-off-by: Mike Frysinger commit 6bd1fbea2e8bff9346a5afb44ca948b4e4ed74a5 Author: Sonic Zhang Date: Wed Sep 9 10:46:19 2009 +0000 Blackfin: move on-chip UART resources to boards files Rather than keeping the pins in the actual driver and worrying about a mess of Kconfig options, declare all the desired pin resources in the boards file. This lets people easily select the specific pins/ports for the normal UART as well as GPIOs for CTS/RTS. Signed-off-by: Sonic Zhang Signed-off-by: Mike Frysinger commit 30124d11097e371e42052144d8a3f4a78d26e09f Author: Dave Kleikamp Date: Mon Mar 1 04:57:34 2010 +0000 powerpc/booke: Fix breakpoint/watchpoint one-shot behavior Another fix for the extended ptrace patches in the -next tree. The handling of breakpoints and watchpoints is inconsistent. When a breakpoint or watchpoint is hit, the interrupt handler is clearing the proper bits in the dbcr* registers, but leaving the dac* and iac* registers alone. The ptrace code to delete the break/watchpoints checks the dac* and iac* registers for zero to determine if they are enabled. Instead, they should check the dbcr* bits. Signed-off-by: Dave Kleikamp Signed-off-by: Benjamin Herrenschmidt commit a8e6da093ea8642b1320fb5d64134366f2a8d0ac Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:23 2010 +0000 powerpc: Reduce printk from pseries_mach_cpu_die() Remove debug printks in pseries_mach_cpu_die(). These are noisy at runtime. Traceevents can be added to instrument this section of code. The following KERN_INFO printks are removed: cpu 62 (hwid 62) returned from cede. Decrementer value = b2802fff Timebase value = 2fa8f95035f4a cpu 62 (hwid 62) got prodded to go online cpu 58 (hwid 58) ceding for offline with hint 2 Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 0212f2602a38e740d5a96aba4cebfc2ebc993ecf Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:16 2010 +0000 powerpc: Move checks in pseries_mach_cpu_die() Rearrange condition checks for better code readability and prevention of possible race conditions when preferred_offline_state can potentially change during the execution of pseries_mach_cpu_die(). The patch will make pseries_mach_cpu_die() put cpu in one of the consistent states and not hit the run over BUG() Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit 8dbce53cc249a76e9450708d291fce5a7e29c6a1 Author: Vaidyanathan Srinivasan Date: Mon Mar 1 02:58:09 2010 +0000 powerpc: Reset kernel stack on cpu online from cede state Cpu hotplug (offline) without dlpar operation will place cpu in cede state and the extended_cede_processor() function will return when resumed. Kernel stack pointer needs to be reset before start_secondary() is called to continue the online operation. Added new function start_secondary_resume() to do the above steps. Signed-off-by: Vaidyanathan Srinivasan Cc: Gautham R Shenoy Signed-off-by: Benjamin Herrenschmidt commit de0b632ba05bc88949e67d33d1c313fcf922ae2e Author: Josh Boyer Date: Fri Feb 5 03:52:16 2010 +0000 powerpc: Fix G5 thermal shutdown This changes the thresholds for the liquid cooled G5 thermal shutdown mechanism to prevent an errant shutdown with some models. Signed-off-by: David Woodhouse Signed-off-by: Benjamin Herrenschmidt commit f09b7b2a1115d3afe02c66156746287f6c63bba0 Author: Mark Nelson Date: Sun Jan 31 20:12:58 2010 +0000 powerpc/pseries: Pass CPPR value to H_XIRR hcall Now that we properly keep track of the CPPR value (since 49bd3647134ea47420067aea8d1401e722bf2aac, "powerpc/pseries: Track previous CPPR values to correctly EOI interrupts") we can pass it to the H_XIRR hcall. This is needed because the Partition Adjunct Option of new versions of pHyp extend the H_XIRR hcall to include the CPPR as an input parameter. Earlier versions not supporting this option just disregard the extra input parameter, so this doesn't cause any problems for existing systems. The Partition Adjunct Option is required for future systems that will support SR-IOV capable devices. Signed-off-by: Mark Nelson Signed-off-by: Benjamin Herrenschmidt commit 856f70a368022645a08fbecc5d30ec218f13232d Author: Dave Kleikamp Date: Tue Feb 23 09:43:17 2010 +0000 powerpc/booke: Fix a couple typos in the advanced ptrace code powerpc/booke: Fix a couple typos in the advanced ptrace code Found and fixed a couple typos in the advanced ptrace patches. (These patches are currently in benh's next tree.) Signed-off-by: Dave Kleikamp Cc: Benjamin Herrenschmidt Cc: linuxppc-dev list Signed-off-by: Benjamin Herrenschmidt commit 5b72d74ce2fccca2a301de60f31b16ddf5c93984 Author: Adam Lackorzynski Date: Sat Feb 27 07:07:59 2010 +0000 powerpc: Fix SMP build with disabled CPU hotplugging. Compiling 2.6.33 with SMP enabled and HOTPLUG_CPU disabled gives me the following link errors: LD init/built-in.o LD .tmp_vmlinux1 arch/powerpc/platforms/built-in.o: In function `.smp_xics_setup_cpu': smp.c:(.devinit.text+0x88): undefined reference to `.set_cpu_current_state' smp.c:(.devinit.text+0x94): undefined reference to `.set_default_offline_state' arch/powerpc/platforms/built-in.o: In function `.smp_pSeries_kick_cpu': smp.c:(.devinit.text+0x13c): undefined reference to `.set_preferred_offline_state' smp.c:(.devinit.text+0x148): undefined reference to `.get_cpu_current_state' smp.c:(.devinit.text+0x1a8): undefined reference to `.get_cpu_current_state' make: *** [.tmp_vmlinux1] Error 1 The following change fixes that for me and seems to work as expected. Signed-off-by: Adam Lackorzynski Signed-off-by: Benjamin Herrenschmidt commit 1426d5a3bd07589534286375998c0c8c6fdc5260 Author: Michael Ellerman Date: Thu Jan 28 13:23:22 2010 +0000 powerpc: Dynamically allocate pacas On 64-bit kernels we currently have a 512 byte struct paca_struct for each cpu (usually just called "the paca"). Currently they are statically allocated, which means a kernel built for a large number of cpus will waste a lot of space if it's booted on a machine with few cpus. We can avoid that by only allocating the number of pacas we need at boot. However this is complicated by the fact that we need to access the paca before we know how many cpus there are in the system. The solution is to dynamically allocate enough space for NR_CPUS pacas, but then later in boot when we know how many cpus we have, we free any unused pacas. Signed-off-by: Michael Ellerman Signed-off-by: Benjamin Herrenschmidt commit 59603b9ae426e968d452f9325cdcff308573dee7 Merge: 57d5488 a111065 Author: Benjamin Herrenschmidt Date: Tue Mar 9 11:51:57 2010 +1100 Merge commit 'kumar/next' into merge commit 522dba7134d6b2e5821d3457f7941ec34f668e6d Merge: 51d0f6d bb910a7 Author: Linus Torvalds Date: Mon Mar 8 16:10:29 2010 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: PCI/PM Runtime: Make runtime PM of PCI devices inactive by default commit 51d0f6d1f50349579f007adf5c0b51aaedd93b94 Merge: 57d5488 da495ec Author: Linus Torvalds Date: Mon Mar 8 14:07:53 2010 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: kfree correct pointer during mount option parsing Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL commit da495ecc0fb096b383754952a1c152147bc95b52 Author: Josef Bacik Date: Thu Feb 25 20:38:35 2010 +0000 Btrfs: kfree correct pointer during mount option parsing We kstrdup the options string, but then strsep screws with the pointer, so when we kfree() it, we're not giving it the right pointer. Tested-by: Andy Lutomirski Signed-off-by: Chris Mason commit 6bef4d317193d3badbbfa3f3c593758ace84a629 Author: Eric Paris Date: Tue Feb 23 19:43:04 2010 +0000 Btrfs: use RB_ROOT to intialize rb_trees instead of setting rb_node to NULL btrfs inialize rb trees in quite a number of places by settin rb_node = NULL; The problem with this is that 17d9ddc72fb8bba0d4f678 in the linux-next tree adds a new field to that struct which needs to be NULL for the new rbtree library code to work properly. This patch uses RB_ROOT as the intializer so all of the relevant fields will be NULL'd. Without the patch I get a panic. Signed-off-by: Eric Paris Acked-by: Venkatesh Pallipadi Signed-off-by: Chris Mason commit 42d38041a94cef1e38f7b8ab9827881022a183a9 Author: Wolfgang Grandegger Date: Mon Mar 8 12:51:41 2010 -0800 MAINTAINERS: add netdev to CAN network layer and drivers entries Signed-off-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit de5865714621e23d65c52955ca2125dbb074c242 Author: Neil Horman Date: Mon Mar 8 12:43:56 2010 -0800 tipc: filter out messages not intended for this host Port commit 20deb48d16fdd07ce2fdc8d03ea317362217e085 from git://tipc.cslab.ericsson.net/pub/git/people/allan/tipc.git Part of the large effort I'm trying to help with getting all the downstreamed code from windriver forward ported to the upstream tree Origional commit message Restore check to filter out inadverdently received messages This patch reimplements a check that allows TIPC to discard messages that are not intended for it. This check was present in TIPC 1.5/1.6, but was removed by accident during the development of TIPC 1.7; it has now been updated to account for new features present in TIPC 1.7 and reinserted into TIPC. The main benefit of this check is to filter out messages arriving from orphaned link endpoints, which can arise when a node exits the network and then re-enters it with a different TIPC network address (i.e. value). Signed-off-by: Neil Horman Origionally-authored-by: Allan Stephens Signed-off-by: David S. Miller commit 91e013827c0bcbb187ecf02213c5446b6f62d445 Merge: 988addf 8d2b09f Author: Russell King Date: Mon Mar 8 20:24:11 2010 +0000 Merge branch 'master' into for-linus commit 988addf82e4c03739375279de73929580a2d4a6a Merge: 004c1c7 25cf84c Author: Russell King Date: Mon Mar 8 20:21:04 2010 +0000 Merge branch 'origin' into devel-stable Conflicts: arch/arm/mach-mx2/devices.c arch/arm/mach-mx2/devices.h sound/soc/pxa/pxa-ssp.c commit d88dca79d3852a3623f606f781e013d61486828a Author: Neil Horman Date: Mon Mar 8 12:20:58 2010 -0800 tipc: fix endianness on tipc subscriber messages Remove htohl implementation from tipc I was working on forward porting the downstream commits for TIPC and ran accross this one: http://tipc.cslab.ericsson.net/cgi-bin/gitweb.cgi?p=people/allan/tipc.git;a=commitdiff;h=894279b9437b63cbb02405ad5b8e033b51e4e31e I was going to just take it, when I looked closer and noted what it was doing. This is basically a routine to byte swap fields of data in sent/received packets for tipc, dependent upon the receivers guessed endianness of the peer when a connection is established. Asside from just seeming silly to me, it appears to violate the latest RFC draft for tipc: http://tipc.sourceforge.net/doc/draft-spec-tipc-02.txt Which, according to section 4.2 and 4.3.3, requires that all fields of all commands be sent in network byte order. So instead of just taking this patch, instead I'm removing the htohl function and replacing the calls with calls to ntohl in the rx path and htonl in the send path. As part of this fix, I'm also changing the subscr_cancel function, which searches the list of subscribers, using a memcmp of the entire subscriber list, for the entry to tear down. unfortunately it memcmps the entire tipc_subscr structure which has several bits that are private to the local side, so nothing will ever match. section 5.2 of the draft spec indicates the tuple should uniquely identify a subscriber, so convert subscr_cancel to just match on those fields (properly endian swapped). I've tested this using the tipc test suite, and its passed without issue. Signed-off-by: Neil Horman Signed-off-by: David S. Miller commit f5c445ed4148434f142be0263a8ad7cb58503e8a Author: Eric Dumazet Date: Mon Mar 8 12:17:04 2010 -0800 ethtool: Use noinline_for_stack Use self documenting noinline_for_stack instead of duplicated comments. Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 81160e66cca3d3a16b7d88e0e2dccfc5c76f36f9 Author: Joe Perches Date: Mon Mar 8 12:15:59 2010 -0800 net/sunrpc: Convert (void)snprintf to snprintf (Applies on top of "Remove uses of NIPQUAD, use %pI4") Casts to void of snprintf are most uncommon in kernel source. 9 use casts, 1301 do not. Remove the remaining uses in net/sunrpc/ Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit fc0b579168cbe737c83c6b9bbfe265d3ae6baca6 Author: Joe Perches Date: Mon Mar 8 12:15:28 2010 -0800 net/sunrpc: Remove uses of NIPQUAD, use %pI4 Originally submitted Jan 1, 2010 http://patchwork.kernel.org/patch/71221/ Convert NIPQUAD to the %pI4 format extension where possible Convert %02x%02x%02x%02x/NIPQUAD to %08x/ntohl Signed-off-by: Joe Perches Signed-off-by: David S. Miller commit e9dcd1613f0ac0b3573b7d813a2c5672cd8302eb Author: Barry Song Date: Mon Mar 8 12:13:57 2010 -0800 can: fix bfin_can build error after alloc_candev() change Looks like commit a6e4bc530403 didn't include updates to drivers so the Blackfin CAN driver fails to build now. Signed-off-by: Barry Song Signed-off-by: Mike Frysinger Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit 49697ee79242d5f8ac88f1ebc62e583d16bcc687 Author: Steve Dickson Date: Tue Oct 13 16:07:33 2009 -0400 nfs4: Make the v4 callback service hidden To avoid hangs in the svc_unregister(), on version 4 mounts (and unmounts), when rpcbind is not running, make the nfs4 callback program an 'hidden' service by setting the 'vs_hidden' flag in the nfs4_callback_version structure. Signed-off-by: Steve Dickson Signed-off-by: Trond Myklebust commit 28b2774a0d5852236dab77a4147b8b88548110f1 Author: Eric Dumazet Date: Mon Mar 8 11:32:01 2010 -0800 tcp: Fix tcp_make_synack() Commit 4957faad (TCPCT part 1g: Responder Cookie => Initiator), part of TCP_COOKIE_TRANSACTION implementation, forgot to correctly size synack skb in case user data must be included. Many thanks to Mika Pentillä for spotting this error. Reported-by: Penttillä Mika Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit f6bb13aa1ea3bb26a4c783822347873f085b9000 Author: Rafael J. Wysocki Date: Thu Mar 4 01:52:58 2010 +0100 ACPI / EC / PM: Close race between EC and resume from hibernation There is a race between resume from hibernation and the EC driver that may result in restoring the hibernation image in the middle of an EC transaction in progress, which in turn may lead to unpredictable behavior of the platform. To remove that race condition, add a helpers for suspending and resuming EC transactions in a safe way to be executed by the ACPI platform hibernate pre-restore and restore cleanup callbacks. http://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 7dd08a570dcf45d52155996fee688405635ee481 Author: Dan Carpenter Date: Sat Mar 6 15:02:22 2010 +0300 nfs: fix unlikely memory leak I'll admit that it's unlikely for the first allocation to fail and the second one to succeed. I won't be offended if you ignore this patch. Signed-off-by: Dan Carpenter Signed-off-by: Trond Myklebust commit 5fe46e9d733f19a880ef7e516002bd4c2b833e14 Author: Bian Naimeng Date: Mon Mar 8 14:49:01 2010 +0800 rpc client can not deal with ENOSOCK, so translate it into ENOCONN If NFSv4 client send a request before connect, or the old connection was broken because a ETIMEOUT error catched by call_status, ->send_request will return ENOSOCK, but rpc layer can not deal with it, so make sure ->send_request can translate ENOSOCK into ENOCONN. Signed-off-by: Bian Naimeng Signed-off-by: Trond Myklebust commit 77d3926306bf4eecac50150ba5625797219f14ba Author: Meelis Roos Date: Mon Mar 8 10:53:08 2010 -0800 qlogicpti: Remove slash in QlogicPTI irq name qlogicpti driver registers its irq with a name containing slash. This results in [ 71.049735] WARNING: at fs/proc/generic.c:316 __xlate_proc_name+0xa8/0xb8() [ 71.132815] name 'Qlogic/PTI' because proc_mkdir with the name of the irq fails. Fix it by just removing the slash from irq name. Discovered and tested on real hardware (Sun Ultra 1). Signed-off-by: Meelis Roos Signed-off-by: David S. Miller commit 9837638727488922727b0cfd438039fa73364183 Author: Eric Dumazet Date: Mon Mar 8 03:20:00 2010 +0000 net: fix route cache rebuilds We added an automatic route cache rebuilding in commit 1080d709fb9d8cd43 but had to correct few bugs. One of the assumption of original patch, was that entries where kept sorted in a given way. This assumption is known to be wrong (commit 1ddbcb005c395518 gave an explanation of this and corrected a leak) and expensive to respect. Paweł Staszewski reported to me one of his machine got its routing cache disabled after few messages like : [ 2677.850065] Route hash chain too long! [ 2677.850080] Adjust your secret_interval! [82839.662993] Route hash chain too long! [82839.662996] Adjust your secret_interval! [155843.731650] Route hash chain too long! [155843.731664] Adjust your secret_interval! [155843.811881] Route hash chain too long! [155843.811891] Adjust your secret_interval! [155843.858209] vlan0811: 5 rebuilds is over limit, route caching disabled [155843.858212] Route hash chain too long! [155843.858213] Adjust your secret_interval! This is because rt_intern_hash() might be fooled when computing a chain length, because multiple entries with same keys can differ because of TOS (or mark/oif) bits. In the rare case the fast algorithm see a too long chain, and before taking expensive path, we call a helper function in order to not count duplicates of same routes, that only differ with tos/mark/oif bits. This helper works with data already in cpu cache and is not be very expensive, despite its O(N^2) implementation. Paweł Staszewski sucessfully tested this patch on his loaded router. Reported-and-tested-by: Paweł Staszewski Signed-off-by: Eric Dumazet Acked-by: Neil Horman Signed-off-by: David S. Miller commit 1515faf2f995add976d4428bbc1583a4a0c81e5f Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:50 2010 +0000 qlcnic: remove extra space from board names Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit addd5abf49be31787aeb6203d266e0bd31a3fadd Author: Amit Kumar Salecha Date: Mon Mar 8 00:14:49 2010 +0000 qlcnic: fix bios version check Bios sub version from unified fw image is calculated incorrect. Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit b7eff1007fea3d153a9a5c0f872304ec19412bbb Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:48 2010 +0000 qlcnic: validate unified fw image Validate all sections of unified fw image, before accessing them, to avoid seg fault. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 9ab17b3968f9521bb4fffd8767953d2b0148aad0 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:47 2010 +0000 qlcnic: fix multicast handling For promiscuous mode, driver send request to device for deleting multicast addresses and again it send request for adding them back while exiting from this mode, this is bad for performance. Just setting device in promiscuous mode is enough, no need to del/add multicast addresses. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bfe8b91b8b877066c8ac788f59a40324eaac6d8 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:46 2010 +0000 qlcnic: additional driver statistics. Statistics added for lro/lso bytes, count for tx stop queue and wake queue and skb alloc failure count. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 8bae5698616ac336938684ce7a7370299bd55d01 Author: Sucheta Chakraborty Date: Mon Mar 8 00:14:45 2010 +0000 qlcnic: fix tx csum status Kernel default tx csum function (ethtool_op_get_tx_csum) doesn't show correct csum status. It takes various FLAGS (NETIF_F_ALL_CSUM) in account to show tx csum status, which driver doesn't set while disabling tx csum. Signed-off-by: Sucheta Chakraborty Signed-off-by: Amit Kumar Salecha Signed-off-by: David S. Miller commit 7e8a9298adf7531c58d73ba9c499353e3807cf19 Author: Ajit Khaparde Date: Sun Mar 7 14:23:44 2010 +0000 be2net: remove unused code in be_load_fw This patch cleans up some unused code from be_load_fw(). Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 500ca9ba241304937c54c379e515b24400379353 Author: Ajit Khaparde Date: Sun Mar 7 14:21:27 2010 +0000 be2net: remove usage of be_pci_func When PCI functions are virtuialized in applications by assigning PCI functions to VM (PCI passthrough), the be2net driver in the VM sees a different function number. So, use of PCI function number in any calculation will break existing code. This patch takes care of it. Signed-off-by: Ajit Khaparde Signed-off-by: David S. Miller commit 6cce09f87a04797fae5b947ef2626c14a78f0b49 Author: Eric Dumazet Date: Sun Mar 7 23:21:57 2010 +0000 tcp: Add SNMP counters for backlog and min_ttl drops Commit 6b03a53a (tcp: use limited socket backlog) added the possibility of dropping frames when backlog queue is full. Commit d218d111 (tcp: Generalized TTL Security Mechanism) added the possibility of dropping frames when TTL is under a given limit. This patch adds new SNMP MIB entries, named TCPBacklogDrop and TCPMinTTLDrop, published in /proc/net/netstat in TcpExt: line netstat -s | egrep "TCPBacklogDrop|TCPMinTTLDrop" TCPBacklogDrop: 0 TCPMinTTLDrop: 0 Signed-off-by: Eric Dumazet Signed-off-by: David S. Miller commit 4045635318538d3ddd2007720412fdc4b08f6a62 Author: Zhu Yi Date: Sun Mar 7 16:21:39 2010 +0000 net: add __must_check to sk_add_backlog Add the "__must_check" tag to sk_add_backlog() so that any failure to check and drop packets will be warned about. Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit 89c0ac7cab2440a771ba1e2ab953186bc9c29786 Author: Randy Dunlap Date: Mon Mar 8 09:32:42 2010 -0800 sound: fix opti92x-ad1848 build Fix 'else' placement in ifdef block so that build succeeds: sound/isa/opti9xx/opti92x-ad1848.c:221: error: 'else' without a previous 'if' Signed-off-by: Randy Dunlap Signed-off-by: Takashi Iwai commit 0d9dc7c8b9b7fa0f53647423b41056ee1beed735 Author: Gal Rosen Date: Thu Jan 21 10:15:32 2010 +0200 [SCSI] scsi_transport_fc: Fix synchronization issue while deleting vport The issue occur while deleting 60 virtual ports through the sys interface /sys/class/fc_vports/vport-X/vport_delete. It happen while in a mistake each request sent twice for the same vport. This interface is asynchronous, entering the delete request into a work queue, allowing more than one request to enter to the delete work queue. The result is a NULL pointer. The first request already delete the vport, while the second request got a pointer to the vport before the device destroyed. Re-create vport later cause system freeze. Solution: Check vport flags before entering the request to the work queue. [jejb: fixed int<->long problem on spinlock flags variable] Signed-off-by: Gal Rosen Acked-by: James Smart Cc: Stable Tree Signed-off-by: James Bottomley commit 004c1c7096659d352b83047a7593e91d8a30e3c5 Merge: 882d01f 3b05007 Author: Russell King Date: Mon Mar 8 16:08:46 2010 +0000 Merge branch 'for-rmk/samsung6' of git://git.fluff.org/bjdooks/linux into devel-stable commit 318ae2edc3b29216abd8a2510f3f80b764f06858 Merge: 25cf84c 3e58974 Author: Jiri Kosina Date: Mon Mar 8 16:55:37 2010 +0100 Merge branch 'for-next' into for-linus Conflicts: Documentation/filesystems/proc.txt arch/arm/mach-u300/include/mach/debug-macro.S drivers/net/qlge/qlge_ethtool.c drivers/net/qlge/qlge_main.c drivers/net/typhoon.c commit 5311114d4867113c00f78829d4ce14be458ec925 Author: Takashi Iwai Date: Mon Mar 8 12:13:07 2010 +0100 ALSA: hda - Fix input source elements of secondary ADCs on Realtek Since alc_auto_create_input_ctls() doesn't set the elements for the secondary ADCs, "Input Source" elemtns for these also get empty, resulting in buggy outputs of alsactl like: control.14 { comment.access 'read write' comment.type ENUMERATED comment.count 1 iface MIXER name 'Input Source' index 1 value 0 } This patch fixes alc_mux_enum_*() (and others) to fall back to the first entry if the secondary input mux is empty. Signed-off-by: Takashi Iwai Cc: commit 50ae0aa8f55813b2cc5e5b7f589f328b8fcd45ec Author: Takashi Iwai Date: Mon Mar 8 12:09:59 2010 +0100 ALSA: hda - Fix wrong model range check for ALC268 Fix a wrong value passed to snd_hda_check_board_codec_sid_config() as the upper-limit in parse_alc268(), so that any wrong value can't be passed. So far, no bogus value was set in the quirk entries, so this won't give any behavioral changes. Signed-off-by: Takashi Iwai commit 10cc2b50eb4b01ca4dc014af2094d28b4ebe20d7 Author: Herbert Xu Date: Fri Mar 5 21:03:35 2010 +0000 bridge: Fix RCU race in br_multicast_stop Thanks to Paul McKenny for pointing out that it is incorrect to use synchronize_rcu_bh to ensure that pending callbacks have completed. Instead we should use rcu_barrier_bh. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 49f5fcfd4ac3df24aa66520e1c5f37db5dfa8c10 Author: Herbert Xu Date: Fri Mar 5 21:07:39 2010 +0000 bridge: Use RCU list primitive in __br_mdb_ip_get As Paul McKenney correctly pointed out, __br_mdb_ip_get needs to use the RCU list walking primitive in order to work correctly on platforms where data-dependency ordering is not guaranteed. Reported-by: Paul E. McKenney Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 0c9a2ac1f8a2e55b3382dfc27256878a58ea49e9 Author: YOSHIFUJI Hideaki / 吉藤英明 Date: Sun Mar 7 00:14:44 2010 +0000 ipv6: Optmize translation between IPV6_PREFER_SRC_xxx and RT6_LOOKUP_F_xxx. IPV6_PREFER_SRC_xxx definitions: | #define IPV6_PREFER_SRC_TMP 0x0001 | #define IPV6_PREFER_SRC_PUBLIC 0x0002 | #define IPV6_PREFER_SRC_COA 0x0004 RT6_LOOKUP_F_xxx definitions: | #define RT6_LOOKUP_F_SRCPREF_TMP 0x00000008 | #define RT6_LOOKUP_F_SRCPREF_PUBLIC 0x00000010 | #define RT6_LOOKUP_F_SRCPREF_COA 0x00000020 So, we can translate between these two groups by shift operation instead of multiple 'if's. Signed-off-by: YOSHIFUJI Hideaki Signed-off-by: David S. Miller commit 25dc27d17dc868aae78fd03bef3113cf586b12e5 Author: Florian Fainelli Date: Sun Mar 7 00:55:50 2010 +0000 cpmac: bump version to 0.5.2 Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 9fba1c31f4f3f9f860a4afee0b409cde27d06741 Author: Florian Fainelli Date: Sun Mar 7 00:55:47 2010 +0000 cpmac: fallback to switch mode if no PHY chip found If we were unable to detect a PHY on any of the MDIO bus id we tried instead of bailing out with -ENODEV, assume the MAC is connected to a switch and use MDIO bus 0. This unbreaks quite a lot of devices out there whose switch cannot be detected. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 30765d0502905a9248e5de72fc7ac83c23422861 Author: Florian Fainelli Date: Sun Mar 7 00:55:26 2010 +0000 cpmac: fix the receiving of 802.1q frames Despite what the comment above CPMAC_SKB_SIZE says, the hardware also needs to account for the FCS length in a received frame. This patch fix the receiving of 802.1q frames which have 4 more bytes. While at it unhardcode the definition and use the one from if_vlan.h. Signed-off-by: Florian Fainelli Signed-off-by: David S. Miller commit 8d15d3864a733476931f7e0b3d82824cddc766c2 Author: Oliver Hartkopp Date: Sat Mar 6 08:31:50 2010 +0000 MAINTAINER: Correct CAN Maintainer responsibilities and paths Update the CAN Maintainer responsibilities and add source paths. Additional the SocketCAN core ML is not subscribers-only anymore. Signed-off-by: Oliver Hartkopp Acked-by: Wolfgang Grandegger Signed-off-by: David S. Miller commit e7111eac8ebda724d1e4d9e6aaf4569744a584d5 Author: Petko Manolov Date: Sun Mar 7 06:10:01 2010 +0000 another pegasus usb net device This one removes trailing whitespace in pegasus.h and more importantly adds new Pegasus compatible device. Signed-off-by: Julian Brown Signed-off-by: Petko Manolov Signed-off-by: David S. Miller commit 0e2b807234c42fab59f98ec913db30dfda0e63a7 Author: Dan Carpenter Date: Sun Mar 7 02:35:42 2010 +0000 irda-usb: add error handling and fix leak If the call to kcalloc() fails then we should return -ENOMEM. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 72150e9b7fec217fbd646a29ea2f65a3d4d55ea9 Author: Dan Carpenter Date: Sat Mar 6 01:04:45 2010 +0000 sock.c: potential null dereference We test that "prot->rsk_prot" is non-null right before we dereference it on this line. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit ea3fb371b2a391958670f2a65e1203f7dba61671 Author: Dan Carpenter Date: Sat Mar 6 01:11:38 2010 +0000 ems_usb: cleanup: remove uneeded check "skb" is alway non-null here, but even if it were null the check isn't needed because dev_kfree_skb() can handle it. This eliminates a smatch warning about dereferencing a variable before checking that it is non-null. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit 02a780c014c40973cbe71d04cec7a24e6629995f Author: Dan Carpenter Date: Sat Mar 6 01:14:09 2010 +0000 bridge: cleanup: remove unneed check We dereference "port" on the lines immediately before and immediately after the test so port should hopefully never be null here. Signed-off-by: Dan Carpenter Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b96b894c518bc7399e6b86b635b5e8cd7356a8e9 Author: Figo.zhang Date: Fri Mar 5 16:36:02 2010 +0000 fix a race in ks8695_poll fix a race at the end of NAPI processing in ks8695_poll() function. Signed-off-by:Figo.zhang Signed-off-by: David S. Miller commit 3b05007e43ea629394e89ea0b023d7b15375a2bb Merge: f9fed7c 41f23a0 Author: Ben Dooks Date: Sun Mar 7 22:56:19 2010 +0000 ARM: Merge next-samsung-s3c2443-clock Merge branch 'next-samsung-s3c2443-clock' into next-samsung commit 41f23a09f32124322dc41bea7f65baff6e9b0ac5 Author: Ben Dooks Date: Sat Jan 30 11:14:14 2010 +0200 ARM: S3C2443: Add set_rate and round_rate calls for armdiv clock Add set_rate and round_rate calls to armdiv for future use with cpu frequency scaling. Signed-off-by: Ben Dooks commit 71ed587d4a5d377ef5a6917043543ff949ff7dcf Author: Ben Dooks Date: Sat Jan 30 10:49:15 2010 +0200 ARM: S3C2443: Remove #if 0 for clk_mpll The clk_mpll has long been moved into common clock code, remove the code completely instead of the nasty #if 0 block. Signed-off-by: Ben Dooks commit 2dd5f181420ae8ea1cb976b81ed87517f0d4fcd7 Author: Ben Dooks Date: Sat Jan 30 10:46:52 2010 +0200 ARM: S3C2443: Update notes on MPLLREF clock Add note on MPLLREF clock source and why it cannot be easily removed. Signed-off-by: Ben Dooks commit 4bed36b2c5b3248ae6f9aaf5194fbe85153e4026 Author: Ben Dooks Date: Sat Jan 30 10:25:49 2010 +0200 ARM: S3C2443: Further clksrc-clk conversions Move more of the core clocks that where left over from the last commit as they are much more core to the system operation. This should allow for easier tracking of any problems. Signed-off-by: Ben Dooks commit 9aa753c4422492547a190df8a3b6a56282669f9b Author: Ben Dooks Date: Sat Jan 30 09:19:59 2010 +0200 ARM: S3C2443: Change to using plat-samsung clksrc-clk implementation The S3C2443 clock code could easily make use of the clksrc implementation in plat-samsung for many of the clocks. Make the clocks that easily move to clksrc-clk over, update any initialisation and remove the old register definitions from the header file (it is only being used once). Signed-off-by: Ben Dooks commit f9fed7cd7efaa0d050f21f6f9ed532d3143b7369 Author: Mark Brown Date: Mon Mar 1 18:51:42 2010 +0000 USB: Fix s3c-hsotg build following Samsung platform header moves Fix a reference to regs-sys.h got missed in the reorganisation of the Samsung platform headers targetted for 2.6.34. Signed-off-by: Mark Brown Acked-by: Greg Kroah-Hartman Signed-off-by: Ben Dooks commit 0ea5357f2e02aa3741daddf71dd8b2f3b313db74 Author: Mark Brown Date: Fri Mar 5 10:47:23 2010 +0000 ARM: S3C64XX: Reintroduce unconditional build of audio device Ben Dooks' commit cf9814eb (ARM: S3C64XX: Make audio device code built unconditionally) made the struct devices for the audio blocks in the S3C64xx series processors be built unconditionally but this change seems to have gone AWOL in the various Samsung platform moves this release cycle, causing link failures with machine drivers that rely on it. Reintroduce the change. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8d2b09f5b0de2c0e37f50d04980bc81098988239 Author: Rabin Vincent Date: Mon Mar 1 05:01:25 2010 +0100 ARM: 5961/1: ux500: fix CLKRST addresses Correct the base addresses of the CLKRST registers. Acked-by: Linus Walleij Acked-by: Srinidhi Kasagar Signed-off-by: Rabin Vincent Signed-off-by: Russell King commit 51d47999b9452a8dc7ae58a11423c5db28f21ae1 Author: Laurent Pinchart Date: Thu Mar 4 15:33:16 2010 +0100 ARM: 5977/1: arm: Enable backtrace printing on oops when PC is corrupted If PC points outside kernel text, start printing the backtrace at LR instead. Signed-off-by: Laurent Pinchart Signed-off-by: Russell King commit d55f88f0275e4b21435957d3d354a79bb9edeec7 Author: Krishna Gudipati Date: Fri Mar 5 19:38:52 2010 -0800 [SCSI] bfa: Update the driver version to 2.1.2.1. Upgrade the upstream driver from 2.0.0.0 to 2.1.2.1. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit d1c61f8ef582055569de76a86fa1984f9b6698cf Author: Krishna Gudipati Date: Fri Mar 5 19:38:44 2010 -0800 [SCSI] bfa: Remove unused header files and did some cleanup. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 95aa060decd2472d319c3f12b0b1b699a5f35058 Author: Krishna Gudipati Date: Fri Mar 5 19:38:27 2010 -0800 [SCSI] bfa: Handle SCSI IO underrun case. When IO is completed with underrun and with good SCSI status, check if the transferred bytes against scsi_cmnd->underflow, which is set to minimum number of bytes that must be transferred for this command, if is less than required minimum, complete the IO with DID_ERROR. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 25e2934c26f5efaea156c9fda4457d01a8bb44e1 Author: Krishna Gudipati Date: Fri Mar 5 19:38:17 2010 -0800 [SCSI] bfa: FCS and include file changes. MS module did not invoke fdmi offline in all cases, call fdmi offline when ms module receives a port offline, so that fdmi offline is from one place in the ms module. Make changes to handle 10G speed in the conversion routine. Replaced the usage of bfa_adapter_attr_s struct with specific API's. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit ca8b4327e405820966971236224db0e0724b5673 Author: Krishna Gudipati Date: Fri Mar 5 19:38:07 2010 -0800 [SCSI] bfa: Modified the portstats get/clear logic Modified the portstats get/clear logic for port physical/FCoE/QoS stats. Added more stats to FC Fixed some issues with FCoE stats collection. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 0a4b1fc0b24fc7adbaf8413f2992ce1395991a78 Author: Krishna Gudipati Date: Fri Mar 5 19:37:57 2010 -0800 [SCSI] bfa: Replace bfa_get_attr() with specific APIs bfa_ioc_attr_s is a big structure and some times could cause stack overflow if defined locally, so add specific APIs that are needed to replace the use of ioc_attr local var. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f58e9ebbf78bd36c6cf1ca651280d39efe73a7c0 Author: Krishna Gudipati Date: Fri Mar 5 19:37:45 2010 -0800 [SCSI] bfa: New portlog entries for events (FIP/FLOGI/FDISC/LOGO). Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 1c8a4c37494932acd59079b4fc8d8f69fb329c2a Author: Krishna Gudipati Date: Fri Mar 5 19:37:37 2010 -0800 [SCSI] bfa: Rename pport to fcport in BFA FCS. Rename pport structures to fcport in BFA FCS, to resolve confusion about the port structures in the firmware, and make sure the SG page is setup correctly. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 13cc20c5e764e6ef8d57f33980ab8c386c25fb4d Author: Krishna Gudipati Date: Fri Mar 5 19:37:29 2010 -0800 [SCSI] bfa: IOC fixes, check for IOC down condition. Currently BFA was not checking for IOC down condition when issuing getstats/clearstats Add check to see if IOC is operational, before issuing getstats/clearstats. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 78f915f7b095dda76970c8c9568489fa779ef73f Author: Krishna Gudipati Date: Fri Mar 5 19:37:18 2010 -0800 [SCSI] bfa: In MSIX mode, ignore spurious RME interrupts when FCoE ports are in FW mismatch state. Use dummy interrupt handlers till chip initialization is complete. Install real interrupt handlers after chip initialization. Also removed msix installation code in bfa_iocfc_init(). Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f5713c5dfb4d61cd77debf61d3873eb36877ff1f Author: Krishna Gudipati Date: Fri Mar 5 19:37:09 2010 -0800 [SCSI] bfa: Fix Command Queue (CPE) full condition check and ack CPE interrupt. Fixed the issue of not acknowledging the command queue full-to-non-full interrupt. Implemented separate acknowledging functions for different ASIC and interrupt mode. Fixed the case of missing CPE interrupt by always processing the pending requests in the completion path. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 816e49b8ed209e5e08d4c43359635cbca17e7196 Author: Krishna Gudipati Date: Fri Mar 5 19:36:56 2010 -0800 [SCSI] bfa: IOC recovery fix in fcmode. ioc_recover failed to work in fcmode. Fixed the code to initialize the ioc_regs.err_set during the notify_hbfail. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 2993cc71d1bff61999ade7f2b6b3ea2dd1e2c8d9 Author: Krishna Gudipati Date: Fri Mar 5 19:36:47 2010 -0800 [SCSI] bfa: AEN and byte alignment fixes. Replace enum types with int and rearrange the fields to fix some alignment issue. Local var ioc_attr is causing the stack to overflow, so removed the usage of the local ioc_attr var and now invoking an API to return the ioc_type. Fix some AEN issues. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 9693e7dff5c2911b4e445f5f656ef57b3a5bffac Author: Krishna Gudipati Date: Fri Mar 5 19:36:30 2010 -0800 [SCSI] bfa: Introduce a link notification state machine. Introduce a link notification state machine to handle next incoming link events while the current event is being delivered to the driver. When the event has been processed by the driver, the link notification state machine will queue the next event (if there is any) to the driver. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 738c9e66dcb7e17a962a7d65c976386b970d10ca Author: Krishna Gudipati Date: Fri Mar 5 19:36:19 2010 -0800 [SCSI] bfa: Added firmware save clear feature for BFA driver. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit f926a05f5c1507aeae0e36175a03c0a19c201187 Author: Krishna Gudipati Date: Fri Mar 5 19:36:00 2010 -0800 [SCSI] bfa: FCS authentication related changes. Made FCS authentication related changes to state machines and header files. Made changes in FCS state machines to handle the case when secret string is NULL. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 7af074dc9d343f69bab4bfd699e6d7ba09915fd9 Author: Krishna Gudipati Date: Fri Mar 5 19:35:45 2010 -0800 [SCSI] bfa: PCI VPD, FIP and include file changes. Changed PCI VPD to incorporate specific OEM vendors. Added FCoE specific interrupt latency and delay params. Added some variables needed by FIP 2.0. Added some new logging and tracing definitions. Added reserved members to make the structures (IOC, IOCFC) 64bit aligned. Changed the module identifiers, as some files were moved. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 86e32dabbad0d860b2be3c30a33c10a134d4ccf1 Author: Krishna Gudipati Date: Fri Mar 5 19:35:33 2010 -0800 [SCSI] bfa: Fix to copy fpma MAC when requested by user space application. Copy fpma MAC when requested by user space application. Added FPMA mac address to the lport attributes structure. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 72041ed8fc8ed92c11af90949bab7b08f3e34fd3 Author: Krishna Gudipati Date: Fri Mar 5 19:35:16 2010 -0800 [SCSI] bfa: RPORT state machine: direct attach mode fix. Make sure that in direct attach mode, we do not query the name server after a target is marked offline. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit e641de37e67953fa9ecad72608942481a5d66a1d Author: Krishna Gudipati Date: Fri Mar 5 19:35:02 2010 -0800 [SCSI] bfa: Replace bfa_assert() with bfa_sm_fault() Replace bfa_assert() with bfa_sm_fault() to get unhandled events for debugging. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 8b651b4294e67789028982d18779a9ebe75c2b8a Author: Krishna Gudipati Date: Fri Mar 5 19:34:44 2010 -0800 [SCSI] bfa: Clear LL_HALT and PSS_ERR bit when IOC crashes. Clear LL_HALT and PSS_ERR bit in the interrupt status register on an IOC crash. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 0a20de446c76529028cb239bf2a13cb0f05b263a Author: Krishna Gudipati Date: Fri Mar 5 19:34:20 2010 -0800 [SCSI] bfa: IOC changes: Support faster recovery and split bfa_ioc.c into ASIC specific code. Add support for faster IOC recovery after failure. Split bfa_ioc.c into three files: bfa_ioc.c: Common code shared between crossbow and catapult ASIC's. bfa_ioc_cb.c: Code specific to the crossbow, reg mapping and interrupt related routines. bfa_ioc_ct.c: Code specific to the catapult, reg mapping and interrupt related routines. Fix to make sure IOC reinitialize's properly on enable request - update the ioc_fwstate reg with BFI_IOC_FAIL on ioc disable mbox cmd timeout. Makefile changes to support the 2 newly added files bfa_ioc_cb.c and bfa_ioc_ct.c. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit c8634fd3115497ac311f57be9c12f993437745cf Author: Jeff Layton Date: Fri Feb 12 07:44:17 2010 -0500 cifs: add a CIFSSMBUnixQFileInfo function ...to allow us to get unix attrs via filehandle. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit bcd5357f430363376565d07ca542127d6d36602c Author: Jeff Layton Date: Fri Feb 12 07:44:16 2010 -0500 cifs: add a CIFSSMBQFileInfo function ...to get inode attributes via filehandle instead of by path. In some places, we need to revalidate an inode on an open filehandle, but we can't necessarily guarantee that the dentry associated with it will still be valid. When we have an open filehandle already, it makes more sense to do a filehandle based operation anyway. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit df2cf170c823ba779ca339e3ede347c87f4dc6a9 Author: Jeff Layton Date: Fri Feb 12 07:44:16 2010 -0500 cifs: overhaul cifs_revalidate and rename to cifs_revalidate_dentry cifs_revalidate is renamed to cifs_revalidate_dentry as a later patch will add a by-filehandle variant. Add a new "invalid_mapping" flag to the cifsInodeInfo that indicates that the pagecache is considered invalid. Add a new routine to check inode attributes whenever they're updated and set that flag if the inode has changed on the server. cifs_revalidate_dentry is then changed to just update the attrcache if needed and then to zap the pagecache if it's not valid. There are some other behavior changes in here as well. Open files are now allowed to have their caches invalidated. I see no reason why we'd want to keep stale data around just because a file is open. Also, cifs_revalidate_cache uses the server_eof for revalidating the file size since that should more closely match the size of the file on the server. Signed-off-by: Jeff Layton Signed-off-by: Steve French commit 0e95017355dcf43031da6d0e360a748717e56df1 Author: Tim Bird Date: Thu Feb 25 15:36:43 2010 -0800 function-graph: Add tracing_thresh support to function_graph tracer Add support for tracing_thresh to the function_graph tracer. This version of this feature isolates the checks into new entry and return functions, to avoid adding more conditional code into the main function_graph paths. When the tracing_thresh is set and the function graph tracer is enabled, only the functions that took longer than the time in microseconds that was set in tracing_thresh are recorded. To do this efficiently, only the function exits are recorded: [tracing]# echo 100 > tracing_thresh [tracing]# echo function_graph > current_tracer [tracing]# cat trace # tracer: function_graph # # CPU DURATION FUNCTION CALLS # | | | | | | | 1) ! 119.214 us | } /* smp_apic_timer_interrupt */ 1) <========== | 0) ! 101.527 us | } /* __rcu_process_callbacks */ 0) ! 126.461 us | } /* rcu_process_callbacks */ 0) ! 145.111 us | } /* __do_softirq */ 0) ! 149.667 us | } /* do_softirq */ 0) ! 168.817 us | } /* irq_exit */ 0) ! 248.254 us | } /* smp_apic_timer_interrupt */ Also, add support for specifying tracing_thresh on the kernel command line. When used like so: "tracing_thresh=200 ftrace=function_graph" this can be used to analyse system startup. It is important to disable tracing soon after boot, in order to avoid losing the trace data. Acked-by: Frederic Weisbecker Signed-off-by: Tim Bird LKML-Reference: <4B87098B.4040308@am.sony.com> Signed-off-by: Steven Rostedt commit 1acaa1b2d9b5904c9cce06122990a2d71046ce16 Author: Arnaldo Carvalho de Melo Date: Fri Mar 5 18:23:50 2010 -0300 tracing: Update the comm field in the right variable in update_max_tr The latency output showed: # | task: -3 (uid:0 nice:0 policy:1 rt_prio:99) The comm is missing in the "task:" and it looks like a minus 3 is the output. The correct display should be: # | task: migration/0-3 (uid:0 nice:0 policy:1 rt_prio:99) The problem is that the comm is being stored in the wrong data structure. The max_tr.data[cpu] is what stores the comm, not the tr->data[cpu]. Before this patch the max_tr.data[cpu]->comm was zeroed and the /debug/trace ended up showing just the '-' sign followed by the pid. Also remove a needless initialization of max_data. Signed-off-by: Arnaldo Carvalho de Melo LKML-Reference: <1267824230-23861-1-git-send-email-acme@infradead.org> Signed-off-by: Steven Rostedt commit a094fe04c751698a18c3a0d376a3bdb117f1e0d8 Author: Steven Rostedt Date: Fri Mar 5 20:08:58 2010 -0500 function-graph: Use comment notation for func names of dangling '}' When a '}' does not have a matching function start, the name is printed within parenthesis. But this makes it confusing between ending '}' and function starts. This patch makes the function name appear in C comment notation. Old view: 3) 1.281 us | } (might_fault) 3) 3.620 us | } (filldir) 3) 5.251 us | } (call_filldir) 3) | call_filldir() { 3) | filldir() { New view: 3) 1.281 us | } /* might_fault */ 3) 3.620 us | } /* filldir */ 3) 5.251 us | } /* call_filldir */ 3) | call_filldir() { 3) | filldir() { Requested-by: Ingo Molnar Signed-off-by: Steven Rostedt commit 801c29fd1fdeb84f60241beb445ff5db154450ae Author: Steven Rostedt Date: Fri Mar 5 20:02:19 2010 -0500 function-graph: Fix unused reference to ftrace_set_func() The declaration of ftrace_set_func() is at the start of the ftrace.c file and wrapped with a #ifdef CONFIG_FUNCTION_GRAPH condition. If function graph tracing is enabled but CONFIG_DYNAMIC_FTRACE is not, a warning about that function being declared static and unused is given. This really should have been placed within the CONFIG_FUNCTION_GRAPH condition that uses ftrace_set_func(). Moving the declaration down fixes the warning and makes the code cleaner. Reported-by: Peter Zijlstra Signed-off-by: Steven Rostedt commit bb910a7040e90a0ca3d3e8245d6d5c128a5d1287 Author: Rafael J. Wysocki Date: Sat Feb 27 21:37:37 2010 +0100 PCI/PM Runtime: Make runtime PM of PCI devices inactive by default Make the run-time power management of PCI devices be inactive by default by calling pm_runtime_forbid() for each PCI device during its initialization. This setting may be overriden by the user space with the help of the /sys/devices/.../power/control interface. That's necessary to avoid breakage on systems where ACPI-based wake-up is known to fail for some devices. Signed-off-by: Rafael J. Wysocki Signed-off-by: Jesse Barnes commit f1a3d57213fe264b4cf584e78bac36aaf9998729 Author: Stephen Rothwell Date: Mon Jan 18 11:53:08 2010 +1100 ceph: update for write_inode API change Signed-off-by: Stephen Rothwell Signed-off-by: Sage Weil commit 3a22813a5aaf8e8c72be575dabe0ba26f9352f4d Author: Breno Leitao Date: Thu Mar 4 10:40:44 2010 +0000 s2io: Fixing debug message Currently s2io is dumping debug messages using the interface name before it was allocated, showing a message like the following: s2io: eth%d: Ring Mem PHY: 0x7ef80000 s2io: s2io_reset: Resetting XFrame card eth%d This patch just fixes it, printing the pci bus information for the card instead of the interface name. Signed-off-by: Breno Leitao Signed-off-by: David S. Miller commit a80483d3722b603dae8a52495f8d88a7d4b1bf1c Author: Jesse Brandeburg Date: Fri Mar 5 02:21:44 2010 +0000 e1000e: fix packet corruption and tx hang during NFSv2 when receiving a particular type of NFS v2 UDP traffic, the hardware could DMA some bad data and then hang, possibly corrupting memory. Disable the NFS parsing in this hardware, verified to fix the bug. Originally reported and reproduced by RedHat's Neil Horman CC: nhorman@tuxdriver.com Signed-off-by: Jesse Brandeburg Signed-off-by: Jeff Kirsher Acked-by: Neil Horman Signed-off-by: David S. Miller commit 5fe88eae26dbd24eed73eb0b681e13981fd486b3 Author: David Dillow Date: Thu Mar 4 04:37:16 2010 +0000 typhoon: fix incorrect use of smp_wmb() The typhoon driver was incorrectly using smp_wmb() to order memory accesses against IO to the NIC in a few instances. Use wmb() instead, which is required to actually order between memory types. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d17792ebdf90289c9fd1bce888076d3d60ecd53b Author: Jeff Garzik Date: Thu Mar 4 08:21:53 2010 +0000 ethtool: Add direct access to ops->get_sset_count On 03/04/2010 09:26 AM, Ben Hutchings wrote: > On Thu, 2010-03-04 at 00:51 -0800, Jeff Kirsher wrote: >> From: Jeff Garzik >> >> This patch is an alternative approach for accessing string >> counts, vs. the drvinfo indirect approach. This way the drvinfo >> space doesn't run out, and we don't break ABI later. > [...] >> --- a/net/core/ethtool.c >> +++ b/net/core/ethtool.c >> @@ -214,6 +214,10 @@ static noinline int ethtool_get_drvinfo(struct net_device *dev, void __user *use >> info.cmd = ETHTOOL_GDRVINFO; >> ops->get_drvinfo(dev,&info); >> >> + /* >> + * this method of obtaining string set info is deprecated; >> + * consider using ETHTOOL_GSSET_INFO instead >> + */ > > This comment belongs on the interface (ethtool.h) not the > implementation. Debatable -- the current comment is located at the callsite of ops->get_sset_count(), which is where an implementor might think to add a new call. Not all the numeric fields in ethtool_drvinfo are obtained from ->get_sset_count(). Hence the "some" in the attached patch to include/linux/ethtool.h, addressing your comment. > [...] >> +static noinline int ethtool_get_sset_info(struct net_device *dev, >> + void __user *useraddr) >> +{ > [...] >> + /* calculate size of return buffer */ >> + for (i = 0; i< 64; i++) >> + if (sset_mask& (1ULL<< i)) >> + n_bits++; > [...] > > We have a function for this: > > n_bits = hweight64(sset_mask); Agreed. I've attached a follow-up patch, which should enable my/Jeff's kernel patch to be applied, followed by this one. Signed-off-by: Jeff Garzik Signed-off-by: David S. Miller commit 723b2f57ad83ee7087acf9a95e8e289414b1f521 Author: Jeff Garzik Date: Wed Mar 3 22:51:50 2010 +0000 ethtool: Add direct access to ops->get_sset_count This patch is an alternative approach for accessing string counts, vs. the drvinfo indirect approach. This way the drvinfo space doesn't run out, and we don't break ABI later. Signed-off-by: Jeff Garzik Signed-off-by: Peter P Waskiewicz Jr Signed-off-by: Jeff Kirsher Signed-off-by: David S. Miller commit 4b79a1aedcb9dd6e3f27b970dcb553aefcd97254 Author: David Brown Date: Fri Mar 5 09:12:34 2010 +0000 net: smc91x: Support Qualcomm MSM development boards. Signed-off-by: David Brown Signed-off-by: Daniel Walker Acked-by: Nicolas Pitre Signed-off-by: David S. Miller commit a3a858ff18a72a8d388e31ab0d98f7e944841a62 Author: Zhu Yi Date: Thu Mar 4 18:01:47 2010 +0000 net: backlog functions rename sk_add_backlog -> __sk_add_backlog sk_add_backlog_limited -> sk_add_backlog Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 2499849ee8f513e795b9f2c19a42d6356e4943a4 Author: Zhu Yi Date: Thu Mar 4 18:01:46 2010 +0000 x25: use limited socket backlog Make x25 adapt to the limited socket backlog change. Cc: Andrew Hendry Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 53eecb1be5ae499d399d2923933937a9ea1a284f Author: Zhu Yi Date: Thu Mar 4 18:01:45 2010 +0000 tipc: use limited socket backlog Make tipc adapt to the limited socket backlog change. Cc: Jon Maloy Cc: Allan Stephens Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Allan Stephens Signed-off-by: David S. Miller commit 50b1a782f845140f4138f14a1ce8a4a6dd0cc82f Author: Zhu Yi Date: Thu Mar 4 18:01:44 2010 +0000 sctp: use limited socket backlog Make sctp adapt to the limited socket backlog change. Cc: Vlad Yasevich Cc: Sridhar Samudrala Signed-off-by: Zhu Yi Signed-off-by: David S. Miller commit 79545b681961d7001c1f4c3eb9ffb87bed4485db Author: Zhu Yi Date: Thu Mar 4 18:01:43 2010 +0000 llc: use limited socket backlog Make llc adapt to the limited socket backlog change. Cc: Arnaldo Carvalho de Melo Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit 55349790d7cbf0d381873a7ece1dcafcffd4aaa9 Author: Zhu Yi Date: Thu Mar 4 18:01:42 2010 +0000 udp: use limited socket backlog Make udp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 6b03a53a5ab7ccf2d5d69f96cf1c739c4d2a8fb9 Author: Zhu Yi Date: Thu Mar 4 18:01:41 2010 +0000 tcp: use limited socket backlog Make tcp adapt to the limited socket backlog change. Cc: "David S. Miller" Cc: Alexey Kuznetsov Cc: "Pekka Savola (ipv6)" Cc: Patrick McHardy Signed-off-by: Zhu Yi Acked-by: Eric Dumazet Signed-off-by: David S. Miller commit 8eae939f1400326b06d0c9afe53d2a484a326871 Author: Zhu Yi Date: Thu Mar 4 18:01:40 2010 +0000 net: add limit for socket backlog We got system OOM while running some UDP netperf testing on the loopback device. The case is multiple senders sent stream UDP packets to a single receiver via loopback on local host. Of course, the receiver is not able to handle all the packets in time. But we surprisingly found that these packets were not discarded due to the receiver's sk->sk_rcvbuf limit. Instead, they are kept queuing to sk->sk_backlog and finally ate up all the memory. We believe this is a secure hole that a none privileged user can crash the system. The root cause for this problem is, when the receiver is doing __release_sock() (i.e. after userspace recv, kernel udp_recvmsg -> skb_free_datagram_locked -> release_sock), it moves skbs from backlog to sk_receive_queue with the softirq enabled. In the above case, multiple busy senders will almost make it an endless loop. The skbs in the backlog end up eat all the system memory. The issue is not only for UDP. Any protocols using socket backlog is potentially affected. The patch adds limit for socket backlog so that the backlog size cannot be expanded endlessly. Reported-by: Alex Shi Cc: David Miller Cc: Arnaldo Carvalho de Melo Cc: Alexey Kuznetsov Cc: Patrick McHardy Cc: Vlad Yasevich Cc: Sridhar Samudrala Cc: Jon Maloy Cc: Allan Stephens Cc: Andrew Hendry Signed-off-by: Zhu Yi Signed-off-by: Eric Dumazet Acked-by: Arnaldo Carvalho de Melo Signed-off-by: David S. Miller commit a11106544f33c104706ae42d27219a409b67478e Author: Scott Wood Date: Thu Feb 25 18:09:45 2010 -0600 powerpc/perf: e500 support This implements perf_event support for the Freescale embedded performance monitor, based on the existing perf_event.c that supports server/classic chips. Some limitations: - Performance monitor interrupts are regular EE interrupts, and thus you can't profile places with interrupts disabled. We may want to implement soft IRQ-disabling, with perfmon interrupts exempted and treated as NMIs. - When trying to schedule multiple event groups at once, and using restricted events, situations could arise where scheduling fails even though it would be possible. Consider three groups, each with two events. One group has restricted events, the others don't. The two non-restricted groups are scheduled, then one is removed, which happens to occupy the two counters that can't do restricted events. The remaining non-restricted group will not be moved to the non-restricted-capable counters to make room if the restricted group tries to be scheduled. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit 776943fd6f104a6e8457dc95a17282e69e963666 Author: Ping Cheng Date: Thu Mar 4 21:50:59 2010 -0800 Input: wacom - merge out and in prox events Process out and in prox events for Graphire and Tablet PC devices in the same loop to simplify the data parsing logic. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 5bc923c505926af927d4f3011da92c243787d6a7 Author: Dan Carpenter Date: Fri Mar 5 00:31:33 2010 -0800 Input: gamecon - fix off by one range check It should be >= GC_MAX not > GC_MAX. Signed-off-by: Dan Carpenter Signed-off-by: Dmitry Torokhov commit facf92695dcf40836973ce09b7f62d3cc3a89152 Author: Mark Brown Date: Mon Mar 1 19:57:59 2010 +0000 ASoC: Fix S3C64xx IIS driver for Samsung header reorg The reorgs of the Samsung headers have moved the GPIO bank definitions from plat/ to mach/ - the IIS driver needs to be updated to take care of this. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8997de30adf5d11e9c807f1d89a894ffed60616b Author: Ben Dooks Date: Thu Mar 4 23:14:44 2010 +0000 ARM: S3C2440: Fix plat-s3c24xx move of s3c2440/s3c2442 support Commit 58bac7b8ded70c39bcd5f7037091051c277618aa failed to move the two PLL files s3c2440-pll-12000000.c and s3c2440-pll-16934400.c, so place these in arch/arm/mach-s3c2440 to fix this commit up. As a note, these are not built by the default configuration and thus the failure to move wasn't spotted until much later. Signed-off-by: Ben Dooks commit 422d2cb8f9afadba1ecd3614f658b6daaaa480fb Author: Yehuda Sadeh Date: Fri Feb 26 15:32:31 2010 -0800 ceph: reset osd after relevant messages timed out This simplifies the process of timing out messages. We keep lru of current messages that are in flight. If a timeout has passed, we reset the osd connection, so that messages will be retransmitted. This is a failsafe in case we hit some sort of problem sending out message to the OSD. Normally, we'll get notification via an updated osdmap if there are problems. If a request is older than the keepalive timeout, send a keepalive to ensure we detect any breaks in the TCP connection. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 9d6df3fdfc470c313b7ea13dbe8a63fb21ab7365 Author: Scott Wood Date: Thu Feb 25 18:04:33 2010 -0600 powerpc/perf: Build callchain code regardless of hardware event support. It's also useful for software events, as well as future support for other types of hardware counters. Signed-off-by: Scott Wood Acked-by: Paul Mackerras Signed-off-by: Kumar Gala commit 653c60f37695d054e24b84102bb2426dd2840b8c Author: Andrea Gelmini Date: Sat Feb 27 17:51:25 2010 +0100 powerpc/cpm2: Checkpatch cleanup arch/powerpc/sysdev/cpm2_pic.h:6: ERROR: "(foo*)" should be "(foo *)" Signed-off-by: Andrea Gelmini Signed-off-by: Kumar Gala commit 948e78c3fc9c799b3f9b6c683b83c665942e6bbe Author: Martyn Welch Date: Mon Mar 1 14:41:59 2010 +0000 powerpc/86xx: Renaming following split of GE Fanuc joint venture This patch renames GE Fanuc boards following the split-up of the GE Fanuc joint venture. These boards are now made by GE Intelligent platorms. Signed-off-by: Martyn Welch Signed-off-by: Kumar Gala commit 6f3d395a5c77e6ccddd59a5221e1354b22c29531 Author: Anton Vorontsov Date: Thu Feb 18 16:57:27 2010 +0300 powerpc/86xx: Convert gef_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, gef_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 43a5a01bcc5b53c67878f043b4a1b31eaa87a360 Author: Anton Vorontsov Date: Thu Feb 18 16:43:12 2010 +0300 powerpc/qe: Convert qe_ic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, qe_ic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 0e5d359cca2d685311c4eaeb570f2e7e7915da31 Author: Anton Vorontsov Date: Thu Feb 18 16:57:38 2010 +0300 powerpc/82xx: Convert pci_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, pci_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 7e026f72cf05137e0b52b7aa5420e95a76bd3195 Author: Anton Vorontsov Date: Thu Feb 18 16:45:12 2010 +0300 powerpc/85xx: Convert socrates_fpga_pic_lock to raw_spinlock Interrupt controllers' hooks are executed in the atomic context, so they are not permitted to sleep (with RT kernels non-raw spinlocks are sleepable). So, socrates_fpga_pic_lock has to be a real (non-sleepable) spinlock. Signed-off-by: Anton Vorontsov Acked-by: Thomas Gleixner Signed-off-by: Kumar Gala commit 12c3400a84742f8bb0e4edc822e9ccba58781e0c Author: Jiri Pirko Date: Thu Mar 4 03:32:16 2010 -0800 rndis_wlan: correct multicast_list handling V3 My previous patch (655ffee284dfcf9a24ac0343f3e5ee6db85b85c5) added locking in a bad way. Because rndis_set_oid can sleep, there is need to prepare multicast addresses into local buffer under netif_addr_lock first, then call rndis_set_oid outside. This caused reorganizing of the whole function. Signed-off-by: Jiri Pirko Reported-by: Jussi Kivilinna Signed-off-by: David S. Miller commit 3e75c3b0ca669ce675c52ad36a7998f55f16757f Merge: cf4fee5 29044ad Author: Ingo Molnar Date: Thu Mar 4 12:27:39 2010 +0100 Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/urgent commit cf4fee50282312528e1f8adf73b1831d1d6ae389 Author: Tom Zanussi Date: Wed Mar 3 01:04:33 2010 -0600 perf trace: Don't use pager if scripting It's useful for paging through raw traces, but just gets in the way when scripting. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-3-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit 10c95f4f41889daaa8130e0bd12209825dbe8d39 Author: Tom Zanussi Date: Wed Mar 3 01:04:32 2010 -0600 perf trace/scripting: Remove extraneous header read perf_header__read() is already done in perf_session__open(), so remove it from the script gen case. Signed-off-by: Tom Zanussi Cc: fweisbec@gmail.com Cc: rostedt@goodmis.org LKML-Reference: <1267599873-8193-2-git-send-email-tzanussi@gmail.com> Signed-off-by: Ingo Molnar commit da7196e1f986c846ffa8b2ec385223fad38e8518 Author: Will Deacon Date: Wed Mar 3 11:47:58 2010 +0000 perf, ARM: Modify kuser rmb() call to compile for Thumb-2 The Thumb-2 instruction set does not provide an encoding for sub pc, r0, #95 as present in the rmb() definition used by perf. This results in compilation failure when using a compiler targetting an instruction set other than ARM. This patch redefines rmb() for ARM by casting the address of the kuser helper to a function pointer, therefore getting the compiler to take care of making the call. Patch taken against tip/master. Signed-off-by: Will Deacon Cc: Russell King - ARM Linux Cc: Jamie Iles Cc: Peter Zijlstra Cc: Mike Galbraith Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker LKML-Reference: <1267616878-2154-1-git-send-email-will.deacon@arm.com> Signed-off-by: Ingo Molnar commit 54dbf96c921513bf98484a20ef366d51944a4c4d Author: Paul E. McKenney Date: Wed Mar 3 07:46:57 2010 -0800 rcu: Suppress RCU lockdep warnings during early boot RCU is used during very early boot, before RCU and lockdep have been initialized. So make the underlying primitives (rcu_read_lock_held(), rcu_read_lock_bh_held(), rcu_read_lock_sched_held(), and rcu_dereference_check()) check for early boot via the rcu_scheduler_active flag. This will suppress false positives. Also introduce a debug_lockdep_rcu_enabled() static inline helper function, which tags the CONTINUE_PROVE_RCU case as likely(), as suggested by Ingo Molnar. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-2-git-send-email-paulmck@linux.vnet.ibm.com> [ v2: removed incomplete debug_lockdep_rcu_update() bits ] Signed-off-by: Ingo Molnar commit 8d53dd546f36073e0d29b0cfc24c665db301e3e7 Author: Paul E. McKenney Date: Wed Mar 3 17:50:18 2010 -0800 rcu, ftrace: Fix RCU lockdep splat in ftrace_perf_buf_prepare() Change the pair of rcu_dereference() calls in ftrace_perf_buf_prepare() to rcu_dereference_sched(). Signed-off-by: Paul E. McKenney Acked-by: Frederic Weisbecker Cc: Steven Rostedt Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Frederic Weisbecker LKML-Reference: <1267667418-32233-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 99ee4ca746dda71326db7645463b4075ac1d665c Author: Paul E. McKenney Date: Wed Mar 3 17:50:17 2010 -0800 rcu: Suppress __mpol_dup() false positive from RCU lockdep Common code is used during task creation and after the task has started running. RCU protection is not needed during task creation because no other CPU has access to the under-construction task. Provide the RCU protection anyway to suppress the false positive, as there does not appear to be a good way for the common code to recognize that the task is only accessible to the CPU creating it. Signed-off-by: Paul E. McKenney Cc: Paul Menage Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e6033e3b307fcfae08408e0673266db38392bda4 Author: Paul E. McKenney Date: Wed Mar 3 17:50:16 2010 -0800 rcu: Make rcu_read_lock_sched_held() handle !PREEMPT The rcu_read_lock_sched_held() needs to unconditionally return the value "1" in a !PREEMPT kernel, because under !PREEMPT, -all- kernel code is implicitly preempt-disabled. This patch makes this happen. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267667418-32233-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit cc5b83a9f884fe8722a275069a5a6fde39988455 Author: Paul E. McKenney Date: Wed Mar 3 07:46:59 2010 -0800 rcu: Add control variables to lockdep_rcu_dereference() diagnostics Add the values of rcu_scheduler_active() and debug_locks() to the lockdep_rcu_dereference() output to help diagnose RCU lockdep splats that occur shortly after the scheduler starts. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-4-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 5ed42b8113667c06a6ff2c72717395b5044d30a1 Author: Paul E. McKenney Date: Wed Mar 3 07:46:58 2010 -0800 rcu, cgroup: Relax the check in task_subsys_state() as early boot is now handled by lockdep-RCU This patch removes the check for !rcu_scheduler_active because this check has been incorporated into rcu_dereference_check(). Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267631219-8713-3-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e02c4fd3142dfb9412531bbfabd510a2a7c6ea46 Merge: ae1f303 ac91d85 Author: Ingo Molnar Date: Thu Mar 4 11:51:29 2010 +0100 Merge branch 'tip/tracing/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent commit 4f16d4e0c9a4b20d9f0db365587b96d6001efd7d Merge: 1e259e0 6630125 Author: Ingo Molnar Date: Thu Mar 4 11:47:50 2010 +0100 Merge branch 'perf/core' into perf/urgent Merge reason: Switch from pre-merge topical split to the post-merge urgent track Signed-off-by: Ingo Molnar commit e67143243a1a6b47e1bdcda189ffac46d2a8744d Author: Krishna Gudipati Date: Wed Mar 3 17:44:02 2010 -0800 [SCSI] bfa: Resume BFA operations after firmware mismatch is resolved. bfad.c & bfad_drv.h: * Created a kernel thread from pci_probe that does the bfad start operations after BFA init done on a firmware mismatch. * The kernel thread on a fw mismatch waits for an event from IOC call back and is woken up from bfa_cb_init() on BFA init success. * In normal cases of no firmware mismatch this thread is terminated in pci_probe. bfa_fcs_lport.c, fabric.c, fcs_lport.h & vport.c: * Split the lport init to attach time and init time code, so that proper config attributes are set after firmware mismatch. bfa_iocfc.c: * Handle an IOC timer issue, where the IOC timer would expire before the init completion and send Init fail event to the driver, however IOC init continues and completes successfully at the later stage. The bfa and driver were not handling this kind of deferred init completion. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit db1466b3e1bd1727375cdbfcbea4bcce2f860f61 Author: Paul E. McKenney Date: Wed Mar 3 07:46:56 2010 -0800 rcu: Use wrapper function instead of exporting tasklist_lock Lockdep-RCU commit d11c563d exported tasklist_lock, which is not a good thing. This patch instead exports a function that uses lockdep to check whether tasklist_lock is held. Suggested-by: Christoph Hellwig Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com Cc: Christoph Hellwig LKML-Reference: <1267631219-8713-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 0e064caf6402d1d67db4233d26beec88ca212919 Merge: 90a6501 f409adf c13f3d3 Author: Ingo Molnar Date: Thu Mar 4 11:45:25 2010 +0100 Merge branches 'core/futexes' and 'core/iommu' into core/urgent Merge reason: Switch from topical split to the stabilization track Signed-off-by: Ingo Molnar commit a046bf0559018ba3d16c412fc4e1aa2be5f11f36 Author: Krishna Gudipati Date: Wed Mar 3 17:43:45 2010 -0800 [SCSI] bfa: Fix to allow creation of only 190 vports on CNA. Brocade CNA currently supports only 190 vports (instead of 191), since there are only 192 unicast cam entries reserved for FCoE. Brocade CNA has a total of 256 unicast cam entries (192 FCoE + 64 LL) 192 cam entries = 1 burned in mac + 1 baseport FPMA mac + 190 vport FPMA macs. Made changes to the code to support only 190 vports. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 82794a2e4153657d12a0c29272e40b47eaadb748 Author: Krishna Gudipati Date: Wed Mar 3 17:43:30 2010 -0800 [SCSI] bfa: New interface to handle firmware upgrade scenario Split bfa_fcs_init() into bfa_fcs_attach() and bfa_fcs_init(). Removed empty function definitions in FCS modules Modified driver to call bfa_fcs_attach() and bfa_fcs_init() as needed. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 5b098082e22c168b7df4c5c3cd924047cee7d995 Author: Krishna Gudipati Date: Wed Mar 3 17:43:19 2010 -0800 [SCSI] bfa: Changes to support FDMI Driver Parameter Added a FCS function to be called during driver init, to set the FDMI Driver parameter. fdmi.c: Created a disabled state when fdmi is disabled. bfad.c: * Added fdmi_enable driver parameter. * Added support to call bfa_fcs_set_fdmi_param() to initialize fcs fdmi setting. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit ab5336189a12b6561a1b5708d782a4e27e2e3b79 Author: Krishna Gudipati Date: Wed Mar 3 17:43:09 2010 -0800 [SCSI] bfa: Enable new halt interrupt in BFA. bfa_intr.c: Enable new halt interrupt in BFA. bfi_ctreg.h: Expose new halt interrupt bit definition to host. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 2f9b8857a914b71ba1b84fb23a0a20a87de41c91 Author: Krishna Gudipati Date: Wed Mar 3 17:42:51 2010 -0800 [SCSI] bfa: Enable IOC auto-recovery and IOC type fix. bfa_ioc.c: - Enable IOC auto-recovery by default. - When CNA is in FC mode, return IOC type as FC (not FCoE) bfa_iocfc.c: - Set fcmode before pci initialization/setup. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 5c1fb1d55672a74d1c318f67cdddbb599df9a76c Author: Krishna Gudipati Date: Wed Mar 3 17:42:39 2010 -0800 [SCSI] bfa: Defined a new LPS event to clear virtual link on a vport Clear virtual links was not propagated upwards to bfa from fw. This resulted in HBA and switch being in an inconsistent state. So defined a new LPS event for clear virtual link on a vport, and also now clear virtual link on a baseport, is sent as a link down event from the fw. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4c147dd81966bd4ba7f026476237ba67ea72d5d9 Author: Krishna Gudipati Date: Wed Mar 3 17:42:11 2010 -0800 [SCSI] bfa: Added separate MSI-X module parameters. Added separate MSI-X module parameters to selectively enable / disable MSI-X interrupts for both Brocade HBA and CNA's. Signed-off-by: Krishna Gudipati Signed-off-by: James Bottomley commit 4c32531324b83672f100692354b680625bcd7fba Author: David S. Miller Date: Thu Mar 4 00:42:30 2010 -0800 MAINTAINERS: Add netdev to bridge entry. Noticed by Ingo Molnar. Signed-off-by: David S. Miller commit a6f018e324ba91d0464cca6895447c2b89e6d578 Author: Divy Le Ray Date: Wed Mar 3 09:49:47 2010 +0000 cxgb3: fix hot plug removal crash queue restart tasklets need to be stopped after napi handlers are stopped since the latter can restart them. So stop them after stopping napi. Signed-off-by: Divy Le Ray Signed-off-by: David S. Miller commit 0eddba525cf4c3a4aab9feaf36b12b465290d4a7 Author: Anton Vorontsov Date: Wed Mar 3 08:18:58 2010 +0000 gianfar: Fix TX ring processing on SMP machines Starting with commit a3bc1f11e9b867a4f49505 ("gianfar: Revive SKB recycling") gianfar driver sooner or later stops transmitting any packets on SMP machines. start_xmit() prepares new skb for transmitting, generally it does three things: 1. sets up all BDs (marks them ready to send), except the first one. 2. stores skb into tx_queue->tx_skbuff so that clean_tx_ring() would cleanup it later. 3. sets up the first BD, i.e. marks it ready. Here is what clean_tx_ring() does: 1. reads skbs from tx_queue->tx_skbuff 2. checks if the *last* BD is ready. If it's still ready [to send] then it it isn't transmitted, so clean_tx_ring() returns. Otherwise it actually cleanups BDs. All is OK. Now, if there is just one BD, code flow: - start_xmit(): stores skb into tx_skbuff. Note that the first BD (which is also the last one) isn't marked as ready, yet. - clean_tx_ring(): sees that skb is not null, *and* its lstatus says that it is NOT ready (like if BD was sent), so it cleans it up (bad!) - start_xmit(): marks BD as ready [to send], but it's too late. We can fix this simply by reordering lstatus/tx_skbuff writes. Reported-by: Martyn Welch Bisected-by: Paul Gortmaker Signed-off-by: Anton Vorontsov Tested-by: Paul Gortmaker Tested-by: Martyn Welch Cc: Sandeep Gopalpet Cc: Stable [2.6.33] Signed-off-by: David S. Miller commit 4c020a961a812ffae9846b917304cea504c3a733 Author: David Dillow Date: Wed Mar 3 16:33:10 2010 +0000 r8169: use correct barrier between cacheable and non-cacheable memory r8169 needs certain writes to be visible to other CPUs or the NIC before touching the hardware, but was using smp_wmb() which is only required to order cacheable memory access. Switch to wmb() which is required to order both cacheable and non-cacheable memory. Noticed by Catalin Marinas and Paul Mackerras. Signed-off-by: David Dillow Signed-off-by: David S. Miller commit d0021b252eaf65ca07ed14f0d66425dd9ccab9a6 Author: Neil Horman Date: Wed Mar 3 08:31:23 2010 +0000 tipc: Fix oops on send prior to entering networked mode (v3) Fix TIPC to disallow sending to remote addresses prior to entering NET_MODE user programs can oops the kernel by sending datagrams via AF_TIPC prior to entering networked mode. The following backtrace has been observed: ID: 13459 TASK: ffff810014640040 CPU: 0 COMMAND: "tipc-client" [exception RIP: tipc_node_select_next_hop+90] RIP: ffffffff8869d3c3 RSP: ffff81002d9a5ab8 RFLAGS: 00010202 RAX: 0000000000000001 RBX: 0000000000000001 RCX: 0000000000000001 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000001001001 RBP: 0000000001001001 R8: 0074736575716552 R9: 0000000000000000 R10: ffff81003fbd0680 R11: 00000000000000c8 R12: 0000000000000008 R13: 0000000000000001 R14: 0000000000000001 R15: ffff810015c6ca00 ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018 RIP: 0000003cbd8d49a3 RSP: 00007fffc84e0be8 RFLAGS: 00010206 RAX: 000000000000002c RBX: ffffffff8005d116 RCX: 0000000000000000 RDX: 0000000000000008 RSI: 00007fffc84e0c00 RDI: 0000000000000003 RBP: 0000000000000000 R8: 00007fffc84e0c10 R9: 0000000000000010 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007fffc84e0d10 R14: 0000000000000000 R15: 00007fffc84e0c30 ORIG_RAX: 000000000000002c CS: 0033 SS: 002b What happens is that, when the tipc module in inserted it enters a standalone node mode in which communication to its own address is allowed <0.0.0> but not to other addresses, since the appropriate data structures have not been allocated yet (specifically the tipc_net pointer). There is nothing stopping a client from trying to send such a message however, and if that happens, we attempt to dereference tipc_net.zones while the pointer is still NULL, and explode. The fix is pretty straightforward. Since these oopses all arise from the dereference of global pointers prior to their assignment to allocated values, and since these allocations are small (about 2k total), lets convert these pointers to static arrays of the appropriate size. All the accesses to these bits consider 0/NULL to be a non match when searching, so all the lookups still work properly, and there is no longer a chance of a bad dererence anywhere. As a bonus, this lets us eliminate the setup/teardown routines for those pointers, and elimnates the need to preform any locking around them to prevent access while their being allocated/freed. I've updated the tipc_net structure to behave this way to fix the exact reported problem, and also fixed up the tipc_bearers and media_list arrays to fix an obvious simmilar problem that arises from issuing tipc-config commands to manipulate bearers/links prior to entering networked mode I've tested this for a few hours by running the sanity tests and stress test with the tipcutils suite, and nothing has fallen over. There have been a few lockdep warnings, but those were there before, and can be addressed later, as they didn't actually result in any deadlock. Signed-off-by: Neil Horman CC: Allan Stephens CC: David S. Miller CC: tipc-discussion@lists.sourceforge.net bearer.c | 37 ++++++------------------------------- bearer.h | 2 +- net.c | 25 ++++--------------------- 3 files changed, 11 insertions(+), 53 deletions(-) Signed-off-by: David S. Miller commit 6d55cb91a0020ac0d78edcad61efd6c8cf5785a3 Author: Timo Teräs Date: Wed Mar 3 04:01:13 2010 +0000 gre: fix hard header destination address checking ipgre_header() can be called with zero daddr when the gre device is configured as multipoint tunnel and still has the NOARP flag set (which is typically cleared by the userspace arp daemon). If the NOARP packets are not dropped, ipgre_tunnel_xmit() will take rt->rt_gateway (= NBMA IP) and use that for route look up (and may lead to bogus xfrm acquires). The multicast address check is removed as sending to multicast group should be ok. In fact, if gre device has a multicast address as destination ipgre_header is always called with multicast address. Signed-off-by: Timo Teras Signed-off-by: David S. Miller commit c839d30a41dd92eb32d7fcfa2b4e99042fc64bf2 Author: Mike Galbraith Date: Wed Mar 3 04:46:50 2010 +0000 net: add scheduler sync hint to tcp_prequeue(). Decreases the odds wakee will suffer from frequent cache misses. Signed-off-by: Mike Galbraith Signed-off-by: David S. Miller commit 8f37ada5b5f6bfb4d251a7f510f249cb855b77b3 Author: stephen hemminger Date: Wed Mar 3 08:19:59 2010 +0000 IPv6: fix race between cleanup and add/delete address This solves a potential race problem during the cleanup process. The issue is that addrconf_ifdown() needs to traverse address list, but then drop lock to call the notifier. The version in -next could get confused if add/delete happened during this window. Original code (2.6.32 and earlier) was okay because all addresses were always deleted. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 84e8b803f1e16f3a2b8b80f80a63fa2f2f8a9be6 Author: stephen hemminger Date: Tue Mar 2 13:32:46 2010 +0000 IPv6: addrconf notify when address is unavailable My recent change in net-next to retain permanent addresses caused regression. Device refcount would not go to zero when device was unregistered because left over anycast reference would hold ipv6 dev reference which would hold device references... The correct procedure is to call notify chain when address is no longer available for use. When interface comes back DAD timer will notify back that address is available. Also, link local addresses should be purged when interface is brought down. The address might be changed. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 5b2a19539c5f59c5a038d213ede723f0245d97cf Author: stephen hemminger Date: Tue Mar 2 13:32:45 2010 +0000 IPv6: addrconf timer race The Router Solicitation timer races with device state changes because it doesn't lock the device. Use local variable to avoid one repeated dereference. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit 122e4519cd5c224d4b8e681d368132b643e28f60 Author: stephen hemminger Date: Tue Mar 2 13:32:44 2010 +0000 IPv6: addrconf dad timer unnecessary bh_disable Timer code runs in bottom half, so there is no need for using _bh form of locking. Also check if device is not ready to avoid race with address that is no longer active. Signed-off-by: Stephen Hemminger Signed-off-by: David S. Miller commit e5c1a0aa00ce94ab0cd669bb290c3ae4657242a3 Merge: 1cd4efd 31f66be Author: David S. Miller Date: Wed Mar 3 22:42:54 2010 -0800 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 commit 31f66be44a657a14e0ab3536e4877c66c9ce031e Author: Helmut Schaa Date: Wed Mar 3 17:42:55 2010 +0100 rt2x00: Export rt2x00soc_probe from rt2x00soc Export rt2x00soc_probe from rt2x00soc as it is used in rt2800pci. Otherwise loading rt2800pci gives "rt2800pci: Unknown symbol rt2x00soc_probe". Signed-off-by: Helmut Schaa Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 4fa004373133ece3d9b1c0a7e243b0e53760b165 Author: Sujith Date: Mon Mar 1 14:42:57 2010 +0530 mac80211: Fix HT rate control configuration Handling HT configuration changes involved setting the channel with the new HT parameters and then issuing a rate_update() notification to the driver. This behavior changed after the off-channel changes. Now, the channel is not updated with the new HT params in enable_ht() - instead, it is now done when the scan work terminates. This results in the driver depending on stale information, defaulting to non-HT mode always. Fix this by passing the new channel type to the driver. Cc: stable@kernel.org Signed-off-by: Sujith Signed-off-by: John W. Linville commit fac829fdcaf451a20106cbc468ff886466320956 Author: James Bottomley Date: Wed Mar 3 11:06:56 2010 +0530 [SCSI] raid_attrs: fix dependency problems RAID attributes uses scsi_is_sdev_device() to gate some SCSI specific checking code. This causes two problems. Firstly if SCSI == n just defining scsi_is_sdev_device() to return false might not be enough to prevent gcc from emitting the code (and thus referring to undefined symbols), so this needs surrounding with an ifdef. Secondly, using scsi_is_sdev_device() when SCSI is either y or m gives a subtle problem in the m case: raid_attrs must also be m to use the symbol. Do the usual Kconfig jiggery-pokery to fix this. Reported-by: Randy Dunlap Signed-off-by: James Bottomley commit 98e1e0f07c3f1820b8ac424569ee9e9916d3665b Author: Boaz Harrosh Date: Fri Feb 19 11:46:24 2010 -0800 [SCSI] libosd: Fix unchecked err return found by smatch Doing CHECK="smatch --two-passes gives: drivers/scsi/osd/osd_initiator.c +1435 osd_finalize_request warning: assignment to 'ret' was never used Which is an unchecked possible allocation failure, Fixed. Reported-by: Dan Carpenter Signed-off-by: Boaz Harrosh Signed-off-by: James Bottomley commit bb2d3de1885cd69a5fc92af99c4e0c05eb5fc122 Author: Martin K. Petersen Date: Tue Mar 2 08:44:34 2010 -0500 [SCSI] sd: Fix VPD buffer allocations Commit e3deec09 incorrectly assumed that the B0 and B1 page lengths were limited to 32 bytes. The B0 VPD page length is defined to be 64 bytes when the device supports thin provisioning. B1 is always defined to be 64 bytes. Signed-off-by: Martin K. Petersen Reported-by: Dan Carpenter Signed-off-by: James Bottomley commit 74315ad00b8ed41e9f97fe322942fa9883517ed1 Author: James Smart Date: Fri Feb 26 14:16:25 2010 -0500 [SCSI] lpfc 8.3.10: Update Driver version to 8.3.10 Signed-off-by: James Smart Signed-off-by: James Bottomley commit 0c9ab6f5cb28199ef5de84874d135ed44f64d92b Author: James Smart Date: Fri Feb 26 14:15:57 2010 -0500 [SCSI] lpfc 8.3.10: Added round robin FCF failover - Added round robin FCF failover on initial or FCF rediscovery FLOGI failure. Signed-off-by: James Smart Signed-off-by: James Bottomley commit fc2b989be9190f3311a5ae41289828e24897a20e Author: James Smart Date: Fri Feb 26 14:15:29 2010 -0500 [SCSI] lpfc 8.3.10: Fix Discovery issues - Prevent Vport discovery after reg_new_vport completes when physical logged in using FDISC. - Remove fast FCF failover fabric name matching. Allow failover to FCFs connected to different fabrics. - Added fast FCF failover in response to FCF DEAD event on current FCF record. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e2aed29f29d0d289df3b0b627b122832d4dc80fe Author: James Smart Date: Fri Feb 26 14:15:00 2010 -0500 [SCSI] lpfc 8.3.10: Added management for LP21000 through BSG. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 0f65ff680f90281d49ee864965f06774eba9657d Author: James Smart Date: Fri Feb 26 14:14:23 2010 -0500 [SCSI] lpfc 8.3.10: Update SLI interface areas - Clear LPFC_DRIVER_ABORTED on FCP command completion. - Clear exchange busy flag when I/O is aborted and found on aborted list. - Free sglq when XRI_ABORTED event is processed before release of IOCB. - Only process iocb as aborted when LPFC_DRIVER_ABORTED is set. Signed-off-by: James Smart Signed-off-by: James Bottomley commit e40a02c12581f710877da372b5d7e15b68a1c5c3 Author: James Smart Date: Fri Feb 26 14:13:54 2010 -0500 [SCSI] lpfc 8.3.10: Fix user interface issues - Add Logging message for critial errors. - Remove unused variable from lpfc_nodev_tmo_show - Update supress_link_up parameter with #define values. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 9f1177a3f8eee22427eb97e6e00b62ff0be2871f Author: James Smart Date: Fri Feb 26 14:12:57 2010 -0500 [SCSI] lpfc 8.3.10: Fix Initialization issues - Add NULL checks to the pointers for the config_async mailbox and dump_wakeup_params mailbox. - Add code to check return value of lpfc_read_sparams everywhere and handle failures appropriately. Signed-off-by: James Smart Signed-off-by: James Bottomley commit 43aebfa12e7631124472237dc945c27af54ca646 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:32 2010 -0600 [SCSI] hpsa: remove unused members next, prev, and retry_count from command list structure. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 33a2ffce51d9598380d73c515a27fc6cff3bd9c4 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:27 2010 -0600 [SCSI] hpsa: Increase the number of scatter gather elements supported. This uses the scatter-gather chaining feature of Smart Array controllers. 32 scatter-gather elements are embedded in the "command list", and the last element in the list may be marked as a "chain pointer", and point to an additional block of scatter gather elements. The precise number of scatter gather elements supported is dependent on the particular kind of Smart Array, and is determined at runtime by querying the hardware. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit db61bfcfe2a68dc71402c270686cd73b80971efc Author: Stephen M. Cameron Date: Thu Feb 25 14:03:22 2010 -0600 [SCSI] hpsa: Clarify calculation of padding for commandlist structure Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit ff9fea94546afa2a496c15354533f06088347f6e Author: Stephen M. Cameron Date: Thu Feb 25 14:03:17 2010 -0600 [SCSI] hpsa: mark hpsa_pci_init as __devinit Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 31468401ccf64322ca99fe05fbe64f1551240f57 Author: Mike Miller Date: Thu Feb 25 14:03:12 2010 -0600 [SCSI] hpsa: remove scan thread The intent of the scan thread was to allow a UNIT ATTENTION/LUN DATA CHANGED condition encountered in the interrupt handler to trigger a rescan of devices, which can't be done in interrupt context. However, we weren't able to get this to work, due to multiple such UNIT ATTENTION conditions arriving during the rescan, during updating of the SCSI mid layer, etc. There's no way to tell the devices, "stand still while I scan you!" Since it doesn't work, there's no point in having the thread, as the rescan triggered via ioctl or sysfs can be done without such a thread. Signed-off-by: Mike Miller Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit e9ea04a65ad842452cbee92b5c865af7fed17f63 Author: Stephen M. Cameron Date: Thu Feb 25 14:03:06 2010 -0600 [SCSI] hpsa: return -ENOMEM, not -1 Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 5512672f75611e9239669c6a4dce648b8d60fedd Author: Stephen M. Cameron Date: Thu Feb 25 14:03:01 2010 -0600 [SCSI] hpsa: fix scsi status mis-shift The SCSI status does not need to be shifted. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit f0edafc6628f924a424ab4059df74f46f4f4241e Author: Stephen M. Cameron Date: Thu Feb 25 14:02:56 2010 -0600 [SCSI] hpsa: fix firmwart typo Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit 667e23d4e968f6826dc5d3e81238a7f1f343fb4f Author: Stephen M. Cameron Date: Thu Feb 25 14:02:51 2010 -0600 [SCSI] hpsa: allow modifying device queue depth. Signed-off-by: Stephen M. Cameron Signed-off-by: James Bottomley commit b0f4d4cf12d0eaa0bd766686bba843fc105b6a60 Author: Brian King Date: Sun Feb 21 10:37:58 2010 -0600 [SCSI] ibmvfc: Add suspend/resume support Adds support for resuming from suspend for IBM VFC devices. We may have lost an interrupt over the suspend, so we just kick the interrupt handler to process anything that is outstanding. We expect to find a transport event indicating we need to reestablish our CRQ. Signed-off-by: Brian King Signed-off-by: James Bottomley commit 64355b929dec0cb6271e4ac7834c9cf262961e40 Author: Brian King Date: Sun Feb 21 10:37:57 2010 -0600 [SCSI] ibmvscsi: Add suspend/resume support Adds support for resuming from suspend for IBM VSCSI devices. We may have lost an interrupt over the suspend, so we just kick the interrupt handler to process anything that is outstanding. We expect to find a transport event indicating we need to reestablish our CRQ. Signed-off-by: Brian King Signed-off-by: James Bottomley commit c03af1ae1cce97a5530b907ea03625ce6e00214e Author: Jayamohan Kallickal Date: Sat Feb 20 08:05:43 2010 +0530 [SCSI] be2iscsi: Alloc only one EQ if intr mode This patch ensures that we alloc only one EQ if we are if we are not in msix mode Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit ed58ea2ab58c7d80a07a829a1cc2c4161c300494 Author: Jayamohan Kallickal Date: Sat Feb 20 08:05:07 2010 +0530 [SCSI] be2iscsi: Fixing memory allocation for connection This patch fixes some situations where enough resources were not avaialable when targets exceeded a certain limit Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 90a289e87648f80b63178c463aa7daaf5205805c Author: Jayamohan Kallickal Date: Sat Feb 20 08:04:28 2010 +0530 [SCSI] be2iscsi: Remove debug code This patch removes some debug lines which are unnecessary and also aligns some lines in code Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit dafab8e079f432268cca5cf378b92d6acfacc393 Author: Jayamohan Kallickal Date: Sat Feb 20 08:03:56 2010 +0530 [SCSI] be2iscsi: cleans up abort handling This patch cleans up abort handling when TMF is sent Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 944b2fbce26ce39555363fd092386807fa5ea08c Author: Jayamohan Kallickal Date: Sat Feb 20 08:03:24 2010 +0530 [SCSI] be2iscsi: Fix for a possible udelay while holding lock This patch fixes a situation where we could call udelay while holding spin_lock Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 4183122dbc7c489f11971c5afa8e42011bca7fa2 Author: Jayamohan Kallickal Date: Sat Feb 20 08:02:39 2010 +0530 [SCSI] be2iscsi: Cleanup of resets for device and target This patch cleans up device and target reset handling for the driver Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit 309ce156aa27f29338438011d292a8d6496623d3 Author: Jayamohan Kallickal Date: Sat Feb 20 08:02:10 2010 +0530 [SCSI] libiscsi: Make iscsi_eh_target_reset start with session reset The iscsi_eh_target_reset has been modified to attempt target reset only. If it fails, then iscsi_eh_session_reset will be called. Signed-off-by: Mike Christie Signed-off-by: Jayamohan Kallickal Signed-off-by: James Bottomley commit d7b4627f5f3390a2f350f16c047b3fc3eccce6d8 Author: Wayne Boyer Date: Fri Feb 19 13:24:38 2010 -0800 [SCSI] ipr: adds PCI ID definitions for new adapters This patch adds the PCI ID definitions for new adapters based on the next generation 64 bit IOA PCI interface chip. New entries have been added to the ipr_pci_table[] array for the adapters and to the ipr_chip[] array for the new versions of the chip. Older entries have been removed for cards that did not ship. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 5aa3a333eaae1016f5a72f9e0e2dce39c08762f8 Author: Wayne Boyer Date: Fri Feb 19 13:24:32 2010 -0800 [SCSI] ipr: add support for new IOASCs This patch adds support for new errors that can be received from adapters using the next generation 64 bit IOA PCI interface chip. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 214777ba125e2902c9b84c764be38099c94d0bd2 Author: Wayne Boyer Date: Fri Feb 19 13:24:26 2010 -0800 [SCSI] ipr: add support for multiple stages of initialization This patch adds support for using the new IOA initialization feedback register. It also enables 64 bit support in the ipr_ioafp_identify_hrrq and ipr_mask_and_clear_interrupts routines. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit f72919ec2bbbe1c42cdda7857a96c0c40e1d78aa Author: Wayne Boyer Date: Fri Feb 19 13:24:21 2010 -0800 [SCSI] ipr: implement shutdown changes and remove obsolete write cache parameter This patch adds a reboot notifier that will issue a shutdown prepare command to all adapters. This helps to prevent a problem where the primary adapter can get shut down before the secondary adapter and cause the secondary adapter to fail over and log and error. This patch also removes the "enable_cache" paramater as it is obsolete. Write cache for an adapter is now controlled from the iprconfig utility. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit dcbad00e6b403089b1846e788bc1a0c67b2bfd2d Author: Wayne Boyer Date: Fri Feb 19 13:24:14 2010 -0800 [SCSI] ipr: add hardware assisted smart dump functionality This patch adds the hardware assisted smart dump functionality for the next generation IOA PCI interface chip. Signea-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 4565e3706329f65b5e64328b5369c53b6ab2715c Author: Wayne Boyer Date: Fri Feb 19 13:24:07 2010 -0800 [SCSI] ipr: add error handling updates for the next generation chip Add support for the new log data notification and overlay IDs. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 3e7ebdfa58ddaef361f9538219e66a7226fb1e5d Author: Wayne Boyer Date: Fri Feb 19 13:23:59 2010 -0800 [SCSI] ipr: update the configuration table code for the next generation chip This patch changes the configuration table structures and related code such that both 32 bit and 64 bit based adapters can work with the driver. This patch also implements the code to generate the virtual bus/id/lun values for devices connected to the new adapters. It also implements support for the new device resource path. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit a74c16390a47dcb6c96b20b572ffc9936073d4b1 Author: Wayne Boyer Date: Fri Feb 19 13:23:51 2010 -0800 [SCSI] ipr: define new offsets to registers for the next generation chip This patch adds the entry to the ipr_chip_cfg array that defines the register offsets for the next generation 64 bit IOA PCI interface chip. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit a32c055feed74246747bf4f45adb765136d3a4d3 Author: Wayne Boyer Date: Fri Feb 19 13:23:36 2010 -0800 [SCSI] ipr: add support for new adapter command structures for the next generation chip Change the adapter command structures such that both 32 bit and 64 bit based adapters can work with the driver. Signed-off-by: Wayne Boyer Signed-off-by: James Bottomley commit 6c71dcb28ff9b63b814a0b76a256f5dae08d3e0d Author: Hannes Reinecke Date: Wed Dec 2 14:28:48 2009 -0600 [SCSI] scsi_dh_emc: fix mode select request setup This patch fixes the request setup code for mode selects. I got the fixes from Hannes Reinecke while trying to hunt down some problems and merged it into one patch. I am sending it because Hannes is busy with other things. The patch fixes: - setting of the length for mode selects. - setting of the data direction for mode select 10. Signed-off-by: Hannes Reinecke Signed-off-by: Mike Christie Signed-off-by: James Bottomley commit 1cd4efddc4512ccbd9fe317f688f361605ca0c88 Author: Randy Dunlap Date: Wed Mar 3 01:23:22 2010 -0800 bridge: depends on INET br_multicast calls ip_send_check(), so it should depend on INET. built-in: br_multicast.c:(.text+0x88cf4): undefined reference to `ip_send_check' or modular: ERROR: "ip_send_check" [net/bridge/bridge.ko] undefined! Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit 4d63cb4d8638fdf2e3bf874936335a08e3b5d8fe Author: Vladislav Zolotarov Date: Wed Mar 3 01:09:21 2010 -0800 bnx2x: Removed FW 5.2.7 Removed FW 5.2.7. Signed-off-by: Vladislav Zolotarov Signed-off-by: Eilon Greenstein Signed-off-by: David S. Miller commit 4d27b87785a743fdae653d395a3a4e763269c53c Author: Dan Carpenter Date: Tue Mar 2 21:07:24 2010 +0000 davinci_emac: off by one This off by one error was found by smatch. drivers/net/davinci_emac.c +2390 emac_dev_open(13) error: buffer overflow 'priv->mac_addr' 6 <= 6 Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit bf829370a8d664d87a61697c8a0d6d780c336aa4 Author: Dan Carpenter Date: Tue Mar 2 22:22:41 2010 +0000 cassini: fix off by one There are only 6 link_modes. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller commit d4612cb86ed8db8956b6b19435f8a30de6c67ffe Author: Marcel Holtmann Date: Tue Mar 2 15:48:23 2010 +0000 Bluetooth: Use single_open() for inquiry cache within debugfs The inquiry cache information in debugfs should be using seq_file support and not allocating memory on the stack for the string. Since the usage of these information is really seldom, using single_open() for it is good enough. Signed-off-by: Marcel Holtmann Signed-off-by: David S. Miller commit 1162563f82b434e3099c9e6c1bbdba846d792f0d Author: Jiri Pirko Date: Tue Mar 2 20:40:01 2010 +0000 af_packet: move strict addr_len check right before dev_[mc/unicast]_[add/del] My previous patch 914c8ad2d18b62ad1420f518c0cab0b0b90ab308 incorrectly changed the length check in packet_mc_add to be more strict. The problem is that userspace is not filling this field (and it stays zeroed) in case of setting PACKET_MR_PROMISC or PACKET_MR_ALLMULTI. So move the strict check to the point in path where the addr_len must be set correctly. Signed-off-by: Jiri Pirko Reported-by: Pavel Roskin Signed-off-by: David S. Miller commit 9fe969345b10931319b3f1e7034fbdeb786de234 Author: Sarveshwar Bandi Date: Tue Mar 2 22:37:28 2010 +0000 be2net: download NCSI section during firmware update Adding code to update NCSI section while updating firmware on the controller. Signed-off-by: Sarveshwar Bandi Signed-off-by: David S. Miller commit 48a29516e8b0b8cd59f5afec90a14f49dd9cf967 Author: Dan Carpenter Date: Tue Mar 2 22:46:10 2010 +0000 cpmac: use after free The original code dereferenced "cpmac_mii" after calling "mdiobus_free(cpmac_mii);" Signed-off-by: Dan Carpenter Reviewed-by: Jiri Pirko Signed-off-by: David S. Miller commit 87c1e12b5eeb7b30b4b41291bef8e0b41fc3dde9 Author: Herbert Xu Date: Tue Mar 2 02:51:56 2010 +0000 ipsec: Fix bogus bundle flowi When I merged the bundle creation code, I introduced a bogus flowi value in the bundle. Instead of getting from the caller, it was instead set to the flow in the route object, which is totally different. The end result is that the bundles we created never match, and we instead end up with an ever growing bundle list. Thanks to Jamal for find this problem. Reported-by: Jamal Hadi Salim Signed-off-by: Herbert Xu Acked-by: Steffen Klassert Acked-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 29044ad1509ecc229f1d5a31aeed7a8dc61a71c4 Author: Frederic Weisbecker Date: Wed Mar 3 02:25:22 2010 +0100 x86/stacktrace: Don't dereference bad frame pointers Callers of a stacktrace might pass bad frame pointers. Those are usually checked for safety in stack walking helpers before any dereferencing, but this is not the case when we need to go through one more frame pointer that backlinks the irq stack to the previous one, as we don't have any reliable address boudaries to compare this frame pointer against. This raises crashes when we record callchains for ftrace events with perf because we don't use the right helpers to capture registers there. We get wrong frame pointers as we call task_pt_regs() even on kernel threads, which is a wrong thing as it gives us the initial state of any kernel threads freshly created. This is even not what we want for user tasks. What we want is a hot snapshot of registers when the ftrace event triggers, not the state before a task entered the kernel. This requires more thoughts to do it correctly though. So first put a guardian to ensure the given frame pointer can be dereferenced to avoid crashes. We'll think about how to fix the callers in a subsequent patch. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: Thomas Gleixner Cc: H. Peter Anvin Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Steven Rostedt Cc: 2.6.33.x Cc: Arnaldo Carvalho de Melo commit ac91d85456372a90af5b85eb6620fd2efb1e431b Author: Lai Jiangshan Date: Tue Mar 2 17:54:50 2010 +0800 tracing: Fix warning in s_next of trace file ops This warning in s_next() can be triggered by lseek(): [] ? s_next+0x77/0x80 [] warn_slowpath_common+0x81/0xa0 [] ? s_next+0x77/0x80 [] warn_slowpath_null+0x1a/0x20 [] s_next+0x77/0x80 [] traverse+0x117/0x200 [] seq_lseek+0xa3/0x120 [] ? seq_lseek+0x0/0x120 [] vfs_llseek+0x41/0x50 [] sys_llseek+0x66/0xa0 [] sysenter_do_call+0x12/0x26 The iterator "leftover" variable is zeroed in the opening of the trace file. But lseek can call s_start() which will call s_next() without reseting the "leftover" variable back to zero, which might trigger the WARN_ON_ONCE(iter->leftover) that is in s_next(). Cc: stable@kernel.org Signed-off-by: Lai Jiangshan LKML-Reference: <4B8CE06A.9090207@cn.fujitsu.com> Signed-off-by: Steven Rostedt commit 882d01f96bc1909455696aae6eb7ce4df3e908c8 Merge: 64ed28a d608c73 Author: Russell King Date: Tue Mar 2 23:40:15 2010 +0000 Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable Conflicts: arch/arm/Kconfig arch/arm/Makefile commit 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 Merge: b93a4af 17ccb83 Author: Russell King Date: Tue Mar 2 23:31:07 2010 +0000 Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/genesis-2.6 into devel-stable Conflicts: arch/arm/Kconfig commit b93a4afcff7be859e30cad2a305731516057d6cf Merge: 62c132a 9b1489e Author: Russell King Date: Tue Mar 2 23:29:32 2010 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable Conflicts: arch/arm/Makefile commit b08dfd0435333818a03b38867c556ebcbb3abc02 Author: Johannes Berg Date: Fri Jan 29 11:54:56 2010 -0800 iwlwifi: load firmware asynchronously before mac80211 registration At the wireless summit in Portland we discussed a way of loading firmware asynchronously from ->probe() before registration to mac80211, in order to register with the wireless subsystems with complete information in cases where firmware is required to know parameters. This is not yet the case in iwlwifi, but for some new features we're working on it will be the case since those will only be supported by new firmware images. Hence, to start with, convert iwlwifi to load firmware asynchronously from probe, unbinding the device when firmware loading fails, and only registering with the wireless subsystems after firmware has been loaded successfully. Future patches will hook into this to register the new firmware capabilities, depending on the firmware API version. Signed-off-by: Johannes Berg Signed-off-by: Reinette Chatre Signed-off-by: John W. Linville commit 535765179fd4e8af26b69d2240d7ec33702a370a Author: Johannes Berg Date: Wed Dec 23 13:15:30 2009 +0100 ar9170: load firmware asynchronously This converts ar9170 to load firmware asynchronously out of ->probe() and only register with mac80211 when all firmware has been loaded successfully. If, on the other hand, any firmware fails to load, it will now unbind from the device. Signed-off-by: Johannes Berg Signed-off-by: John W. Linville commit 6e93d7195e75741e9ebe23ca5591977d0b39ecc0 Author: Helmut Schaa Date: Tue Mar 2 16:34:49 2010 +0100 rt2x00: fix rt2800pci compilation with SoC Compiling rt2800pci with CONFIG_RT2800PCI_SOC fails with "... rt2880pci.c: error: incompatible type for argument 2 of 'rt2x00soc_probe'". Fix this by using &rt2800pci_ops instead of rt2800pci_ops. Signed-off-by: Helmut Schaa Signed-off-by: John W. Linville commit 51b2853fd91a3c8fd9f3adc1549569d2c1dc2a2d Author: Bryan Polk Date: Mon Mar 1 12:23:28 2010 -0500 rt2x00: Add USB ID for CEIVA adapter to rt73usb This adds support for CEIVA USB wireless adapters to the rt73usb driver. Signed-off-by: Bryan Polk Acked-by: Ivo van Doorn Acked-by: Gertjan van Wingerde Signed-off-by: John W. Linville commit 9c87ba6734422034fccb938da1039ed63da1395c Author: Jouni Malinen Date: Sun Feb 28 12:13:46 2010 +0200 mac80211: Fix reassociation processing (within ESS roaming) Commit e1dd33f60ced091114e4aacf141e0d03b88d3e13 changed cfg80211 to allow association commands while in associated state to enable support for roaming within an ESS. However, this was not enough to resolve all cases with mac80211 which needs some additional handling of the reassociation case to clear internal state with the BSS that was in use previously. This patch makes ieee80211_mgd_assoc() accept a valid reassociation command and clean the association state with the previous BSS. This fixes roaming between BSSes in an ESS when using wpa_supplicant with -Dnl80211. Signed-off-by: Jouni Malinen Cc: stable@kernel.org Signed-off-by: John W. Linville commit a9f042cbe5284f34ccff15f3084477e11b39b17b Author: Ming Lei Date: Sun Feb 28 00:56:24 2010 +0800 ath9k: fix lockdep warning when unloading module Since txq->axq_lock may be hold in softirq context, it must be acquired with spin_lock_bh() instead of spin_lock() if softieq is enabled. The patch fixes the lockdep warning below when unloading ath9k modules. ================================= [ INFO: inconsistent lock state ] 2.6.33-wl #12 --------------------------------- inconsistent {IN-SOFTIRQ-W} -> {SOFTIRQ-ON-W} usage. rmmod/3642 [HC0[0]:SC0[0]:HE1:SE1] takes: (&(&txq->axq_lock)->rlock){+.?...}, at: [] ath_tx_node_cleanup+0x62/0x180 [ath9k] {IN-SOFTIRQ-W} state was registered at: [] __lock_acquire+0x2f6/0xd35 [] lock_acquire+0xcd/0xf1 [] _raw_spin_lock_bh+0x3b/0x6e [] spin_lock_bh+0xe/0x10 [ath9k] [] ath_tx_tasklet+0xcd/0x391 [ath9k] [] ath9k_tasklet+0x70/0xc8 [ath9k] [] tasklet_action+0x8c/0xf4 [] __do_softirq+0xf8/0x1cd [] call_softirq+0x1c/0x30 [] do_softirq+0x4b/0xa3 [] irq_exit+0x4a/0x8c [] do_IRQ+0xac/0xc3 [] ret_from_intr+0x0/0x16 [] cpuidle_idle_call+0x9e/0xf8 [] cpu_idle+0x62/0x9d [] rest_init+0x7e/0x80 [] start_kernel+0x3e8/0x3f3 [] x86_64_start_reservations+0xa7/0xab [] x86_64_start_kernel+0xf8/0x107 irq event stamp: 42037 hardirqs last enabled at (42037): [] _raw_spin_unlock_irqrestore+0x47/0x56 hardirqs last disabled at (42036): [] _raw_spin_lock_irqsave+0x2b/0x88 softirqs last enabled at (42000): [] spin_unlock_bh+0xe/0x10 [ath9k] softirqs last disabled at (41998): [] _raw_spin_lock_bh+0x18/0x6e other info that might help us debug this: 4 locks held by rmmod/3642: #0: (rtnl_mutex){+.+.+.}, at: [] rtnl_lock+0x17/0x19 #1: (&wdev->mtx){+.+.+.}, at: [] cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] #2: (&ifmgd->mtx){+.+.+.}, at: [] ieee80211_mgd_deauth+0x3f/0x17e [mac80211] #3: (&local->sta_mtx){+.+.+.}, at: [] sta_info_destroy_addr+0x2b/0x5e [mac80211] stack backtrace: Pid: 3642, comm: rmmod Not tainted 2.6.33-wl #12 Call Trace: [] valid_state+0x178/0x18b [] ? save_stack_trace+0x2f/0x4c [] ? check_usage_backwards+0x0/0x88 [] mark_lock+0x113/0x230 [] __lock_acquire+0x36a/0xd35 [] ? native_sched_clock+0x2d/0x5f [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] lock_acquire+0xcd/0xf1 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_off+0xd/0xf [] _raw_spin_lock+0x36/0x69 [] ? ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ath_tx_node_cleanup+0x62/0x180 [ath9k] [] ? trace_hardirqs_on+0xd/0xf [] ath9k_sta_remove+0x22/0x26 [ath9k] [] __sta_info_destroy+0x1ad/0x38c [mac80211] [] sta_info_destroy_addr+0x3e/0x5e [mac80211] [] ieee80211_set_disassoc+0x175/0x180 [mac80211] [] ieee80211_mgd_deauth+0x58/0x17e [mac80211] [] ? __mutex_lock_common+0x37f/0x3a4 [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ieee80211_deauth+0x1e/0x20 [mac80211] [] __cfg80211_mlme_deauth+0x130/0x13f [cfg80211] [] ? cfg80211_netdev_notifier_call+0x28d/0x46d [cfg80211] [] ? trace_hardirqs_off+0xd/0xf [] __cfg80211_disconnect+0x111/0x189 [cfg80211] [] cfg80211_netdev_notifier_call+0x2ce/0x46d [cfg80211] [] notifier_call_chain+0x37/0x63 [] raw_notifier_call_chain+0x14/0x16 [] call_netdevice_notifiers+0x1b/0x1d [] dev_close+0x6a/0xa6 [] rollback_registered_many+0xb6/0x2f4 [] unregister_netdevice_many+0x1b/0x66 [] ieee80211_remove_interfaces+0xc5/0xd0 [mac80211] [] ieee80211_unregister_hw+0x47/0xe8 [mac80211] [] ath9k_deinit_device+0x7a/0x9b [ath9k] [] ath_pci_remove+0x38/0x76 [ath9k] [] pci_device_remove+0x2d/0x51 [] __device_release_driver+0x7b/0xd1 [] driver_detach+0x98/0xbe [] bus_remove_driver+0x94/0xb7 [] driver_unregister+0x6c/0x74 [] pci_unregister_driver+0x46/0xad [] ath_pci_exit+0x15/0x17 [ath9k] [] ath9k_exit+0xe/0x2f [ath9k] [] sys_delete_module+0x1c7/0x236 [] ? retint_swapgs+0x13/0x1b [] ? trace_hardirqs_on_caller+0x119/0x144 [] ? audit_syscall_entry+0x11e/0x14a [] system_call_fastpath+0x16/0x1b wlan1: deauthenticating from 00:23:cd:e1:f9:b2 by local choice (reason=3) PM: Removing info for No Bus:wlan1 cfg80211: Calling CRDA to update world regulatory domain PM: Removing info for No Bus:rfkill2 PM: Removing info for No Bus:phy1 ath9k 0000:16:00.0: PCI INT A disabled Signed-off-by: Ming Lei Signed-off-by: John W. Linville commit 86baf712295a00d664da8566186b67041c89b15b Author: Dan Carpenter Date: Sat Feb 27 09:12:34 2010 +0300 zd1211rw: fix potential array underflow The first chunk fixes a debugging assert to print a warning about array underflows. The second chunk corrects a potential array underflow. I also removed an assert in the second chunk because it can no longer happen. Signed-off-by: Dan Carpenter Acked-by: Benoit Papillault Signed-off-by: John W. Linville commit 3082a2b7b1af1b1508c1c3fa589566064f926f40 Author: Matthew Garrett Date: Tue Feb 16 16:36:25 2010 -0500 rfkill: Add support for KEY_RFKILL Add support for handling KEY_RFKILL in the rfkill input module. This simply toggles the state of all rfkill devices. The comment in rfkill.h is also updated to reflect that RFKILL_TYPE_ALL may be used inside the kernel. Signed-off-by: Matthew Garrett Acked-by: Marcel Holtmann Signed-off-by: John W. Linville commit 6510b8917948283005a125c8337d3312a8a0561c Author: Stanislaw Gruszka Date: Fri Feb 26 15:10:28 2010 +0100 airo: return from set_wep_key() when key length is zero Even if keylen == 0 is a bug and should not really happen, better avoid possibility of passing bad value to firmware. Signed-off-by: Stanislaw Gruszka Signed-off-by: John W. Linville commit 6630125419ef37ff8781713c5e9d416f2a4ba357 Author: Arnaldo Carvalho de Melo Date: Tue Mar 2 15:25:38 2010 -0300 perf archive: Don't try to collect files without a build-id To avoid these error: [root@doppio ~]# perf archive tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: .build-id/00/00000000000000000000000000000000000000: Cannot stat: No such file or directory tar: Exiting with failure status due to previous errors [root@doppio ~]# More work is needed to support archiving symtabs for binaries without a build-id, perhaps creating a perf.data UUID + adding build-ids for the binaries copied into the cache and then have this perf.data session UUID be a directory with symlinks to the by now calculated build-id of the files inside it. Or just do an extra pass and insert the calculated build-ids in the perf.data header. Reported-by: Ingo Molnar Signed-off-by: Arnaldo Carvalho de Melo Cc: Frédéric Weisbecker Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Paul Mackerras Signed-off-by: Ingo Molnar commit b622d644c7d61a5cb95b74e7b143c263bed21f0a Author: Peter Zijlstra Date: Mon Feb 1 15:36:30 2010 +0100 perf_events, x86: Fixup fixed counter constraints Patch 1da53e0230 ("perf_events, x86: Improve x86 event scheduling") lost us one of the fixed purpose counters and then ed8777fc13 ("perf_events, x86: Fix event constraint masks") broke it even further. Widen the fixed event mask to event+umask and specify the full config for each of the 3 fixed purpose counters. Then let the init code fill out the placement for the GP regs based on the cpuid info. Signed-off-by: Peter Zijlstra Cc: Stephane Eranian LKML-Reference: Signed-off-by: Ingo Molnar commit 320ebf09cbb6d01954c9a060266aa8e0d27f4638 Author: Peter Zijlstra Date: Tue Mar 2 12:35:37 2010 +0100 perf, x86: Restrict the ANY flag The ANY flag can show SMT data of another task (like 'top'), so we want to disable it when system-wide profiling is disabled. Signed-off-by: Peter Zijlstra LKML-Reference: Signed-off-by: Ingo Molnar commit 14be1f7454ea96ee614467a49cf018a1a383b189 Author: Dimitri Sivanich Date: Mon Mar 1 11:48:15 2010 -0600 x86: Fix sched_clock_cpu for systems with unsynchronized TSC On UV systems, the TSC is not synchronized across blades. The sched_clock_cpu() function is returning values that can go backwards (I've seen as much as 8 seconds) when switching between cpus. As each cpu comes up, early_init_intel() will currently set the sched_clock_stable flag true. When mark_tsc_unstable() runs, it clears the flag, but this only occurs once (the first time a cpu comes up whose TSC is not synchronized with cpu 0). After this, early_init_intel() will set the flag again as the next cpu comes up. Only set sched_clock_stable if tsc has not been marked unstable. Signed-off-by: Dimitri Sivanich Acked-by: Venkatesh Pallipadi Acked-by: Peter Zijlstra LKML-Reference: <20100301174815.GC8224@sgi.com> Signed-off-by: Ingo Molnar commit ad6759fbf35d104dbf573cd6f4c6784ad6823f7e Author: john stultz Date: Mon Mar 1 12:34:43 2010 -0800 timekeeping: Prevent oops when GENERIC_TIME=n Aaro Koskinen reported an issue in kernel.org bugzilla #15366, where on non-GENERIC_TIME systems, accessing /sys/devices/system/clocksource/clocksource0/current_clocksource results in an oops. It seems the timekeeper/clocksource rework missed initializing the curr_clocksource value in the !GENERIC_TIME case. Thanks to Aaro for reporting and diagnosing the issue as well as testing the fix! Reported-by: Aaro Koskinen Signed-off-by: John Stultz Cc: Martin Schwidefsky Cc: stable@kernel.org LKML-Reference: <1267475683.4216.61.camel@localhost.localdomain> Signed-off-by: Thomas Gleixner commit 57e413d95b0f92b9a5569408ddc3441e0f20e856 Author: Ping Cheng Date: Mon Mar 1 23:50:24 2010 -0800 Input: wacom - replace WACOM_PKGLEN_PENABLED Replacing WACOM_PKGLEN_PENABLED with WACOM_PKGLEN_GRAPHIRE since they both represent the same value, 8. This value will be used for both Tablet PC and Bamboo with touch devices. Signed-off-by: Ping Cheng Signed-off-by: Dmitry Torokhov commit 62c132a8008991530839401674ce8e1b12b005d3 Author: Eric Miao Date: Tue Mar 2 10:24:14 2010 +0800 [ARM] pxa: fix typo in mxm8x10.h Signed-off-by: Eric Miao commit 31436bbe8f85f79fc0ddb963edb3d29f6e2b3bae Author: Daniel Mack Date: Wed Feb 24 18:50:16 2010 +0100 [ARM] pxa/raumfeld: set GPIO drive bits for LED pins Set GPIO bits to pull the pins connected to LEDs for lower power mode. We want all LEDs off when devices are in suspend. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 438a22fe26c3fdeb422d92072523d5b35d849dc3 Author: Marc Zyngier Date: Thu Feb 18 20:33:02 2010 +0000 [ARM] pxa/zeus: Add support for mcp2515 CAN bus Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit fcfdc67ff2b104355683f7264a6559a0cc360646 Author: Marc Zyngier Date: Thu Feb 18 20:31:43 2010 +0000 [ARM] pxa/zeus: Add support for onboard max6369 watchdog Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 90ac0dfd9f5931c9011b35ced0ba576e32656fb2 Author: Marc Zyngier Date: Thu Feb 18 20:30:31 2010 +0000 [ARM] pxa/zeus: Add Eurotech as the manufacturer Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 7ff27dfa6e484ff5d901ec075a623c06c46d7a0f Author: Marc Zyngier Date: Thu Feb 18 20:29:24 2010 +0000 [ARM] pxa/zeus: Correct the USB host initialisation flags Signed-off-by: Amit Walambe Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 662b0836a667158284c8a4a091de745fd5637ff1 Author: Marc Zyngier Date: Fri Feb 19 14:07:37 2010 +0800 [ARM] pxa/zeus: Allow usage of 8250-compatible UART in uncompress Zeus console port is wired to a 8250-compatible device (pxa UARTs are reserved to other uses). This patch allows such a configuration in the uncompress sequence. Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit c95efee13303d9ff9e67f2600174f492039311ce Author: Eric Miao Date: Fri Feb 19 13:49:39 2010 +0800 [ARM] pxa: refactor uncompress.h for non-PXA uarts The original patch came from Marc Zyngier where support of 8250-compatible UART is required to show the uncompress information. Modified a little bit here, including changes below: 1. #include is actually not necessary 2. introduced uart_{read,write}() for different base and shift 3. introduced uart_is_enabled() and assumed enabled always for non-PXA uarts Signed-off-by: Eric Miao Acked-by: Marc Zyngier commit 2029e5643a3c4fdd4ad20169fb950cc16e023d0c Author: Eric Miao Date: Tue Feb 2 23:39:35 2010 -0800 [ARM] mmp2: fix incorrect calling of chip->mask_ack() for 2nd level cascaded IRQs The irq_chip is not yet registered, so no default irq_chip.mask_ack(), which we have to handle it correctly manually here. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit df0c382436df5bdd74030baafa294b75c231ec8c Author: Haojian Zhuang Date: Wed Feb 3 10:01:18 2010 -0500 [ARM] mmp2: add handling on PMIC IRQ Since PMIC INT pin is a special pin of CPU, the status of PMIC INT pin needs to be cleared after PMIC IRQ occured. Now append the clear operation in irq chip handler. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ce0ac4235972cc2533e4e2095396208b59117c57 Author: Haojian Zhuang Date: Thu Jan 28 12:34:59 2010 +0800 [ARM] mmp2: add support for board IRQs Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0913b86ff7fe220a50c82baca4431e7d5a8da5c8 Author: Haojian Zhuang Date: Thu Jan 28 12:27:36 2010 +0800 [ARM] mmp2: add missing ICU register definitions Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 16144bfb83bb8319c07c18b57eac15368708d02c Author: Haojian Zhuang Date: Mon Jan 25 06:03:54 2010 -0500 [ARM] mmp2: add gpio initialization Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 247b4592f385622774de877f568fc30eb37dc831 Author: Haojian Zhuang Date: Mon Jan 25 06:03:25 2010 -0500 [ARM] mmp2: add mfpr setting Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 4e3b4da98e20c5dc58e544ac5b321c1942071f7f Author: Haojian Zhuang Date: Mon Jan 25 06:02:50 2010 -0500 [ARM] mmp2: add mask function in irq-mmp2.c Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit e8e6cb325671daa17c776ad53b70fd6213260368 Author: Eric Miao Date: Tue Jan 5 15:28:26 2010 +0800 MAINTAINERS: add maintainers for Marvell MMP2 (aka ARMADA610) support Cc: Haojian Zhuang Signed-off-by: Eric Miao commit e1cb7db2ef7f911dbe0edd5ff8d2216a817738d0 Author: Haojian Zhuang Date: Wed Jan 6 09:07:15 2010 -0500 [ARM] mmp: support jasper development board Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit ccffb1ad1f354aee0bdf33b6486ebb9476223c1b Author: Haojian Zhuang Date: Tue Jan 5 15:02:19 2010 +0800 [ARM] mmp: add default configuration for MMP2 Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 2f7e8faef5a50efaa1c173e99bdaa29e0129bb99 Author: Haojian Zhuang Date: Fri Dec 4 09:41:28 2009 -0500 [ARM] mmp: add support for Marvell MMP2 Marvell MMP2 (aka ARMADA610) is a SoC based on PJ4 core. It's ARMv6 compatible. Support basic interrupt handler and timer, and basic support for MMP2 based FLINT platform. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 978da5bcdb33f6e030fa3304662e2455a018f1b0 Author: Eric Miao Date: Tue Jan 5 15:06:37 2010 +0800 [ARM] mmp: rename irq.c to irq-pxa168.c to allow other SoC IRQ chips Signed-off-by: Eric Miao commit e6dac5e1b6ea7be4b0092ae0ac96b352a8c028db Author: Haojian Zhuang Date: Tue Jan 12 09:07:45 2010 +0800 [ARM] mmp: update pxa168_defconfig and include avengers lite support Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 9896de72d20686f4dbc9cdd64ca178c80d6838b6 Author: Haojian Zhuang Date: Tue Jan 12 08:54:50 2010 +0800 [ARM] mmp: avengers lite (pxa168) board bring up Signed-off-by: Gavin Gu Signed-off-by: Jing Xiang Signed-off-by: Jack Ren Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit 0925e2f0fc5a55621cb80afbb6d4543c62e6a653 Author: Stefan Schmidt Date: Sat Feb 13 21:59:32 2010 +0100 [ARM] pxa/imote2: Remove redundant pin entry for nCS. Also remove a trailing whitespace while being there. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit d496936f954f9886ac7037d013cdf3c279e627bd Author: Stefan Schmidt Date: Sun Feb 14 10:19:21 2010 +0100 [ARM] pxa/imote2: Add defconfig for the imote2 platform. Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit f9efc9df94fd126f7d585339e64edec0c03e904b Author: Eric Miao Date: Tue Feb 9 19:46:01 2010 +0800 ASoC: Remove legacy SSP API usage from pxa-ssp.c Acked-by: Mark Brown Signed-off-by: Eric Miao commit a056bef45529810183f56944dcea8b4e297c2dc3 Author: Eric Miao Date: Tue Feb 9 11:10:10 2010 +0800 [ARM] pxa: introduce PXA_SSP_LEGACY for legacy SSP API Signed-off-by: Eric Miao commit 98acdbe4cf83f5a2e21c7aac830146b5d6da9282 Author: Stefan Schmidt Date: Tue Feb 16 22:42:55 2010 +0100 [ARM] pxa: define zeus_power_off() only when CONFIG_PM enabled Add some safety check for CONFIG_PM around zeus_power_off(). Without it linking can fail like this: arch/arm/mach-pxa/built-in.o: In function `zeus_power_off': e800.c:(.text+0x2bc8): undefined reference to `pxa27x_cpu_suspend' Signed-off-by: Stefan Schmidt Acked-by: Marc Zyngier Signed-off-by: Eric Miao commit cfab57e0e44631b1369e05efa54031b993511c2f Author: Stefan Schmidt Date: Tue Feb 16 22:41:52 2010 +0100 [ARM] pxa: enable check_scoop_reg() only if CONFIG_PM is set. This function gets only called from scoop_suspend() and scoop_resume() which are only built in if we have CONFIG_PM set. Make it the same for check_scoop_reg(). This fixes the following warning: arch/arm/common/scoop.c:143: warning: ‘check_scoop_reg’ defined but not used Signed-off-by: Stefan Schmidt Signed-off-by: Eric Miao commit 1f3b536be7bfb3930cf7dc6d995d82877f25d6cf Author: Edwin Peer Date: Fri Feb 5 18:31:48 2010 +0200 [ARM] pxa: add support for Embedian MXM-8x10 Signed-off-by: Edwin Peer Signed-off-by: Eric Miao commit 0dc726bb264ca5ecfdfab94a6937e0e9b9b26f64 Author: Eric Miao Date: Sun Dec 27 23:01:25 2009 +0800 [ARM] pxa: move board board IRQ definitions out of irqs.h Signed-off-by: Eric Miao commit 19851c58e680f71d087b79b53edbf814193e1d33 Author: Eric Miao Date: Sat Dec 26 16:23:02 2009 +0800 [ARM] sa1111: allow cascaded IRQs to be used by platforms Signed-off-by: Eric Miao commit 08fa159003aa510027951671b94aadc380ab2d2a Author: Eric Miao Date: Sat Dec 26 12:32:38 2009 +0800 [ARM] sa1111: avoid using hardcoded IRQ numbers for PCMCIA driver The IRQs for card detect and status change are currently hardcoded in SA1111 PCMCIA driver, which can be actually obtained from the .irq[] from 'struct sa1111_dev' to keep it generic. Signed-off-by: Eric Miao commit ac609d266e4af4ebf586d610bd76e04dddae0c4c Author: Eric Miao Date: Thu Feb 4 18:07:33 2010 -0800 [ARM] locomo: allow cascaded IRQ base to be specified by platforms Signed-off-by: Eric Miao commit 00dd8027b913088ff9b656c5aaa6336c303b7f26 Author: Eric Miao Date: Fri Dec 25 12:18:33 2009 +0800 [ARM] locomo: remove unused IRQs and avoid unnecessary cascade IRQ_LOCOMO_* are never used elsewhere, remove these definitions. As well as the cascade of these IRQs. IRQ_LOCOMO_*_BASE changed to IRQ_LOCOMO_*. IRQ_LOCOMO_LT and IRQ_LOCOMO_SPI are likely to be used in a same way as IRQ_LOCOMO_KEY. IRQ_LOCOMO_GPIO and the demultiplex handler should really be living somewhere else. Signed-off-by: Eric Miao commit da8065ac3ea29d1bfdb5a163be346fbe35066f8d Author: Eric Miao Date: Thu Feb 4 17:13:55 2010 -0800 [ARM] locomo: avoid unnecessary cascaded keyboard IRQ It is not necessary and is over-complicated for IRQ_LOCOMO_KEY to be a cascaded IRQ of IRQ_LOCOMO_KEY_BASE. Removed and introduced locomokbd_{open,close} for masking/unmasking of the keyboard IRQ. Signed-off-by: Eric Miao commit efe7f8bda015b03ab1420b5bca538d18e6559863 Author: Eric Miao Date: Wed Dec 23 14:52:07 2009 +0800 [ARM] sa1100: remove unreferenced IRQ definitions These IRQ definitions related to LOCOMO are never referenced anywhere, thus could be safely removed. Signed-off-by: Eric Miao commit f69a6548c9d5dd29ecaed1c714b41487c458ce8b Author: Eric Miao Date: Fri Jan 1 15:28:21 2010 +0800 [ARM] pxa/tosa: make use of the matrix keypad driver Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit 96f6a13a6d8a6370fb9a8c828d549f3ddea8d0c5 Author: Eric Miao Date: Mon Jan 4 13:34:05 2010 +0800 [ARM] pxa/cm-x270: avoid direct access of GPIO/MFP registers Cc: Mike Rapoport Signed-off-by: Eric Miao commit 846c864cac520eaa10e845f585f05af643aa848a Author: Eric Miao Date: Mon Jan 4 17:14:21 2010 +0800 [ARM] pxa: remove now unnecessary pxa_gpio_mode() calls in ac97 Now most (if not all) PXA platforms have been switched to the new MFP API, it's rather safe to remove these unnecessary pxa_gpio_mode() calls in pxa2xx-ac97-lib.c now. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit c11b6a420b092a576e003bbb520392268338d97b Author: Eric Miao Date: Mon Jan 4 17:00:13 2010 +0800 [ARM] pxa: add the missing AC97 pin configurations Missing AC97 pin configurations are added where pxa_set_ac97_info() are called for all pxa25x/pxa27x platforms. Where no exact configuration is provided, use the default as in sound/arm/pxa2xx-ac97-lib.c Cc: Dmitry Eremin-Solenikov Signed-off-by: Eric Miao commit fb1bf8cd13bfa7ed0364ab0d82f717fc020d35f6 Author: Eric Miao Date: Mon Jan 4 16:30:58 2010 +0800 [ARM] pxa: introduce processor specific pxa27x_assert_ac97reset() This is really pxa27x specific and should be kept in pxa27x.c. With this newly introduced function, the original set_resetgpio_mode() is deprecated. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit e1aed7ca555af7412ca1336241b918d78485232f Author: Eric Miao Date: Mon Jan 4 16:26:32 2010 +0800 [ARM] pxa: remove the unnecessary restoring of MFP registers MFP registers are saved and restored by the mfp sys_device before all other platform devices, and it is unnecessary here. Cc: Dmitry Eremin-Solenikov Cc: Mark Brown Signed-off-by: Eric Miao commit bedbda97175bcc540512f67ce02364100fba5f28 Author: Eric Miao Date: Mon Jan 4 11:37:14 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa27x platforms Signed-off-by: Eric Miao commit 07bae6c3215e060d5e3742b6f2932de0787f0782 Author: Eric Miao Date: Mon Jan 4 11:25:10 2010 +0800 [ARM] pxa: simplify the LCD pin configuration for pxa25x platforms There are only limited possible LCD pin configurations for pxa25x platforms, simplify this by macro. Signed-off-by: Eric Miao commit 669cb51c6abf77e10cbeb6f483c96abc492206ac Author: Eric Miao Date: Fri Jan 1 15:29:22 2010 +0800 [ARM] pxa: use chip->ack() instead of accessing GEDR directly Signed-off-by: Eric Miao commit e9964c102312967a4bc1fd501cb628c4a3b19034 Author: Sage Weil Date: Mon Mar 1 15:16:56 2010 -0800 ceph: fix flush_dirty_caps race with caps migration The flush_dirty_caps() used to loop over the first entry of the cap_dirty dirty list on the assumption that after calling ceph_check_caps() it would be removed from the list. This isn't true for caps that are being migrated between MDSs, where we've received the EXPORT but not the IMPORT. Instead, do a safe list iteration, and pin the next inode on the list via the CEPH_I_NOFLUSH flag. Signed-off-by: Sage Weil commit 7af8f1e4aa86720840d3318e4dc225c3c7e5a6d0 Author: Sage Weil Date: Mon Mar 1 15:17:34 2010 -0800 ceph: include migrating caps in issued set We should include caps that are mid-migration (we've received the EXPORT, but not the IMPORT) in the issued caps set. Signed-off-by: Sage Weil commit e53a8fd773065628b24605b289a9a40ee4a35d83 Author: Sage Weil Date: Mon Mar 1 14:50:05 2010 -0800 ceph: fix osdmap decoding when pools include (removed) snaps Add missing pointer dereference (p is a void **). Signed-off-by: Sage Weil commit 195d3ce2cc9a8ec69827f6369c41b269345b9988 Author: Sage Weil Date: Mon Mar 1 09:57:54 2010 -0800 ceph: return EBADF if waiting for caps on closed file Verify the file is actually open for the given caps when we are waiting for caps. This ensures we will wake up and return EBADF if another thread closes the file out from under us. Note that EBADF is also the correct return code from write(2) when called on a file handle opened for reading (although the vfs should catch that). Signed-off-by: Sage Weil commit 6f863e712d4114e8ae2f02de64ebeac0546ebaa0 Author: Sage Weil Date: Mon Mar 1 15:26:41 2010 -0800 ceph: set osd request message front length correctly We didn't set the front length correctly. When messages used the message pool we ended up with the conservative max (4 KB), and the rest of the time the slightly less conservative estimate. Even though the OSD ignores the extra data, set it to the right value to avoid sending extra data over the network. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 3ca02ef96e119d36bc1752baeae7dd0c59c2f325 Author: Sage Weil Date: Mon Mar 1 15:25:00 2010 -0800 ceph: reset front len on return to msgpool; BUG on mismatched front iov Reset msg front len when a message is returned to the pool: the caller may have changed it. BUG if we try to send a message with a hdr.front_len that doesn't match the front iov. Signed-off-by: Sage Weil commit 70edb55bdfa8922c8ad40bc5a67abb6d9fee8d47 Author: Sage Weil Date: Mon Mar 1 13:20:50 2010 -0800 ceph: fix snaptrace decoding on cap migration between mds This was simply broken. Apparently at some point we thought about putting the snaptrace in the middle section, but didn't. Signed-off-by: Sage Weil commit c16e786927b977cb880873214bbd815e8d5ec4ba Author: Sage Weil Date: Mon Mar 1 13:02:00 2010 -0800 ceph: use single osd op reply msg Use a single ceph_msg for the osd reply, even when we are getting multiple replies. Signed-off-by: Sage Weil commit 1679f876a641d209e7b22e43ebda0693c71003cf Author: Sage Weil Date: Fri Feb 26 13:55:51 2010 -0800 ceph: reset bits on connection close Clear LOSSYTX bit, so that if/when we reconnect, said reconnect will retry on failure. Clear _PENDING bits too, to avoid polluting subsequent connection state. Drop unused REGISTERED bit. Signed-off-by: Sage Weil commit 1d40ddd10dab332456e3863fed2a6e71aa6635ab Author: Russell King Date: Mon Mar 1 16:19:23 2010 +0000 MTD: fix pismo build error Signed-off-by: Russell King commit bb1165d6882f423f90fc7007a88c6c993b7c2ac4 Author: Robert Richter Date: Mon Mar 1 14:21:23 2010 +0100 perf, x86: rename macro in ARCH_PERFMON_EVENTSEL_ENABLE For consistency reasons this patch renames ARCH_PERFMON_EVENTSEL0_ENABLE to ARCH_PERFMON_EVENTSEL_ENABLE. The following is performed: $ sed -i -e s/ARCH_PERFMON_EVENTSEL0_ENABLE/ARCH_PERFMON_EVENTSEL_ENABLE/g \ arch/x86/include/asm/perf_event.h arch/x86/kernel/cpu/perf_event.c \ arch/x86/kernel/cpu/perf_event_p6.c \ arch/x86/kernel/cpu/perfctr-watchdog.c \ arch/x86/oprofile/op_model_amd.c arch/x86/oprofile/op_model_ppro.c Signed-off-by: Robert Richter commit a163b1099dc7016704043c7fc572ae42519f08f7 Author: Robert Richter Date: Thu Feb 25 19:43:07 2010 +0100 perf, x86: add some IBS macros to perf_event.h Signed-off-by: Robert Richter commit 1d6040f17d12a65b9f7ab4cb9fd6d721206b79ec Author: Robert Richter Date: Thu Feb 25 19:40:46 2010 +0100 perf, x86: make IBS macros available in perf_event.h This patch moves code from oprofile to perf_event.h to make it also available for usage by perf. Signed-off-by: Robert Richter commit 86d62b6fa2845725ad88b95387c8c52731fb2460 Merge: 3d08340 cfc9c0b Author: Robert Richter Date: Mon Mar 1 11:13:21 2010 +0100 Merge remote branch 'tip/oprofile' into tip/perf/core Signed-off-by: Robert Richter commit 90a6501f94aedd7fb40f5556334843194fb598be Author: Paul E. McKenney Date: Sun Feb 28 08:32:18 2010 -0800 sched, rcu: Fix rcu_dereference() for RCU-lockdep Make rcu_dereference() of runqueue data structures be rcu_dereference_sched(). Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <20100228163218.GD6846@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit e2f4699ac15fe36de1288505bc6e6e5a8603ab1b Merge: 1883c79 30ff056 Author: Ingo Molnar Date: Mon Mar 1 09:28:53 2010 +0100 Merge branch 'linus' into core/rcu Merge reason: Backmerge latest upstream to queue up dependent fix in the scheduler. Signed-off-by: Ingo Molnar commit 1e259e0a9982078896f3404240096cbea01daca4 Author: Frederic Weisbecker Date: Sun Feb 28 20:51:15 2010 +0100 hw-breakpoints: Remove stub unthrottle callback We support event unthrottling in breakpoint events. It means that if we have more than sysctl_perf_event_sample_rate/HZ, perf will throttle, ignoring subsequent events until the next tick. So if ptrace exceeds this max rate, it will omit events, which breaks the ptrace determinism that is supposed to report every triggered breakpoints. This is likely to happen if we set sysctl_perf_event_sample_rate to 1. This patch removes support for unthrottling in breakpoint events to break throttling and restore ptrace determinism. Signed-off-by: Frederic Weisbecker Cc: 2.6.33.x Cc: Peter Zijlstra Cc: K.Prasad Cc: Paul Mackerras commit ae1f30384baef4056438d81b305a6a5199b0d16c Author: Frederic Weisbecker Date: Sun Feb 28 19:42:38 2010 +0100 tracing: Include irqflags headers from trace clock trace_clock.c includes spinlock.h, which ends up including asm/system.h, which in turn includes linux/irqflags.h in x86. So the definition of raw_local_irq_save is luckily covered there, but this is not the case in parisc: tip/kernel/trace/trace_clock.c:86: error: implicit declaration of function 'raw_local_irq_save' tip/kernel/trace/trace_clock.c:112: error: implicit declaration of function 'raw_local_irq_restore' We need to include linux/irqflags.h directly from trace_clock.c to avoid such build error. Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Robert Richter Cc: Peter Zijlstra Signed-off-by: Ingo Molnar commit 1883c79a57a5fe25309007590cccb1b2782c41b2 Author: Paul E. McKenney Date: Sat Feb 27 14:53:08 2010 -0800 rcu: Make task_subsys_state() RCU-lockdep checks handle boot-time use It is apparently legal to invoke task_subsys_state() without RCU protection during early boot time. After all, there are no concurrent tasks, so there can be no grace periods completing concurrently. But this does need an Acked-by from the cgroups folks. Located-by: Ingo Molnar Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-2-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 622ea685f1fafdf84d612440535c84341f0860b8 Author: Paul E. McKenney Date: Sat Feb 27 14:53:07 2010 -0800 rcu: Fix holdoff for accelerated GPs for last non-dynticked CPU Make the holdoff only happen when the full number of attempts have been made. Signed-off-by: Paul E. McKenney Cc: laijs@cn.fujitsu.com Cc: dipankar@in.ibm.com Cc: mathieu.desnoyers@polymtl.ca Cc: josh@joshtriplett.org Cc: dvhltc@us.ibm.com Cc: niv@us.ibm.com Cc: peterz@infradead.org Cc: rostedt@goodmis.org Cc: Valdis.Kletnieks@vt.edu Cc: dhowells@redhat.com LKML-Reference: <1267311188-16603-1-git-send-email-paulmck@linux.vnet.ibm.com> Signed-off-by: Ingo Molnar commit 3d083407a16698de86b42aee0da2ffb280b5cb7e Author: Frederic Weisbecker Date: Sat Feb 27 17:24:15 2010 +0100 x86/hw-breakpoints: Remove the name field Remove the name field from the arch_hw_breakpoint. We never deal with target symbols in the arch level, neither do we need to ever store it. It's a legacy for the previous version of the x86 breakpoint backend. Let's remove it. Signed-off-by: Frederic Weisbecker Cc: K.Prasad Cc: Linus Torvalds commit dd8b1cf681eab40bc5afb67bdd06b2ca341f5669 Author: Frederic Weisbecker Date: Sat Feb 27 17:10:39 2010 +0100 perf: Remove pointless breakpoint union Remove pointless union in the breakpoint field of hw_perf_event. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Paul Mackerras commit b67577dfb45580c498bfdb1bc76c00c3b2ad6310 Author: Frederic Weisbecker Date: Wed Feb 3 09:09:33 2010 +0100 perf lock: Drop the buffers multiplexing dependency We need to deal with time ordered events to build a correct state machine of lock events. This is why we multiplex the lock events buffers. But the ordering is done from the kernel, on the tracing fast path, leading to high contention between cpus. Without multiplexing, the events appears in a weak order. If we have four events, each split per cpu, perf record will read the events buffers in the following order: [ CPU0 ev0, CPU0 ev1, CPU0 ev3, CPU0 ev4, CPU1 ev0, CPU1 ev0....] To handle a post processing reordering, we could just read and sort the whole in memory, but it just doesn't scale with high amounts of events: lock events can fill huge amounts in few times. Basically we need to sort in memory and find a "grace period" point when we know that a given slice of previously sorted events can be committed for post-processing, so that we can unload the memory usage step by step and keep a scalable sorting list. There is no strong rules about how to define such "grace period". What does this patch is: We define a FLUSH_PERIOD value that defines a grace period in seconds. We want to have a slice of events covering 2 * FLUSH_PERIOD in our sorted list. If FLUSH_PERIOD is big enough, it ensures every events that occured in the first half of the timeslice have all been buffered and there are none remaining and there won't be further to put inside this first timeslice. Then once we reach the 2 * FLUSH_PERIOD timeslice, we flush the first half to be gentle with the memory (the second half can still get new events in the middle, so wait another period to flush it) FLUSH_PERIOD is defined to 5 seconds. Say the first event started on time t0. We can safely assume that at the time we are processing events of t0 + 10 seconds, ther won't be anymore events to read from perf.data that occured between t0 and t0 + 5 seconds. Hence we can safely flush the first half. To point out funky bugs, we have a guardian that checks a new event timestamp is not below the last event's timestamp flushed and that displays a warning in this case. Signed-off-by: Frederic Weisbecker Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Paul Mackerras Cc: Hitoshi Mitake Cc: Li Zefan Cc: Lai Jiangshan Cc: Masami Hiramatsu Cc: Jens Axboe commit 84c6f88fc8265d7a712d7d6ed8fc1a878dfc84d1 Author: Hitoshi Mitake Date: Thu Feb 4 16:08:15 2010 +0900 perf lock: Fix and add misc documentally things I've forgot to add 'perf lock' line to command-list.txt, so users of perf could not find perf lock when they type 'perf'. Fixing command-list.txt requires document (tools/perf/Documentation/perf-lock.txt). But perf lock is too much "under construction" to write a stable document, so this is something like pseudo document for now. And I wrote description of perf lock at help section of CONFIG_LOCK_STAT, this will navigate users of lock trace events. Signed-off-by: Hitoshi Mitake Cc: Peter Zijlstra Cc: Paul Mackerras Cc: Arnaldo Carvalho de Melo LKML-Reference: <1265267295-8388-1-git-send-email-mitake@dcl.info.waseda.ac.jp> Signed-off-by: Frederic Weisbecker commit 44ee63587dce85593c22497140db16f4e5027860 Author: Tejun Heo Date: Wed Feb 17 10:50:50 2010 +0900 percpu: Add __percpu sparse annotations to hw_breakpoint Add __percpu sparse annotations to hw_breakpoint. These annotations are to make sparse consider percpu variables to be in a different address space and warn if accessed without going through percpu accessors. This patch doesn't affect normal builds. In kernel/hw_breakpoint.c, per_cpu(nr_task_bp_pinned, cpu)'s will trigger spurious noderef related warnings from sparse. Changing it to &per_cpu(nr_task_bp_pinned[0], cpu) will work around the problem but deemed to ugly by the maintainer. Leave it alone until better solution can be found. Signed-off-by: Tejun Heo Cc: Stephen Rothwell Cc: K.Prasad LKML-Reference: <4B7B4B7A.9050902@kernel.org> Signed-off-by: Frederic Weisbecker commit 018cbffe6819f6f8db20a0a3acd9bab9bfd667e4 Merge: 1dd2980 60b341b Author: Frederic Weisbecker Date: Sat Feb 27 16:18:46 2010 +0100 Merge commit 'v2.6.33' into perf/core Merge reason: __percpu annotations need the corresponding sparse address space definition upstream. Conflicts: tools/perf/util/probe-event.c (trivial) commit 080af17e9c6360c5a835528e8de3141a46273ed2 Author: Sage Weil Date: Thu Feb 25 16:40:07 2010 -0800 ceph: remove bogus mds forward warning The must_resend flag is always true, not false. In any case, we can just ignore it anyway. Signed-off-by: Sage Weil commit c99eb1c7263a44e63161a041a778b345b5cf0b6a Author: Sage Weil Date: Fri Feb 26 09:37:33 2010 -0800 ceph: remove fragile __map_osds optimization We used to try to avoid freeing and then reallocating the osd struct. This is a bit fragile due to potential interactions with other references (beyond o_requests), and may be the cause of this crash: [120633.442358] BUG: unable to handle kernel NULL pointer dereference at (null) [120633.443292] IP: [] rb_erase+0x11d/0x277 [120633.443292] PGD f7ff3067 PUD f7f53067 PMD 0 [120633.443292] Oops: 0000 [#1] PREEMPT SMP [120633.443292] last sysfs file: /sys/kernel/uevent_seqnum [120633.443292] CPU 1 [120633.443292] Modules linked in: ceph fan ac battery psmouse ehci_hcd ide_pci_generic ohci_hcd thermal processor button [120633.443292] Pid: 3023, comm: ceph-msgr/1 Not tainted 2.6.32-rc2 #12 H8SSL [120633.443292] RIP: 0010:[] [] rb_erase+0x11d/0x277 [120633.443292] RSP: 0018:ffff8800f7b13a50 EFLAGS: 00010246 [120633.443292] RAX: ffff880022907819 RBX: ffff880022907818 RCX: 0000000000000000 [120633.443292] RDX: ffff8800f7b13a80 RSI: ffff8800f587eb48 RDI: 0000000000000000 [120633.443292] RBP: ffff8800f7b13a60 R08: 0000000000000000 R09: 0000000000000004 [120633.443292] R10: 0000000000000000 R11: ffff8800c4441000 R12: ffff8800f587eb48 [120633.443292] R13: ffff8800f58eaa00 R14: ffff8800f413c000 R15: 0000000000000001 [120633.443292] FS: 00007fbef6e226e0(0000) GS:ffff880009200000(0000) knlGS:0000000000000000 [120633.443292] CS: 0010 DS: 0018 ES: 0018 CR0: 000000008005003b [120633.443292] CR2: 0000000000000000 CR3: 00000000f7c53000 CR4: 00000000000006e0 [120633.443292] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 [120633.443292] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 [120633.443292] Process ceph-msgr/1 (pid: 3023, threadinfo ffff8800f7b12000, task ffff8800f5858b40) [120633.443292] Stack: [120633.443292] ffff8800f413c000 ffff8800f587e9c0 ffff8800f7b13a80 ffffffffa0098a86 [120633.443292] <0> 00000000000006f1 0000000000000000 ffff8800f7b13af0 ffffffffa009959b [120633.443292] <0> ffff8800f413c000 ffff880022a68400 ffff880022a68400 ffff8800f587e9c0 [120633.443292] Call Trace: [120633.443292] [] __remove_osd+0x4d/0xbc [ceph] [120633.443292] [] __map_osds+0x199/0x4fa [ceph] [120633.443292] [] ? __send_request+0xf8/0x186 [ceph] [120633.443292] [] kick_requests+0x169/0x3cb [ceph] [120633.443292] [] ceph_osdc_handle_map+0x370/0x522 [ceph] Since we're probably screwed anyway if a small kmalloc is failing, don't bother with trying to be clever here. Signed-off-by: Sage Weil commit 98e12b5a6e05413420a7e3b3eca7fbfc2ff41b6d Author: Russell King Date: Thu Feb 25 23:56:38 2010 +0000 ARM: Fix decompressor's kernel size estimation for ROM=y Commit 2552fc2 changed the way the decompressor decides if it is safe to decompress the kernel directly to its final location. Unfortunately, it took the top of the compressed data as being the stack pointer, which it is for ROM=n cases. However, for ROM=y, the stack pointer is not relevant, and results in the wrong answer. Fix this by explicitly storing the end of the biggybacked data in the decompressor, and use that to calculate the compressed image size. CC: Signed-off-by: Russell King commit 2a2d10f386c1bacabe1a530c06dc8488eac419e5 Merge: 2f68ffd c499546 Author: Russell King Date: Thu Feb 25 20:41:34 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable commit e80a52d14f868059e8ec790c9fae88cdb8a1df98 Author: Sage Weil Date: Thu Feb 25 12:40:45 2010 -0800 ceph: fix connection fault STANDBY check Move any out_sent messages to out_queue _before_ checking if out_queue is empty and going to STANDBY, or else we may drop something that was never acked. And clean up the code a bit (less goto). Signed-off-by: Sage Weil commit 161fd65ac934608345aed35226fc889ea3b0b500 Author: Sage Weil Date: Thu Feb 25 12:38:57 2010 -0800 ceph: invalidate_authorizer without con->mutex held This fixes lock ABBA inversion, as the ->invalidate_authorizer() op may need to take a lock (or even call back into the messenger). Signed-off-by: Sage Weil commit 9b1489e989695c4d502865f8bec616c0f17e99ab Merge: bac3fcf 08268b7 Author: Uwe Kleine-König Date: Thu Feb 25 14:01:49 2010 +0100 Merge branch 'mxc-master' of git://git.pengutronix.de/git/imx/linux-2.6 into imx/master Removed selection of COMMON_CLKDEV by CONFIG_ARCH_MX5. This is handled in 03e09cd8902717b66f940357257d8ad76114d9f2. arch/arm/plat-mxc/iomux-mx1-mx2.c was moved to arch/arm/plat-mxc/iomux-v1.c in 5e2e95f520538e095d10456acd28d9107317aa32 and got bug fixed in 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c. The bug in arch/arm/plat-mxc/iomux-v1.c isn't present any more since bac3fcfad565c9bbceeed8b607f140c29df97355, so arch/arm/plat-mxc/iomux-mx1-mx2.c is simply deleted. Conflicts: arch/arm/plat-mxc/Kconfig arch/arm/plat-mxc/Makefile arch/arm/plat-mxc/iomux-mx1-mx2.c Signed-off-by: Uwe Kleine-König commit 3e58974027b04e84f68b964ef368a6cd758e2f84 Author: Nikanth Karthikesan Date: Thu Feb 25 14:44:56 2010 +0530 doc: fix typo in comment explaining rb_tree usage Fix typo in comment explaining rb_tree usage. s/int/in Signed-off-by: Nikanth Karthikesan Signed-off-by: Jiri Kosina commit 17ccb834d517c66c09123c24ba8553c5b14e0f78 Author: Kuninori Morimoto Date: Tue Feb 23 07:07:01 2010 +0000 ARM: mach-shmobile: ap4evb: Add KEYSC support Because AP4 board has capacitor for KEYSC, we need much time for waiting. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit d608c738bb8fb37e5fbfcdef9c566764f2fea086 Author: Mark Brown Date: Wed Feb 24 16:45:54 2010 +0000 ARM: S3C64XX: Add initial support for board specific IRQs Follow the scheme used for IRQs. By default 16 GPIOs are allocated for board use. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit e6502522c2850968a086284d0f28de4fb880eb78 Author: Kukjin Kim Date: Wed Feb 24 16:41:01 2010 +0900 ARM: S5PV210: Add S5PC110 configuration file This patch adds S5PC110 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit af60ca4f291713111e397031e2abffa66c6c857f Author: Kukjin Kim Date: Wed Feb 24 16:40:57 2010 +0900 ARM: S5PV210: Add S5PV210 configuration file This patch adds S5PV210 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d515ec339bf7970c8f6e368c8c7bb330417dcda9 Author: Kukjin Kim Date: Wed Feb 24 16:40:53 2010 +0900 ARM: S5PV210: Add SMDKC110 board support file This patch adds SMDKC110 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 981744165e31410bd7bc973fd259f24b836d0346 Author: Kukjin Kim Date: Wed Feb 24 16:40:49 2010 +0900 ARM: S5PV210: Add SMDKV210 board support file This patch adds SMDKV210 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 170f4e425808b801f81bb6be24b2c1eb80313d8e Author: Kukjin Kim Date: Wed Feb 24 16:40:44 2010 +0900 ARM: S5PV210: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5PV210 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5PV210. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 2c798557b9e0961e545e526197654d9437a6330e Author: Kukjin Kim Date: Wed Feb 24 16:40:40 2010 +0900 ARM: S5PV210: Add IRQ support This patch adds IRQ support for S5PV210. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 and VIC3 in plat-s5p common irq code. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 0c1945d336116e82454b5461238618ef81696669 Author: Kukjin Kim Date: Wed Feb 24 16:40:36 2010 +0900 ARM: S5PV210: Add clock support for S5PV210 This patch adds clock support for S5PV210. This patch adds the clock register definitions and the various system clocks in S5PV210. Clocks that are common to other S5P SoC'c are added in the common S5P clock support. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 939d28aae17a0cb591a2ec54993496a5d31f2ec6 Author: Kukjin Kim Date: Wed Feb 24 16:40:29 2010 +0900 ARM: S5PV210: Add Samsung S5PV210 CPU support This patch adds support for Samsung S5PV210 CPU. This patch also adds an entry for S5PV210 cpu in plat-s5p cpu table. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7c821a179f91c3ad52588400ce52a7fb48b9868c Author: Jiri Kosina Date: Wed Feb 24 13:55:31 2010 +0100 Remove fs/ntfs/ChangeLog Remove fs/ntfs/ChangeLog. No need for such files since we have git. Acked-by: Anton Altaparmakov Signed-off-by: Jiri Kosina commit a8ab0102d7f031e477dbe31450d5b69d40bea324 Author: Thadeu Lima de Souza Cascardo Date: Mon Feb 1 15:57:15 2010 -0200 doc: fix console doc typo Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit e21a05cb408bb9f244f11a0813d4b355dad0822e Author: GeunSik Lim Date: Wed Feb 24 11:06:39 2010 +0100 doc: cpuset: Update the cpuset flag file This patch is for modifying with correct cuset flag file. We need to update current manual for cpuset. For example, before) cpus, cpu_exclusive, mems after ) cpuset.cpus, cpuset.cpu_exclusive, cpuset.mems Signed-off-by: Geunsik Lim Acked-by: Paul Menage Signed-off-by: Jiri Kosina commit 08268b78d6f0c659dc1d86453c57b336f6f4f9ae Author: Baruch Siach Date: Wed Feb 24 11:31:31 2010 +0200 mx25: move ARCH_MXC_IOMUX_V3 to the ARCH level ARCH_MXC_IOMUX_V3 is not specific to the i.MX25 PDK platform. Thus, ARCH_MXC_IOMUX_V3 should be selected by ARCH_MX25. Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 82d52a1948254aa3f35ca1a24c23284bd9f9a9c2 Author: Fabio Estevam Date: Wed Feb 17 12:02:56 2010 -0800 mx51_babbage: Fix ckih2 parameter in mx51_clocks_init function This patch is to be applied into Sascha's mxc-master branch. Fix ckih2 parameter in mx51_clocks_init funtion. CKIH2 pin is left unconnected on Babbage. Signed-off-by: Fabio Estevam Acked-by: Amit Kucheria Signed-off-by: Sascha Hauer commit cd6eb9808ce54caeea779e785e19a9b9bea97e43 Author: Mark Brown Date: Tue Feb 23 11:05:11 2010 +0000 mx31ads: Configure SSI5 pins in IOMUX for PMIC module audio support SSI5 on the CPU is connected to the PMIC module to provide audio support so unconditionally configure the relevant pins on the CPU to route out the signals. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit bac3fcfad565c9bbceeed8b607f140c29df97355 Author: Uwe Kleine-König Date: Mon Feb 15 09:47:55 2010 +0100 arm/imx/iomux-v1: check for invalid modes in mxc_gpio_mode mxc_gpio_mode checks for invalid pins and so it returns zero for success, -EINVAL for invalid pins. While at it, remove definitions of GPIO_PORT_MAX removed as they are unused now. Signed-off-by: Uwe Kleine-König commit e835d88e71f54c048a8cc907cc34084f1dd5846b Author: Uwe Kleine-König Date: Tue Feb 16 11:07:49 2010 +0100 arm/imx: let platform files include the SoC-specific iomux header Signed-off-by: Uwe Kleine-König commit 111588f8304b7e13f107bd4c590e8d3939ad907d Author: Uwe Kleine-König Date: Mon Feb 15 21:52:34 2010 +0100 arm/imx/iomux-v1: rename header file Addionally make iomux-mx*.h headers stand-alone and similar to iomux-v3 platform files should include their platform iomux header from now on. For now iomux.h simply includes all iomux-v1 platform headers and so provides compatibility until all files are converted. Signed-off-by: Uwe Kleine-König commit 261f6f681ced65de82a619f6802ebe82fd9af080 Author: Uwe Kleine-König Date: Mon Feb 15 21:18:43 2010 +0100 arm/mx25: don't include iomux.h which is for iomux-v1 machines Signed-off-by: Uwe Kleine-König commit 2f6c97c48e727d1bbd3131527380da19161f6f5f Author: Uwe Kleine-König Date: Mon Feb 15 21:10:39 2010 +0100 arm/imx/iomux-mx3.h: unify style and comments - use __MACH_IOMUX_MX3_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 8902cbd9dbd290ce273c372eec08dfdb14757a47 Author: Uwe Kleine-König Date: Mon Feb 15 21:04:17 2010 +0100 arm/imx/iomux-mx2x: unify style - use __MACH_IOMUX_MX2x_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6056154145bd6c6ec4eeeaee65f6b12c5b88b1d7 Author: Uwe Kleine-König Date: Mon Feb 15 20:56:03 2010 +0100 arm/imx/iomux-mx27: unify style and comments - use __MACH_IOMUX_MX27_H__ as header protector analogous to - use tabs for indention - fix sorting Signed-off-by: Uwe Kleine-König commit e76feb87422c0bb7517cd97be342f55fab743d3a Author: Uwe Kleine-König Date: Mon Feb 15 20:50:57 2010 +0100 arm/imx/iomux-mx25: unify style and comment cleanup - use __MACH_IOMUX_MX25_H__ as header protector analogous to - remove doxygen comments - remove #error about mach/iomux.h which is unused on mx25 - remove #ifndef __ASSEMBLY__ which is unneeded here Signed-off-by: Uwe Kleine-König commit 6985a719f96e1d83258b47eb170bf44969860ca3 Author: Uwe Kleine-König Date: Mon Feb 15 20:46:47 2010 +0100 arm/imx/iomux-mx21: unify style - use __MACH_IOMUX_MX21_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit 6863f1981060832536f2d06c20c0219b2e74c477 Author: Uwe Kleine-König Date: Mon Feb 15 20:39:59 2010 +0100 arm/imx/iomux-mx1: unify style and comment cleanup - use __MACH_IOMUX_MX1_H__ as header protector analogous to - use tabs for indention Signed-off-by: Uwe Kleine-König commit f021b5a1ef1b229ddc8c5cf3f2c5da308d974a5a Author: Uwe Kleine-König Date: Mon Feb 15 16:57:09 2010 +0100 arm/imx/iomux-v1: make base address a runtime choice While at it move register modification to static inlines and so make the relevant code more readable. Signed-off-by: Uwe Kleine-König commit 5e2e95f520538e095d10456acd28d9107317aa32 Author: Uwe Kleine-König Date: Mon Feb 15 09:42:59 2010 +0100 arm/imx/iomux-v1: rename source file and reorganize Kconfig stuff Signed-off-by: Uwe Kleine-König commit 8735fde2d0c42ae914d3e68d967612ff417f463c Author: Uwe Kleine-König Date: Wed Feb 17 22:17:43 2010 +0100 arm/imx/dma-v1: protect #ifdef'd blocks additionally by cpu_is_... This is necessary for a multi-SoC kernel. Signed-off-by: Uwe Kleine-König commit e9f49d4183759e4d8469ac86189ef8bc4374cccc Author: Uwe Kleine-König Date: Wed Feb 17 19:37:05 2010 +0100 arm/imx/dma-v1: don't use deprecated symbols DMA_BASE and MXC_INT_DMACH0 Signed-off-by: Uwe Kleine-König commit 8e3a6e7fa739d021324d813cd6fdd1c5c7998774 Author: Uwe Kleine-König Date: Wed Feb 17 21:05:27 2010 +0100 arm/imx: choose sane CONSISTENT_DMA_SIZE if video is enabled for both mx1 and mx3 Signed-off-by: Uwe Kleine-König commit abf61632884ae6bfd1e7b967d5254fa7b5191e7b Author: Uwe Kleine-König Date: Wed Feb 17 21:08:00 2010 +0100 arm/imx/irq: order definitions of MXC_GPIO_IRQS numerically This is important for kernels supporting more than one SoC. Signed-off-by: Uwe Kleine-König commit 220f7f307015e876a11bf906bf9d7fe669a097a1 Author: Uwe Kleine-König Date: Mon Feb 15 17:11:17 2010 +0100 arm/imx: don't depend on ARCH_MXC twice MXC_IRQ_PRIOR, MXC_PWM and ARCH_HAS_RNGA are all defined in an "if ARCH_MXC" ... "endif" block, so they depend on ARCH_MXC anyhow. Signed-off-by: Uwe Kleine-König commit a8e33260ce184aea367fa11ae8bd3ab941e75b49 Author: Uwe Kleine-König Date: Fri Feb 19 15:29:26 2010 +0100 arm/imx: remove #ifndef CONFIG_COMMON_CLKDEV block COMMON_CLKDEV is used on all imx platforms, so this isn't used. Signed-off-by: Uwe Kleine-König commit 44fb5d1945fe87f3299de5e2e0581f092e8dd455 Author: Uwe Kleine-König Date: Fri Feb 19 17:08:42 2010 +0100 arm/imx: remove MTD_XIP support This is broken since at least one year when ec996ba (mxc timer: make compile time independent) removed the symbol MXC_TCN. Signed-off-by: Uwe Kleine-König commit 9f69fdb36da31672b0e40712fed494182530c887 Author: Uwe Kleine-König Date: Fri Feb 19 16:16:09 2010 +0100 arm/imx: don't explicitly select GENERIC_GPIO ARCH_REQUIRE_GPIOLIB selects GPIOLIB which in turn selects GENERIC_GPIO Signed-off-by: Uwe Kleine-König commit 03e09cd8902717b66f940357257d8ad76114d9f2 Author: Uwe Kleine-König Date: Mon Feb 15 17:10:42 2010 +0100 arm/imx: let ARCH_MXC select COMMON_CLKDEV instead of each subfamily Signed-off-by: Uwe Kleine-König commit 401d87dd66693605147f955ac2a4f1c0ac155027 Author: Uwe Kleine-König Date: Mon Feb 15 09:54:46 2010 +0100 arm/imx: remove "NO_PAD_CTRL" from Copyright statements I assume this was introduced by something like sed -i -e 's/)/, NO_PAD_CTRL)' Signed-off-by: Uwe Kleine-König commit 8e9980588c734c29f4322922e35ea509168e9fb5 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v2: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 51918075d74978d6ca6ec14c81f55938f24108a2 Author: Uwe Kleine-König Date: Fri Feb 12 22:38:31 2010 +0100 arm/imx/audmux-v1: use SoC-prefixed names Signed-off-by: Uwe Kleine-König commit 6574305b0ed32f286dcebd653a2f3ba4e421f06c Author: Uwe Kleine-König Date: Mon Feb 8 21:07:16 2010 +0100 arm/imx/gpio: remove a BUG_ON in hot path Now if the problem occurs that triggered the BUG_ON before, the machine runs in a NULL pointer dereference. So it wouldn't be much harder now to debug the situation if it occured. Signed-off-by: Uwe Kleine-König commit 3621f188b945a9f9bc1387115834041b7a4619e0 Author: Uwe Kleine-König Date: Mon Feb 8 21:02:30 2010 +0100 arm/imx/gpio: use fls to find set bits in the irq status register As in most cases only few irqs are pending using fls is more effective than looping over all bits. Signed-off-by: Uwe Kleine-König commit 3244c3e7797d235250cd01d4a1d3f60b3b2f6261 Author: Uwe Kleine-König Date: Mon Feb 8 20:34:27 2010 +0100 arm/imx: use generic_handle_irq instead of open-coding it Signed-off-by: Uwe Kleine-König commit 3d40f7fef45c0173e98dcdad6a9d642127331c66 Author: Uwe Kleine-König Date: Fri Feb 5 22:14:37 2010 +0100 arm/imx/gpio: GPIO_INT_{HIGH,LOW}_LEV are not necessarily constant GPIO_INT_LOW_LEV is defined as (cpu_is_mx1_mx2() ? 0x3 : 0x0) so depending on compiler optimisation and enabled SoCs this doesn't qualify as a constant expression as needed by a switch statement. Ditto for GPIO_INT_HIGH_LEV. Signed-off-by: Uwe Kleine-König commit 4a50d00cb90dd5dd79e40281a8719a1fc673c2a5 Author: Uwe Kleine-König Date: Fri Feb 5 22:00:11 2010 +0100 arm/mx2: split generic.c into mm-imx2[17].c This removes some #ifdefs and prepares moving the files in a directory with more than imx21 and imx27 support. Signed-off-by: Uwe Kleine-König commit 621b0e53b5059bf5641c3294c31ac2949c966c93 Author: Uwe Kleine-König Date: Fri Feb 5 17:44:33 2010 +0100 arm/mx2/devices: no need for IMX_NEEDS_DEPRECATED_SYMBOLS any more The previous commits cleaned up arch/arm/mach-mx2/devices.c such that it doesn't rely on deprecated symbols any more. Signed-off-by: Uwe Kleine-König commit 897359d596ca406aaa9f9687b439b4498b579d7f Author: Uwe Kleine-König Date: Fri Feb 5 17:40:28 2010 +0100 arm/mx2: define seperate gpio port descriptions for imx21 and imx27 As the gpio ports have different addresses on imx21 and imx27 there are two different port descriptions needed if not relying on the overloaded cpp macro IO_ADDRESS. So some cpp magic is added to minimize code duplication. Signed-off-by: Uwe Kleine-König commit 3636a145321573f2f735e3ae69f87e0fb166abec Author: Uwe Kleine-König Date: Thu Feb 11 16:31:49 2010 +0100 arm/mx2: use per-SOC nand device The previous commit introduced one nand device per SoC. Use this directly instead of the compatibility macro that will break for multi-SoC kernels. And while at it remove the compatibility macro now that all in-tree users are fixed. Signed-off-by: Uwe Kleine-König commit 2e5070bc1152e8afbf76734e8e3fbfbe60a573ef Author: Jassi Brar Date: Wed Feb 17 19:03:19 2010 +0000 ARM: S3C64XX: Declare IISv4 PCLK for S3C6410 [Updated the device ID to -1 since there's only one IISv4 device but the S3C clock API tries to match based on the ID of the requesting device (and not the name) -- broonie.] Signed-Off-by: Jassi Brar [ben-linux@fluff.org: Fixed Jassi's lastname] Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit de6985be185167d14a79695f345025c531a685d0 Author: Jassi Brar Date: Fri Feb 12 10:38:51 2010 +0000 ARM: S3C64XX: Add AC97 platform resources This patch defines the platform device and the resources: IRQ, DMA and MEM, needed by the AC97 controller driver. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1f1008684a392f92c174252243d72a3297d6fa46 Author: Mark Brown Date: Wed Feb 17 19:03:20 2010 +0000 ARM: SMDK6410: Register IISv4 device The IISv4 controller is connected to the WM8580 on the board. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit a7a81d0bbd7820b279b14dbe00041a603c3cbf84 Author: Mark Brown Date: Wed Feb 17 18:19:31 2010 +0000 ARM: SMDK6410: Add support for PMIC LED on WM1192-EV1 PMIC module The PMIC LED on the SMDK6410 CPU board is driven by GPIO4 of the WM8312 PMIC. Provide software control of this LED. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 60f9101a8881797fecd89450b8a8d17a440e6281 Author: Mark Brown Date: Wed Feb 17 18:19:29 2010 +0000 ARM: SMDK6410: Add initial support for WM1192-EV1 PMIC board The Wolfson Microelectronics 1192-EV1 is a plug in module for the SMDK6410 providing power using a WM8312 PMIC. This patch provides initial hookup sufficient to initialise the board, though not all features are fully described yet. As part of this supplies for the system that are provided as a single supply by one of the currently merged PMIC boards are factored out so they can be reused between different regulators. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit bc449e53121681d16fbefb9c14d28b0638ae33db Author: Jassi Brar Date: Fri Feb 12 10:38:52 2010 +0000 ARM: S3C2443: GPIO: Correct AC97 pin defines GPIO_E-[5,9] pin functionality was defined incorrectly. The patch corrects and adds missing pins. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit c2b2c645dbeecb3433021ea71c6bbed70a1e9db6 Author: Jassi Brar Date: Fri Feb 12 10:38:50 2010 +0000 ARM: SMDK2443: Enable AC97 device Add AC97 controller to platform devices and initialize the AC97 gpios. Signed-off-by: Jassi Brar Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1088f336ccc73feaaff2f95eec6fb5b6e7e94337 Author: Ben Dooks Date: Wed Feb 24 01:46:10 2010 +0000 ARM: SAMSUNG: Fix UART number for S5P6442 The recent changes in the UART code mean that we need to ensure that the 4 UART case is only selected if S5PV210 is being compiled. Signed-off-by: Ben Dooks commit 03843a1294073c19783b43f60f3a455dd0672685 Author: Kukjin Kim Date: Fri Jan 29 10:23:40 2010 +0900 ARM: S5P6442: Add serial port support This patch adds UART serial port support for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 7f7035f21c10d83994e045a98c0906781dba02d3 Author: Kukjin Kim Date: Fri Jan 29 10:22:47 2010 +0900 ARM: S5P6442: Add S5P6442 configuration file This patch adds S5P6442 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 461859db1f367200602d81c9352e2477a6187814 Author: Kukjin Kim Date: Fri Jan 29 10:21:16 2010 +0900 ARM: S5P6442: Add SMDK6442 board support file This patch adds SMDK6442 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 550db7f155c9e51288fbe114fbb33d7a044d8a75 Author: Kukjin Kim Date: Fri Jan 29 10:19:26 2010 +0900 ARM: S5P6442: Update Kconfig and Makefiles Updates arch/arm Kconfig and Makefile for building the S5P6442 support. Also modifies the plat-s5p Kconfig file to include the support for plat-s5p for S5P6442. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d13de2ab8a7afe2d915be4c4758fe25825204226 Author: Ben Dooks Date: Wed Feb 24 01:43:27 2010 +0000 ARM: S5P6442: Add files missing from original commit The removal of plat-s3c has left these missing from the initial commit, so add copies from elsewhere. Signed-off-by: Ben Dooks commit d9f18a981bd0a724c87d04db1d61d91261a2feb4 Author: Kukjin Kim Date: Fri Jan 29 10:17:20 2010 +0900 ARM: S5P6442: Add IRQ support This patch adds IRQ support for S5P6442. This patch adds interrupt register definitions, IRQ definitions for various interrupt sources and new VIC base for VIC2 in plat-s5p common irq code. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b6f837575edc5213e00903afea240f0119ee5ec9 Author: Kukjin Kim Date: Thu Feb 4 09:42:13 2010 +0900 ARM: S5P6442: Add clock support for S5P6442 This patch adds clock support for S5P6442. This patch adds the clock register definitions and the various system clocks in S5P6442. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f7f6a4a0df9b43051d57fdb8ea96c083247a08f Author: Kukjin Kim Date: Fri Jan 29 10:12:14 2010 +0900 ARM: S5P6442: Add Samsung S5P6442 CPU support This patch adds support for Samsung S5P6442 CPU. This patch also adds an entry for S5P6442 cpu in plat-s5p cpu table. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a0af8b3c701d254b55fc291150d5320317c0a338 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:29 2010 +0200 ARM: SAMSUNG: adc: disable/enable IRQ on suspend/resume IRQ should be disabled on suspend and re-enabled on resume. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 0fe1309b4db2a994d0b8347cea034cf58cb4b312 Author: Vasily Khoruzhick Date: Thu Feb 18 18:32:27 2010 +0200 ARM: SAMSUNG: Add resources description for s3c24xx ts driver Without resources description driver fails during initialization. Signed-off-by: Vasily Khoruzhick Signed-off-by: Ben Dooks commit 7965b214bfbe0e6b3dc843cd1d639dc2711ff86e Author: Ben Dooks Date: Tue Feb 23 00:18:36 2010 +0000 ARM: SAMSUNG: Eliminate plat-s3c The plat-s3c directory is now clear, so remove the files in it and expunge it from the build process. Signed-off-by: Ben Dooks commit f94327f2cebf3711defd25375df0c380562127ba Author: Ben Dooks Date: Fri Jan 29 09:02:20 2010 +0000 ARM: SAMSUNG: Move include/mach files out of plat-s3c Move the include/mach files out of plat-s3c and into the relevant machine files. This does mean copying the files, but there is nowhere else to put them. Signed-off-by: Ben Dooks commit ae5fa355ec571525fab60f66dd9d6a2b12c7575e Author: Ben Dooks Date: Fri Jan 29 09:02:19 2010 +0000 ARM: SAMSUNG: Select NO_IOPORT for plat-samsung All these platforms select NO_IOPORT, so move it to plat-samsung Kconfig Signed-off-by: Ben Dooks commit 46ba2a7284fbd61fcba1e16bdd723c79ec5c268f Author: Ben Dooks Date: Fri Jan 29 09:02:18 2010 +0000 ARM: S3C24XX: Move audio-simtec.h to plat-s3c24xx Continue the clearout of plat-s3c by moving audio-simtec.h to plat-s3c24xx as there are no current implementations outside of this platform. Signed-off-by: Ben Dooks commit 89f1fa080b5dca259c9779bcf81b95a409fdbf5b Author: Ben Dooks Date: Fri Jan 29 09:02:17 2010 +0000 ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx Move the Kconfig entries from plat-s3c to plat-samsung and plat-s3c24xx as necessary. The S3C_BOOT entries and the DMA configuration can go to plat-samsung. The low-level UART configurations are currently S3C2XX specific and can go to plat-s3c24xx. Eliminating plat-s3c from the build process will be submitted seperately. Signed-off-by: Ben Dooks commit 88d892a37fc231ab2aa3b1c40ca9d67224616594 Author: Yehuda Sadeh Date: Tue Feb 23 18:16:23 2010 +0000 ceph: don't clobber write return value when using O_SYNC Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit a1ea787c7b6ec036d169d84e08cca7b6e399ba70 Author: Sage Weil Date: Tue Feb 23 14:02:44 2010 -0800 ceph: fix client_request_forward decoding The tid is in the message header, not body. Broken since 6df058c0. No need to look at next mds session; just mark the request and be done. (The old error path was broken too, but now it's gone.) Signed-off-by: Sage Weil commit 2600d2dd5085ab6fb09540226138a60055abf335 Author: Sage Weil Date: Mon Feb 22 15:12:16 2010 -0800 ceph: drop messages on unregistered mds sessions; cleanup Verify the mds session is currently registered before handling incoming messages. Clean up message handlers to pull mds out of session->s_mds instead of less trustworthy src field. Clean up con_{get,put} debug output. Signed-off-by: Sage Weil commit a6369741c48815fedfce7072b7a9cd98b5bafd56 Author: Sage Weil Date: Mon Feb 22 13:59:00 2010 -0800 ceph: fix comments, locking in destroy_inode The destroy_inode path needs no inode locks since there are no inode references. Update __ceph_remove_cap comment to reflect that it is called without cap->session->s_mutex in this case. Signed-off-by: Sage Weil commit 4ce1e9adabbad8f2c45ceeeb6de56cc368484297 Author: Alexander Beregalov Date: Mon Feb 22 17:17:44 2010 +0300 ceph: move dereference after NULL test Signed-off-by: Alexander Beregalov Signed-off-by: Sage Weil commit 5b3a4db3e4009aff918abb1353eb3f4925393a7b Author: Sage Weil Date: Fri Feb 19 21:43:23 2010 -0800 ceph: fix up unexpected message handling Fix skipping of unexpected message types from osd, mon. Clean up pr_info and debug output. Signed-off-by: Sage Weil commit c499546f43f2c31b681271ef7db922839fcde5fe Author: Sebastien Requiem Date: Tue Feb 23 14:51:24 2010 +0100 [ARM] MV78xx0: Support for Buffalo WXL (Terastation Duo) * Modification of Kconfig to add the Option * 1 new file : buffalo-wxl-setup.c This file is inspired from the db-78xx0-setup.c already present. The following is done: - Configure MPP Lines for the plateform (see my patch for MPP) This is taken from the stock kernel provided by buffalotech (the vendor) - GigaBit Ethernet - Sata - Uart are initiallized in a different way than on the dev board as we have one core only. - USB The kernel has been running for some days now on my plateform. Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit ee40ceab234d34abdfeb9922d0f1a18bfa7efdaf Author: Sebastien Requiem Date: Tue Feb 23 14:38:14 2010 +0100 [ARM] MV78XX0: MPP routines and definitions This patch is composed of two new files : - mpp.c which is mainly inspired by the same file as in mach-kirkwood - mpp.h that is written from the documentation provided by Marvell http://www.marvell.com/products/processors/embedded/discovery_innovation/HW_MV78100_OpenSource.pdf Moreover, due to some implementation problem, I have defined some MPPX_UNUSED that offer developers the possibility to SET MPP to some unused value (such as for Buffalo WXL). Note: This patch doesn't support MV78200 yet (only 78100 MPP lines have been written) Signed-off-by: Sebastien Requiem Signed-off-by: Nicolas Pitre commit d5b5746bed1023e4a55f96405422d3e51968fa43 Author: John Holland Date: Fri Feb 19 23:11:04 2010 +0100 [ARM] eSATA SheevaPlug: correlate MPP to SD CD and SD WP Accept SD CD and SD WP in accordance to http://plugcomputer.org/data/docs/Sheeva-PowerPlug-V1.3-GTI-090906.pdf on MPP 47 and 44 respectively on the eSATA SheevaPlug Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d7b222d708e6eff0cf47928f439c8bcf49f10bb6 Author: John Holland Date: Fri Feb 19 23:11:01 2010 +0100 [ARM] eSATA SheevaPlug: configure SoC SATA interface Enable the kirkwood SATA SoC interface on the eSATA SheevaPlug. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit d8ecb3490050b33bf46ce77c7f239e0fc51a6835 Author: John Holland Date: Fri Feb 19 23:10:58 2010 +0100 [ARM] eSATA SheevaPlug basic board support Allow basic eSATA SheevaPlug board configuration and build. Signed-off-by: John Holland Signed-off-by: Nicolas Pitre -- commit fa80945269f312bc609e8384302f58b03c916e12 Author: Thomas Renninger Date: Sat Feb 20 11:44:27 2010 +0100 ACPI thermal: Don't invalidate thermal zone if critical trip point is bad V2: Corrected integer/long conversion. Some BIOSes return a negative value for the critical trip point. Especially since Windows 2006... We currently invalidate the whole thermal zone in this case. But it may still be needed for cooling, also without critical trip point. This patch invalidates the critical trip point if no _CRT function is found or if it returns negative values, but does not invalidate the whole thermal zone in this case. Reference: http://bugzilla.novell.com/show_bug.cgi?id=531547 Signed-off-by: Thomas Renninger Tested-by: clarkt@cnsp.com Acked-by: Zhang Rui Signed-off-by: Len Brown commit 41dcc17c735d4e99a91002b09850d0f09ee4ab4b Author: Kuninori Morimoto Date: Fri Feb 19 07:52:12 2010 +0000 ARM: mach-shmobile: pfc-sh7377: modify KEYIN settings Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 6c6971dc4e8c23bb61bf309898e1693f9c5c8c24 Author: Ben Dooks Date: Fri Jan 29 09:02:16 2010 +0000 ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung Move the init.c and time.c files to plat-samsung from plat-s3c, thus clearing the last files that are being built in here. Signed-off-by: Ben Dooks commit 2c420fe22f3d526691773288807d010068ce3033 Author: Ben Dooks Date: Fri Jan 29 09:02:15 2010 +0000 ARM: SAMSUNG: Move DMA support to plat-samsung Move the core of the DMA support to plat-samsung for everyone to use. Signed-off-by: Ben Dooks commit 806c17b5497f62faa65a1fdd235b7fa2df17d704 Author: Ben Dooks Date: Fri Jan 29 09:02:14 2010 +0000 ARM: SAMSUNG: Move pm.c to plat-samsung Move pm.c to plat-samsung, it should be usable by all Samsung systems Signed-off-by: Ben Dooks commit 7086a9df056602c8e0d9ae8fe17b028832d05f3d Author: Ben Dooks Date: Fri Jan 29 09:02:13 2010 +0000 ARM: SAMSUNG: Move map-base to plat-samsung Move the map-base file to plat-samsung. To make the move easier, we do not change the S3C_ prefix on many of the items as this would involve going through altering all the dependencies. Signed-off-by: Ben Dooks commit c116c1d7254348c7247ec4d7ab005dcc3f42565b Author: Ben Dooks Date: Fri Jan 29 09:02:12 2010 +0000 ARM: SAMSUNG: Move common headers from plat-s3c to plat-samsung Move common headers from plat-s3c's include/plat directory into plat-samsung. No need to fix any files, these are still included via Signed-off-by: Ben Dooks commit 7f0ff702cdf51472750f4b6042866f1b83a11215 Merge: d35b7a8 110d85a Author: Ben Dooks Date: Mon Feb 22 23:38:26 2010 +0000 ARM: Merge next-samsung-s3c64xx-platdeletion Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung Conflicts: arch/arm/mach-s3c64xx/Makefile (fixed) commit 110d85acd479b80dc11b7fa3abef63285da8ea0c Author: Ben Dooks Date: Mon Feb 22 23:26:47 2010 +0000 ARM: S3C64XX: Eliminate plat-s3c64xx Now we've move the support out of plat-s3c64xx for everything, eliminate the platform directory arch/arm/plat-s3c64xx and remove it from the ARM build configuration. Note, PLAT_S3C64XX is kept around for the moment until the drivers that depend on it can be updated, so it is moved to the mach-s3c64xx Kconfig. Signed-off-by: Ben Dooks commit 281ff33b7c1b1ba2a5f9b03425e5f692a94913fa Author: Suresh Siddha Date: Thu Feb 18 11:51:40 2010 -0800 x86_64, cpa: Don't work hard in preserving kernel 2M mappings when using 4K already We currently enforce the !RW mapping for the kernel mapping that maps holes between different text, rodata and data sections. However, kernel identity mappings will have different RWX permissions to the pages mapping to text and to the pages padding (which are freed) the text, rodata sections. Hence kernel identity mappings will be broken to smaller pages. For 64-bit, kernel text and kernel identity mappings are different, so we can enable protection checks that come with CONFIG_DEBUG_RODATA, as well as retain 2MB large page mappings for kernel text. Konrad reported a boot failure with the Linux Xen paravirt guest because of this. In this paravirt guest case, the kernel text mapping and the kernel identity mapping share the same page-table pages. Thus forcing the !RW mapping for some of the kernel mappings also cause the kernel identity mappings to be read-only resulting in the boot failure. Linux Xen paravirt guest also uses 4k mappings and don't use 2M mapping. Fix this issue and retain large page performance advantage for native kernels by not working hard and not enforcing !RW for the kernel text mapping, if the current mapping is already using small page mapping. Reported-by: Konrad Rzeszutek Wilk Signed-off-by: Suresh Siddha LKML-Reference: <1266522700.2909.34.camel@sbs-t61.sc.intel.com> Tested-by: Konrad Rzeszutek Wilk Cc: stable@kernel.org [2.6.32, 2.6.33] Signed-off-by: H. Peter Anvin commit 8cb3a2ebc19eef58bcbd5460c4fb463f30bc6459 Author: Kuninori Morimoto Date: Mon Feb 22 09:30:12 2010 +0000 ARM: mach-shmobile: ap4evb: Add S6 debug switch support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 5098280e015e36daebfd16f976ec3db6f4975fac Author: Kuninori Morimoto Date: Mon Feb 22 09:20:39 2010 +0000 ARM: mach-shmobile: ap4evb: Add LED support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 586f64c749a71fa2c86e1e2c121d22c8bc60669a Author: Jiri Kosina Date: Mon Feb 22 11:10:48 2010 +0100 Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed This is a partial revert of commit 3ad2f3fbb961 ("tree-wide: Assorted spelling fixes") as the change in arch/sparc/kernel/leon_kernel.c has been already fixed while refactoring the file in the sparc tree. Reported-by: Stephen Rothwell Signed-off-by: Jiri Kosina commit 992426bfe98e71db1ce767fd66f6c68ed18fcc14 Author: Ben Dooks Date: Sat Feb 20 23:01:33 2010 +0000 ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed dma-plat.h is the last file left in plat-s3c64xx, but to remove it we must also change the use of dma-plat.h by the core code and the s3c24xx implementation. Rename the s3c24xx dma-plat.h in the common plat-samsung directory as it may be used for other ports. Move the specific dma bits into the mach-s3c64xx directory and update the build as needed. Signed-off-by: Ben Dooks commit 431fb7df24ebf360ba35895a60d084de364e39f8 Author: Ben Dooks Date: Fri Feb 5 13:52:53 2010 +0100 ARM: SAMSUNG: Move pm-core.h to machine directory Move the pm-core.h to the machine include directory in the process of eliminating the plat-s3c64xx. Signed-off-by: Ben Dooks commit 89f0ce721c0bc95c109300edcd8525d8ea5df8f2 Author: Ben Dooks Date: Tue Jan 26 15:49:15 2010 +0900 ARM: S3C64XX: Remove plat-s3c64xx Kconfig and PLAT_S3C64XX Remove the Kconfig and PLAT_S3C64XX defines for the previous S3C64XX directory structure now that the code is moved into mach-s3c64xx. Note, we cannot currently remove plat-s3c64xx directory as we have a pair of include files used within plat-s3c and plat-samsung that need to find a new home. Signed-off-by: Ben Dooks commit 55bf9267dd628c9369674ca75f5b00e275529289 Author: Ben Dooks Date: Tue Jan 26 15:10:38 2010 +0900 ARM: S3C64XX: Combine the clock init code Turn the init sequence of s3c24xx_register_baseclocks(xtal); s3c64xx_register_clocks(); s3c6400_register_clocks(S3C6410_CLKDIV0_ARM_MASK); into a single call as this is now contained within one file. Signed-off-by: Ben Dooks commit 62acb2f82dc27cd40729e7d4c2879e57fe41b927 Author: Ben Dooks Date: Tue Jan 26 14:53:19 2010 +0900 ARM: S3C64XX: Merge s3c6400-clock.c and clock.c into mach-s3c64xx Merge plat-s3c64xx/s3c6400-clock.c mach-s3c64xx/clock.c placing all the clock code into one place. Note, no effort is made in this patch to squash the init functions together. Signed-off-by: Ben Dooks commit 6ce8fde296e56cda9d7416e015ed2fe495c9c48c Author: Ben Dooks Date: Tue Jan 26 14:32:09 2010 +0900 ARM: S3C64XX: Merge s3c6400-init.c into cpu.c Since this file is small, and is compiled for both systems in this architecture merge it into the cpu support file and remove the original instead of moving it. Signed-off-by: Ben Dooks commit f7be9abaa5f4a64fdcca6808bb7eacb3547e574e Author: Ben Dooks Date: Tue Jan 26 13:41:30 2010 +0900 ARM: S3C64XX: Move core support to mach-s3c64xx Move the core S3C64XX support to mach-s3c64xx as it is unlikely to be used outside of this directory. Also move the SoC header files in with it. This includes the clock, cpu, cpufreq, dma, gpiolib and pll support. Signed-off-by: Ben Dooks commit 88fc68a280709f3fb9488986ab39eac330d17b6d Author: Ben Dooks Date: Tue Jan 26 11:19:18 2010 +0900 ARM: S3C64XX: Move device and device setup into mach-s3c64xx Move the S3C64XX specific device and setup files into mach-s3c64xx as they are unlikely to be used outside of this code. Signed-off-by: Ben Dooks commit ed618aff8a952f712caf1d475e0947a32a8b6606 Author: Ben Dooks Date: Tue Jan 26 11:07:23 2010 +0900 ARM: S3C64XX: Move IRQ support into mach-s3c64xx Move IRQ support to mach-s3c64xx as it is unlikely to be re-used outside this machine. Signed-off-by: Ben Dooks commit 3501c9ae9fc5414d09c9a8d3a5452d2b167db916 Author: Ben Dooks Date: Tue Jan 26 10:45:40 2010 +0900 ARM: S3C64XX: Move headers into machine include directory Move the register and GPIO definition files from plat-s3c64xx into the machine include direcotry as they are unlikely to be reused outside mach-s3c64xx. This move includes removing the empty and replacing it with the implementation. Signed-off-by: Ben Dooks commit bcd2cbd10ce31c950a40c08d7f601f8ff23537b8 Author: Yehuda Sadeh Date: Fri Feb 19 00:12:21 2010 +0000 ceph: cleanup redundant code in handle_cap_grant There is no state in local vars that requires us to loop after temporarily dropping i_lock. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit c9af9fb68e01eb2c2165e1bc45cfeeed510c64e6 Author: Yehuda Sadeh Date: Fri Feb 19 00:10:11 2010 +0000 ceph: don't truncate dirty pages in invalidate work thread Instead of truncating the whole range of pages, we skip those pages that are dirty or in the middle of writeback. Those pages will be cleared later when the writeback completes. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit e63dc5c780ba32d6d8b3662eecce2b8d96489b41 Author: Yehuda Sadeh Date: Fri Feb 19 00:07:01 2010 +0000 ceph: remove page upon writeback completion if lost cache cap This page should have been removed earlier when the cache cap was revoked, but a writeback was in flight, so it was skipped. We truncate it here just as the writeback finishes, while it's still locked. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 5ecad6fd7bfd30b3eaea51345f546b81de7a6473 Author: Sage Weil Date: Wed Feb 17 10:43:37 2010 -0800 ceph: fix check for invalidate_mapping_pages success We need to know whether there was any page left behind, and not the return value (the total number of pages invalidated). Look at the mapping to see if we were successful or not. Move it all into a helper to simplify the two callers. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 8b7ef6d8f16274da42344cd50746ddb1c93c25ea Author: Thomas Renninger Date: Tue Feb 16 22:55:51 2010 +0100 ACPI thermal: Check for thermal zone requirement ACPI spec says (11.5 Thermal Zone Interface Requirements): A thermal zone must contain at least one trip point (critical, near critical, active, or passive) Check this once at init time. Signed-off-by: Thomas Renninger Tested-by: clarkt@cnsp.com Signed-off-by: Len Brown commit b7e9f6219d01ccb4af6fe5ad082150032ecae8ab Author: Jiri Kosina Date: Fri Feb 19 00:44:42 2010 +0100 Remove drivers/parport/ChangeLog Remove outdated drivers/parport/ChangeLog. No need for such files since we have git. Acked-by: Alan Cox Signed-off-by: Jiri Kosina commit 1ef8a5be834117fa54db6cb595fc2d45c14a38cf Author: Jonathan Corbet Date: Thu Feb 18 09:52:00 2010 -0700 Remove drivers/char/ChangeLog The ChangeLog file under drivers/char is 30K of stuff dedicated to the mid-90's TTY exploits of Ted Ts'o; it has been updated once since 1998 - and that was in 2001. It's interesting history, but we don't normally carry that kind of history inline with the code. Let's remove it. Signed-off-by: Jonathan Corbet Acked-by: Alan Cox Acked-by: "Theodore Ts'o" Signed-off-by: Jiri Kosina commit 02624a17896036c663fd5992c22919af8dad93ed Author: Kuninori Morimoto Date: Thu Feb 18 17:58:19 2010 +0900 ARM: mach-shmobile: ap4evb: Add tiny document Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b228b48e454007436a8e6ff1c6b6f4f6602fc45e Author: Kuninori Morimoto Date: Thu Feb 18 16:44:41 2010 +0900 ARM: mach-shmobile: ap4evb: Add SCIFA0 support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 0f547dc1f6e4faf05fd9946c6b7e9a828e7f901e Author: Baruch Siach Date: Wed Feb 17 12:33:25 2010 +0200 mx25pdk: add LCD support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 04a03e5fe3d337242e5c0a9c93d2fd24cff545ef Author: Baruch Siach Date: Wed Feb 17 12:33:24 2010 +0200 mx25: add platform support for imxfb Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit f601441916d1e19291d0b4f044b4a7551e2924d0 Author: Baruch Siach Date: Wed Feb 17 12:33:23 2010 +0200 imxfb: add support for i.MX25 The commit also introduces the HAVE_FB_IMX config that is to be selected from the MX25 platform config. Once this commit gets merged, the two other i.MX archs, ARCH_MX1 and ARCH_MX2, should follow this one. Signed-off-by: Baruch Siach Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 1b7e0677fb1513605df327ae2987d17e0b2ae3ea Author: Kuninori Morimoto Date: Wed Feb 17 09:30:14 2010 +0000 ARM: mach-shmobile: SMSC 9220 support for AP4EVB. Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit b789b3fdccc1690826331f4c878b644c3904ca6b Author: Kuninori Morimoto Date: Wed Feb 17 09:39:10 2010 +0000 ARM: mach-shmobile: Add sh7372 pinmux support Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit 2c27c9a57c93a0757b9b4b0e7dc1abeaf1db1ce2 Author: Sage Weil Date: Wed Feb 17 15:45:51 2010 -0800 ceph: fix typo in ceph_queue_writeback debug output Signed-off-by: Sage Weil commit cb2992a60b7e73fbabe9ffe54056eed0022f2ed2 Author: Mulyadi Santosa Date: Thu Feb 18 01:22:40 2010 +0700 doc: typo - Table 1-2 should refer to "status", not "statm" Fixes a typo in proc.txt documentation. Table 1-2 should refer to "status", not "statm" Signed-off-by: Mulyadi Santosa Signed-off-by: Jiri Kosina commit a17d6473cc9eb64a5b41c568310aa73824ebaa64 Author: Sage Weil Date: Wed Feb 17 13:56:07 2010 -0800 ceph: v0.19 release Signed-off-by: Sage Weil commit 4fc51be8fa7043ff9a1e34fef0e99214373332ac Author: Sage Weil Date: Tue Feb 16 15:55:03 2010 -0800 ceph: use rbtree for pg pools; decode new osdmap format Since we can now create and destroy pg pools, the pool ids will be sparse, and an array no longer makes sense for looking up by pool id. Use an rbtree instead. The OSDMap encoding also no longer has a max pool count (previously used to allocate the array). There is a new pool_max, that is the largest pool id we've ever used, although we don't actually need it in the client. Signed-off-by: Sage Weil commit 9794b146fa7b93f8ab74fb62d67fdefad760769f Author: Sage Weil Date: Tue Feb 16 15:53:32 2010 -0800 ceph: fix memory leak when destroying osdmap with pg_temp mappings Also move _lookup_pg_mapping into a helper. Signed-off-by: Sage Weil commit 7c1332b8cb5b27656cf6ab1f5fe808a8eb8bb2c0 Author: Sage Weil Date: Tue Feb 16 11:39:45 2010 -0800 ceph: fix iterate_caps removal race We need to be able to iterate over all caps on a session with a possibly slow callback on each cap. To allow this, we used to prevent cap reordering while we were iterating. However, we were not safe from races with removal: removing the 'next' cap would make the next pointer from list_for_each_entry_safe be invalid, and cause a lock up or similar badness. Instead, we keep an iterator pointer in the session pointing to the current cap. As before, we avoid reordering. For removal, if the cap isn't the current cap we are iterating over, we are fine. If it is, we clear cap->ci (to mark the cap as pending removal) but leave it in the session list. In iterate_caps, we can safely finish removal and get the next cap pointer. While we're at it, clean up put_cap to not take a cap reservation context, as it was never used. Signed-off-by: Sage Weil commit 85ccce43a3fc15a40ded6ae1603e3f68a17f4d24 Author: Sage Weil Date: Wed Feb 17 10:02:43 2010 -0800 ceph: clean up readdir caps reservation Use a global counter for the minimum number of allocated caps instead of hard coding a check against readdir_max. This takes into account multiple client instances, and avoids examining the superblock mount options when a cap is dropped. Signed-off-by: Sage Weil commit 5ce6e9dbe6805ab8ee67e21936d17f431adc63c6 Author: Sage Weil Date: Mon Feb 15 16:22:28 2010 -0800 ceph: fix authentication races, auth_none oops Call __validate_auth() under monc->mutex, and use helper for initial hello so that the pending_auth flag is set. This fixes possible races in which we have an authentication request (hello or otherwise) pending and send another one. In particular, with auth_none, we _never_ want to call ceph_build_auth() from __validate_auth(), since the ->build_request() method is NULL. Signed-off-by: Sage Weil commit 85ff03f6bfef7d5b59ab3aefd4773f497ffad8a4 Author: Sage Weil Date: Mon Feb 15 14:47:28 2010 -0800 ceph: use rbtree for mon statfs requests An rbtree is lighter weight, particularly given we will generally have very few in-flight statfs requests. Signed-off-by: Sage Weil commit a105f00cf17d711e876b3dc67e15f9a89b7de5a3 Author: Sage Weil Date: Mon Feb 15 14:37:55 2010 -0800 ceph: use rbtree for snap_realms Switch from radix tree to rbtree for snap realms. This is much more appropriate given that realm keys are few and far between. Signed-off-by: Sage Weil commit 44ca18f2682eb1cfbed153849adedb79e3e19790 Author: Sage Weil Date: Mon Feb 15 12:08:46 2010 -0800 ceph: use rbtree for mds requests The rbtree is a more appropriate data structure than a radix_tree. It avoids extra memory usage and simplifies the code. It also fixes a bug where the debugfs 'mdsc' file wasn't including the most recent mds request. Signed-off-by: Sage Weil commit 91e45ce38946a8efa21fefbc65d023ca3c0b434f Author: Sage Weil Date: Mon Feb 15 12:05:09 2010 -0800 ceph: cancel delayed work when closing connection This ensures that if/when we reopen the connection, we can requeue work on the connection immediately, without waiting for an old timer to expire. Queue new delayed work inside con->mutex to avoid any race. This fixes problems with clients failing to reconnect to the MDS due to the client_reconnect message arriving too late (due to waiting for an old delayed work timeout to expire). Signed-off-by: Sage Weil commit e2663ab60de59d20fa33da3528f6d5359f8eb003 Author: Sage Weil Date: Tue Feb 16 22:01:03 2010 -0800 ceph: allow connection to be reopened by fault callback Fix the messenger to allow a ceph_con_open() during the fault callback. Previously the work wasn't getting queued on the connection because the fault path avoids requeued work (normally spurious). Loop on reopening by checking for the OPENING state bit. This fixes OSD reconnects when a TCP connection drops. Signed-off-by: Sage Weil commit c13f3d378f77ce3176628ade452b0e461242faf3 Author: FUJITA Tomonori Date: Mon Feb 15 11:33:04 2010 +0900 x86/gart: Unexport gart_iommu_aperture I wrongly exported gart_iommu_aperture in the commit 42590a75019a50012f25a962246498dead428433. It's not necessary so let's unexport it. Signed-off-by: FUJITA Tomonori Cc: Joerg Roedel LKML-Reference: <20100215113241P.fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Ingo Molnar commit 94d32f99c6aba8b702a9cf78cb328aeb7882b1e5 Author: Andy Green Date: Mon Feb 1 13:28:54 2010 +0100 imx-serial-excessive-status-clearing-on-break.patch cc: Sasha Hauer We noticed that we were only able to communicate once with a GSM module per session, if we powered down the module then the serial driver was broken until reset, no traffic or /proc/interrupts activity could be seen any more. Volker noticed it was provoked by a long "break" seen on the wire when the RX was not driven during powerdown, we discovered we could kill the serial driver just by forcing RX low extenally for a little while. I saw that the processing for BREAK in the driver gets too excited and clears down all set bits in USR2, including that a character is pending. This stops all further characters getting processed. The attached one-liner makes the serial driver immortal against BREAK. Signed-off-by: Andy Green Signed-off-by: Volker Ernst Signed-off-by: Sascha Hauer commit 38bcb37a6f63fcdfcc0dd0af3ec5c03a4b7be48e Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 2 14:37:56 2010 -0800 ACPICA: fix acpi_ex_release_mutex() comment trivial, leftover from my NULL pointer dereference patch which got 'superseded' by commit fbc3be2 Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit ded180e7ebfc324b36a94931f99d0705dcd8da29 Author: Bartlomiej Zolnierkiewicz Date: Tue Feb 2 14:37:55 2010 -0800 ACPI: remove superfluous NULL pointer check from acpi_processor_get_throttling_info() Dan's list contains: drivers/acpi/processor_throttling.c +1139 acpi_processor_get_throttling_info(11) warning: variable derefenced before check 'pr' acpi_processor_get_throttling_info() is never called with pr == NULL. [ bart: the potential NULL pointer dereference was finally fixed in (much later than mine) commit 5cfa245 but my patch is still valid ] Reported-by: Dan Carpenter Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Len Brown commit 0e026445fb36852d3102cb8bb24868765fe5816a Author: Len Brown Date: Tue Feb 16 03:01:42 2010 -0500 ACPI: delete unused acpi_evaluate_string() Roel found a logic issue in the #if 0 acpi_evaluate_string(): - || (element->type != ACPI_TYPE_BUFFER) + && (element->type != ACPI_TYPE_BUFFER) delete the dead code. pointed-out-by: Roel Kluin Signed-off-by: Len Brown commit 2f68ffd11aa76b251921976c982b814df9ebe890 Merge: 5601280 a602f0f Author: Russell King Date: Mon Feb 15 21:20:33 2010 +0000 Merge branch 'arm/clock-event' of git://git.pengutronix.de/git/ukl/linux-2.6 into devel-stable commit 56012808f4d5606e401539f663d92009d964425b Merge: a814290 b2a731a Author: Russell King Date: Mon Feb 15 21:20:18 2010 +0000 Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable Conflicts: arch/arm/Makefile commit 153a008bf7915ea9127341409170cb197d111282 Author: Sage Weil Date: Mon Feb 15 12:11:51 2010 -0800 ceph: reset osd connections after fault A single osd connection fault (e.g. tcp disconnect) wasn't reopening the connection, which causes all current and future requests for that osd to hang. Signed-off-by: Sage Weil commit f0d3ab49110327516b7f0b6d27fd33d6fa079d6c Author: Uwe Kleine-König Date: Fri Feb 5 16:57:59 2010 +0100 arm/mx2: define seperate imx_nand devices for imx21 and imx27 As the NFC controller has different addresses on imx21 and imx27 there are two different devices needed if not relying on the overloaded cpp macro NFC_BASE_ADDR. So some cpp magic is added to minimize code duplication. As obviously these two defines need different names, the name of the old device is #defined to the new one when building for only one of imx21 or imx27. Signed-off-by: Uwe Kleine-König commit dfff0615d28bdb3e8d213e5537dd069265912667 Author: Uwe Kleine-König Date: Fri Feb 12 21:58:11 2010 +0100 tree-wide: fix typos "ass?o[sc]iac?te" -> "associate" in comments Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit deded43508f065c95af506d18b8309ba842c397e Author: Kuninori Morimoto Date: Fri Feb 12 09:55:08 2010 +0000 ARM: mach-shmobile: intc-sh7372 tidyup This patch is based on Rev 0.5 manual Signed-off-by: Kuninori Morimoto Signed-off-by: Paul Mundt commit aa18ef609b65a76e4531b09dd0c196be3e04eb94 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:11:18 2010 +0000 ARM: mach-shmobile: G4EVM USBHS support Add G4EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7377. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 276b4f623cfd30320c004269725683ba8f262bb6 Author: NISHIMOTO Hiroki Date: Fri Feb 12 08:10:06 2010 +0000 ARM: mach-shmobile: sh7377 and G4EVM pinmux support Add support for the sh 7377 pinmux using drivers/sh/pfc.c and some LEDs on G4EVM. Signed-off-by: NISHIMOTO Hiroki Signed-off-by: Paul Mundt commit 6c5d1a49e5e88ee831117f4b2375829933ad15da Author: Sage Weil Date: Sat Feb 13 20:29:31 2010 -0800 ceph: fix msgr to keep sent messages until acked The test was backwards from commit b3d1dbbd: keep the message if the connection _isn't_ lossy. This allows the client to continue when the TCP connection drops for some reason (network glitch) but both ends survive. Signed-off-by: Sage Weil commit 6b79b264ce04e2acd24330140e147801cdbaa39f Author: Jiri Kosina Date: Fri Feb 12 10:31:37 2010 +0100 No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h This is partial revert of commit 9404c9c392d5 ("Fix misspelling of "should" and "shouldn't" in comments"). According to Dave Airlie: "Can we drop any cleanups to atombios.h? This file comes from AMD and we normally drop it into place, so they just get overwritten next time." Reported-by: Dave Airlie Signed-off-by: Jiri Kosina commit 3a7b802d1a8c279876ec74094d71f3c6c45d8030 Author: Magnus Damm Date: Wed Feb 10 20:13:31 2010 +0900 ARM: mach-shmobile: G3EVM USBHS support Add G3EVM platform data and a magic setup sequence to initialize the r8a66597 block aka USBHS in sh7367. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 7fdda6780aaa21c7a94e09975649649bb0f4a932 Author: Magnus Damm Date: Wed Feb 10 20:10:55 2010 +0900 ARM: mach-shmobile: sh7367 and G3EVM pinmux support Add support for the sh7367 pinmux using drivers/sh/pfc.c and select serial console pins and some LEDs on G3EVM. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 8031049147c58d9d8b6226c3ac31a9d72d053e25 Author: Sage Weil Date: Tue Feb 9 16:43:11 2010 -0800 ceph: remove bogus invalidate_mapping_pages We were invalidating mapping pages when dropping FILE_CACHE in __send_cap(). But ceph_check_caps attempts to invalidate already, and also checks for success, so we should never get to this point. Signed-off-by: Sage Weil commit 0840d8af3e6e40bcd5f2366698eb2755f88acfea Author: Sage Weil Date: Tue Feb 9 15:44:16 2010 -0800 ceph: invalidate pages even if truncate is pending There is no reason not to invalidate pages when a truncate is pending. Both throw out page cache pages. Signed-off-by: Sage Weil commit 3c6f6b79a64db7f1c7abf09d693db3b0066784fb Author: Sage Weil Date: Tue Feb 9 15:24:44 2010 -0800 ceph: cleanup async writeback, truncation, invalidate helpers Grab inode ref in helper. Make work functions static, with consistent naming. Signed-off-by: Sage Weil commit 6a026589ba333185c466c906376fe022a27a53f9 Author: Sage Weil Date: Tue Feb 9 14:04:02 2010 -0800 ceph: fix sync read eof check deadlock If a sync read gets a short result from the OSD, it may need to do a getattr to see if it is short due to reaching end-of-file. The getattr was being done while holding a reference to FILE_RD, which can lead to a deadlock if the MDS is revoking that capability bit and can't process the getattr until it does. We fix this by setting a flag if EOF size validation is needed, and doing the getattr in ceph_aio_read, after the RD cap ref is dropped. If the read needs to be continued, we loop and continue traversing the file. Signed-off-by: Sage Weil commit 68c283236a1e0772e1a469dd2ffc17afc300b07b Author: Sage Weil Date: Tue Feb 9 13:41:47 2010 -0800 ceph: do not retain caps that are being revoked Never retain caps in __send_cap() that are being revoked. Signed-off-by: Sage Weil commit cbd03635913a86afb7c2cfc0058932956b05b51e Author: Sage Weil Date: Tue Feb 9 13:41:18 2010 -0800 ceph: cap revocation fixes Try to invalidate pages in ceph_check_caps() if FILE_CACHE is being revoked. If we fail, queue an immediate async invalidate if FILE_CACHE is being revoked. (If it's not being revoked, we just queue the caps for later evaluation later, as per the old behavior.) Signed-off-by: Sage Weil commit 29065a513aa4c7e4b46b77cbcd25f814a4ca0bfe Author: Yehuda Sadeh Date: Tue Feb 9 11:14:41 2010 -0800 ceph: sync read/write considers page cache In the cases where we either do a sync read or a write, we need to make sure that everything in the page cache is flushed. In the case of a sync write we invalidate the relevant pages, so that subsequent read/write reflects the new data written. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 3d497d858ae6e5f23a28783030aecc69074e102d Author: Yehuda Sadeh Date: Tue Feb 9 11:08:40 2010 -0800 ceph: fix truncation when not holding caps A truncation should occur when either we have the specified caps for the file, or (in cases where we are not the only ones referencing the file) when it is mapped or when it is opened. The latter two cases were not handled. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 4af6b2257ee0eb8f4bf3b1dc8acb643c0e8a887f Author: Yehuda Sadeh Date: Tue Feb 9 11:02:51 2010 -0800 ceph: refactor ceph_write_begin, fix ceph_page_mkwrite Originally ceph_page_mkwrite called ceph_write_begin, hoping that the returned locked page would be the page that it was requested to mkwrite. Factored out relevant part of ceph_page_mkwrite and we lock the right page anyway. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 972f0d3ab1a15cb5d790dd8c53903066084b28f2 Author: Yehuda Sadeh Date: Thu Feb 4 13:41:41 2010 -0800 ceph: fix short synchronous reads Zeroing of holes was not done correctly: page_off was miscalculated and zeroing the tail didn't not adjust the 'read' value to include the zeroed portion. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 02f90c61096ec3ad691e808a4aa7ca5a06e550ec Author: Sage Weil Date: Thu Feb 4 16:18:10 2010 -0800 ceph: add uid field to ceph_pg_pool Also verify encoding version as we go. Signed-off-by: Sage Weil commit f5a2041bd96c9f05ff10172b9c814c14f247084e Author: Yehuda Sadeh Date: Wed Feb 3 11:00:26 2010 -0800 ceph: put unused osd connections on lru Instead of removing osd connection immediately when the requests list is empty, put the osd connection on an lru. Only if that osd has not been used for more than a specified time, will it be removed. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit b056c8769d1da6a6a80ce780a4b8957b70434a41 Author: Yehuda Sadeh Date: Wed Feb 3 10:47:48 2010 -0800 ceph: remove unused variable Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit ec0994e48ea2aebf62ff08376227f3a9ccf46262 Author: Sage Weil Date: Tue Feb 2 16:25:35 2010 -0800 ceph: add support for auth_x authentication protocol The auth_x protocol implements support for a kerberos-like mutual authentication infrastructure used by Ceph. We do not simply use vanilla kerberos because of scalability and performance issues when dealing with a large cluster of nodes providing a single logical service. Auth_x provides mutual authentication of client and server and protects against replay and man in the middle attacks. It does not encrypt the full session over the wire, however, so data payload may still be snooped. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 5c42dc7070c94622ca914b5a2e227f3744e857e7 Author: Jean Delvare Date: Thu Feb 11 15:04:36 2010 +0100 devres/irq: Fix devm_irq_match comment Fix the reference (in comment). Signed-off-by: Jean Delvare Signed-off-by: Jiri Kosina commit 07c8739c521cb029d0f3549556aae2d304513978 Author: Sage Weil Date: Thu Feb 4 09:42:20 2010 -0800 ceph: add struct version to auth encoding Inlucde struct version in encoding. This will streamline future protocol changes. Signed-off-by: Sage Weil commit 9bd2e6f8ba71facf1cadb7154a7e0e4d345a6aba Author: Sage Weil Date: Tue Feb 2 16:21:06 2010 -0800 ceph: allow renewal of auth credentials Add infrastructure to allow the mon_client to periodically renew its auth credentials. Also add a messenger callback that will force such a renewal if a peer rejects our authenticator. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 8b6e4f2d8b21c25225b1ce8d53a2e03b92cc8522 Author: Sage Weil Date: Tue Feb 2 16:07:07 2010 -0800 ceph: aes crypto and base64 encode/decode helpers Helpers to encrypt/decrypt AES and base64. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit c7e337d6490d6f2f5e66ddf1b04d00b0dbd10108 Author: Sage Weil Date: Tue Feb 2 16:11:19 2010 -0800 ceph: buffer decoding helpers Helper for decoding into a ceph_buffer, and other misc decoding helpers we will need. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit b2a731aa5cbca7e0252da75e16de7ae5feb1313a Author: Laurie Bradshaw Date: Wed Feb 10 16:10:43 2010 +0000 [ARM] orion5x: D-link DNS-323 revision A1 power LED This patch fixes the power LED on DNS-323 revision A1, and adds timer support for (hopefully) both A1 and B1 revisions. Power LED on revision A1 is active low and also requires GPIO 4 to be low to work. Tested on my DNS-323 revision A1. I have set the default trigger to timer as that replicates the behaviour of the original firmware, userspace can change the trigger at the end of the boot process providing a useful indication that booting has completed. Signed-off-by: Nicolas Pitre commit eeb5b4ae81f4a750355fa0c15f4fea22fdf83be1 Author: Kevin Dankwardt Date: Wed Feb 10 23:43:40 2010 +0900 fat: Fix stat->f_namelen I found that the length of a file name when created cannot exceed 255 characters, yet, pathconf(), via statfs(), returns the maximum as 260. Signed-off-by: Kevin Dankwardt Signed-off-by: OGAWA Hirofumi commit e335c75cf32b7014f84c90bbe7ed9b7ecd8e7778 Author: Valentin Longchamp Date: Tue Feb 9 18:13:36 2010 +0100 mx31moboard: support for the smartbot baseboard This baseboard is used on the handbot and eybot robots. The sel gpios are used as enables and rst signals on smartbot, thus the sel init is moved from mx31moboard file to board files. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit cda82f85c2bba92daa3d017f7c7bc5f8c61a2e11 Author: Valentin Longchamp Date: Tue Feb 9 18:13:35 2010 +0100 mx31moboard: make usbh2 enable gpio claim more atomic It is more cosmetic than fixing a real problem, but the code looks more logical like that Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit f8594c283e409024d817e75027074570ce27dcc5 Author: Valentin Longchamp Date: Tue Feb 9 18:13:34 2010 +0100 mx31moboard: change initial reset status for robot microcontollers We want the microcontrollers to be held in reset during kernel boot. We also set the turretcam as the default camera since it is present on all marxbots. Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit fed9b63ca5aa999e618140cc1cc6bd73f212ec9b Merge: d2831d1 3d48e1d Author: Sascha Hauer Date: Wed Feb 10 11:11:37 2010 +0100 Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master commit d2831d1f543489ef97a20e6e65f625e195b521bf Author: Sascha Hauer Date: Tue Feb 9 11:04:36 2010 +0100 i.MX pcm043: Add AC97 sound support Signed-off-by: Sascha Hauer commit c8a6885f2153087668b64d4ee25f78a7dda1dadb Author: Sascha Hauer Date: Mon Feb 8 16:42:28 2010 +0100 pca100: add sound support Signed-off-by: Sascha Hauer commit d9e557e5cb2052164f04af75c7d3d9bdd4111054 Author: Sascha Hauer Date: Tue Feb 9 10:48:16 2010 +0100 add ssi header file Signed-off-by: Sascha Hauer commit 1afeea84bd821e9a8c1c6606ba677bc229dd57de Author: Simon Guinot Date: Tue Feb 9 21:20:56 2010 +0100 [ARM] Kirkwood: define SATA LED for netspace_v2 This patch add a GPIO LED named "ns_v2:blue:sata" which can be used to enable or disable SATA activity LED blinking. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit ca9cea939932a0a64fee9d83b3c631431359446f Author: Simon Guinot Date: Tue Feb 9 21:20:55 2010 +0100 [ARM] Kirkwood: add LaCie Internet Space v2 support The Internet and Network Space v2 boards are very close. The only difference is that there is no USB type B plug wired on the Internet Space v2. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit 7a15726cb4aca67150b93a5ce5413efe6e87c95d Author: Simon Guinot Date: Tue Feb 9 21:21:50 2010 +0100 [ARM] Orion5x: enable SATA LED blinking for d2net Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit d74b96a73a99853708d6b278c2ce683657fa1ec5 Author: Simon Guinot Date: Tue Feb 9 21:21:49 2010 +0100 [ARM] Orion5x: set valid GPIO inhibit power-off for d2net This patch allow user-space to configure the switch power-off behaviour via the gpiolib sysfs interface. Signed-off-by: Simon Guinot Signed-off-by: Nicolas Pitre commit 3d48e1d0e8701d004ce7e1dd66088f42e429d079 Author: Amit Kucheria Date: Thu Feb 4 15:57:29 2010 -0800 mxc: MAINTAINERS: Add maintainer for mach-mx5 Add self to MAINTAINERS for Freescale i.MX5 SoCs Signed-off-by: Amit Kucheria commit 51c23a04c39e6a95a37b8af8625a550e674ddef6 Author: Amit Kucheria Date: Fri Dec 4 00:57:20 2009 +0200 mxc: Add mx51_defconfig This config is used to test the base support for i.MX51 processors on the Babbage board Signed-off-by: Amit Kucheria commit b996b5830364c1b1d2469be574f4ebe831987ba9 Author: Amit Kucheria Date: Tue Feb 2 11:57:53 2010 -0800 mxc: Add support for the Babbage board (i.MX5) Babbage is a reference board from Freescale for their i.MX51 SoC. Add board definition, Kconfig and Makefiles to enable Freescale i.MX51 processor and Babbage board. Boot tested on a Babbage2.5 board Signed-off-by: Amit Kucheria commit a329b48c43e5e2e6b51ce159d99aefeb90c7c066 Author: Amit Kucheria Date: Thu Feb 4 12:21:53 2010 -0800 mxc: Core support for Freescale i.MX5 series Add basic clock support, cpu identification, I/O mapping, interrupt controller, serial port and ethernet. Signed-off-by: Amit Kucheria commit 438caa3f6c91ba21c539a8547c4075b619dc6500 Author: Amit Kucheria Date: Thu Feb 4 12:09:40 2010 -0800 mxc: changes to common plat-mxc code to add support for i.MX5 Prepare for i.MX5 SoC code by adding the relevant macros to common plat-mxc code. Signed-off-by: Amit Kucheria commit 0f3332c4fabb2227b1bc15dc7542017d08f10a09 Author: Sascha Hauer Date: Fri Dec 4 09:34:51 2009 +0100 mxc: refactor timer code to use timer versions Refactor the timer code into version 1 and version 2. Essentially there are 2 versions of the timer hardware on Freescale MXC hardware. Version 1 is found on MX1/MXL, MX21 and MX27. Version 2 is found on MX25, MX31, MX35, MX37, MX51, and future parts. Signed-off-by: Sascha Hauer Acked-by: Grant Likely Signed-off-by: Amit Kucheria commit a003708ad4ee9384226251431c7953a24079ff80 Author: Amit Kucheria Date: Thu Dec 3 22:36:41 2009 +0200 mxc: TrustZone interrupt controller (TZIC) for Freescale i.MX5 family Freescale i.MX51 processor uses a new interrupt controller. Add driver for TrustZone Interrupt Controller Signed-off-by: Amit Kucheria commit b80109e256bc17ed66c9d559175f087b03ca2a8e Author: Anton Blanchard Date: Tue Feb 9 15:07:40 2010 +1100 Remove reference to kthread_create_on_cpu kthread_create_on_cpu doesn't exist so update a comment in kthread.c to reflect this. Signed-off-by: Anton Blanchard Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 3ad2f3fbb961429d2aa627465ae4829758bc7e07 Author: Daniel Mack Date: Wed Feb 3 08:01:28 2010 +0800 tree-wide: Assorted spelling fixes In particular, several occurances of funny versions of 'success', 'unknown', 'therefore', 'acknowledge', 'argument', 'achieve', 'address', 'beginning', 'desirable', 'separate' and 'necessary' are fixed. Signed-off-by: Daniel Mack Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit e4e430c611db75f58d3ca33869e182a530859426 Author: Magnus Damm Date: Tue Feb 9 03:36:03 2010 +0000 ARM: mach-shmobile: sh7372 INTCA support Add support for the sh7372 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 6673be73809c8aa1ca5255c83f4fc85c43fdbfab Author: Magnus Damm Date: Tue Feb 9 03:35:53 2010 +0000 ARM: mach-shmobile: sh7377 INTCA support Add support for the sh7377 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f8eef1305b33438dd7a3a01e43b94e57ca87fc9b Author: Magnus Damm Date: Tue Feb 9 03:35:42 2010 +0000 ARM: mach-shmobile: sh7367 INTCA support Add support for the sh7367 INTCA hardware block. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 4ae04acb81256719a71125c0f0280e2a3ad68e25 Author: Magnus Damm Date: Mon Feb 8 11:02:54 2010 +0000 ARM: mach-shmobile: early console support using earlyprintk Add support for early console to the SH-Mobile boards. Simply perform an early platform probe for "earlyprintk" to trigger the early serial console code in sh-sci.c. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 62f60d6a37910501814c6281e6c21b485434a7f1 Author: Magnus Damm Date: Mon Feb 8 10:53:13 2010 +0000 ARM: mach-shmobile: optimize get_irqnr_preamble/and_base macros Optimize the SH-Mobile interrupt assembly macros to avoid reloading the INTFLGA register address in case of multiple pending interrupts. Kindly pointed out by Russell King. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 58152a16901dfce8662f5ec7e16d06dfce6fd31e Author: Uwe Kleine-König Date: Fri Feb 5 11:42:54 2010 +0100 arm/mx2/devices: use SoC-prefixed names where possible There is only NFC_BASE_ADDR left which is defined differently for mx21 and mx27. Signed-off-by: Uwe Kleine-König commit 69ddb488035068fce9a4ac4a63cffa91dfb3f37f Author: Uwe Kleine-König Date: Fri Feb 5 12:03:37 2010 +0100 arm/mx2: use cpp magic to create imx-ssi devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit ccd0e42c827666e91296b6395b7b7b04fb8c8803 Author: Uwe Kleine-König Date: Fri Feb 5 10:46:56 2010 +0100 arm/mx2: use cpp magic to create imx-mmc devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 9309b2ba54d9082b8eb2ce641ad395cf5d9929f4 Author: Uwe Kleine-König Date: Thu Feb 4 22:13:52 2010 +0100 arm/mx2: use cpp magic to create imx-i2c devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 2b84a3640ffdebbbea3ec004eae963e920c16e1a Author: Uwe Kleine-König Date: Thu Feb 4 14:11:02 2010 +0100 arm/mx2: use cpp magic to create imx_gpt devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 68c94b40b31926f627573a7f656b903f6644744e Author: Uwe Kleine-König Date: Thu Feb 4 22:04:32 2010 +0100 arm/mx2: use cpp magic to create spi_imx devices This makes the source shorter and easier to verify. While at it switch to use the SoC-prefixed constants. Signed-off-by: Uwe Kleine-König commit 34bf0fc54a4634ebb0a992e8562191a01233e240 Author: Magnus Damm Date: Mon Feb 8 03:35:46 2010 +0000 ARM: mach-shmobile: G3EVM, G4EVM and AP4EVB defconfigs Add defconfigs for G3EVM, G4EVM and AP4EVB. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit d48d38e87c2ce56dcee030a8bcd5e9e1090c232f Author: Paul Mundt Date: Mon Feb 8 12:50:24 2010 +0900 MAINTAINERS: Add entry for ARM-based SH-Mobile architecture. Signed-off-by: Paul Mundt commit 8a77b8d0744ab21b59a9413c41c6a3d6cb9b0b4f Author: Magnus Damm Date: Fri Feb 5 11:15:33 2010 +0000 serial: sh-sci: Support ARM-based SH-Mobile CPUs. Add support for ARM-based SH-Mobile CPUs to the sh-sci driver. Also remove the SCLSR register that is missing on sh772x, sh7705 and SH-Mobile. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 65a5b28f0af00dddd785b516914739460562638f Author: Magnus Damm Date: Fri Feb 5 11:15:25 2010 +0000 sh: Let INTC set IRQF_VALID on ARM platforms. Reuse the SuperH INTC code on ARM by using set_irq_flags() to set IRQF_VALID on ARM platforms. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 13d605de2ece8c8f7c17a88747d90b7931350ee5 Author: Magnus Damm Date: Fri Feb 5 11:15:15 2010 +0000 sh: Build drivers/sh for ARM-based SH-Mobile CPUs. Build drivers/sh in the case of ARM-based SH-Mobile CPUs. Shared code for the interrupt controller (INTC) and the gpio/pinmux (PFC) is located there. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 2b7eda63e489a43575f776a1a32bcfbcd75b9476 Author: Magnus Damm Date: Fri Feb 5 11:14:58 2010 +0000 ARM: mach-shmobile: SH-Mobile AP4 support. This adds preliminary support for the SH7372 (SH-Mobile AP4) CPU and the AP4EVB reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit f2aaf66df0858116b2fcdbbfe8126d4ff925ac61 Author: Magnus Damm Date: Fri Feb 5 11:15:07 2010 +0000 ARM: mach-shmobile: SH-Mobile G4 support. This adds preliminary support for the SH7377 (SH-Mobile G4) CPU and the G4EVM reference board. Only timer, serial console and NOR flash are supported at this point. Support for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit c793c1b0c8ea11b46caf5a532752214b27a2df42 Author: Magnus Damm Date: Fri Feb 5 11:14:49 2010 +0000 ARM: mach-shmobile: SH-Mobile G3 support. This adds preliminary support for the SH-Mobile G-series. The SH-Mobile G-series is a series of ARM/SH multi-core CPUs that aside from the ARM MPU are primarily composed of existing SH IP blocks. This includes initial support for the SH7367 (SH-Mobile G3) CPU and the G3EVM reference board. Only timer, serial console, and NOR flash are supported at this point. Patches for the interrupt controller, pinmux support, clock framework and runtime pm will be submitted as feature patches on top of this. Signed-off-by: Magnus Damm Signed-off-by: Paul Mundt commit 1537a3638cbf741d3826c1002026cce487a6bee0 Author: Daniel Mack Date: Fri Jan 29 15:57:49 2010 +0800 tree-wide: fix 'lenght' typo in comments and code Some misspelled occurences of 'octet' and some comments were also fixed as I was on it. Signed-off-by: Daniel Mack Cc: Jiri Kosina Cc: Joe Perches Cc: Junio C Hamano Signed-off-by: Jiri Kosina commit b5218a87cbe0f01d551b2dae90b54cad8ded72df Author: Pavel Roskin Date: Tue Jan 19 13:25:50 2010 +0100 drm/kms: fix spelling in error message Signed-off-by: Pavel Roskin [clemens@ladisch.de: merged into drm_fb_helper] Signed-off-by: Clemens Ladisch Signed-off-by: Jiri Kosina commit a64061e100826be758145462f8c656ba17c9541b Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:26:47 2010 -0200 doc: capitalization and other minor fixes in pnp doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 9ce8e498ee58bb8a866a6c3c08fcb385ed66e9d2 Author: Baruch Siach Date: Tue Feb 2 08:54:51 2010 +0200 devres: typo fix s/dev/devm/ Signed-off-by: Baruch Siach Signed-off-by: Jiri Kosina commit 350f82586b7554240bee18c41cc5c842f63265ae Author: Edward Z. Yang Date: Mon Feb 1 18:26:59 2010 -0500 Remove redundant trailing semicolons from macros Signed-off-by: Edward Z. Yang Acked-by: Rusty Russell Signed-off-by: Jiri Kosina commit 7d9b48ea81ee49779b95ecd0df5a8c2789e4f836 Author: Uwe Kleine-König Date: Thu Jan 28 22:09:43 2010 +0100 fix typo "definetly" -> "definitely" in comment Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 551e378ca1852dc51609b722014416d4da0770c6 Author: Daniel Mack Date: Thu Jan 28 16:11:51 2010 +0800 tree-wide: s/widht/width/g typo in comments Signed-off-by: Daniel Mack Cc: Jiri Kosina Signed-off-by: Jiri Kosina commit d9a5f04b6a8e0e681ae37fde84016a57ca17371f Author: Shahar Havivi Date: Wed Jan 27 10:18:28 2010 +0100 vt: remove unused variables Remove unused fields in drivers/char/vt.c variables orig_buf and orig_count are assigned but never used. Signed-off-by: Shahar Havivi Signed-off-by: Jiri Kosina commit 7dd607e82d823e40675b0b87f035ff04dcb0b5c0 Author: Jiri Kosina Date: Wed Jan 27 01:00:10 2010 +0100 crypto: fix typo in Kconfig help text Reported-by: Toralf Förster Signed-off-by: Jiri Kosina commit 5e39df5625fb903587ac8e281fa57d76714996e4 Author: Uwe Kleine-König Date: Mon Jan 25 21:38:09 2010 +0100 grammar fix in comment Signed-off-by: Uwe Kleine-König Cc: Nicolas Pitre Signed-off-by: Jiri Kosina commit 9ddc5b6f18fbac07d2746566b73b89e89fdd4e6a Author: Uwe Kleine-König Date: Wed Jan 20 17:02:24 2010 +0100 tree-wide: fix typos "ammount" -> "amount" Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 659431fcafd820cc426afedadcc4548933224985 Author: Uwe Kleine-König Date: Mon Jan 18 16:02:48 2010 +0100 fix typos "precidence" -> "precedence" in comments This patch was generated by git grep -E -i -l 'precidence' | xargs -r perl -p -i -e 's/precidence/precedence/' Signed-off-by: Uwe Kleine-König Signed-off-by: Jiri Kosina commit 3333e9ee9f8b82307f99fb8466724649da573025 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:27:32 2010 -0200 doc: fix Defaultd -> Defaults typo in EISA doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 19afd8e2ffd7a6e4026d51d63495e14d2a7bacc3 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 18:30:05 2010 -0200 doc: update 00-INDEX for Documentation/laptops/ Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit 2273130de8b24adeb59231a9a8c6274bf5d35447 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:23:14 2010 -0200 fix comment typo leve -> level in powerpc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit de8164fb2242d77c8a83fb3c63830eb7914d696d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:22:28 2010 -0200 doc: fix leve -> level typo in pm-runtime doc Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit af66585270ef99aa6097faf3bd7344855077e75d Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:14:26 2010 -0200 fix comment typo boo -> boot in ksysfs.c Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit d6b198bc8a67deee5984fb9506f000ae4fce9d75 Author: Thadeu Lima de Souza Cascardo Date: Sun Jan 17 19:10:07 2010 -0200 fix ext3/ext4 comment typo compain -> complain Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Jiri Kosina commit db18efac0bd644e4b7af757394ca0bef8d91dcee Author: Jaak Ristioja Date: Fri Jan 15 12:05:07 2010 +0200 bio: Fix outdated comment about bio_alloc_bioset() In commit 451a9ebf653d28337ba53ed5b4b70b0b9543cca1 bio_alloc_bioset() was refactored not to take NULL as a valid argument for bs. This patch changes the comment for that function accordingly. Currently, passing NULL as argument to parameter bs would result in a NULL pointer dereference. Signed-off-by: Jaak Ristioja Signed-off-by: Jiri Kosina commit 6382dc334064bb0b41a95df0e3c438de35f2ffb7 Author: Justin P. Mattock Date: Thu Jan 14 23:03:18 2010 -0800 fix comment typos in avc.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit fb637f3cd31783db2b654842ea32ffec15c4bd62 Author: Justin P. Mattock Date: Thu Jan 14 22:16:16 2010 -0800 fix comment typo in pci-dma.c Signed-off-by: Justin P. Mattock Signed-off-by: Jiri Kosina commit 0747e3bc54b43faaa88ab0b37eb5b6f50972965b Author: Stefan Weil Date: Thu Jan 7 00:44:08 2010 +0100 Fix spelling of 'platform' in log messages Replace platfrom -> platform. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 947af2943576400628bba085eaa6b85143526133 Author: Stefan Weil Date: Thu Jan 7 00:03:52 2010 +0100 Fix spelling of 'platform' in comments and doc Replace platfrom -> platform. This is a frequent spelling bug. Signed-off-by: Stefan Weil Signed-off-by: Jiri Kosina commit 3d956d1dfffef3b19d743aa1a443ab5a300051cb Author: Peter Huewe Date: Tue Dec 22 09:41:42 2009 +0100 isdn/mISDN: add __init/__exit macros to dsp_core.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/mISDN/dsp_core.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 60c14a1507a9fcd2e3b8eb53c218cb74ae404bcf Author: Peter Huewe Date: Tue Dec 22 09:38:14 2009 +0100 media/dvb: add __init/__exit macros to bt878.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/media/dvb/bt8xx/bt878.c Signed-off-by: Peter Huewe Acked-by: Jean Delvare Signed-off-by: Jiri Kosina commit 73a98fce881c46eaeb33c1aef23ab607f4d03344 Author: Peter Huewe Date: Tue Dec 22 09:38:02 2009 +0100 w1: add __init/__exit macros to w1.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/w1/w1.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 8885074038b219b90cb0f5cd1a049ba80c7e815b Author: Peter Huewe Date: Tue Dec 22 09:27:06 2009 +0100 isdn/hardware: add __init/__exit macros to mISDNisar.c Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of drivers/isdn/hardware/mISDN/mISDNisar.c Signed-off-by: Peter Huewe Signed-off-by: Jiri Kosina commit 71709247aa852b5c4a01e70a9186590800d15575 Author: Robert P. J. Day Date: Mon Dec 28 11:50:29 2009 -0500 xen: Fix misspelled CONFIG variable in comment. Signed-off-by: Robert P. J. Day Signed-off-by: Jiri Kosina commit 473a72a18bf446f51837f7731214db297981f0ed Author: Peter Huewe Date: Tue Dec 22 09:27:05 2009 +0100 uwb/i1480: add __init/__exit macros Trivial patch which adds the __init/__exit macros to the module_init/ module_exit functions of uwb/i1480/i1480-est.c Signed-off-by: Peter Huewe Acked-by: David Vrabel Signed-off-by: Jiri Kosina commit c9404c9c392d557a4687c4cbda022b03cb787ce9 Author: Adam Buchbinder Date: Fri Dec 18 15:40:42 2009 -0500 Fix misspelling of "should" and "shouldn't" in comments. Some comments misspell "should" or "shouldn't"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 634bad68bc25753816594ecd390dcea980528315 Author: Adam Buchbinder Date: Fri Dec 18 15:40:41 2009 -0500 Fix misspelling of "successful" and variants in comments. Some comments misspell "successful" or variants of the word; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit e233230f9c8f02d4c3a643ec5067ca21bc90ee9a Author: Nicolas Pitre Date: Fri Feb 5 00:24:33 2010 -0500 [ARM] orion5x: update defconfig Signed-off-by: Nicolas Pitre commit f123560a07313218108d3cc652af99eaaf04d67f Author: Nicolas Pitre Date: Thu Feb 4 23:27:23 2010 -0500 [ARM] Kirkwood: update defconfig Signed-off-by: Nicolas Pitre commit 1961528959aa523a351b49236f8627b30793ee80 Author: Nicolas Pitre Date: Fri Feb 5 00:20:24 2010 -0500 [ARM] orion5x: fix some improper includes in Linkstation files ... and replace misuse of arch_reset() with arm_machine_restart(). Signed-off-by: Nicolas Pitre commit 2d18638ec010a2ed1daa08b4774ed12108647a53 Author: Zhu Qingsen Date: Thu Feb 4 19:33:27 2010 -0800 [ARM] Orion: Add Buffalo Linkstation LS-HGL support Signed-off-by: Zhu Qingsen Signed-off-by: Nicolas Pitre commit b2fdb5660fccc060e47658baad8911a963397ced Author: Alexander Clouter Date: Mon Jan 18 23:38:19 2010 +0000 [ARM] kirkwood: combine support for openrd base/client support Inspired by the mach-ep93xx flattening work, there is really not much difference between the OpenRD base and client board support so they should be merged together. Signed-off-by: Alexander Clouter Acked-by: Simon Kagstrom Signed-off-by: Nicolas Pitre commit 639b9be60ec2045a0a59b2ea33479937c4b5acef Author: H Hartley Sweeten Date: Fri Jan 29 15:30:53 2010 -0700 mach-dove/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Signed-off-by: Nicolas Pitre commit 3e3e65fc425588a4a4b9143d7dfe40e52a2bf0be Author: H Hartley Sweeten Date: Fri Jan 29 14:43:52 2010 -0800 mach-kirkwood/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit ef4a6777cf33c4a7a76e74ecd593f74a1df30b96 Author: H Hartley Sweeten Date: Fri Jan 29 14:56:58 2010 -0800 mach-orion5x/common.c: remove unnecessary (void *) casts The (void *) cast is not needed when setting dev.platform_data to the address of the data. Remove the casts. Signed-off-by: H Hartley Sweeten Cc: Lennert Buytenhek Signed-off-by: Nicolas Pitre commit cb2dc111b156eb41f61ed4e5b3a3a5df90526d9d Author: Sascha Hauer Date: Thu Feb 4 14:32:53 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit ee14373cdc91fbc9ad8db0bf38e28d58f577b181 Author: Sascha Hauer Date: Thu Feb 4 09:32:44 2010 +0100 i.MX31 pcm037: Add USB support Signed-off-by: Sascha Hauer commit 773f206b2f3745bde8ee17ec0f884c19db3917a5 Author: Sascha Hauer Date: Wed Feb 3 17:13:41 2010 +0100 i.MX27 pcm038: Add USB support Signed-off-by: Sascha Hauer commit eee7c497d250bbb2bfd0fdc2b41b9b6ff02148a2 Author: Sascha Hauer Date: Wed Feb 3 17:13:29 2010 +0100 i.MX27 pca100: Add USB support Signed-off-by: Sascha Hauer commit d186f04c17d86e587e72bc402302df56a9b820f3 Author: Sascha Hauer Date: Thu Feb 4 14:34:48 2010 +0100 i.MX35: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 9cf945cbef42a4524b6a58486bd8bfb96640e97f Author: Sascha Hauer Date: Thu Feb 4 14:45:41 2010 +0100 i.MX27: Add USB control register access support Signed-off-by: Sascha Hauer Cc: Daniel Mack commit 84ab80616b0eb5fac4d1970f10ea1b3cf75280e1 Author: Sascha Hauer Date: Thu Feb 4 14:45:11 2010 +0100 i.MX ehci platform support: Some fixes - The SIC mask is only 2bits wide, not 4 - MX31_OTG_PM_BIT and MX31_H1_PM_BIT use negative logic - clear MX31_H1_DT_BIT and MX31_H2_DT_BIT so that they can be cleared, not only set. - return -EINVAL if called with an invalid controller number Signed-off-by: Sascha Hauer Cc: Daniel Mack commit ba593e5966440deec8684863e0cba9b502c4a377 Author: Sascha Hauer Date: Thu Feb 4 14:40:59 2010 +0100 fsl_mx3_udc: Add i.MX35 support The i.MX35 works fine with this driver, but we do not have the usb_ahb clock. Signed-off-by: Sascha Hauer Cc: Guennadi Liakhovetski commit e34b7005e5f55a55964c13ec9784e8e2b427a83c Author: Jasper Spaans Date: Fri Nov 20 14:20:05 2009 +0100 arch/x86/kernel/apic/apic_flat_64.c: Make comment match the code Make the comment match the code, this also holds for intel systems, according to probe_64.c in the same directory. Signed-off-by: Jasper Spaans Signed-off-by: Jiri Kosina commit 5d93a14241bf5ba299422440bc366ec43970c002 Author: Shaun Patterson Date: Sat Dec 5 22:30:52 2009 -0500 vmiclock: fix comment spelling mistake Signed-off-by: Shaun Patterson Signed-off-by: Jiri Kosina commit 640462cbd659990bcceaf86ab17ccbc02147e62a Author: Rudy Matela Date: Wed Dec 9 11:35:40 2009 -0300 Coding style correction of some wan drivers Added a space separating some if/switch/while keywords from the following parenthesis to conform to the CodingStyle. Signed-off-by: Rudy Matela Acked-by: Krzysztof Halasa Signed-off-by: Jiri Kosina commit 7e2a10836c0455cb3ca397f89b8280496148d571 Author: Julia Lawall Date: Thu Nov 12 23:08:36 2009 +0100 fs/qnx4: decrement sizeof size in strncmp As an identical match is wanted in this case, strcmp can be used instead. The semantic match that lead to detecting this problem is as follows: (http://coccinelle.lip6.fr/) // @@ expression foo; constant char *abc; @@ *strncmp(foo, abc, sizeof(abc)) // Signed-off-by: Julia Lawall Signed-off-by: Anders Larsen Signed-off-by: Jiri Kosina commit fe9a2302230fa287715a11a3d3aec74eec75a6a4 Author: Ali Gholami Rudi Date: Sun Nov 8 19:29:23 2009 +0330 doc: fix checking socket() in net tstamp example Signed-off-by: Ali Gholami Rudi Acked-by: Patrick Ohly Signed-off-by: Jiri Kosina commit edf86baae2e92bc03615086b2a341cd6d56c20f2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:41 2009 -0500 Fix misspellings of "separate" in strings. Some string messages misspell "separate"; this fixes them. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 2a61aa401638529cd4231f6106980d307fba98fa Author: Adam Buchbinder Date: Fri Dec 11 16:35:40 2009 -0500 Fix misspellings of "invocation" in comments. Some comments misspell "invocation"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c41b20e721ea4f6f20f66a66e7f0c3c97a2ca9c2 Author: Adam Buchbinder Date: Fri Dec 11 16:35:39 2009 -0500 Fix misspellings of "truly" in comments. Some comments misspell "truly"; this fixes them. No code changes. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit a089377f29d3af0f62f3bdc6db0c5042513fc3f3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:38 2009 -0500 Fix misspelling of "truly" in a label. A label reads 'truely_dead' rather than 'truly_dead'; this fixes it. No change in functionality. Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit 303863f43fa5106637325a213717b2f306e2efc3 Author: Adam Buchbinder Date: Fri Dec 11 16:35:37 2009 -0500 Fix a grammar error (redundant "be") in comment Signed-off-by: Adam Buchbinder Signed-off-by: Jiri Kosina commit c14e522b1aab6a1a3765db182aacca4f359f6d91 Author: Sebastian Andrzej Siewior Date: Wed Dec 16 23:13:44 2009 +0100 tree wide: remove execute flag from .c files Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Jiri Kosina commit c5c7b32d3c67049ab4e509d0e8bf93811c433dfb Author: Geert Uytterhoeven Date: Sun Dec 13 20:07:31 2009 +0100 ataflop: Killl warning about unused variable flags After commit e0c0978699a83f26f2341f7eedc1463b79e31aff ("ataflop: remove buggy/commented-out IRQ disable from do_fd_request()") the `flags' variable became unused: drivers/block/ataflop.c:1473: warning: unused variable 'flags' Hence remove it. Signed-off-by: Geert Uytterhoeven Signed-off-by: Jiri Kosina commit 9fd96bbb6a3a1fd9ba24e84a2d7ccc6ccb6beb60 Merge: 5c17ef8 e27bf72 Author: Sascha Hauer Date: Thu Feb 4 11:18:09 2010 +0100 Merge branch 'imx/master' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 5c17ef878fa25e04b1e8f1d8f5fa8b267753472c Author: Roel Kluin Date: Wed Feb 3 20:19:00 2010 +0100 MX1/MX2: -EINVAL overwritten in second iteration in mxc_gpio_setup_multiple_pins() Due to the `ret = gpio_request()' below in the loop, the initial -EINVAL value of ret is overwritten. Signed-off-by: Roel Kluin Acked-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit d35b7a829a13b69c4747b69380b504b6544a2375 Merge: 28db4ed 84c9b72 Author: Ben Dooks Date: Wed Feb 3 01:56:07 2010 +0000 ARM: Merge next-samsung-s3c244x-merge Merge branch 'next-samsung-s3c244x-merge' into next-samsung commit 28db4ed52d329ca06da9fbcc9dcf6c4e25cdcac2 Merge: 87aef30 91492b4 Author: Ben Dooks Date: Wed Feb 3 01:55:39 2010 +0000 ARM: Merge next-samsung-devupdates2 Merge branch 'next-samsung-devupdates2' into next-samsung commit 91492b4a04586e7cb191c72de9d1b22545a3ce16 Author: Maurus Cuelenaere Date: Sat Jan 30 18:01:48 2010 +0100 ARM: SAMSUNG: Add support for 12bit ADC The S3C64XX SoC series support 12bit ADC data, enable this and mask the data accordingly. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit cf9814eb6d83f066d5db63f4144598e9c6ca2951 Author: Ben Dooks Date: Fri Jan 29 13:03:34 2010 +0900 ARM: S3C64XX: Make audio device code built unconditionally Making the code depend on CONFIG_SND_S3C24XX_SOC means that if the ASoC code is build modularily, the boards will fail to link due to the device code also being built as a module. As per Mark Brown's suggestions, just compile this always as it is expected many machines will have audio. Also move the obj-y line out of the device setup area into a new area just for devices. Signed-off-by: Ben Dooks commit 1de203adf6210b9dd81d907ea8cda587bc61cf4c Author: Ben Dooks Date: Fri Jan 29 10:53:35 2010 +0900 ARM: SAMSUNG: Use PLAT_SAMSUNG instead of PLAT_S3C As part of the development process, it is hoped PLAT_S3C is either removed from all of the PLAT_SAMSUNG derived platforms or removed entirely. It is also better to use PLAT_SAMSUNG as this is the current base of all Samsung devices. Change the two places that use PLAT_S3C to use PLAT_SAMSUNG Signed-off-by: Ben Dooks commit 3bd9377e8761cb7f1000b3075763df779ab9aeca Author: Ben Dooks Date: Fri Jan 29 10:52:02 2010 +0900 ARM: SAMSUNG: Add SERIAL_SAMSUNG_UARTS_4 Kconfig option Add SERIAL_SAMSUNG_UARTS_4 to mop up the number of cases currently using four Samsung compatible UARTS. Signed-off-by: Ben Dooks commit 21030403209f0c253d462492f881c613bd8eeda2 Author: Michel Pollet Date: Wed Jan 27 16:38:08 2010 +0000 ARM: S3C2412: SoC has the fractional baud rate register The S3C2412 has a fractional baud rate register, this patch adds the corresponding flag to the UART definition to allow generation of more precise baud rates for the various clock combinations. Signed-off-by: Michel Pollet Signed-off-by: Ben Dooks commit 4b4c662571bb3a19d6bacb4433886ec35c7093fa Author: Jassi Brar Date: Thu Jan 28 17:14:49 2010 +0900 ARM: S3C64XX: SPI: Make platform device compilation selectable The SPI controller platform devices should be compiled in independent of the driver support, otherwise we might end up with dev-spi built as kernel module. Change this to make every machine select if it has some SPI device and wants to build device definitions. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 2848552cef6a14fe4e54e676a61a340c8fd023b3 Author: Ben Dooks Date: Wed Jan 27 18:13:59 2010 +0900 ARM: SAMSUNG: Add DMA masks to hsotg device Add the required DMA masks to the hs-otg device definition to allow DMA to work with it. Signed-off-by: Ben Dooks commit 79788c698b290426320e60374ed1324e4b5c69eb Author: Sage Weil Date: Tue Feb 2 16:34:04 2010 -0800 ceph: release all pages after successful osd write response We release all the pages, even if the osd response was different than the number of pages written. This could only happen due to truncation that arrives the osd in different order, for which we want the pages released anyway. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit 0c948992a00d478c17042f4790b7d6b35299cf94 Author: Yehuda Sadeh Date: Mon Feb 1 16:10:45 2010 -0800 ceph: always send truncation info with read and write osd ops This fixes a bug where the read/write ops arrive the osd after a following truncation request. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit e27bf72465f4d867a2aea33cad5e9e255c4d92ff Author: Uwe Kleine-König Date: Sat Jan 30 16:23:51 2010 +0100 imx/mx25: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König commit 34101237d975ba37d19cbfe9318984af78332816 Author: Uwe Kleine-König Date: Fri Jan 29 17:36:05 2010 +0100 imx: define per SOC ..._PHYS_OFFSET and use these in favour of PHYS_OFFSET This is a further step in allowing to build a kernel image for more than one imx SOC. Signed-off-by: Uwe Kleine-König commit 7fc06d8c24fb7915d9cebc9aad7d3b40d8a6ef0b Author: Uwe Kleine-König Date: Fri Jan 15 10:13:30 2010 +0100 imx2x: convert serial.c to use soc-prefixed constants This makes the file compilable for a kernel that supports both imx21 and imx27. Signed-off-by: Uwe Kleine-König commit 08f9bf167c2729b46920fdef459787667ee68130 Author: Uwe Kleine-König Date: Thu Jan 14 22:04:49 2010 +0100 mxc91231: redefine MXC91231_IO_ADDRESS using IMX_IO_ADDRESS This simplifies the macro and makes is similar to the other ..._IO_ADDRESS macros defined for imx SOCs. Signed-off-by: Uwe Kleine-König commit 9ea07ec05e8030f6b4e12c4a41a9d633c0ccb618 Author: Uwe Kleine-König Date: Wed Jan 13 18:07:11 2010 +0100 mxc91231: use MXC91231_IO_ADDRESS instead of MXC91231_AIPS1_IO_ADDRESS Apart from MXC91231_IO_ADDRESS itself this was the only usage of MXC91231_AIPS1_IO_ADDRESS. Now MXC91231_IO_ADDRESS can be recoded with IMX_IO_ADDRESS and all helper macros can go away. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Fabio Estevam Cc: Daniel Schaeffer Cc: Alberto Panizzo Cc: Ivo Clarysse commit 8ac5b7c5ec8d46ad273d37aaa0d6e1f9cd2b01d9 Author: Uwe Kleine-König Date: Wed Jan 13 17:58:04 2010 +0100 imx: WARN in clk_disable if the clock isn't enabled Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 84c9b7271a0af08c4e5fce3901a0ad3d952036bc Author: Ben Dooks Date: Tue Jan 26 16:54:21 2010 +0900 ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h Merge these two headers into one, these two SoCs are so similar. Note, correct fault in mach-smdk2443.h including the wrong header. Signed-off-by: Ben Dooks commit 58bac7b8ded70c39bcd5f7037091051c277618aa Author: Ben Dooks Date: Tue Jan 26 16:47:41 2010 +0900 ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440 Remove the old common S3C2440 and S3C2442 SoC support from plat-s3c24xx into mach-s3c2440 now this directory is serving both SoCs. Signed-off-by: Ben Dooks commit 70556b143ae4cf404a73c2461a6bf7fef3fefbf7 Author: Ben Dooks Date: Tue Jan 26 16:37:50 2010 +0900 ARM: S3C24XX: Remove old mach-s3c2442 Remove the old mach-s3c2442 directory now all is merged into mach-s3c2440 and remove it from the arch/arm build process. Signed-off-by: Ben Dooks commit 916ee9249a7f19d8eb18cc9ee16ca495a517ab34 Author: Ben Dooks Date: Tue Jan 26 16:31:32 2010 +0900 ARM: S3C244X: Move S3C2442 code into S3C2440 Move the remaining S3C2442 code into mach-s3c2440 as there is only one file currently in there and these two SoCs are very similar. Signed-off-by: Ben Dooks commit 1f51bbfd5905b8c860cc95ae10c20e0844d0ade8 Author: Ben Dooks Date: Tue Jan 26 16:27:08 2010 +0900 ARM: S3C2440: Fix SMDK2440 SoC selection Fix the entries for SMDK2440 should have allowed for S3C2440 or S3C2440 SoC selection but this depended on ARCH_S3C2440 which has not been around for a while. Remove the dependency to allow this to be selected. Signed-off-by: Ben Dooks commit 491547d43bc2393de914b5ad18b6f5219107f918 Author: Ben Dooks Date: Tue Jan 26 16:13:35 2010 +0900 ARM: S3C2442: Merge s3c2442.c and clock.c Merge s3c2442.c and clock.c as the s3c242.c does not contain much and the clock parts are always built for s3c2442 anyway. Signed-off-by: Ben Dooks commit 5cbcccb370355d4cd8534796bf32ac8bb04627cc Author: Ben Dooks Date: Tue Jan 26 16:06:46 2010 +0900 ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440 Move the pair of machines in arch/arm/mach-s3c2442 into the mach-s3c2440 directory as the S3C2440 and S3C2442 are very close. Signed-off-by: Ben Dooks commit 66ac2f28b658f1938035966cafc42501758b4324 Author: Uwe Kleine-König Date: Mon Jan 25 17:55:16 2010 +0100 mx25: deprecate UART1_BASE_ADDR and UART2_BASE_ADDR Signed-off-by: Uwe Kleine-König commit 7d58289fc315258b4829a29d21c540eb35dd6feb Author: Uwe Kleine-König Date: Mon Jan 11 11:37:24 2010 +0100 mx1: prefix SOC specific defines with MX1_ and deprecate old names The old names are defined only if the cpp symbol IMX_NEEDS_DEPRECATED_SYMBOLS exists, which is defined (for now) for all files below arch/arm/mach-mx1. This was done earlier for mx2 and mx3, too. USBD_INT0 is for now defined unconditionally to prevent breaking drivers/usb/gadget/imx_udc. While at it use IMX_IO_ADDRESS to define MX1_IO_ADDRESS which adds a cast to the IO_ADDRESS macro fixing many warnings like arch/arm/mach-mx1/generic.c:51: warning: passing argument 1 of 'mxc_init_irq' makes pointer from integer without a cast . Signed-off-by: Uwe Kleine-König commit 4ec07bba6945290c48dcc5b789cbd7adeabd7695 Author: Ben Dooks Date: Sat Jan 30 15:02:58 2010 +0900 ARM: S3C2443: Use common clock gate code Add common clock gate code for each of the S3C2443 clock gate code. Whether to move this elsewhere will be decided later. Signed-off-by: Ben Dooks commit 0f26c4b21b684825a6dd41f2bc04d48ff62d72f8 Author: Yehuda Sadeh Date: Fri Jan 29 11:01:11 2010 -0800 ceph: remove unreachable code We never truncate to a smaller size without contacting the MDS. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit ac8839d7b264d0fa478fca7c4f9b6bb833540a80 Author: Sage Weil Date: Wed Jan 27 14:28:10 2010 -0800 ceph: include type in ceph_entity_addr, filepath Include a type/version in ceph_entity_addr and filepath. Include extra byte in filepath encoding as necessary. Signed-off-by: Sage Weil commit 1eaa4f2762899d2f3c54ba7a4fee564e255ad0a5 Author: Baruch Siach Date: Wed Jan 27 15:00:49 2010 +0200 mx25pdk: platform code for the DryIce RTC module Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit dcbabbc1fce2c32e4cfe0e18a2651226a72ecaae Author: Baruch Siach Date: Wed Jan 27 15:00:48 2010 +0200 mx25: add support for the DryIce rtc Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 4cb73288b195dc04c1f604c38bd4ebd2081db9fa Merge: 70c91a3 66ddfc6 Author: Sascha Hauer Date: Fri Jan 29 10:43:17 2010 +0100 Merge branch 'mxc-rc' into mxc-master commit 87aef30eb3c5dac0491c83fe3b90bc61f1df24ec Author: Atul Dahiya Date: Fri Jan 29 09:08:28 2010 +0900 ARM: S5P: Change S5P_TIMER_IRQ based to 11 for SAMSUNG S5P series. Currently, S5P_TIMER_IRQ is based at the end of VICs. This patch changes the S5P_TIMER_IRQ base from end of VICs to 11 in ISA IRQ space. No of VICs varies between SOCs. This causes an exception on S5P6442. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit a814290e17ae314bd614476cffc6119846eca27e Merge: e55d193 ab5d97d Author: Russell King Date: Wed Jan 27 22:11:32 2010 +0000 Merge branch 'for-rmk/samsung3' of git://git.fluff.org/bjdooks/linux into devel-stable commit 81317960466ebd37fd958aa07993e3fea461dbe4 Author: Kukjin Kim Date: Wed Jan 27 16:57:07 2010 +0900 ARM: S5P6440: Move common memory map definitions for S5P 1. Moved common memory map definitions for S5P such as S5P_VA_XXX into plat-s5p/include/mach/map-s5p.h from mach-s5p6440/include/mach. 2. Removed unnecessary definitions in the map.h and irq.c 3. Removed the unnecessary support for unaligned UART address 4. Renamed S5P_VA_VICx definitions as VA_VICx 5. Moved the definitons of VIC_BASE to plat-s5p/include/plat/irqs.h Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit e96b234b7e9d24e50528287b881ca229b7f094b8 Author: Kukjin Kim Date: Mon Jan 25 14:24:04 2010 +0900 ARM: S5P6440: Move CPU specific code in plat-s5p to machine directory The s5p6440-clock.c and s5p6440-init.c code in the plat-s5p is specific to s5p6440 SoC based systems. So these files are being moved to the machine directory of s5p6440. And these files are renamed in the machine directory. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 70c91a384918736afee13104eea059cc7c8728a1 Author: Vladimir Zapolskiy Date: Tue Jan 26 14:00:40 2010 +0300 ARM: IMX31: configure pins iomux for SDHC setup on litekit board. This patch adds SDHC support, and corrects current pins setup. Added irq handling on card removal. Signed-off-by: Vladimir Zapolskiy Cc: Daniel Mack Cc: Sascha Hauer Signed-off-by: Sascha Hauer commit 4e41db871e0ea46b08eb3cdf887153c853e3ee3d Author: Uwe Kleine-König Date: Mon Jan 25 18:23:04 2010 +0100 mx2/mx3: debug-macro.S needs deprecated symbols This fixes: arch/arm/kernel/debug.S:147: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' arch/arm/kernel/debug.S:163: Error: constant expression expected -- `ldrne r3,=(((UART1_BASE_ADDR)-AIPI_BASE_ADDR)+AIPI_BASE_ADDR_VIRT)' when compiling for mx2 with CONFIG_DEBUG_LL=y. A similar error exists on mx3 and is fixed by this commit, too. These were introduced by aae7019382896cf1075a93acc564e42601bc44a2. Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer commit 159a3ddd6c0521b4ab81697b2cf06a903a854862 Merge: 50ee2d3 1725c67 Author: Ben Dooks Date: Tue Jan 26 18:21:40 2010 +0900 ARM: Merge next-smdk6410-defconfig Merge branch 'next-smdk6410-defconfig' into next-samsung commit 50ee2d35a592ead260527244af5160c7fa6189ea Author: Ben Dooks Date: Mon Jan 25 10:46:51 2010 +0900 ARM: SAMSUNG: Add error printing to s3c24xx_register_clocks Add an error print to s3c24xx_register_clocks to provide more useful information when failing to register the clock. I belive this was originally left out due to the possibility of a problem with low-level debugging code. However, if the low-level debug code is not functional by now there will be a whole other set of problems being presented to the system. Signed-off-by: Ben Dooks commit 8428d47a36a35c457a1147c3e8aa61c1be343604 Author: Ben Dooks Date: Mon Jan 25 10:44:10 2010 +0900 ARM: SAMSUNG: Add documentation to the clock registration calls. Add some kerneldoc documentation to the s3c24xx_register_clock and the s3c24xx_register_clocks() call. Signed-off-by: Ben Dooks commit 2f6c2ac1d945ffc2e343103bdcfccbdb2e2de805 Author: Ben Dooks Date: Tue Jan 26 10:38:52 2010 +0900 ARM: S3C64XX: Squash SDHCI setup into one file Squash the SDHCI setup for both the S3C6400 and S3C6410 into one file and make the S3C6410 case use the S3C6400 code. Signed-off-by: Ben Dooks commit 97ce9d6938d58e7846dc0365c720c13ebe64547e Author: Ben Dooks Date: Tue Jan 26 10:18:14 2010 +0900 ARM: S3C64XX: Remove useless IO descriptor from S3C6410 The iotable in arch/arm/mach-s3c64xx/s3c6410.c is currently empty and therefore can be removed from the build. Signed-off-by: Ben Dooks commit 431107ea5b680a24a4d01fbd3a178a3eb932f378 Author: Ben Dooks Date: Tue Jan 26 10:11:04 2010 +0900 ARM: S3C64XX: Merge mach-s3c6400 and mach-s3c6410 As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx. Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches. Signed-off-by: Ben Dooks commit ab5d97db1c6ced3e95c00d097931471707032b1f Author: Ben Dooks Date: Mon Jan 25 10:39:23 2010 +0900 ARM: SAMSUNG: Fix bad use of __initdata for s3c_register_clocks() Functions should be marked __init, not __initdata. Signed-off-by: Ben Dooks commit f6b56704f78b2667fc8f61d2f398931fbc032b62 Author: Maurus Cuelenaere Date: Fri Jan 22 23:29:16 2010 +0100 ARM: SAMSUNG: Fix null pointer dereference in ADC driver ARM: SAMSUNG: Fix null pointer dereference in ADC driver Use struct adc_device instead of relying on client (which could be NULL) when checking for SoC type. Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit d85127319cc36c38eb99615c52531c6ef2f11369 Author: Thomas Abraham Date: Fri Jan 22 10:50:42 2010 +0900 ARM: S5PV210: Add serial port support This patch adds UART serial port support for S5PV210. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 361be8601d78e488b5249032cc4e779b81d7928e Author: Sage Weil Date: Mon Jan 25 16:03:02 2010 -0800 ceph: precede encoded ceph_pg_pool struct with version Signed-off-by: Sage Weil commit 0d59ab81c3d3adf466c3fd37d7fb6d46b05d1fd4 Author: Yehuda Sadeh Date: Wed Jan 13 17:03:23 2010 -0800 ceph: keep reserved replies on the request structure This includes treating all the data preallocation and revokation at the same place, not having to have a special case for the reserved pages. Signed-off-by: Yehuda Sadeh commit 0547a9b30a5ac8680325752b61d3ffa9d4971b6e Author: Yehuda Sadeh Date: Mon Jan 11 14:47:13 2010 -0800 ceph: alloc message data pages and check if tid exists Now doing it in the same callback that is also responsible for allocating the 'front' part of the message. If we get a message that we haven't got a corresponding tid for, mark it for skipping. Moving the mutex unlock/lock from the osd alloc_msg callback to the calling function in the messenger. Signed-off-by: Yehuda Sadeh commit 9d7f0f139edfdce1a1539b100c617fd9182b0829 Author: Yehuda Sadeh Date: Mon Jan 11 10:32:02 2010 -0800 ceph: refactor messages data section allocation Signed-off-by: Yehuda Sadeh commit 2450418c47b7998ad55a73f23707b1e21c371eef Author: Yehuda Sadeh Date: Fri Jan 8 13:58:34 2010 -0800 ceph: allocate middle of message before stating to read Both front and middle parts of the message are now being allocated at the ceph_alloc_msg(). Signed-off-by: Yehuda Sadeh commit 5b1daecd59f95eb24dc629407ed80369c9929520 Author: Sage Weil Date: Mon Jan 25 11:33:08 2010 -0800 ceph: properly handle aborted mds requests Previously, if the MDS request was interrupted, we would unregister the request and ignore any reply. This could cause the caps or other cache state to become out of sync. (For instance, aborting dbench and doing rm -r on clients would complain about a non-empty directory because the client didn't realize it's aborted file create request completed.) Even we don't unregister, we still can't process the reply normally because we are no longer holding the caller's locks (like the dir i_mutex). So, mark aborted operations with r_aborted, and in the reply handler, be sure to process all the caps. Do not process the namespace changes, though, since we no longer will hold the dir i_mutex. The dentry lease state can also be ignored as it's more forgiving. Signed-off-by: Sage Weil commit 3ea25f9441fc0951ada649105f2c57a59536b539 Author: Sage Weil Date: Mon Jan 25 11:18:17 2010 -0800 ceph: mark MDS CREATE as a write op CEPH_MDS_OP_CREATE was not correctly marked as a write operation. Signed-off-by: Sage Weil commit ec7384ec23dc5a9ea8733e90438e16b6066bfe1b Author: Julia Lawall Date: Wed Jan 20 15:16:41 2010 -0800 ceph: remove duplicate variable initialization The variable client is initialized twice to the same (side effect-free) expression. Drop one initialization. A simplified version of the semantic match that finds this problem is: (http://coccinelle.lip6.fr/) // @forall@ idexpression *x; identifier f!=ERR_PTR; @@ x = f(...) ... when != x ( x = f(...,<+...x...+>,...) | * x = f(...) ) // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit a602f0f2f04f150fa1f7312b9e601e8e1a5afe10 Author: Uwe Kleine-König Date: Thu Dec 17 12:43:29 2009 +0100 arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode These functions are called with irqs already off. This commit removes the calls to raw_local_irq_save and raw_local_irq_restore on platforms that don't have to use a shared interrupt for their timekeeping. Signed-off-by: Uwe Kleine-König commit 501d70383aa9ffc78b41aa7e74f6b0254c7c731c Author: Uwe Kleine-König Date: Mon Sep 21 09:30:09 2009 +0200 arm/at91: Don't disable irqs in set_next_event and set_mode callbacks on AT91 the timer irq is shared, so the handler might be entered without irqs being disabled. Though this should not happen as the timer irq is registered early, there have been some reports on the mailing list. To make debugging that problem easier next time it pops up a WARN_ON_ONCE is added to the handler if irqs are not off. Signed-off-by: Uwe Kleine-König commit 0647aee035245e0e5ea39ae17cf909b7099f988d Author: Ben Dooks Date: Wed Jan 20 15:09:40 2010 +0900 ARM: S5P6440: Add HSMMC and OTG base addresses to map.h Add the HSOTG and HSMMC block addresses to the map.h file. Signed-off-by: Ben Dooks commit 1725c679a08902ce04419b274d22254155ce707c Author: Ben Dooks Date: Tue Jan 19 13:16:50 2010 +0900 ARM: S3C64XX: Update s3c6400_defconfig for current kernel Update the s3c6400_defconfig with one from the current kernel which has been build and run tested on an SMDK6410. Signed-off-by: Ben Dooks commit 3a3b585aa4ecad21ae91cfa9e5f387d64a15a312 Author: Ben Dooks Date: Tue Jan 19 11:34:58 2010 +0900 ARM: S3C6400: Update s3c6400_defconfig for bigger initrds for SMDK6410 The Samsung initrd for SMDK6410 is now bigger than the original initrds that where used. Increase the command-line size and the size of the ramdisk that it is unpacked into. Also change the default init to /linuxrc to avoid problems with the current SMDK ramdisk image failing to run /bin/bash. Signed-off-by: Ben Dooks commit 75497d96b2094d325594b46d5e5f12b2396c4d51 Author: Ben Dooks Date: Thu Jan 21 13:31:38 2010 +0900 ARM: S3C64XX: Tidy up common code in s3c64xx_spi_set_info() The s3c64xx_spi_set_info() sets one of two platform data structures depending on which controller is being specified. Change to taking a pointer to the relevant platform data structure and then having one set of code to place the data into the area being pointed to. Cc: Jassi Brar Signed-off-by: Ben Dooks commit bd548e5ef21ac2ff18b262a905543d7a2340fb87 Author: Maurus Cuelenaere Date: Thu Jan 21 01:37:28 2010 +0100 ARM: S3C64XX: Fix typo in s3c-hsotg platform data ARM: S3C64XX: Fix typo in s3c-hsotg platform data Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 46f2b478b21bdb5bb588317c971a77df13702660 Author: Mark Brown Date: Wed Jan 20 13:06:05 2010 +0000 ARM: SAMSUNG: Staticise gpiolib implementation functions They are not exported, they are referenced via vtables. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8dcdd6e6bb09ba1915668b45a0ee730e820d0de1 Author: Mark Brown Date: Wed Jan 20 13:06:04 2010 +0000 ARM: S3C64XX: Staticise audio platform data It's not exported. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 1c24522c05f25b89cc4df5a875d8a005a774f570 Author: Mark Brown Date: Wed Jan 20 12:05:55 2010 +0000 ARM: S3C64XX: Fix dev-audio build As reported when the patch was posted commit 71269364 ("ARM: S3C64XX: Add I2S resources in platform code") uses pin names for the IISv4 data output pins which are not present in mainline, causing dev-audio to fail to build. Fix this by using the defines which are actually present in the kernel source. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 9fca878623378e7dd6da8e7135a561c17bc1112b Author: Mark Brown Date: Tue Jan 19 15:26:56 2010 +0000 ARM: SMDK6410: Set up interrupt range for WM835x on 1190-EV1 PMIC board The WM835x driver won't actually use this yet but it will in the future when the changes converting it to genirq are merged. Signed-off-by: Mark Brown Signed-off-by: Ben Dooks commit 8005745d6eea79da8ee2e7fe978d14e412aa3353 Author: Ben Dooks Date: Wed Jan 20 12:29:25 2010 +0900 ARM: SAMSUNG: Move pm-check.c to plat-samsung Move the pm-check.c file to plat-samsung for all Samsung SoC users, and update Kconfig names to make them SAMSUNG_ instead of S3C2410_ Sed expresions used to make the change: s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g Signed-off-by: Ben Dooks commit 106cc6aa73f594015fc8b99f7c70d1b7cf23f19a Author: Ben Dooks Date: Wed Jan 20 12:22:24 2010 +0900 ARM: SAMSUNG: Move pmw.c to plat-samsung Move the PWM driver support to plat-samsung, as these PWM blocks are close enough across the current range to be supported by this driver. Signed-off-by: Ben Dooks commit 6890556c140469622497bea98cf49bf93f92f922 Author: Ben Dooks Date: Wed Jan 20 11:09:28 2010 +0900 ARM: SAMSUNG: Move more support into plat-samsung Move header files which are not likely to be touched in any further support addition out of plat-s3c's include directory into plat-samsung. Signed-off-by: Ben Dooks commit 5b8a2fb34f5670b1f07483bfa40de9ce539dbdb2 Author: Roel Kluin Date: Sun Jan 17 20:25:36 2010 +0100 msm_sdcc.c: missing brackets in msmsdcc_resume() Since the curly brackets were missing the test and enable_irq(), if true, occurred twice. Signed-off-by: Roel Kluin commit 54b89177ac533dc7439491afd26baf59464b425c Merge: a0c814a af15194 Author: Ben Dooks Date: Tue Jan 19 18:53:46 2010 +0900 ARM: Merge next-samsung-s5p6440-iodec Merge branch 'next-samsung-s5p6440-iodec' into next-samsung-try10 commit a0c814afcfc2c840698372bd402b669b659ee1c5 Author: Ben Dooks Date: Mon Nov 23 23:32:31 2009 +0000 ARM: SAMSUNG: Add initial documentation directory and overview Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing. Signed-off-by: Ben Dooks commit af1519408a0d40f312e8f103504cd292cc49d927 Author: Kukjin Kim Date: Tue Jan 19 11:21:39 2010 +0900 ARM: S5P6440: Add IO descriptor for ChipID block. This patch adds the IO descriptor for ChipID block in S5P6440. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit e856bb1f8dfcd924a973102a244b81920752648e Author: Ben Dooks Date: Tue Jan 19 17:14:46 2010 +0900 ARM: SAMSUNG: Remove empty gpio-core.h and use central plat/gpio-core.h Rename mach-s3c2410/include/mach/gpio-core.h to mach/gpio-track.h so that it can be included by when needed. Eliminate all other empty gpio-core.h files and just include the as necessary. Signed-off-by: Ben Dooks commit 16e2c7c59f0a4debcb110648025bef11958aa3cd Author: Ben Dooks Date: Mon Jan 18 18:00:55 2010 +0900 ARM: SAMSUNG: Move GPIO headers to plat-samsung Move the GPIO and GPIO configuration headers into arch/arm/plat-samsung as they are common to all the Samsung SoCs. Signed-off-by: Ben Dooks commit 4f2b617aff8147338faa0d5ed7b57636076671bf Author: Ben Dooks Date: Mon Jan 18 11:22:38 2010 +0900 ARM: SAMSUNG: Move gpiolib support in gpio.c to plat-samsung Move the gpio.c code containing the core gpiolib and GPIO support to plat-samsung from plat-s3c as it is used by all current Samsung SoCs. Note, we didn't move this to gpiolib.c as it contains code that is not strictly for gpiolib support and the 4bit code is already called gpiolib.c so make the change easier by not renaming both files in one go. Signed-off-by: Ben Dooks commit 67866fb38680d85cbd13c7bb468fb89f16e026d1 Author: Ben Dooks Date: Mon Jan 18 10:47:45 2010 +0900 ARM: SAMSUNG: Move pm-gpio into plat-samsung Move the pm-gpio code into plat-samsung. Note, this should be changed later to properly compile the 4bit code if the 4bit settings are enabled. Signed-off-by: Ben Dooks commit 42d828d46f526605c84ebdb5a987fd25fe09a3c9 Author: Kukjin Kim Date: Tue Jan 19 15:31:17 2010 +0900 ARM: S5P6440: Add S5P6440 GPIO support This patch adds Samsung's S5P6440 GPIO support. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1f323cfda5feee4e9c1fc09ededaee849f906468 Author: Kukjin Kim Date: Tue Jan 19 15:30:54 2010 +0900 ARM: SAMSUNG: Move GPIO common functions to plat-samsung This patch moves GPIO common functions (from plat-s3c64xx) into plat-samsung. and adds the config option to build the plat-samsung/gpiolib for Samsung SoCs. Signed-off-by: Adityapratap Sharma Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 9717453c40ba9ffbd8c40968df45498059bfec0e Merge: ea2de1d 51fe522 Author: Ben Dooks Date: Tue Jan 19 18:36:16 2010 +0900 ARM: Merge next-samsung-serial1 Merge branch 'next-samsung-serial1' into next-samsung-try7 commit ea2de1dc8b5872de21a03757dca9d1560b5c9a81 Merge: 668dfc7 f9e011b Author: Ben Dooks Date: Tue Jan 19 18:36:12 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try7 commit 668dfc7527eb755e1bf194bf19c0c281e9df6deb Merge: 9e15714 22c810a Author: Ben Dooks Date: Tue Jan 19 18:36:09 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try7 commit 9e157144afe81052f5abe122c2469e33a30d20a5 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 18:36:04 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try7 commit 51fe52229e3765dc56b8d2dd5df656fbf8a20500 Author: Thomas Abraham Date: Thu Jan 14 15:05:38 2010 +0900 ARM: SAMSUNG: serial: Modify console initialization. This patch modifies s3c24xx_serial_initconsole function to accept multiple platform UART information structures. This is required on platforms that have differences among the instances of UART ports. As an example, the FIFO sizes could be different for each UART instance and hence multiple platform UART information structures would be needed. This patch also modifies the s3c24xx_console_init macro since it wraps the call to the s3c24xx_serial_initconsole function. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit bb9b1c772727849051e485a877aa9a4b2d3ac1a1 Merge: c3e71c6 f9e011b Author: Ben Dooks Date: Tue Jan 19 17:49:59 2010 +0900 ARM: Merge next-samsung-clock2 Merge branch 'next-samsung-clock2' into next-samsung-try5 commit c3e71c6d21a760c27b511e3dd9dbe46517c6f0f7 Merge: 645f0b0 22c810a Author: Ben Dooks Date: Tue Jan 19 17:48:35 2010 +0900 ARM: Merge next-samsung-devupdates1 Merge branch 'next-samsung-devupdates1' into next-samsung-try5 commit 645f0b07fe0dd0fa697c5b327c2d8c005bd0b5c0 Merge: 44d6cef8 6a2b411 Author: Ben Dooks Date: Tue Jan 19 17:47:39 2010 +0900 ARM: Merge next-jassi-spi Merge branch 'next-jassi-spi' into next-samsung-try5 commit 44d6cef805c1b17218723279a2767484e43d6fac Merge: 8e2376a a4e9469 Author: Ben Dooks Date: Tue Jan 19 17:42:25 2010 +0900 ARM: Merge next-s3c6410-andygreen Merge branch 'next-s3c6410-andygreen' into next-samsung-try5 commit 8e2376ab1086b2bff18fdb887f5bc13740ae6e24 Merge: 7126936 bcedfa9 Author: Ben Dooks Date: Tue Jan 19 17:42:02 2010 +0900 ARM: Merge next-samsung-mc-adc Merge branch 'next-samsung-mc-adc' into next-samsung-try5 Conflicts: arch/arm/mach-s3c6400/include/mach/map.h (fix ADC and RTC merge) commit 22c810ab3e25d16e6f128384d107b933b6fd8fff Author: Ben Dooks Date: Mon Jan 18 16:24:22 2010 +0900 ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata(). Add a s3c24xx_mci_set_platdata() call for all the machine files that have platform data for the MCI driver. This brings the MCI device into line with the other devices with __initdata and a specific call to ensure the right structure type is being passed. Signed-off-by: Ben Dooks commit 3cd2fff59fc924752611301f4ca7e8484f5744a5 Author: Ben Dooks Date: Fri Jan 15 15:09:20 2010 +0900 ARM: MINI2440: Remove commented out devices from device array There's no point in having these in until there is proper support for them, so remove as they only confuse the device changing script. Signed-off-by: Ben Dooks commit f126752043c67003de6d34b14160f87ba0323c98 Author: Ben Dooks Date: Wed Jan 13 14:59:46 2010 +0900 ARM: SAMSUNG: Add platform data registration for OHCI Add a platform data helper for the OHCI device Signed-off-by: Ben Dooks commit 0a6361316d6493b9dcbdda9a6a4586c3ccbfd008 Author: Ben Dooks Date: Tue Jan 12 15:15:28 2010 +0900 ARM: SAMSUNG: Make UART device code common Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a common entry in plat-samsung since they are the same in all the current implementations. Signed-off-by: Ben Dooks commit 6a2b4111643127a28944d673995810a82582c5a1 Author: Jassi Brar Date: Mon Jan 18 17:32:02 2010 +0900 ARM: S3C64XX: SPI: Define SPI controller devices Platform devices for SPI Controller of S3C64XX are defined and exported for machines to include. Also, controller setup helper functions are defined for machine code to set runtime configuration of the controller and the bus. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 398ccccb770e6ed3e138925404f0746cbe57c5a1 Author: Jassi Brar Date: Mon Jan 18 17:45:52 2010 +0900 ARM: S3C64XX: SPI: Header for passing platform data We need a way to pass controller specific information to the SPI driver. For that purpose new headers are made. SPI Controller is assumed 'type-s3c64xx' and can be defined for newer SoCs. Hence, that part is placed under plat-samsung to be shared across newer SoCs. SoC specific part - spi source clocks, will be placed under plat-/include/plat/ Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 87315a802a8aab9d986858fcf2230726c1b5c598 Author: Jassi Brar Date: Mon Jan 18 16:15:08 2010 +0900 ARM: S3C64XX: SPI: Define SPI-48M clock sources Defined special 48MHz clock sources for SPI-0,1. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 10f9f743f661d200a7a0006e65688cf28c2f01d9 Author: Jassi Brar Date: Mon Jan 18 16:15:07 2010 +0900 ARM: S3C64XX: SPI: Add SPI controller register base Added SPI controller register base. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit f9e011b6b305d38445bbd4a1e7a8814e056de37b Author: Ben Dooks Date: Mon Jan 18 15:57:42 2010 +0900 ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call. The call has been assuming all clksrc-clks' divider size is 4 bits, but this may not be the case anymore. Use the reg_div.size parameter to calculate the maximum value it can take and check against that. Signed-off-by: Ben Dooks commit f3b464cca94c4a8f54fbc11ec5af8b143fd1750b Author: Ben Dooks Date: Mon Jan 18 15:37:25 2010 +0900 ARM: SAMSUNG: Fix clksrc-clk's checks for bad register settings The WARN_ON() was only checking the first clock in the array, instead of being executed for each clksrc clock being registered. Since this is an array of clocks, WARN_ON() does not provide a lot of useful information about the problem, so change to using printk(KERN_ERR) to report the problem to the console. As a note, we still try and register the clock even if these problems are present just in case and to avoid changing the behaviour of the registration process. Signed-off-by: Ben Dooks commit b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 Author: Thomas Abraham Date: Mon Jan 18 14:30:16 2010 +0900 ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock sources Adds a additional check in s3c_set_clksrc function to ensure that the clksrc_clk does have a choice of multiple clock sources. In addition to this, a check is added to ensure that a parent is assigned to the clksrc_clk in case it does not have a choice of parent clocks. Signed-off-by: Thomas Abraham Signed-off-by: Ben Dooks commit a0de298a0eee7f9004a8e512c12c7b40d66c9934 Author: Ben Dooks Date: Mon Jan 18 13:24:01 2010 +0900 ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable The clk_hd0 and clk_pd0 where given a local dummy_enable call due to not being registered with the clock code, which they really should have been. Register these two clocks and remove the clk_dummy_enable as this is done by the default clock registration code. Signed-off-by: Ben Dooks commit a4e946947b966d018f3f712d5c7ca2932c2aadd2 Author: Andy Green Date: Tue Dec 29 14:40:43 2009 +0000 ARM: SMDK6410: Add comments on ethernet connectivity LAN9115 Ethernet only works on SMDK6410 if certain switches are set in specific ways. Document the requirement. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 810f613c03a1614c71a2b27859e91ae155bd659f Author: Andy Green Date: Tue Dec 29 14:40:30 2009 +0000 ARM: S3C64XX: Add virtual mapping for S3C64XX SROM area This adds the physical address of the SROM unit, and applies a virtual mapping for it to the S3C_VA_MEM slot. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit f01fdac005d44e6c36af5b5eb841c4804570f0ad Author: Andy Green Date: Tue Dec 29 14:40:36 2009 +0000 ARM: SMDK6410: Add nC1 chipselect SROM setup Since the mach-smdk6410.c file claims it can start up the smsc9115 ethernet device on the board, it should take care about configuring the necessary chip select nCS1 so it can see the chip. The select defaults to 8-bit mode so without config the Ethernet doesn't work. This patch uses the new SROM definitions to set nCS1 to the state found in the Samsung U-Boot port for 6410. It may be more conservative that it needs to be since those settings were marked as for CS8900A also using this chip select. But this change is enough to get the ethernet working when booted with Qi. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit a7c9194cdc9a858bbf5a4cdae289e28dea149aeb Author: Andy Green Date: Tue Dec 29 14:40:23 2009 +0000 ARM: S3C64XX: Add SROM register definitions This introduces a platform file for s3c64xx that defines the SROM unit registers that control chip select characteristics. Signed-off-by: Andy Green Signed-off-by: Ben Dooks commit 0084f27a21d36ac846cd4366289c229a7cce511b Merge: bcedfa9 7126936 Author: Ben Dooks Date: Mon Jan 18 09:35:29 2010 +0900 ARM: Merge next-s3c64xx Merge branch 'next-s3c64xx' into next-samsung Conflicts: arch/arm/mach-s3c6400/include/mach/map.h ( ADC and RTC PA merge fixed) commit bcedfa98d97e02e95bb023ab93675dbe63c508ef Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:34 2010 +0100 ARM: S3C64XX: Add S3C64XX support to the generic Samsung ADC driver Add S3C64XX support to the generic Samsung ADC driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 3929e1e76d9116856a4c7a00fcce0539dd8507a0 Author: Maurus Cuelenaere Date: Thu Jan 14 00:30:31 2010 +0100 ARM: SAMSUNG: Move S3C24XX ADC driver to plat-samsung Move S3C24XX ADC driver to plat-samsung Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit 71269364a8d5ea42ecc6cbc7b687e5d45cbabe0e Author: Jassi Brar Date: Wed Jan 6 15:33:44 2010 +0900 ARM: S3C64XX: Add I2S resources in platform code Define resources needed by the I2S drivers in platform code. Audio cfg_gpio callback and IORESOURCE_DMA are added. Signed-off-by: Jassi Brar Signed-off-by: Ben Dooks commit 206090913d0d6ad3506e3e2693a696fc1626993e Author: Maurus Cuelenaere Date: Tue Jan 12 01:40:14 2010 +0100 ARM: S3C64XX: Add S3C64XX RTC platform driver Add S3C64XX RTC platform driver Signed-off-by: Maurus Cuelenaere Signed-off-by: Ben Dooks commit c67fcd670b55e89e0c129fbf7fae854bd1f8bfa6 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:44 2009 +0400 ACPI: Battery: Add support for _BIX extended info method Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 16698857fba1b10af4890055272975adf5686e83 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:37 2009 +0400 ACPI: SBS: Export cycle_count Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit c955fe8e0bdd7be7a6bc2d49245d570a816f7cc5 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:30 2009 +0400 POWER: Add support for cycle_count Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 7b3bcc4a1a7cd2d53b403ca29d06ceb5fa617eb7 Author: Alexey Starikovskiy Date: Thu Oct 15 14:31:24 2009 +0400 ACPI: Battery: Add bit flags Signed-off-by: Alexey Starikovskiy Signed-off-by: Len Brown commit 0f61628e37e121b7786bff2653fc25a321e82ec4 Author: Ben Dooks Date: Sun Nov 29 14:34:56 2009 +0000 ARM: S3C2412: Fixup commented out device in SMDK2413 The SMDK2413 has a commented out device that does not have any setup data for it, so remove it for now. Signed-off-by: Ben Dooks commit b813248c614b07642adbf1d7b577d0466003b339 Author: Ben Dooks Date: Mon Nov 23 00:13:39 2009 +0000 ARM: S3C: Rename s3c_device_usb to s3c_device_ohci Prepare for the forthcoming device changes by renaming s3c_device_usb to s3c_device_ohci as this is what the device represents. Signed-off-by: Ben Dooks commit 501dae90b3ae4dd3d8efdacfcb072c3d65eb5a33 Author: Kukjin Kim Date: Thu Jan 14 08:23:53 2010 +0900 ARM: S5P6440: Add serial port support This patch adds UART serial port support for S5P6440 CPU. Most of the serial support of Samsung's 6400 CPU is reused for 6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 62a6156e88b2e89eafed30aefc97ff4979393c1c Author: Kukjin Kim Date: Thu Jan 14 08:23:04 2010 +0900 ARM: S5P6440: Add configuration file This patch adds Samsung's S5P6440 default configuration file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit d25168ea9308e19c7000f0c997eedec87c5d6298 Author: Kukjin Kim Date: Thu Jan 14 08:22:00 2010 +0900 ARM: S5P6440: Add Board support file This patch adds Samsung's SMDK6440 board support file. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit c4ffccddd54b669cc9683f2c69e31035e916a1a0 Author: Kukjin Kim Date: Thu Jan 14 08:19:36 2010 +0900 ARM: S5P6440: Add new Kconfig and Makefiles This patch adds the Kconfig and Makefile for the new S5P6440 machine and platform directories. It also updates arch/arm Kconfig and Makefiles to include the support for the new S5P6440 CPU. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5f3545f64a44b2b2dac34141dba23d18cdf40a92 Author: Kukjin Kim Date: Thu Jan 14 08:15:39 2010 +0900 ARM: S5P6440: Add Timer support This patch adds timer support for S5P6440 CPU. Signed-off-by: Atul Dahiya Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit b7db51be43bc8f9943324a00b80e5d034de0a733 Author: Kukjin Kim Date: Thu Jan 14 08:14:40 2010 +0900 ARM: S5P6440: Add IRQ support This patch adds IRQ support for S5P6440 CPU. Signed-off-by: Adityapratap Sharma Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 1a0e8a52ad56075663d8e120e2468fc96fb6fa6c Author: Kukjin Kim Date: Thu Jan 14 08:13:37 2010 +0900 ARM: S5P6440: Add Clock and PLL support This patch adds clock and pll support for S5P6440. This patch are based on Harald Welte's patches and Ben's plat-samsung. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 209fecd1b8e65b8046efbbc8314d449e53c4c6b6 Author: Kukjin Kim Date: Thu Jan 14 15:29:17 2010 +0900 ARM: S5P6440: Add new CPU initialization support This patch adds Samsung's S5P6440 CPU support. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit be97162d47b2e067f9d21097650f2f0405dacc9f Author: Ben Dooks Date: Tue Jan 12 14:13:58 2010 +0900 ARM: S5PC1XX: Use common UART IRQ handling code Use the common UART IRQ handling code for the S5PC100 system. Signed-off-by: Ben Dooks commit 47101ec73901183520de724fb5f9062c014236bb Author: Ben Dooks Date: Thu Jan 7 14:41:38 2010 +0900 ARM: S5PC1XX: Move to using standard timer IRQ handling code Move to using the standard VIC/Timer IRQ handling code added previously to avoid duplicating code. Thanks to Marek Szyprowski for pointing out dual Kconfig change. Signed-off-by: Ben Dooks commit 35accd2f6639a9245488f2f389e3c6372c7641e4 Author: Ben Dooks Date: Tue Jan 12 13:10:59 2010 +0900 ARM: S5PC1XX: Remove definitions deleted by previous clksrc changes Remove the definitions we've deleted in the previous updates to the clksrc_clk for arch/arm/plat-s5pc1xx/include/plat/regs-clock.h. Added comments about the removal to the clock header since we only need these defines in one place (and they've now been removed there) we get rid of them from the header. Signed-off-by: Ben Dooks commit 37872bb9efddf9518cc77c43f9fa8fc6bfd3d727 Author: Ben Dooks Date: Tue Jan 12 12:52:43 2010 +0900 ARM: SAMSUNG: Add script to change old clksrc_clk to new register defs This script is used to change the old style clksrc_clk as originally found in plat-s3c64xx to the new style. It is here for reference if needed for future code merges. Signed-off-by: Ben Dooks commit c837e88cf9e18c311332cc1c8c488993a201d568 Author: Ben Dooks Date: Tue Jan 12 12:49:17 2010 +0900 ARM: S5PC1XX: Change clksrc_clks to use array of clocks Remove the individual 'struct clksrc_clks' and place them into an array so that we can simply use s3c_register_clksrcs to register tham all in one go. Since the spdif clock relies on the audio clock, move the audio clocks into their own arrary. Thanks to Marek Szyprowski for testing and pointing out the four clocks what where missed from the clock list. Signed-off-by: Ben Dooks commit 1d026d9b1671bcb05e7b00f545f1d62476e9063c Author: Ben Dooks Date: Tue Jan 12 12:39:58 2010 +0900 ARM: S5PC1XX: Move clock definitions around ready to turn into clksrc arrays Move the clock definitions around ready to turn the clocks into an array of clocks and register them in one go. Signed-off-by: Ben Dooks commit 45426468148d77e8c5eaece21d2a16e063066567 Author: Ben Dooks Date: Tue Jan 12 12:19:28 2010 +0900 ARM: S5PC1XX: Move to using generic clksrc_clk for clock code Remove the copy of the old s3c64xx struct clksrc_clk and use the new one in plat-samsung. This eliminates a bug in the set_parent() call where it failed to set the clk->parent after sucesfully updating the clock. The script that was used to automate much of the process will be supplied seperately. Signed-off-by: Ben Dooks commit 85841bcedd6048dd37cab58a504e5317192324c6 Author: Kukjin Kim Date: Mon Jan 11 12:21:51 2010 +0900 ARM: SAMSUNG: Add config option for number of additional GPIO pins. This patch adds a configuration option for specifing the number of additional GPIO pins to be used in addition to the GPIO pins supported onchip. Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 5b39be4637bb795b2133dbee0eadbcc08bdd4134 Author: Ben Dooks Date: Thu Jan 7 08:59:26 2010 +0900 ARM: Add common entry code for system with two VICs Add a common entry-macro-vic2.S for systems where there are two VICs so that the machine or platform directories just need to setup the correct information before including into their own entry-macro.S file. Since this code is from the S3C64XX project, we update the S3C64XX machine entry code to use this new header. Signed-off-by: Ben Dooks commit 51022cf6591ae2945960d034788bdeffa28cde13 Author: Ben Dooks Date: Wed Jan 6 11:18:44 2010 +0900 ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung Move the handling for the UART interrupts out of the s3c64xx specific code and into plat-samsung so that it can be used by all implementations that need it. Signed-off-by: Ben Dooks commit 7162ba03729e0a47aaab44448ce2453f07a9664d Author: Ben Dooks Date: Wed Jan 6 10:14:51 2010 +0900 ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files Move the VIC based timer interrupt handling out of plat-s3c64xx and into plat-samsung to be re-used for other systems. This also reduces the code size as we now have a common init routine and use the irq_desc to store the interrupt number of the timer. Signed-off-by: Ben Dooks commit 4f830db9629e413e7c5523085ab009b0de5ae6d0 Author: Ben Dooks Date: Wed Jan 6 02:28:20 2010 +0900 ARM: SAMSUNG: Move gpio-config.c into plat-samsung The arch/arm/plat-s3c/gpio-config.c file is common to pretty much all the Samsung SoCs, so move it to arch/arm/plat-samsung Signed-off-by: Ben Dooks commit b6a604137bb978d9f65b1228cf0bb691ece45cba Author: Ben Dooks Date: Wed Jan 6 02:45:09 2010 +0900 ARM: SAMSUNG: Move device definitions in plat-samsung Move all the platform device definitions from plat-s3c into plat-samsung Signed-off-by: Ben Dooks commit 9745626b65b856bf58e70feb4eee1e5471db699e Author: Ben Dooks Date: Wed Jan 6 02:39:28 2010 +0900 ARM: SAMSUNG: Move pwm-clock code into plat-samsung Move the code for the pwm-clock into plat-samsung, as it is common to all Samsung SoCs. Signed-off-by: Ben Dooks commit ed276849bc6a8ad5bb0f9fa94fe8305ee67bb6c6 Author: Kukjin Kim Date: Thu Jan 14 12:50:23 2010 +0900 ARM: SAMSUNG: Make clk_default_setrate and clk_ops_def_setrate visible This patch makes clk_default_setrate and clk_ops_def_setrate available to code outside plat-samsung clock code. Signed-off-by: Thomas Abraham Signed-off-by: Kukjin Kim Signed-off-by: Ben Dooks commit 14235696d401e62f8f5740ca2fb917ab42b9fd18 Author: Ben Dooks Date: Wed Jan 6 01:53:25 2010 +0900 ARM: SAMSUNG: Do not register set_parent call if no source If there is no source register defined, do not register a clksrc clock with a valid .set_parent in the ops. Signed-off-by: Ben Dooks commit 1d9f13c49ed750260f40317629bdd66160a3ac16 Author: Ben Dooks Date: Wed Jan 6 01:21:38 2010 +0900 ARM: SAMSUNG: Add call to register array of clocks Add s3c_register_clocks() to register an array of clocks, printing an error message if there is a problem. Replace all points in the code where this could be used. Signed-off-by: Ben Dooks commit fb6e76cd2309c76d2120e013ff34ff6ab27aad88 Author: Ben Dooks Date: Wed Jan 6 01:07:57 2010 +0900 ARM: SAMSUNG: Do not allow get/set/round rate calls with no divider If the reg_div field is not set, then do not register clk_ops with the get/set/round rate calls as these will fail to work. Signed-off-by: Ben Dooks commit 2c2f69b15d5420291a941ace10149e76f0af7ab0 Author: Ben Dooks Date: Wed Dec 23 18:43:48 2009 +0000 ARM: SAMSUNG: Move clock.c to arch/arm/plat-samsung This is the core implementation of the clock code for all Samsung based SoCs, so move it to arch/arm/plat-samsung (the clock.h file has already been moved). Since the file is built for every Samsung SoC, no changes are needed to the Kconfig system. Signed-off-by: Ben Dooks commit 682e2b7d45878586ce84f6993da0b8a2981a399d Author: Ben Dooks Date: Wed Dec 9 00:08:35 2009 +0000 ARM: S3C64XX: Avoid announcing clksrc clocks twice The new code calls the clock setup code on registration which can be before the clock system has been fully initialised. The following code re-does this setup at the end of the clock registration and thus we get two printings. Update the calls to only print on the last pass or when doing the necessary resume work. Signed-off-by: Ben Dooks commit f3e0b724cc70ef5ee2a6e0d9dfafa2328c294ab3 Author: Ben Dooks Date: Tue Dec 8 01:26:07 2009 +0000 ARM: S3C64XX: Fixup .reg_src and .reg_div with named initialisers Change these two fields to have named initialisers as per the review comments from Kyungmin Park. sed used: s@\.reg_src\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_src\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g s@\.reg_div\(.*\)=\(.*\){\(.*\),\(.*\),\(.*\)}@.reg_div\1=\2{ .reg =\3, .shift =\4, .size =\5 }@g Signed-off-by: Ben Dooks commit b3bf41be06634d69959a68a2b53e1ffc92f0d103 Author: Ben Dooks Date: Tue Dec 1 01:24:37 2009 +0000 ARM: SAMSUNG: Reduce size of struct clk. Reduce the size of struct clk by 12 bytes and make defining clocks with common implementation functions easier by moving the set_rate, get_rate, round_rate and set_parent calls into a new structure called 'struct clk_ops' and using that instead. This change does make a few clocks larger as they need their own clk_ops, but this is outweighed by the number of clocks with either no ops or having a common set of ops. Update all the users of this. Signed-off-by: Ben Dooks commit 13bbd88504bfa0d205fa4121322869d8d7e083d0 Author: Harald Welte Date: Tue Dec 1 01:24:36 2009 +0000 ARM: S3C64XX: Remove unused clock definitions from clock header Clean out the definitions we are no longer using after the new clock code updates. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from initial patch provided] Signed-off-by: Ben Dooks commit 399cae747426a6acdba8e347edef241a05a08b09 Author: Ben Dooks Date: Tue Dec 1 01:24:35 2009 +0000 ARM: S3C64XX: Use new clock-clksrc.c code for clocks. Move the s3c6400-clock.c implementation over to use the new common plat-samsung based clock-clksrc.c. Note, this does not delete the clocks definitions that are now unused in the regs-clock.h to reduce the quantity of change in this commit. Based on original patches by Harald Welte. Signed-off-by: Ben Dooks commit aa9ad6ad9c16e1daff41792c485f46e601a5af33 Author: Harald Welte Date: Tue Dec 1 01:24:34 2009 +0000 ARM: SAMSUNG: Add core clock implementation for clksrc based clocks Add a core for the clksrc clock implementation, which is found in many of the newer Samsung SoCs into plat-samsung. Signed-off-by: Harald Welte [ben-linux@fluff.org: split from original patch to make change smaller] [ben-linux@fluff.org: split clk and clksrc changes] [ben-linux@fluff.org: moved to plat-samsung from plat-s3c] [ben-linux@fluff.org: re-wrote headers after splits] [ben-linux@fluff.org: added better documentation to headers] Signed-off-by: Ben Dooks commit 8360493c4ae4c116339cd1cf4da100c3547f23af Author: Ben Dooks Date: Mon Nov 30 01:31:32 2009 +0000 ARM: S3C64XX: Compress s3c6400-clock.c code The individually named clocks are all static to the code and thus can be compressed into a single array and then the array can be referenced. This removes the need for a seperate array of pointers to clocks. Fix a minor problem of re-initialising the pointers in s3c6400_set_clksrc() as this is also called by the cpufreq code. Move these initialisations to the code that does the registration. Based on Harald Welte's original clock changes patch. Signed-off-by: Ben Dooks commit f9c4f1e4ddf40103dcf85e23d00230ab8ece2a89 Author: Ben Dooks Date: Mon Nov 30 01:10:57 2009 +0000 ARM: S3C64XX: Cleanup common init code in s3c6400-clock.c Remove the four fields from clksrc_clk.clk which are always the same and init them when the clock is registered. This helps remove the amount of repeated code. This is a re-work of Harald Welte's clock changes for the latest kernel. Signed-off-by: Ben Dooks commit 70792bcfad5f4817fc067b7fdb0541d8b13b5502 Author: Ben Dooks Date: Mon Nov 30 00:40:47 2009 +0000 ARM: SAMSUNG: Move to plat-samsung Move the header to plat-samsung where it can be used by all the platforms, and readies it for the next round of clock updates where the clock code will be amalgamated. Signed-off-by: Ben Dooks commit 7740a42f816790583bd8a9079337772d511af3a3 Author: Sage Weil Date: Fri Jan 8 15:58:25 2010 -0800 ceph: display pgid in debugfs osd request dump Signed-off-by: Sage Weil commit 103e2d3ae57d38d18aaac1b327266c1407499ac1 Author: Sage Weil Date: Thu Jan 7 16:12:36 2010 -0800 ceph: remove unused erank field The ceph_entity_addr erank field is obsolete; remove it. Get rid of trivial addr comparison helpers while we're at it. Signed-off-by: Sage Weil commit 4baa75ef0ed29adae03fcbbaa9aca1511a5a8cc9 Author: Yehuda Sadeh Date: Thu Jan 7 15:36:32 2010 -0800 ceph: change dentry offset and position after splice_dentry This fixes a bug, where we had the parent list have dentries with offsets that are not monotonically increasing, which caused the ceph dcache_readdir to skip entries. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit b97235dfa1aba54786b19fc53ba026e47be86ac6 Author: Baruch Siach Date: Thu Jan 14 11:24:15 2010 +0200 mx25pdk: add NAND device support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 27f590258954ea0d22b43e33dd356bc76a8dfe7a Author: Baruch Siach Date: Thu Jan 14 11:24:14 2010 +0200 mx25: add NAND support Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit b6d0c1bda9038354ff2f0c77da23fd32e0f11a1f Author: Baruch Siach Date: Thu Jan 14 11:24:13 2010 +0200 mtd: mxc_nand: add MX25 to Kconfig Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 37439a0f123e9eecf7b3920c9f9bd25e35ea8e3e Merge: becc670 a8dfb64 Author: Sascha Hauer Date: Thu Jan 14 10:58:10 2010 +0100 Merge branch 'imx' of git://git.pengutronix.de/git/ukl/linux-2.6 into mxc-master commit 8045e2985012bdb95d832dfbcceae1815880a6ed Author: OGAWA Hirofumi Date: Tue Jan 12 03:32:24 2010 +0900 fat: Fix vfat_lookup() After d_find_alias(), vfat_lookup() checks !(->d_flags & DCACHE_DISCONNECTED) without IS_ROOT(). This means it hits non-anonymous but disconnected dentry. (NOTE: d_splice_alias() doesn't clear DCACHE_DISCONNECTED) But, vfat_lookup() has interest to alias if it was non-anonymous. So, this adds vfat_d_anon_disconn() helper to check it correctly. Another bug is refcnt leak. It needs dput() for uninterested alias. Signed-off-by: OGAWA Hirofumi commit e55d1936f207f81c4e225d6c513e0fa487e544c5 Merge: 74d2e4f e7cc894 Author: Russell King Date: Sun Jan 10 17:33:56 2010 +0000 Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable commit a8dfb6462a033984b99fee4122fe0799a31f5bb4 Author: Uwe Kleine-König Date: Thu Jan 7 11:27:17 2010 +0100 imx: define functions to configure chip selects in the WEIM This has the addional effect that the macros CSCR_U, CSCR_L and CSCR_A are not used anymore in mach-pcm038.c and mach-qong.c. These still use the deprecated IO_ADDRESS macro and shouldn't be used in new code. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 3cdd54417d0f821825a353f7273d356399112f56 Author: Uwe Kleine-König Date: Fri Jan 8 16:02:30 2010 +0100 imx: properly protect mach/mx{1,[25][157x]}.h from multiple inclusion Some headers have used (now) wrong names or havn't had protection at all. This is needed before adding static inline functions to the headers. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Magnus Lilja Cc: Holger Schurig Cc: Jiri Kosina Cc: Daniel Mack commit 4631166124d928d3e9372a57b1477ce6335332c5 Author: Uwe Kleine-König Date: Fri Jan 8 12:29:11 2010 +0100 imx: remove unneeded include of mach/hardware.h This include isn't needed and hurts when defining static inline functions in mach/hardware.h (or files included by mach/hardware.h). The reason is that the consumers of mach/uncompress.h are compiled using -Dstatic= so the code for all inline function is included in e.g. arch/arm/boot/compressed/misc.o. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jörg Knobloch Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Dmitriy Taychenachev commit d13ab097ae9671be6765c7a8f1946641db5a7dac Author: Uwe Kleine-König Date: Tue Jan 5 11:27:42 2010 +0100 imx: remove mx1ads defconfig For some time now the defconfig for mx1ads produces a kernel for a versatile board. As CONFIG_ARCH_MX1ADS is included in the mx1 defconfig just get rid of mx1ads_defconfig. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer commit aae7019382896cf1075a93acc564e42601bc44a2 Author: Uwe Kleine-König Date: Thu Dec 17 17:17:54 2009 +0100 imx: only define deprecated symbols conditionally Define deprecated symbols in an #ifdef IMX_NEEDS_DEPRECATED_SYMBOLS ... All files that still depend on the old definitions get -DIMX_NEEDS_DEPRECATED_SYMBOLS passed to the compiler. When all remaining users are fixed this allows including the soc specific headers unconditionally. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Daniel Mack Cc: Alberto Panizzo Cc: Ilya Yanok Cc: Holger Schurig Cc: Jiri Kosina Cc: Magnus Lilja commit a9b7a2dd217bd43e122b604ec99b63e0211c38aa Author: Uwe Kleine-König Date: Thu Dec 17 11:56:43 2009 +0100 imx: mangle addresses after adding the offset don't use IO_ADDRESS($base) + $offset but IO_ADDRESS($base + $offset) Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: "Agustín Ferrín Pozuelo" Cc: Javier Martin Cc: Valentin Longchamp Cc: Daniel Mack Cc: Dmitriy Taychenachev commit 59e2608169bf4199f9f9e08a8abe80132e9416f5 Author: Uwe Kleine-König Date: Wed Dec 16 19:08:09 2009 +0100 mx3/kzm_arm11_01: define and use board specific IO_ADDRESS macro Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 6ef9af6871e3f220c6c7facf90babe6931d972bd Author: Uwe Kleine-König Date: Wed Dec 16 19:07:20 2009 +0100 imx35: define and use MX35_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jürgen Beisert Cc: Rabin Vincent Cc: Valentin Longchamp commit df9375fad4f99b28f5a500d9aa2cbb04e065ac97 Author: Uwe Kleine-König Date: Wed Dec 16 19:07:04 2009 +0100 imx25: redefine MX25_IO_ADDRESS using IMX_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King commit 1273e7686f0c122bf58592c57387471c7f4eaa1b Author: Uwe Kleine-König Date: Wed Dec 16 19:06:12 2009 +0100 imx31: define and use MX31_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Greg Kroah-Hartman Cc: Mark Brown Cc: Magnus Lilja commit bc9ea6c7f5352f8857525b054bc3df784be1b8d5 Author: Uwe Kleine-König Date: Wed Dec 16 17:30:27 2009 +0100 imx27: define and use MX27_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Holger Schurig commit a3f5ac7838a93977f71288310336a725eb6e62db Author: Uwe Kleine-König Date: Wed Dec 16 17:29:39 2009 +0100 imx21: define and use MX21_IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent Cc: Agustín Ferrín Pozuelo commit 1f2ddd64da6e53365102d831aa9e0446b78f0300 Author: Uwe Kleine-König Date: Wed Dec 16 19:05:04 2009 +0100 imx: provide helper macro to define IO_ADDRESS Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Dmitriy Taychenachev commit 321ed164369bb5e4888eb24d70ebc64c232ffc31 Author: Uwe Kleine-König Date: Thu Dec 10 10:41:26 2009 +0100 imx/mx3: rename files defining a machine to mach-$mach.c While at it remove some superfluous parenthesis. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit 6a4ef48103a78a46b80e07fcd8ac4edda0c7128f Author: Yehuda Sadeh Date: Thu Dec 31 12:04:58 2009 -0800 ceph: fix copy_user_to_page_vector() The function was broken in the case where there was more than one page involved, broke the ceph sync_write case. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit becc670a1bda8f240a93e45d9794f9f79713ffdb Author: Mark Brown Date: Mon Jan 4 18:24:50 2010 +0000 mx31ads: Allow enable/disable of switchable supplies They will be automatically powered off at startup so users will need to enable them for use. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit edc34a90613bbb393c019882f85b74f24066ca19 Author: Mark Brown Date: Mon Jan 4 18:24:49 2010 +0000 mx31ads: Convert 1133-EV1 to use dev_name to specify consumer devices This means we don't need to go running round working out struct devices at runtime. Signed-off-by: Mark Brown Signed-off-by: Sascha Hauer commit 386c5cf7a9a1d6856f17bde43174f751fac1bc0b Author: Uwe Kleine-König Date: Thu Dec 10 10:34:04 2009 +0100 imx/mx2: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Eric Benard commit f747f935431c796749752037b8cf7d3f76e96b47 Author: Uwe Kleine-König Date: Thu Dec 10 10:25:07 2009 +0100 imx: rename Kconfig symbol for "LogicPD MX27 LITEKIT platform" Not using MACH_IMX27LITE makes machine_is_imx27lite always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Schaeffer commit bc727390f0a7d7069a39cd97451fa890caa0010e Author: Uwe Kleine-König Date: Thu Dec 10 10:19:43 2009 +0100 imx: rename Kconfig symbol for "Eukrea CPUIMX27 module" Not using MACH_CPUIMX27 makes machine_is_cpuimx27 always return 0 independent of building support for this machine. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Jean Delvare Cc: Eric Benard commit 95c00464dda726c49ac8c45228bee8bf395ffa97 Author: Uwe Kleine-König Date: Wed Dec 9 20:12:07 2009 +0100 imx/mx1: rename files defining a machine to mach-$mach.c Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 5c4c62bcb27cf9200553edeaecac1ab8cc2add91 Author: Uwe Kleine-König Date: Wed Dec 9 20:09:35 2009 +0100 imx/mx1: add newline at end of Makefile Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Paulius Zaleckas Cc: Darius Augulis Cc: Mauro Carvalho Chehab commit 60d644cae9d96e13547c69fbac22e800790e6054 Author: Uwe Kleine-König Date: Wed Dec 9 19:52:57 2009 +0100 imx/mx3: rename clock.c and iomux.c to {clock,iomux}-imx31.c These files are only used on imx31. This makes the name consistent with the imx35 files. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Daniel Mack Cc: Fabio Estevam Cc: Valentin Longchamp commit f568dd7f5805bfa9e99f6df866300498b55eb8f4 Author: Uwe Kleine-König Date: Wed Dec 9 11:57:21 2009 +0100 imx/mach-mx3: use constants namespaced by the corresponding SOC (easy part) This just leaves cpu.c, devices.c and mm.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Alberto Panizzo Cc: Valentin Longchamp Cc: Daniel Mack Cc: Guennadi Liakhovetski Cc: Yoichi Yuasa Cc: Mark Brown Cc: Magnus Lilja Cc: Fabio Estevam Cc: Sascha Hauer Cc: Harro Haan Cc: Jean Delvare Cc: Luotao Fu Cc: Ilya Yanok commit 3f35d1f5e4507ea4eb7ff5feaf624737c1b47631 Author: Uwe Kleine-König Date: Wed Dec 9 11:32:11 2009 +0100 imx/mach-mx2: use constants namespaced by the corresponding SOC (easy part) This just leaves devices.c, generic.c and serial.c to clean up. As these files are used on more than one SOC they need some more work. Signed-off-by: Uwe Kleine-König Cc: Holger Schurig Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp Cc: Jean Delvare Cc: Eric Benard Cc: Ivo Clarysse Cc: Vladimir Barinov Cc: Daniel Schaeffer Cc: Simon POLETTE Cc: Fabio Estevam Cc: Alan Carvalho de Assis Cc: Luotao Fu commit b70564686a3a3eac7c2da09722091dcf5b07d5a4 Author: Uwe Kleine-König Date: Fri Dec 11 09:57:27 2009 +0100 imx/clock-imx27: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Rabin Vincent Cc: Javier Martin Cc: Valentin Longchamp commit 318859fdff2caf4455749ff0097efb8f3e9b6879 Author: Uwe Kleine-König Date: Fri Dec 11 11:04:06 2009 +0100 imx/clock-imx21: use a macro to define registers This way the base address isn't hard coded in each register definition Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit 5113f81520278ba17c64031fa01aeafc9a83f9d1 Author: Uwe Kleine-König Date: Fri Dec 11 10:07:15 2009 +0100 imx/mx2: fold crm_regs.h into its only consumer Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Russell King Cc: Holger Schurig Cc: Rabin Vincent commit 0c99c5288eb9b1bbc9684b0ec0fd7efc578749b3 Author: Zhang Rui Date: Thu Dec 17 16:02:08 2009 +0800 ACPI: Disable explicit power state retrieval on fans If the ACPI power state can be got both directly and indirectly, we prefer to get it indirectly. https://bugzilla.redhat.com/show_bug.cgi?id=531916 describes a system with a _PSC method for the fan that always returns "on". There's no benefit in us always requesting the state of the fan when performing transitions - we want to do everything we can to ensure that the fan turns on when it should do, not risk hardware damage by believing the hardware when it tells us the fan is already on. Given that the Leading Other OS(tm) works fine on this machine, it seems likely that it behaves in much this way. inspired-by: Matthew Garrett Signed-off-by: Zhang Rui Signed-off-by: Len Brown commit cffdde993a016bedbc2f5eb60d00c3a766ffb612 Author: Dmitry Torokhov Date: Thu Dec 24 00:02:30 2009 -0800 sony-laptop - switch from workqueue to a timer The function that is executing in workqueue context does not need to sleep so let's switch to a timer which is more lightweight. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit c45bc9d62c39202b401d1bf7bb2812abb88798a1 Author: Dmitry Torokhov Date: Thu Dec 24 00:02:23 2009 -0800 sony-laptop - simplify keymap initialization Also use input_set_capability() helper instead of manipulating bits directly. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 9593bd07ec8eaaa30aba4281b2b3273282fc344f Author: Dmitry Torokhov Date: Thu Dec 24 00:02:16 2009 -0800 sony-laptop - remove private workqueue, use keventd instead If we reschedule work instead of having work function sleep for 10 msecs between reads from kfifo we can safely use the main workqueue (keventd) and not bother with creating driver-private one. Signed-off-by: Dmitry Torokhov Signed-off-by: Len Brown commit 93cea5bebf91319095db866163a7e35c3e77d8f2 Author: Sage Weil Date: Wed Dec 23 12:21:51 2009 -0800 ceph: use ceph_pagelist for mds reconnect message; change encoding (protocol change) Use the ceph_pagelist to encode the MDS reconnect message. We change the message encoding (protocol change!) at the same time to make our life easier (we don't know how many snaprealms we have when we start encoding). An empty message implies the session is closed/does not exist. Signed-off-by: Sage Weil commit 58bb3b374b07a2a43315213f00a48a5ffd6d0915 Author: Sage Weil Date: Wed Dec 23 12:12:31 2009 -0800 ceph: support ceph_pagelist for message payload The ceph_pagelist is a simple list of whole pages, strung together via their lru list_head. It facilitates encoding to a "buffer" of unknown size. Allow its use in place of the ceph_msg page vector. This will be used to fix the huge buffer preallocation woes of MDS reconnection. Signed-off-by: Sage Weil commit 04a419f908b5291ff7e8ffd7aa351fa0ac0c08af Author: Sage Weil Date: Wed Dec 23 09:30:21 2009 -0800 ceph: add feature bits to connection handshake (protocol change) Define supported and required feature set. Fail connection if the server requires features we do not support (TAG_FEATURES), or if the server does not support features we require. Signed-off-by: Sage Weil commit 6df058c025ce343052c5516b1d8a9a7e73cddd64 Author: Sage Weil Date: Tue Dec 22 11:24:33 2009 -0800 ceph: include transaction id in ceph_msg_header (protocol change) Many (most?) message types include a transaction id. By including it in the fixed size header, we always have it available even when we are unable to allocate memory for the (larger, variable sized) message body. This will allow us to error out the appropriate request instead of (silently) dropping the reply. Signed-off-by: Sage Weil commit 0cf90ab5b075821940873e73cdbfeb8edc3dabe8 Author: Sage Weil Date: Tue Dec 22 10:45:18 2009 -0800 ceph: more informative msgpool errors Signed-off-by: Sage Weil commit 350b1c32ea58d29e25d63fc25e92dd48f9339546 Author: Sage Weil Date: Tue Dec 22 10:45:45 2009 -0800 ceph: control access to page vector for incoming data When we issue an OSD read, we specify a vector of pages that the data is to be read into. The request may be sent multiple times, to multiple OSDs, if the osdmap changes, which means we can get more than one reply. Only read data into the page vector if the reply is coming from the OSD we last sent the request to. Keep track of which connection is using the vector by taking a reference. If another connection was already using the vector before and a new reply comes in on the right connection, revoke the pages from the other connection. Signed-off-by: Sage Weil commit ec302645f4a9bd9ec757c30d185557e1c0972c1a Author: Sage Weil Date: Tue Dec 22 10:43:42 2009 -0800 ceph: use connection mutex to protect read and write stages Use a single mutex (previously out_mutex) to protect both read and write activity from concurrent ceph_con_* calls. Drop the mutex when doing callbacks to avoid nested locking (the callback may need to call something like ceph_con_close). Signed-off-by: Sage Weil commit 529cfcc46ffa2cbe4d07641c11e65f67fe7b66e4 Author: Sage Weil Date: Tue Dec 22 10:29:39 2009 -0800 ceph: unregister canceled/timed out osd requests Canceled or timed out osd requests were getting left in the request list and never deallocated (until umount). Unregister if they are canceled (control-c) or time out. Signed-off-by: Sage Weil commit e0e3271074e1ebd0b80a912a457ce03c971bcd66 Author: Sage Weil Date: Mon Dec 21 21:04:26 2009 -0800 ceph: only unregister registered bdi Signed-off-by: Sage Weil commit 5dacf09121ffb2e5fc7d15b78cae0b77042a1935 Author: Sage Weil Date: Mon Dec 21 20:40:34 2009 -0800 ceph: do not touch_caps while iterating over caps list Avoid confusing iterate_session_caps(), flag the session while we are iterating so that __touch_cap does not rearrange items on the list. All other modifiers of session->s_caps do so under the protection of s_mutex. Signed-off-by: Sage Weil commit 7067f797b8409f1e10ec95ac2c1e17a200173d13 Author: Sage Weil Date: Mon Dec 21 16:02:37 2009 -0800 ceph: fix incremental osdmap pg_temp decoding bug An incremental pg_temp wasn't being decoded properly (wrong bound on for loop). Also remove unused local variable, while we're at it. Signed-off-by: Sage Weil commit 30dc6381bbac213987be6fe0b0fb89868ff1f2c0 Author: Sage Weil Date: Mon Dec 21 14:49:37 2009 -0800 ceph: fix error paths for corrupt osdmap messages Both osdmap_decode() and osdmap_apply_incremental() should never return NULL. Signed-off-by: Sage Weil commit 5de7bf8afa87f75af5ef3d6f9fce3e171cac834c Author: Sage Weil Date: Mon Dec 21 11:48:44 2009 -0800 ceph: do not drop lease during revalidate We need to hold session s_mutex for __ceph_mdsc_drop_dentry_lease(), which we don't, so skip it. It was purely an optimization. Signed-off-by: Sage Weil commit c4a29f26d50bea65809ca670992108a33aa2efa6 Author: Sage Weil Date: Mon Dec 21 11:42:18 2009 -0800 ceph: ensure rename target dentry fails revalidation This works around a bug in vfs_rename_dir() that rehashes the target dentry. Ensure such dentries always fail revalidation by timing out the dentry lease and kicking it out of the current directory lease gen. This can be reverted when the vfs bug is fixed. Signed-off-by: Sage Weil commit 2baba25019ec564cd247af74013873d69a0b8190 Author: Yehuda Sadeh Date: Fri Dec 18 13:51:57 2009 -0800 ceph: writeback congestion control Set bdi congestion bit when amount of write data in flight exceeds adjustable threshold. Signed-off-by: Yehuda Sadeh Signed-off-by: Sage Weil commit dbd646a851713bec5bfff40ecf624b2e78518fe5 Author: Yehuda Sadeh Date: Wed Dec 16 14:51:06 2009 -0800 ceph: writepage grabs and releases inode Fixes a deadlock that is triggered due to kswapd, while the page was locked and the iput couldn't tear down the address space. Signed-off-by: Yehuda Sadeh commit 169e16ce816ca417286daf1db25de424a9d65a0c Author: Yehuda Sadeh Date: Wed Dec 16 14:22:17 2009 -0800 ceph: remove unaccessible code Signed-off-by: Yehuda Sadeh commit 06edf046dd68ccbc7cf5f70f957a31702d0e7596 Author: Sage Weil Date: Tue Dec 15 14:44:32 2009 -0800 ceph: include link to bdi in debugfs Signed-off-by: Sage Weil commit e2885f06ce31d82b556be021acfa2eba160f29cc Author: Sage Weil Date: Tue Dec 15 10:27:48 2009 -0800 ceph: make mds ops interruptible Signed-off-by: Sage Weil commit cf3e5c409b5d66ec66207092a3f7e3e2c42c0f3f Author: Sage Weil Date: Fri Dec 11 09:48:05 2009 -0800 ceph: plug leak of incoming message during connection fault/close If we explicitly close a connection, or there is a socket error, we need to drop any partially received message. Signed-off-by: Sage Weil commit 9ec7cab14e6de732d4e7c355fe67c5810c32c758 Author: Sage Weil Date: Mon Dec 14 15:13:47 2009 -0800 ceph: hex dump corrupt server data to KERN_DEBUG Also, print fsid using standard format, NOT hex dump. Signed-off-by: Sage Weil commit 93c20d98c29ccefa039c3843ccc37122caaf3d31 Author: Yehuda Sadeh Date: Tue Dec 15 09:50:36 2009 -0800 ceph: fix msgpool reservation leak Signed-off-by: Yehuda Sadeh commit b3d1dbbdd5670d8a9fb01f7dfb1cac522ff6795a Author: Sage Weil Date: Mon Dec 14 14:58:11 2009 -0800 ceph: don't save sent messages on lossy connections For lossy connections we drop all state on socket errors, so there is no reason to keep sent ceph_msg's around. Signed-off-by: Sage Weil commit 92ac41d0a4ab26fb68d3f841332e5d1f15d79123 Author: Sage Weil Date: Mon Dec 14 14:56:56 2009 -0800 ceph: detect lossy state of connection The server indicates whether a connection is lossy; set our LOSSYTX bit appropriately. Do not set lossy bit on outgoing connections. Signed-off-by: Sage Weil commit 5e095e8b40b0402ad3bcadc5b8d84c38b26c30b2 Author: Sage Weil Date: Mon Dec 14 14:30:34 2009 -0800 ceph: plug msg leak in con_fault Signed-off-by: Sage Weil commit c86a2930ccbd90d77c54d04b5c2bbec95b989e40 Author: Sage Weil Date: Mon Dec 14 14:04:30 2009 -0800 ceph: carry explicit msg reference for currently sending message Carry a ceph_msg reference for connection->out_msg. This will allow us to make out_sent optional. Signed-off-by: Sage Weil commit e7cc894120bb809738cebcd87b5ed3057bbe51fe Author: Uwe Kleine-König Date: Thu Dec 17 14:56:57 2009 +0100 [ARM] pxa/ttc_dkb: remove duplicate macro definition ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is already included. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Bin Yang Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit e863c884cd18dca9533c352655af73d921f4a311 Author: Daniel Mack Date: Fri Nov 27 13:47:11 2009 +0100 [ARM] pxa/raumfeld: add defconfig Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit 550ee52d823845f882ddadcd032b33169866a739 Author: Daniel Mack Date: Fri Nov 27 13:47:09 2009 +0100 [ARM] pxa/raumfeld: add platform support This adds support for Raumfeld's 'Controller', 'Connector', 'Speaker S' and 'Speaker M' devices. They're all based on PXA303 SoCs. Signed-off-by: Daniel Mack Signed-off-by: Eric Miao commit d4a780ce8821a37dd135f15b6150a5bfc5604f29 Author: Sage Weil Date: Fri Dec 11 08:55:23 2009 -0800 ceph: fix leak of monc mutex Fix leak of monc mutex on ENOMEM or bad fsid when receiving new mon map. Audited all other users. Signed-off-by: Sage Weil commit 767ea5c33a360ce88da24e296e802dace5821799 Author: Sage Weil Date: Wed Dec 9 12:34:01 2009 -0800 ceph: do not feed bad device ids to crush Do not feed bad (large) device ids to CRUSH. Signed-off-by: Sage Weil commit c2e552e76e2c6907ca50cd9a4b747a2e2e8c615e Author: Sage Weil Date: Mon Dec 7 15:55:05 2009 -0800 ceph: use kref for ceph_msg Signed-off-by: Sage Weil commit 415e49a9c4faf1a1480b1497da2037608e5aa2c5 Author: Sage Weil Date: Mon Dec 7 13:37:03 2009 -0800 ceph: use kref for ceph_osd_request Signed-off-by: Sage Weil commit 153c8e6bf7ffee561e046e60b26ef6486c6fc9f2 Author: Sage Weil Date: Mon Dec 7 12:31:09 2009 -0800 ceph: use kref for struct ceph_mds_request Signed-off-by: Sage Weil commit b6c1d5b81ea0841ae9d3ce2cda319ab986b081cf Author: Sage Weil Date: Mon Dec 7 12:17:17 2009 -0800 ceph: simplify ceph_buffer interface We never allocate the ceph_buffer and buffer separtely, so use a single constructor. Disallow put on NULL buffer; make the caller check. Signed-off-by: Sage Weil commit dd26d857a7bf1b5b734a23180c19eac3e46db944 Author: Sage Weil Date: Sat Dec 5 10:13:33 2009 -0800 ceph: use kref for ceph_buffer Signed-off-by: Sage Weil commit 2f2ffd35822688a3650e503197b8724f47312748 Author: Sage Weil Date: Fri Dec 4 10:27:17 2009 -0800 ceph: mark v0.18 release Signed-off-by: Sage Weil commit fb99f8810965b7e5a00e9754bd7bf556b00ba0c2 Author: Sage Weil Date: Thu Dec 3 15:04:08 2009 -0800 ceph: update MAINTAINERS entry with correct git URL Signed-off-by: Sage Weil commit 33d4909ccc094b8262667bccdd52e01458bee0df Author: Sage Weil Date: Wed Dec 2 14:42:39 2009 -0800 ceph: allow preferred osd to be get/set via layout ioctl There is certainly no reason not to report this. The only real downside to allowing the user to set it is that you don't get default values by zeroing the layout struct (the default is -1). Signed-off-by: Sage Weil commit 1d1de9160e0d8aff0d67a21137b62e63ffd6f184 Author: Sage Weil Date: Wed Dec 2 11:54:25 2009 -0800 ceph: hide /.ceph from readdir results We need to skip /.ceph in (cached) readdir results, and exclude "/.ceph" from the cached ENOENT lookup check. Signed-off-by: Sage Weil commit 50b885b96c903e420a1eac54dd27626244704a06 Author: Sage Weil Date: Tue Dec 1 14:12:07 2009 -0800 ceph: whitespace cleanup Signed-off-by: Sage Weil commit 34b43a56b9b103a7a820032177131532d9dbdbe8 Author: Sage Weil Date: Tue Dec 1 12:23:54 2009 -0800 ceph: plug leak of request_mutex Fix leak of osd client request_mutex on receiving dup ack. Signed-off-by: Sage Weil commit 75eb3592811028e5b01835126483d115532a3aa1 Author: Sage Weil Date: Sat Nov 21 13:08:14 2009 -0800 ceph: remove useless IS_ERR checks ceph_lookup_snap_realm either returns a valid pointer or NULL; there is no need to check IS_ERR(result). Reported-by: Julia Lawall Signed-off-by: Sage Weil commit 32c895e776a0dd2cb701d60fbd6440280c09ce35 Author: Julia Lawall Date: Sat Nov 21 16:53:16 2009 +0100 fs/ceph: Move a dereference below a NULL test If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/). // @@ type T; expression E; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E when != i if (E == NULL) S + i = E->fld; // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit 60d877334f7d9f5f2417ea4a83c1def769286102 Author: Julia Lawall Date: Sat Nov 21 12:53:08 2009 +0100 fs/ceph: introduce missing kfree Error handling code following a kmalloc should free the allocated data. The semantic match that finds this problem is as follows: (http://www.emn.fr/x-info/coccinelle/) // @r exists@ local idexpression x; statement S; expression E; identifier f,f1,l; position p1,p2; expression *ptr != NULL; @@ x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...); ... if (x == NULL) S <... when != x when != if (...) { <+...x...+> } ( x->f1 = E | (x->f1 == NULL || ...) | f(...,x->f1,...) ) ...> ( return \(0\|<+...x...+>\|ptr\); | return@p2 ...; ) @script:python@ p1 << r.p1; p2 << r.p2; @@ print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line) // Signed-off-by: Julia Lawall Signed-off-by: Sage Weil commit b19a29af74c09553b9fef95cdf6e9af3df65f544 Author: Sage Weil Date: Fri Nov 20 14:44:18 2009 -0800 ceph: remove dead code Left over from mount/auth protocol changes. Signed-off-by: Sage Weil commit 03c677e1d189ff62891d9f278c55bb798a418b81 Author: Sage Weil Date: Fri Nov 20 15:14:15 2009 -0800 ceph: reset msgr backoff during open, not after successful handshake Reset the backoff delay when we reopen the connection, so that the delays for any initial connection problems are reasonable. We were resetting only after a successful handshake, which was of limited utility. Signed-off-by: Sage Weil commit 0dc2570fab222affe7739b88b5ed04c511d433dc Author: Sage Weil Date: Fri Nov 20 13:43:45 2009 -0800 ceph: reset requested max_size after mds reconnect The max_size increase request to the MDS can get lost during an MDS restart and reconnect. Reset our requested value after the MDS recovers, so that any blocked writes will re-request a larger max_size upon waking. Also, explicit wake session caps after the reconnect. Normally the cap renewal catches this, but not in the cases where the caps didn't go stale in the first place, which would leave writers waiting on max_size asleep. Signed-off-by: Sage Weil commit dc14657c9c946f25b84a98e9ffa41b812a70699e Author: Yehuda Sadeh Date: Fri Nov 20 13:59:13 2009 -0800 ceph: mount fails immediately on error Signed-off-by: Yehuda Sadeh commit 94045e115ee72aee3b17295791da07078f2f778c Author: Sage Weil Date: Thu Nov 19 15:31:50 2009 -0800 ceph: decode updated mdsmap format The mds map now uses the global_id as the 'key' (instead of the addr, which was a poor choice). This is protocol change. Signed-off-by: Sage Weil commit 0743304d871559cb4c7c066357de2caa60e94c2f Author: Sage Weil Date: Wed Nov 18 16:50:41 2009 -0800 ceph: fix debugfs entry, simplify fsid checks We may first learn our fsid from any of the mon, osd, or mds maps (whichever the monitor sends first). Consolidate checks in a single helper. Initialize the client debugfs entry then, since we need the fsid (and global_id) for the directory name. Also remove dead mount code. Signed-off-by: Sage Weil commit cfea1cf42b614583c02727d5bffd5a2384e92bda Author: Sage Weil Date: Wed Nov 18 16:50:55 2009 -0800 ceph: small cleanup in hash function Signed-off-by: Sage Weil commit b9bfb93ce2b1ef668254f0b9e16fcc5246d65d8e Author: Sage Weil Date: Wed Nov 18 15:08:44 2009 -0800 ceph: move mempool creation to ceph_create_client Signed-off-by: Sage Weil commit 4e7a5dcd1bbab6560fbc8ada29a840e7a20ed7bc Author: Sage Weil Date: Wed Nov 18 16:19:57 2009 -0800 ceph: negotiate authentication protocol; implement AUTH_NONE protocol When we open a monitor session, we send an initial AUTH message listing the auth protocols we support, our entity name, and (possibly) a previously assigned global_id. The monitor chooses a protocol and responds with an initial message. Initially implement AUTH_NONE, a dummy protocol that provides no security, but works within the new framework. It generates 'authorizers' that are used when connecting to (mds, osd) services that simply state our entity name and global_id. This is a wire protocol change. Signed-off-by: Sage Weil commit 5f44f142601bf94c448e2d463f0f18fd159da164 Author: Sage Weil Date: Wed Nov 18 14:52:18 2009 -0800 ceph: handle errors during osd client init Unwind initializing if we get ENOMEM during client initialization. Signed-off-by: Sage Weil commit 71ececdacae24be333c534869cb1b06357f0e215 Author: Sage Weil Date: Wed Nov 18 11:27:06 2009 -0800 ceph: remove unnecessary ceph_con_shutdown We require that ceph_con_close be called before we drop the connection, so this is unneeded. Just BUG if con->sock != NULL. Signed-off-by: Sage Weil commit 42ce56e50d948fc7c1c8c3a749ee5a21a7e134f6 Author: Sage Weil Date: Wed Nov 18 11:22:36 2009 -0800 ceph: remove bad calls to ceph_con_shutdown We want to ceph_con_close when we're done with the connection, before the ref count reaches 0. Once it does, do not call ceph_con_shutdown, as that takes the con mutex and may sleep, and besides that is unnecessary. Signed-off-by: Sage Weil commit 11ea8eda064aa4dc6e44a6dade1891b69ebd5255 Author: Sage Weil Date: Thu Nov 12 15:07:24 2009 -0800 ceph: fix page invalidation deadlock We occasionally want to make a best-effort attempt to invalidate cache pages without fear of blocking. If this fails, we fall back to an async invalidate in another thread. Use invalidate_mapping_pages instead of invalidate_inode_page2, as that will skip locked pages, and not deadlock. Signed-off-by: Sage Weil commit 039934b895c89c2bb40aa5132efe00e60b70efca Author: Sage Weil Date: Thu Nov 12 15:05:52 2009 -0800 ceph: build cleanly without CONFIG_DEBUG_FS Signed-off-by: Sage Weil commit fef320ff8887c702cde7ca6b8dbfff3a341d49fe Author: Sage Weil Date: Wed Nov 11 15:50:12 2009 -0800 ceph: pr_info when mds reconnect completes This helps the user know what's going on during the (involved) reconnect process. They already see when the mds fails and reconnect starts. Signed-off-by: Sage Weil commit b377ff13b31778c19203f3089d14080beb40a692 Author: Sage Weil Date: Wed Nov 11 15:22:37 2009 -0800 ceph: initialize i_size/i_rbytes on snapdir Signed-off-by: Sage Weil commit 09b8a7d2af83ae96dc052f9708e50140d06a9b6c Author: Sage Weil Date: Wed Nov 11 15:21:27 2009 -0800 ceph: exclude snapdir from readdir results It was hidden from sync readdir, but not the cached dcache version. Signed-off-by: Sage Weil commit cdac830313fa6bf2831693af80fefe4aaac11b7d Author: Sage Weil Date: Tue Nov 10 16:02:23 2009 -0800 ceph: remove recon_gen logic We don't get an explicit affirmative confirmation that our caps reconnect, nor do we necessarily want to pay that cost. So, take all this code out for now. Signed-off-by: Sage Weil commit eed0ef2caf928327332da54d23579debe629d5bc Author: Sage Weil Date: Tue Nov 10 14:34:36 2009 -0800 ceph: separate banner and connect during handshake into distinct stages We need to make sure we only swab the address during the banner once. So break process_banner out of process_connect, and clean up the surrounding code so that these are distinct phases of the handshake. Signed-off-by: Sage Weil commit 685f9a5d14194fc35db73e5e7370740ccc14b64a Author: Sage Weil Date: Mon Nov 9 12:05:48 2009 -0800 ceph: do not confuse stale and dead (unreconnected) caps We were using the cap_gen to track both stale caps (caps that timed out due to temporarily losing touch with the mds) and dead caps that did not reconnect after an MDS failure. Introduce a recon_gen counter to track reconnections to restarted MDSs and kill dead caps based on that instead. Rename gen to cap_gen while we're at it to make it more clear which is which. Signed-off-by: Sage Weil commit fb690390e305ea51e1883b105c7d3c52d7100ba5 Author: Sage Weil Date: Sat Nov 7 20:18:22 2009 -0800 ceph: make CRUSH hash function a bucket property Make the integer hash function a property of the bucket it is used on. This allows us to gracefully add support for new hash functions without starting from scatch. Signed-off-by: Sage Weil commit 1654dd0cf5ee1827322aca156af7d96d757201c7 Author: Sage Weil Date: Fri Nov 6 21:55:25 2009 -0800 ceph: make object hash a pg_pool property The object will be hashed to a placement seed (ps) based on the pg_pool's hash function. This allows new hashes to be introduced into an existing object store, or selection of a hash appropriate to the objects that will be stored in a particular pool. Signed-off-by: Sage Weil commit cfbbcd24a6bfd794295ee7ad76dfbff40ad6b934 Author: Sage Weil Date: Fri Nov 6 16:44:05 2009 -0800 ceph: use strong hash function for mapping objects to pgs We were using the (weak) dcache hash function, but it was leaving lower bits consecutive for consecutive (inode) objects. We really want to make the object to pg mapping random and uniform, so use a proper hash function here. This is Robert Jenkin's public domain hash function (with some minor cleanup): http://burtleburtle.net/bob/hash/evahash.html This is a protocol revision. Signed-off-by: Sage Weil commit c6cf726316abd613cfb7c325d950f3629f964ec6 Author: Sage Weil Date: Fri Nov 6 16:39:26 2009 -0800 ceph: make CRUSH hash functions non-inline These are way to big to be inline. I missed crush/* when doing the inline audit for akpm's review. Signed-off-by: Sage Weil commit 1bdb70e59026838a79f77c440f8fe480a66e65e8 Author: Sage Weil Date: Fri Nov 6 13:57:49 2009 -0800 ceph: clean up 'osd%d down' console msg No ceph prefix. Signed-off-by: Sage Weil commit f28bcfbe660a3246621a367020054d4f1a179cd9 Author: Sage Weil Date: Wed Nov 4 11:46:35 2009 -0800 ceph: convert port endianness The port is informational only, but we should make it correct. Signed-off-by: Sage Weil commit 6a18be16f7513ea8a4923c161ce073987932cbdb Author: Sage Weil Date: Wed Nov 4 11:40:05 2009 -0800 ceph: fix sparse endian warning Use the __le macro, even though for -1 it doesn't matter. Signed-off-by: Sage Weil commit 51042122d4f85e0f8ee577a4230f172fcc57c456 Author: Sage Weil Date: Wed Nov 4 11:39:12 2009 -0800 ceph: fix endian conversions for ceph_pg The endian conversions don't quite work with the old union ceph_pg. Just make it a regular struct, and make each field __le. This is simpler and it has the added bonus of actually working. Signed-off-by: Sage Weil commit 63f2d211954b790fea0a9caeae605c7956535af6 Author: Sage Weil Date: Tue Nov 3 15:17:56 2009 -0800 ceph: use fixed endian encoding for ceph_entity_addr We exchange struct ceph_entity_addr over the wire and store it on disk. The sockaddr_storage.ss_family field, however, is host endianness. So, fix ss_family endianness to big endian when sending/receiving over the wire. Signed-off-by: Sage Weil commit 859e7b149362475672e2a996f29b8f45cbb34d82 Author: Sage Weil Date: Mon Nov 2 09:32:47 2009 -0800 ceph: init/destroy bdi in client create/destroy helpers This keeps bdi setup/teardown in line with client life cycle. Signed-off-by: Sage Weil commit 33aa96e7430d215e2ee779f65cdad0f6d4571fe1 Author: Sage Weil Date: Sun Nov 1 17:53:24 2009 -0800 crush: always return a value from crush_bucket_choose Even when we encounter a corrupt bucket. We still BUG(). This fixes the warning fs/ceph/crush/mapper.c: In function 'crush_choose': fs/ceph/crush/mapper.c:352: warning: control may reach end of non-void function 'crush_bucket_choose' being inlined Signed-off-by: Sage Weil commit 63ff78b25c4b204075b5b98afcac6ad3639d43fe Author: Sage Weil Date: Sun Nov 1 17:51:15 2009 -0800 ceph: fix uninitialized err variable Fixes warning fs/ceph/xattr.c: In function '__build_xattrs': fs/ceph/xattr.c:353: warning: 'err' may be used uninitialized in this function Signed-off-by: Sage Weil commit ff1d1f7179363209b7f1493ea39b666f50d05cf4 Author: Noah Watkins Date: Fri Oct 30 12:57:30 2009 -0700 ceph: fix intra strip unit length calculation Commit 645a102581b3639836b17d147c35d574fd6e8267 fixes calculation of object offset for layouts with multiple stripes per object. This updates the calculation of the length written to take into account multiple stripes per object. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit 645a102581b3639836b17d147c35d574fd6e8267 Author: Sage Weil Date: Wed Oct 28 15:15:05 2009 -0700 ceph: fix object striping calculation for non-default striping schemes We were incorrectly calculationing of object offset. If we have multiple stripe units per object, we need to shift to the start of the current su in addition to the offset within the su. Also rename bno to ono (object number) to avoid some variable naming confusion. Signed-off-by: Sage Weil commit 5600f5ebd318f7af6f4b19a29f08d18bb85264e5 Author: Sage Weil Date: Wed Oct 28 14:57:25 2009 -0700 ceph: correct comment to match striping calculation The object extent offset is the file offset _modulo_ the stripe unit. The code was correct, the comment was wrong. Reported-by: Noah Watkins Signed-off-by: Sage Weil commit 35e054a66e07f508aa7cfabc7db1757379093689 Author: Noah Watkins Date: Wed Oct 28 14:04:48 2009 -0700 ceph: remove redundant use of le32_to_cpu Using stripe unit size calculated and saved on the stack to avoid a redundant call to le32_to_cpu. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit fbbccec9c6218cbc9ff47c6d88bfc6b52079e3ea Author: Noah Watkins Date: Wed Oct 28 11:54:49 2009 -0700 ceph: replace list_entry with container_of Usage of non-list.h list_entry function for container_of functionality replaced with direct use of container_of. Signed-off-by: Noah Watkins Signed-off-by: Sage Weil commit 6b8051855d983db8480ff1ea1b02ef2b49203c22 Author: Sage Weil Date: Tue Oct 27 11:50:50 2009 -0700 ceph: allocate and parse mount args before client instance This simplifies much of the error handling during mount. It also means that we have the mount args before client creation, and we can initialize based on those options. Signed-off-by: Sage Weil commit e53c2fe075feda1fd4f009956ac026dc24c3a199 Author: Sage Weil Date: Tue Oct 27 10:19:28 2009 -0700 ceph: fix, clean up string mount arg parsing Clearly demark int and string argument options, and do not try to convert string arguments to ints. Signed-off-by: Sage Weil commit 6ca874e92d5e50beb8e351dfd8121947bafc79ec Author: Sage Weil Date: Mon Oct 26 22:06:22 2009 -0700 ceph: silence uninitialized variable warning Signed-off-by: Sage Weil commit 7b813c46021e8f4909772a5bbfb5212bd140764c Author: Sage Weil Date: Mon Oct 26 22:07:53 2009 -0700 ceph: reduce parse_mount_args stack usage Since we've increased the max mon count, we shouldn't put the addr array on the parse_mount_args stack. Put it on the heap instead. Signed-off-by: Sage Weil commit ecb19c4649d7396737eb0d91a475661fe9d7c028 Author: Sage Weil Date: Thu Oct 22 10:53:02 2009 -0700 ceph: remove small mon addr limit; use CEPH_MAX_MON where appropriate Get rid of separate max mon limit; use the system limit instead. This allows mounts when there are lots of mon addrs provided by mount.ceph (as with a host with lots of A/AAAA records). Signed-off-by: Sage Weil commit 232d4b01319767b3ffa5d08962a81c805962be49 Author: Sage Weil Date: Wed Oct 21 11:21:49 2009 -0700 ceph: move directory size logic to ceph_getattr We can't fill i_size with rbytes at the fill_file_size stage without adding additional checks for directories. Notably, we want st_blocks to remain 0 on directories so that 'du' still works. Fill in i_blocks, i_size specially in ceph_getattr instead. Signed-off-by: Sage Weil commit bb097ffaf833a40335b6dd5e4fa6f5ed0b223bdc Author: Sage Weil Date: Mon Oct 19 16:17:31 2009 -0700 ceph: v0.17 of client Signed-off-by: Sage Weil commit ee7fdfaff7702bd209e3a013b2fc4643233f5465 Author: Sage Weil Date: Mon Oct 19 11:41:51 2009 -0700 ceph: include preferred osd in placement seed Mix the preferred osd (if any) into the placement seed that is fed into the CRUSH object placement calculation. This prevents all the placement pgs from peering with the same osds. Rev the osd client protocol with this change. Signed-off-by: Sage Weil commit 8fa9765576875200a7412a5300b5f0537211f038 Author: Sage Weil Date: Fri Oct 16 14:44:35 2009 -0700 ceph: enable readahead Initialized bdi->ra_pages to enable readahead. Use 512KB default. Signed-off-by: Sage Weil commit 76e3b390d41db9d69e254a09dd1aedd3e6aac25f Author: Sage Weil Date: Thu Oct 15 18:13:53 2009 -0700 ceph: move dirty caps code around Cleanup only. Signed-off-by: Sage Weil commit 8f3bc053c610826a657714649ea596f07875db2e Author: Sage Weil Date: Wed Oct 14 17:36:07 2009 -0700 ceph: warn on allocation from msgpool with larger front_len Pass the front_len we need when pulling a message off a msgpool, and WARN if it is greater than the pool's size. Then try to allocate a new message (to continue without failing). Signed-off-by: Sage Weil commit 07bd10fb9853a41a7f0bb271721cca97d15eccae Author: Sage Weil Date: Wed Oct 14 17:26:40 2009 -0700 ceph: correct subscribe_ack msgpool payload size Defined a struct for the SUBSCRIBE_ACK, and use that to size the msgpool. Signed-off-by: Sage Weil commit afcdaea3f2a78ce4873bd7e98a6d603bda23d167 Author: Sage Weil Date: Wed Oct 14 14:27:38 2009 -0700 ceph: flush dirty caps via the cap_dirty list Previously we were flushing dirty caps by passing an extra flag when traversing the delayed caps list. Besides being a bit ugly, that can also miss caps that are dirty but didn't result in a cap requeue: notably, mark_caps_dirty(). Separate the flushing into a separate helper, and traverse the cap_dirty list. This also brings i_dirty_item in line with i_dirty_caps: we are on the list IFF caps != 0. We carry an inode ref IFF dirty_caps|flushing_caps != 0. Lose the unused return value from __ceph_mark_caps_dirty(). Signed-off-by: Sage Weil commit cdc35f96277314bbfeefd0505410cabd69aebd8d Author: Sage Weil Date: Wed Oct 14 14:24:19 2009 -0700 ceph: move generic flushing code into helper Both callers of __mark_caps_flushing() do the same work; move it into the helper. Signed-off-by: Sage Weil commit f2cf418cec8d61df0651a0140a92a8c75246e14f Author: Sage Weil Date: Wed Oct 14 14:09:07 2009 -0700 ceph: initialize sb->s_bdi, bdi_unregister after kill_anon_super Writeback doesn't work without the bdi set, and writeback on umount doesn't work if we unregister the bdi too early. Signed-off-by: Sage Weil commit c89136ea4253c73e89e97f5138bb22d97ad9f564 Author: Sage Weil Date: Wed Oct 14 09:59:09 2009 -0700 ceph: convert encode/decode macros to inlines This avoids the fugly pass by reference and makes the code a bit easier to read. Signed-off-by: Sage Weil commit 535bbb530764b1b2b3b732837f0e61e1baae7109 Author: Sage Weil Date: Tue Oct 13 12:55:26 2009 -0700 ceph: add version field to message header This makes it easier for individual message types to indicate their particular encoding, and make future changes backward compatible. Signed-off-by: Sage Weil commit 572033069dbc2cff8d4a2d2b34c576e1813fda70 Author: Sage Weil Date: Fri Oct 9 21:52:34 2009 -0700 ceph: remove unused CEPH_MSG_{OSD,MDS}_GETMAP Signed-off-by: Sage Weil commit 8fc57da4d32767cc6096ecaed24636dabefd1dbc Author: Sage Weil Date: Mon Oct 12 10:28:13 2009 -0700 ceph: ignore trailing data in monamp This lets us extend the format more easily. Signed-off-by: Sage Weil commit 752727a1b21a462d6ef634d552f180ae692f8947 Author: Sage Weil Date: Fri Oct 9 16:38:45 2009 -0700 ceph: add file layout validation This tracks updates to code shared with userspace. Signed-off-by: Sage Weil commit 13e38c8ae771d73bf6d1f0f98e35f99c0f0d48ff Author: Sage Weil Date: Fri Oct 9 16:36:34 2009 -0700 ceph: update to mon client protocol v15 The mon request headers now include session_mon information that must be properly initialized. Signed-off-by: Sage Weil commit 266673db423e6ab247170d6c6d72ec36e530a911 Author: Sage Weil Date: Fri Oct 9 10:31:32 2009 -0700 ceph: cancel osd requests before resending them This ensures we don't submit the same request twice if we are kicking a specific osd (as with an osd_reset), or when we hit a transient error and resend. Signed-off-by: Sage Weil commit 81b024e70fed635a2cf5a4bf911db1649bb005f5 Author: Sage Weil Date: Fri Oct 9 10:29:18 2009 -0700 ceph: reset osd session on fault, not peer_reset The peer_reset just takes longer (until we reconnect and discover the osd dropped the session... which it will). Signed-off-by: Sage Weil commit 991abb6ecfc8edf9863aa6a3f43249e63f9d4d4e Author: Sage Weil Date: Thu Oct 8 22:22:37 2009 -0700 ceph: fail gracefully on corrupt osdmap (bad pg_temp mapping) Return an error and report a corrupt map instead of crying BUG(). Signed-off-by: Sage Weil commit 0ba6478df7c6bef0f4b2625554545f941f89fb97 Author: Sage Weil Date: Thu Oct 8 16:57:16 2009 -0700 ceph: revoke osd request message on request completion If an osd has failed or returned and a request has been sent twice, it's possible to get a reply and unregister the request while the request message is queued for delivery. Since the message references the caller's page vector, we need to revoke it before completing. Signed-off-by: Sage Weil commit c1ea8823be69ebebaface912142190e910711984 Author: Sage Weil Date: Thu Oct 8 16:55:47 2009 -0700 ceph: fix osd request submission race The osd request submission path registers the request, drops and retakes the request_mutex, then sends it to the OSD. A racing kick_requests could sent it during that interval, causing the same msg to be sent twice and BUGing in the msgr. Fix by only sending the message if it hasn't been touched by other threads. Signed-off-by: Sage Weil commit 0656d11ba6ffa3dee0e8916a1903f96185651217 Author: Sage Weil Date: Thu Oct 8 10:25:46 2009 -0700 ceph: renew mon subscription before it expires Be conservative: renew subscription once half the interval has expired. Do not reuse sub expiration to control hunting. Signed-off-by: Sage Weil commit e251e288082d5e89604eee1fef0c31bed1fe8f02 Author: Sage Weil Date: Wed Oct 7 16:38:19 2009 -0700 ceph: fix mdsmap decoding when multiple mds's are present A misplaced sizeof() around namelen was throwing things off. Signed-off-by: Sage Weil commit b28813a61d6ffe05ad353a86965607bb7a7fd60f Author: Sage Weil Date: Wed Oct 7 10:59:34 2009 -0700 ceph: gracefully avoid empty crush buckets This avoids a divide by zero when the input and/or map are malformed. Signed-off-by: Sage Weil commit b195befd9acb514dd2afb722e63fdd880ed63217 Author: Sage Weil Date: Wed Oct 7 10:59:30 2009 -0700 ceph: include preferred_osd in file layout virtual xattr Signed-off-by: Sage Weil commit fa0b72e9e2900ee87886aaf8bc4c4701be1e081d Author: Sage Weil Date: Wed Oct 7 10:59:10 2009 -0700 ceph: show meaningful version on module load Kill the old git revision; print the ceph version and protocol versions instead. Signed-off-by: Sage Weil commit e324b8f991679a43e09dd13500bf1988c0bfc0ea Author: Sage Weil Date: Tue Oct 6 12:20:56 2009 -0700 ceph: document shared files in README Document files shared between kernel and user code trees. Signed-off-by: Sage Weil commit 9030aaf9bf0a1eee47a154c316c789e959638b0f Author: Sage Weil Date: Tue Oct 6 11:31:15 2009 -0700 ceph: Kconfig, Makefile Kconfig options and Makefile. Signed-off-by: Sage Weil commit 76aa844d5b2fb8c839180d3f5874e333b297e5fd Author: Sage Weil Date: Tue Oct 6 11:31:14 2009 -0700 ceph: debugfs Basic state information is available via /sys/kernel/debug/ceph, including instances of the client, fsids, current monitor, mds and osd maps, outstanding server requests, and hooks to adjust debug levels. Signed-off-by: Sage Weil commit 8f4e91dee2a245e4be6942f4a8d83a769e13a47d Author: Sage Weil Date: Tue Oct 6 11:31:14 2009 -0700 ceph: ioctls A few Ceph ioctls for getting and setting file layout (striping) parameters, and learning the identity and network address of the OSD a given region of a file is stored on. Signed-off-by: Sage Weil commit a8e63b7d51cce4557ee7bcd8f51be5cae8547d20 Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: nfs re-export support Basic NFS re-export support is included. This mostly works. However, Ceph's MDS design precludes the ability to generate a (small) filehandle that will be valid forever, so this is of limited utility. Signed-off-by: Sage Weil commit 8fc91fd85950d106883852c6d215614ec28cc92d Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: message pools The msgpool is a basic mempool_t-like structure to preallocate messages we expect to receive over the wire. This ensures we have the necessary memory preallocated to process replies to requests, or to process unsolicited messages from various servers. Signed-off-by: Sage Weil commit 31b8006e1d79e127a776c9414e3e0b5f9508047e Author: Sage Weil Date: Tue Oct 6 11:31:13 2009 -0700 ceph: messenger library A generic message passing library is used to communicate with all other components in the Ceph file system. The messenger library provides ordered, reliable delivery of messages between two nodes in the system. This implementation is based on TCP. Signed-off-by: Sage Weil commit 963b61eb041e8850807d95f8d7a4c6a454c45000 Author: Sage Weil Date: Tue Oct 6 11:31:12 2009 -0700 ceph: snapshot management Ceph snapshots rely on client cooperation in determining which operations apply to which snapshots, and appropriately flushing snapshotted data and metadata back to the OSD and MDS clusters. Because snapshots apply to subtrees of the file hierarchy and can be created at any time, there is a fair bit of bookkeeping required to make this work. Portions of the hierarchy that belong to the same set of snapshots are described by a single 'snap realm.' A 'snap context' describes the set of snapshots that exist for a given file or directory. Signed-off-by: Sage Weil commit a8599bd821d084d04a3290fffae1071624ec00ea Author: Sage Weil Date: Tue Oct 6 11:31:12 2009 -0700 ceph: capability management The Ceph metadata servers control client access to inode metadata and file data by issuing capabilities, granting clients permission to read and/or write both inode field and file data to OSDs (storage nodes). Each capability consists of a set of bits indicating which operations are allowed. If the client holds a *_SHARED cap, the client has a coherent value that can be safely read from the cached inode. In the case of a *_EXCL (exclusive) or FILE_WR capabilities, the client is allowed to change inode attributes (e.g., file size, mtime), note its dirty state in the ceph_cap, and asynchronously flush that metadata change to the MDS. In the event of a conflicting operation (perhaps by another client), the MDS will revoke the conflicting client capabilities. In order for a client to cache an inode, it must hold a capability with at least one MDS server. When inodes are released, release notifications are batched and periodically sent en masse to the MDS cluster to release server state. Signed-off-by: Sage Weil commit ba75bb98cfb93b62c54af25bf67ff90857264bbe Author: Sage Weil Date: Tue Oct 6 11:31:11 2009 -0700 ceph: monitor client The monitor cluster is responsible for managing cluster membership and state. The monitor client handles what minimal interaction the Ceph client has with it: checking for updated versions of the MDS and OSD maps, getting statfs() information, and unmounting. Signed-off-by: Sage Weil commit 5ecc0a0f8128b1876e8614638deaed49cc8b174c Author: Sage Weil Date: Tue Oct 6 11:31:11 2009 -0700 ceph: CRUSH mapping algorithm CRUSH is a pseudorandom data distribution function designed to map inputs onto a dynamic hierarchy of devices, while minimizing the extent to which inputs are remapped when the devices are added or removed. It includes some features that are specifically useful for storage, most notably the ability to map each input onto a set of N devices that are separated across administrator-defined failure domains. CRUSH is used to distribute data across the cluster of Ceph storage nodes. More information about CRUSH can be found in this paper: http://www.ssrc.ucsc.edu/Papers/weil-sc06.pdf Signed-off-by: Sage Weil commit f24e9980eb860d8600cbe5ef3d2fd9295320d229 Author: Sage Weil Date: Tue Oct 6 11:31:10 2009 -0700 ceph: OSD client The OSD client is responsible for reading and writing data from/to the object storage pool. This includes determining where objects are stored in the cluster, and ensuring that requests are retried or redirected in the event of a node failure or data migration. If an OSD does not respond before a timeout expires, keepalive messages are sent across the lossless, ordered communications channel to ensure that any break in the TCP is discovered. If the session does reset, a reconnection is attempted and affected requests are resent (by the message transport layer). Signed-off-by: Sage Weil commit 2f2dc053404febedc9c273452d9d518fb31fde72 Author: Sage Weil Date: Tue Oct 6 11:31:09 2009 -0700 ceph: MDS client The MDS (metadata server) client is responsible for submitting requests to the MDS cluster and parsing the response. We decide which MDS to submit each request to based on cached information about the current partition of the directory hierarchy across the cluster. A stateful session is opened with each MDS before we submit requests to it, and a mutex is used to control the ordering of messages within each session. An MDS request may generate two responses. The first indicates the operation was a success and returns any result. A second reply is sent when the operation commits to disk. Note that locking on the MDS ensures that the results of updates are visible only to the updating client before the operation commits. Requests are linked to the containing directory so that an fsync will wait for them to commit. If an MDS fails and/or recovers, we resubmit requests as needed. We also reconnect existing capabilities to a recovering MDS to reestablish that shared session state. Old dentry leases are invalidated. Signed-off-by: Sage Weil commit 1d3576fd10f0d7a104204267b81cf84a07028dad Author: Sage Weil Date: Tue Oct 6 11:31:09 2009 -0700 ceph: address space operations The ceph address space methods are concerned primarily with managing the dirty page accounting in the inode, which (among other things) must keep track of which snapshot context each page was dirtied in, and ensure that dirty data is written out to the OSDs in snapshort order. A writepage() on a page that is not currently writeable due to snapshot writeback ordering constraints is ignored (it was presumably called from kswapd). Signed-off-by: Sage Weil commit 124e68e74099090e28da5518f73fda878e7e8232 Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: file operations File open and close operations, and read and write methods that ensure we have obtained the proper capabilities from the MDS cluster before performing IO on a file. We take references on held capabilities for the duration of the read/write to avoid prematurely releasing them back to the MDS. We implement two main paths for read and write: one that is buffered (and uses generic_aio_{read,write}), and one that is fully synchronous and blocking (operating either on a __user pointer or, if O_DIRECT, directly on user pages). Signed-off-by: Sage Weil commit 2817b000b02c5f0c05af67c01fb2684e1381d6ef Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: directory operations Directory operations, including lookup, are defined here. We take advantage of lookup intents when possible. For the most part, we just need to build the proper requests for the metadata server(s) and pass things off to the mds_client. The results of most operations are normally incorporated into the client's cache when the reply is parsed by ceph_fill_trace(). However, if the MDS replies without a trace (e.g., when retrying an update after an MDS failure recovery), some operation-specific cleanup may be needed. We can validate cached dentries in two ways. A per-dentry lease may be issued by the MDS, or a per-directory cap may be issued that acts as a lease on the entire directory. In the latter case, a 'gen' value is used to determine which dentries belong to the currently leased directory contents. We normally prepopulate the dcache and icache with readdir results. This makes subsequent lookups and getattrs avoid any server interaction. It also lets us satisfy readdir operation by peeking at the dcache IFF we hold the per-directory cap/lease, previously performed a readdir, and haven't dropped any of the resulting dentries. Signed-off-by: Sage Weil commit 355da1eb7a1f91c276b991764e951bbcd8047599 Author: Sage Weil Date: Tue Oct 6 11:31:08 2009 -0700 ceph: inode operations Inode cache and inode operations. We also include routines to incorporate metadata structures returned by the MDS into the client cache, and some helpers to deal with file capabilities and metadata leases. The bulk of that work is done by fill_inode() and fill_trace(). Signed-off-by: Sage Weil commit 16725b9d2a2e3d0fd2b0034482e2eb0a2d78050f Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: super.c Mount option parsing, client setup and teardown, and a few odds and ends (e.g., statfs). Signed-off-by: Sage Weil commit c30dbb9cc7fc75ab1d0ee6fb084ba4684f7a665d Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: ref counted buffer struct ceph_buffer is a simple ref-counted buffer. We transparently choose between kmalloc for small buffers and vmalloc for large ones. This is currently used only for allocating memory for xattr data. Signed-off-by: Sage Weil commit de57606c23afded22202825b3db8a5d61859f198 Author: Sage Weil Date: Tue Oct 6 11:31:07 2009 -0700 ceph: client types We first define constants, types, and prototypes for the kernel client proper. A few subsystems are defined separately later: the MDS, OSD, and monitor clients, and the messaging layer. Signed-off-by: Sage Weil commit 0dee3c28af2fbe22ca62739a7f57da5435d35793 Author: Sage Weil Date: Tue Oct 6 11:31:06 2009 -0700 ceph: on-wire types These headers describe the types used to exchange messages between the Ceph client and various servers. All types are little-endian and packed. These headers are shared between the kernel and userspace, so all types are in terms of e.g. __u32. Additionally, we define a few magic values to identify the current version of the protocol(s) in use, so that discrepancies to be detected on mount. Signed-off-by: Sage Weil commit 7ad920b504a980adcab4d3f6b85695526e6fd7bb Author: Sage Weil Date: Tue Oct 6 11:31:05 2009 -0700 ceph: documentation Mount options, syntax. Signed-off-by: Sage Weil