aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-03-21hwmon: (sht15) Spelling fixJustin P. Mattock1-1/+1
Remove one too many "n" in a word. Signed-off-by: Justin P. Mattock <[email protected]> Acked-by: Jean Delvare <[email protected]>
2011-03-21hwmon: (w83795) Document pin mappingJean Delvare1-0/+127
Apparently users are interested in this information, so let's provide it. Signed-off-by: Jean Delvare <[email protected]> Acked-by: Guenter Roeck <[email protected]>
2011-03-21Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds6-4/+39
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc: Add {open_by,name_to}_handle_at and clock_adjtime syscalls. sparc: Implement of_iomap(). sparc: Implement of_address_to_resource(). sparc: Provide NO_IRQ definition.
2011-03-21Merge branch 'merge' of ↵Linus Torvalds6-27/+184
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/ptrace: Remove BUG_ON when full register set not available powerpc: Factoring mpic cpu id fetching into a function powerpc: Make MPIC honor the "pic-no-reset" device tree property powerpc: Document the Open PIC device tree binding powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodes
2011-03-21FS: lookup_mnt() is only used in the core fs routines nowDavid Howells2-1/+1
lookup_mnt() is only used in the core fs routines now, so it doesn't need to be globally declared anymore. It isn't exported to modules at the moment, so nothing that can be modularised seems to be using it. Signed-off-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21fuse: make fuse_dentry_revalidate() RCU awareMiklos Szeredi1-4/+4
Only bail out of fuse_dentry_revalidate() on LOOKUP_RCU when blocking is actually necessary. CC: Nick Piggin <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
2011-03-21fuse: make fuse_permission() RCU awareMiklos Szeredi1-8/+22
Only bail out of fuse_permission() on IPERM_FLAG_RCU when blocking is actually necessary. CC: Nick Piggin <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
2011-03-21fuse: wakeup pollers on connection release/abortBryan Green2-1/+18
If a fuse dev connection is broken, wake up any processes that are blocking, in a poll system call, on one of the files in the now defunct filesystem. Signed-off-by: Miklos Szeredi <[email protected]>
2011-03-21fuse: reduce size of struct fuse_requestMiklos Szeredi2-3/+10
Reduce the size of struct fuse_request by removing cuse_init_out from the request structure and allocating it dinamically instead. CC: Tejun Heo <[email protected]> Signed-off-by: Miklos Szeredi <[email protected]>
2011-03-21bfs: fix bitmap size argument to find_first_zero_bit()Akinobu Mita1-1/+1
The usage of find_first_zero_bit() in bfs_create() is wrong for two reasons. The bitmap size argument to find_first_zero_bit() is info->si_lasti but the correct bitmap size is info->si_lasti + 1 as info->si_lasti is the last valid index in info->si_imap bitmap. Another problem is that it is impossible to detect that info->si_imap bitmap is full because there is an off-by-one bug in the return value check for find_first_zero_bit(). If no zero bits exist in info->si_imap, find_first_zero_bit() returns info->si_lasti. But the check can't catch it due to the off-by-one. Signed-off-by: Akinobu Mita <[email protected]> Acked-by: "Tigran A. Aivazian" <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21kbuild: Make DEBUG_SECTION_MISMATCH selectable, but not on by defaultMichal Marek1-1/+0
CONFIG_DEBUG_SECTION_MISMATCH has also runtime effects due to the -fno-inline-functions-called-once compiler flag, so forcing it on everyone is not a good idea. Signed-off-by: Michal Marek <[email protected]>
2011-03-21i2c-pxa2xx: Fix register offsetsVasily Khoruzhick1-7/+7
Fix regression that was introduced by dynamic register layout. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21i2c-pxa2xx: pass of_node from platform driver to adapter and publishSebastian Andrzej Siewior1-0/+5
the of_node will auto-publish devices which are added to the device tree. Commit 925bb9c6 aka ("of/i2c: Fix module load order issue caused by of_i2c.c) moved the of_i2c_register_devices() function from the i2c core back to the drivers. This patch does the same thing for the pxa driver. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21i2c-pxa2xx: check timeout correctlySebastian Andrzej Siewior1-1/+3
timeout here maybe 0 if the event occured and a task with a higher priority stole the cpu and we were sleeping longer than the timeout value we specified. In case of a real timeout I changed the error code to I2C_RETRY so we retry the transfer. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21i2c-pxa2xx: add support for shared IRQ handlerSebastian Andrzej Siewior1-2/+8
Sodaville has three of them on a single IRQ. IRQF_DISABLED is removed because it is a NOP allready and scheduled for removal. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21i2c-pxa2xx: Add PCI support for PXA I2C controllerSebastian Andrzej Siewior4-5/+206
The Sodaville I2C controller is almost the same as found on PXA2xx. The difference: - the register are at a different offset - no slave support The PCI probe code adds three platform devices which are probed then by the platform code. The X86 part also adds dummy clock defines because we don't have HW clock support. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21ARM: pxa2xx: reorganize I2C filesSebastian Andrzej Siewior40-51/+39
This patch moves the platform data definition from arch/arm/plat-pxa/include/plat/i2c.h to include/linux/i2c/pxa-i2c.h so it can be accessed from x86 the same way as on ARM. This change should make no functional change to the PXA code. The move is verified by building the following defconfigs: cm_x2xx_defconfig corgi_defconfig em_x270_defconfig ezx_defconfig imote2_defconfig pxa3xx_defconfig spitz_defconfig zeus_defconfig raumfeld_defconfig magician_defconfig mmp2_defconfig pxa168_defconfig pxa910_defconfig Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Dirk Brandewie <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21i2c-pxa2xx: use dynamic register layoutSebastian Andrzej Siewior1-20/+50
This will prepare the driver to handle register layouts where certain registers are not available at all. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-21fs: Use BUG_ON(!mnt) at dentry_open().Tetsuo Handa1-11/+2
dentry_open() requires callers to pass a valid vfsmount. Signed-off-by: Tetsuo Handa <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21fs: devpts_pty_new() return -ENOMEM if dentry allocation failedAndrey Vagin1-10/+9
In this case nobody can open a slave point, so will be better return from devpts_pty_new() Now we should not check error code from d_find_alias() in devpts_pty_kill(), because the dentry exists all times. Signed-off-by: Andrey Vagin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21nfs: lock() vs unlock() typoDan Carpenter1-2/+2
These should be spin_unlock() instead of spin_lock(). It's a typo. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21pstore: fix leaking ->i_privateTony Luck1-1/+7
Move kfree() of i_private out of ->unlink() and into ->evict_inode() Signed-off-by: Tony Luck <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21introduce sys_syncfs to sync a single file systemSage Weil7-2/+34
It is frequently useful to sync a single file system, instead of all mounted file systems via sync(2): - On machines with many mounts, it is not at all uncommon for some of them to hang (e.g. unresponsive NFS server). sync(2) will get stuck on those and may never get to the one you do care about (e.g., /). - Some applications write lots of data to the file system and then want to make sure it is flushed to disk. Calling fsync(2) on each file introduces unnecessary ordering constraints that result in a large amount of sub-optimal writeback/flush/commit behavior by the file system. There are currently two ways (that I know of) to sync a single super_block: - BLKFLSBUF ioctl on the block device: That also invalidates the bdev mapping, which isn't usually desirable, and doesn't work for non-block file systems. - 'mount -o remount,rw' will call sync_filesystem as an artifact of the current implemention. Relying on this little-known side effect for something like data safety sounds foolish. Both of these approaches require root privileges, which some applications do not have (nor should they need?) given that sync(2) is an unprivileged operation. This patch introduces a new system call syncfs(2) that takes an fd and syncs only the file system it references. Maybe someday we can $ sync /some/path and not get sync: ignoring all arguments The syscall is motivated by comments by Al and Christoph at the last LSF. syncfs(2) seems like an appropriate name given statfs(2). A similar ioctl was also proposed a while back, see http://marc.info/?l=linux-fsdevel&m=127970513829285&w=2 Signed-off-by: Sage Weil <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21Small typo fix...Holger Hans Peter Freyther1-1/+1
Hi, I was backporting the coredump over pipe feature and noticed this small typo, I wish I would have something bigger to contribute... >From 15d6080e0ed4267da103c706917a33b1015e8804 Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther <[email protected]> Date: Thu, 24 Feb 2011 17:42:50 +0100 Subject: [PATCH] fs: Fix a small typo in the comment The function is called umh_pipe_setup not uhm_pipe_setup. Signed-off-by: Holger Hans Peter Freyther <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21Filesystem: fifo: Fixed coding style issue.David Jenni1-2/+1
Fixed coding style issue. Signed-off-by: David Jenni <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21fs/inode: Fix kernel-doc format for inode_init_ownerBen Hutchings1-1/+1
Signed-off-by: Ben Hutchings <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21select: remove unused MAX_SELECT_SECONDSNamhyung Kim2-6/+0
Remove the leftover from the commit 8ff3e8e85fa6 ("select: switch select() and poll() over to hrtimers"). Signed-off-by: Namhyung Kim <[email protected]> Acked-by: Arjan van de Ven <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-21vfs: cleanup do_vfs_ioctl()Namhyung Kim1-13/+8
Move declaration of 'inode' to beginning of the function. Since it is referenced directly or indirectly (in case of FIFREEZE/FITHAW/ FS_IOC_FIEMAP) it's not harmful IMHO. And remove unnecessary casts using 'argp' instead. Signed-off-by: Namhyung Kim <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-03-20Merge branch 'trivial' of ↵Linus Torvalds67-137/+85
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits) video: change to new flag variable scsi: change to new flag variable rtc: change to new flag variable rapidio: change to new flag variable pps: change to new flag variable net: change to new flag variable misc: change to new flag variable message: change to new flag variable memstick: change to new flag variable isdn: change to new flag variable ieee802154: change to new flag variable ide: change to new flag variable hwmon: change to new flag variable dma: change to new flag variable char: change to new flag variable fs: change to new flag variable xtensa: change to new flag variable um: change to new flag variables s390: change to new flag variable mips: change to new flag variable ... Fix up trivial conflict in drivers/hwmon/Makefile
2011-03-20Merge branch 'misc' of ↵Linus Torvalds4-12/+27
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: scripts/extract-ikconfig: add xz compression support kbuild: add GNU GLOBAL tags generation setlocalversion: update mercurial tag parsing
2011-03-20Merge branch 'packaging' of ↵Linus Torvalds2-1/+8
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: kbuild: Add make tarxz-pkg build option
2011-03-20Merge branch 'i2c-for-linus' of ↵Linus Torvalds13-100/+97
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-i801: SMBus patch for Intel DH89xxCC DeviceIDs i2c: Drop i2c_adapter.id i2c: Deprecate i2c_driver.attach_adapter and .detach_adapter i2c-dev: Use standard bus notification mechanism i2c: Export i2c_for_each_dev i2c: Get rid of <linux/i2c-id.h> i2c: Minor fixes to upgrading-clients document i2c: make i2c_get_adapter prototype clearer i2c: Fix typo in instantiating-devices document i2c-boardinfo: Fix typo in comment
2011-03-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tileLinus Torvalds2-7/+9
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: asm-generic: support clock_adjtime() in <asm-generic/unistd.h> arch/tile: fix futex sanitization definition/prototype mismatch
2011-03-20r8169: fix a bug in rtl8169_init_phy()Eric Dumazet1-2/+2
commit 54405cde7624 (r8169: support control of advertising.) introduced a bug in rtl8169_init_phy() Reported-and-tested-by: Piotr Hosowicz <[email protected]> Reported-and-tested-by: Linus Torvalds <[email protected]> Signed-off-by: Eric Dumazet <[email protected]> Acked-by:: Oliver Neukum <[email protected]> Cc: Francois Romieu <[email protected]> Tested-by: Anca Emanuel <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-03-21powerpc/ptrace: Remove BUG_ON when full register set not availableMike Wolf2-3/+14
In some cases during a threaded core dump not all the threads will have a full register set. This happens when the signal causing the core dump races with a thread exiting. The race happens when the exiting thread has entered the kernel for the last time before the signal arrives, but doesn't get far enough through the exit code to avoid being included in the core dump. So we get a thread included in the core dump which is never going to go out to userspace again and only has a partial register set recorded Normally we would catch each thread as it is about to go into userspace and capture the full register set then. However, this exiting thread is never going to go out to userspace again, so we have no way to capture its full register set. It doesn't really matter, though, as this is a thread which is effectively already dead. So instead of hitting a BUG() in this case (a really bad choice of action in the first place), we use a poison value for the register values. [BenH]: Some cosmetic/stylistic changes and fix build on ppc32 Signed-off-by: Mike Wolf <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-21powerpc: Factoring mpic cpu id fetching into a functionMeador Inge1-17/+14
The following code snippet: unsigned int cpu = 0; if (mpic->flags & MPIC_PRIMARY) cpu = hard_smp_processor_id(); is seen in several places in the 'mpic.c' code. This changeset factors that pattern out into a helper function called 'mpic_processor_id'. Signed-off-by: Meador Inge <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-21powerpc: Make MPIC honor the "pic-no-reset" device tree propertyMeador Inge2-11/+59
This property, defined in the Open PIC binding, tells the kernel not to use the reset bit in the global configuration register. Additionally, its presence mandates that only sources which are actually used (i.e. appear in the device tree) should have their VECPRI bits initialized. Although, "pic-no-reset" can be used for the same use cases that "protected-sources" is covering, the "protected-sources" implementation was left completely intact. This is a more pragmatic approach as there are already several existing systems which use protected sources. If "pic-no-reset" *and* "protected-sources" are both used, however, then "pic-no-reset" takes precedence in terms of the init behavior and the sanity checks done by protected sources will still take place. Signed-off-by: Meador Inge <[email protected]> Cc: Hollis Blanchard <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-21powerpc: Document the Open PIC device tree bindingMeador Inge1-0/+98
This binding documents several properties that have been in use for quite some time, and adds one new property 'pic-no-reset', which controls the runtime initialization behavior of the PIC. More specifically, the presence of 'pic-no-reset' mandates that the PIC shall not be reset during runtime initialization and that any initialization related to interrupt sources shall be limited to sources explicitly referenced in the device tree. This functionality is useful in AMP systems where multiple OSes are sharing the PIC and the reinitialization of the PIC can interfere with OSes that are already up and running. The interrupt specifier definition is based off of Stuart Yoder's FSL MPIC binding. Signed-off-by: Meador Inge <[email protected]> Cc: Grant Likely <[email protected]> Cc: Stuart Yoder <[email protected]> Cc: Hollis Blanchard <[email protected]> Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-21powerpc/pci: Fix crash in PCI code on ppc64 when matching device nodesBenjamin Herrenschmidt1-2/+5
Commit b5d937de0367d26f65b9af1aef5f2c34c1939be0 has a bug which causes basically a NULL dereference in the PCI code during boot on ppc64 machines. fetch_dev_dn() is called when dev->dev.of_node is NULL, so using that as the starting point for the search makes no sense. It should instead start from the device node of the PHB. Signed-off-by: Benjamin Herrenschmidt <[email protected]>
2011-03-20i2c-mxs: set controller to pio queue mode after resetSascha Hauer1-2/+2
mxs_reset_block() clears the PIO_QUEUE_MODE bit. So we have to set it again after a controller reset. Signed-off-by: Sascha Hauer <[email protected]> Signed-off-by: Wolfram Sang <[email protected]> Cc: Ben Dooks <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2442: RX1950: Add support for LED blinkingVasily Khoruzhick1-0/+54
Add .gpio_set_blink callback to support HW blinking available on RX1950 Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2442: RX1950: Retain LEDs state in suspendVasily Khoruzhick1-0/+3
s3c_adc_battery uses LEDs to indicate charging process, retain LEDs state in suspend, otherwise user have no information if PDA battery is charging after he put it to suspend. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2410: H1940: Fix lcd_power_set functionVasily Khoruzhick1-11/+15
Current implementation of lcd_power_set is not reliable, sometimes it does not enable LCD at all. Mimic WinCE behavior to fix this issue. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2410: H1940: Add battery supportVasily Khoruzhick1-0/+144
Add battery monitoring/charging support via pda_power and s3c_adc_battery drivers Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2410: H1940: Use leds-gpio driver for LEDs managingVasily Khoruzhick3-3/+101
We can use generic leds-gpio driver, as latch api was converted to gpiolib. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2410: H1940: Make h1940-bluetooth.c compile againVasily Khoruzhick1-3/+0
It was broken by removal of rfkill_set_led_trigger_name function, and now compiler complains about implicit declaration. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20ARM: S3C2410: H1940: Add keys deviceArnaud Patard (Rtp)1-0/+39
Add buttons definition for H1940. Signed-off-by: Vasily Khoruzhick <[email protected]> Signed-off-by: Ben Dooks <[email protected]>
2011-03-20Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12Ben Dooks5-0/+578
2011-03-20Merge branch 'vhost-net-next' of ↵David S. Miller2-150/+64
git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2011-03-20Merge branch 'master' of ↵David S. Miller9-104/+73
git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6