aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-08-01ext4: use ext4_kvzalloc()/ext4_kvmalloc() for s_group_desc and s_group_infoTheodore Ts'o3-13/+15
Signed-off-by: "Theodore Ts'o" <[email protected]>
2011-08-01ext4: introduce ext4_kvmalloc(), ext4_kzalloc(), and ext4_kvfree()Theodore Ts'o2-18/+39
Introduce new helper functions which try kmalloc, and then fall back to vmalloc if necessary, and use them for allocating and deallocating s_flex_groups. Signed-off-by: "Theodore Ts'o" <[email protected]>
2011-08-01CIFS: Move buffer allocation to a separate functionPavel Shilovsky1-37/+55
Reviewed-and-Tested-by: Jeff Layton <[email protected]> Signed-off-by: Pavel Shilovsky <[email protected]> Signed-off-by: Steve French <[email protected]>
2011-08-01gpio_msm: Move Qualcomm MSM v2 gpio driver into driversDavid Brown5-8/+12
Migrate the driver for the v7-based MSM chips into drivers/gpio. The driver is unchanged, only moved. Change-Id: I810db5b50b71cdca4e869aa0d0310f7f48781a55 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01gpio_msm: Move Qualcomm v6 MSM driver into driversDavid Brown5-5/+14
Migrate the driver for the v6-based MSM chips into drivers/gpio. The driver is unchanged, only moved. Change-Id: I03ba597b95b4d62b42da112a8efac88d67aa40f9 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01msm: gpio: Fold register defs into C fileDavid Brown2-273/+250
No need to have a separate header file containing only register definitions that are used by a single driver. Fold these into the gpio driver. Signed-off-by: David Brown <[email protected]>
2011-08-01msm: gpiomux: Move public API to public headerDavid Brown3-17/+40
The gpiomux.h header contains some SOC ifdefs. However, the API that is actually used by the GPIO driver only uses two functions that are general. Move these general definitions into a public header file. Change-Id: Ia5df8af87dba268225598d56908e523bcfc24ef6 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01msm: gpio: Remove ifdefs on gpio chip registersDavid Brown1-7/+26
Select the GPIO register configuration at runtime rather than through idefs. Change-Id: I02ea0a3d61bc81669f32097c32420f0688552231 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01msm: gpio: Remove chip-specific register definitionsDavid Brown2-226/+220
Put an SOC prefix on each GPIO register definition, eliminating the need to have SOC ifdefs around the definitions. Change-Id: I5a01fd328a89ce1be610847934d6e118f5465e42 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01msm: Remove chip-ifdefs for GPIO io mappingsDavid Brown5-24/+20
The two GPIO controllers are always mapped to the same virtual address across all MSM devices. Instead of selecting this at compile time, determine the physical address at runtime, eliminating yet something else preventing multiple MSM targets from being compiled into the same kernel. Change-Id: I1672219d978ab6243526adeda6badf49472baa27 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01msm: gpio: Remove unsupported devicesDavid Brown1-7/+0
The MSM7x25 and MSM7x27 devices are not yet supported in the kernel. Remove #ifdef-based tables supporting these chips for now. Change-Id: I4d9f5abc4cc0942ce75a067097b072489493c1b8 Signed-off-by: David Brown <[email protected]> Acked-by: Linus Walleij <[email protected]> Acked-by: Nicolas Pitre <[email protected]>
2011-08-01OMAP: DSS2: HDMI: fix hdmi clock nameTomi Valkeinen1-2/+2
The HDMI clock (hdmi_clk) is missing in the current OMAP4 HWMOD database. Fix this in the DSS driver by using the old clock name (dss_48mhz_clk). Signed-off-by: Tomi Valkeinen <[email protected]>
2011-08-01HACK: OMAP: DSS2: clk hack for OMAP2/3Tomi Valkeinen5-3/+19
The HWMOD data for OMAP2 and 3 are currently not up to date regarding DSS (OMAP4 HWMOD data is fine). This patch makes the DSS driver to get the opt clocks needed for OMAP2/3 with the old clock names, thus allowing DSS driver to use runtime PM. The HWMOD databases should be fixes ASAP, and this patch can be reverted after that. Signed-off-by: Tomi Valkeinen <[email protected]>
2011-08-01of: address: use resource_size helperFelipe Balbi1-1/+1
that should be the approved way of calculating the size of resources. No functional changes. Cc: Grant Likely <[email protected]> Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-08-01ext4: use the correct error exit path in ext4_init_inode_table()Yongqiang Yang1-1/+1
This patch lets ext4_init_inode_table() handle errors right. ext4_init_inode_table() should down_write() alloc_sem which has been up_write()ed and stop the started journal handle. Signed-off-by: Yongqiang Yang <[email protected]> Signed-off-by: "Theodore Ts'o" <[email protected]>
2011-08-01ALSA: asihpi - Don't leak firmware if mem alloc failsJesper Juhl1-3/+6
We leak the memory allocated to 'firmware' when we fail to release_firmware() after a kmalloc() failure in hpi_dsp_code_open(). This patch should take care of the leak. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-08-01xfs: Fix build breakage in xfs_iops.c when CONFIG_FS_POSIX_ACL is not setMarkus Trippelsdorf1-1/+4
commit 4e34e719e45, that takes the ACL checks to common code, accidentely broke the build when CONFIG_FS_POSIX_ACL is not set: CC fs/xfs/linux-2.6/xfs_iops.o fs/xfs/linux-2.6/xfs_iops.c:1025:14: error: ‘xfs_get_acl’ undeclared here (not in a function) Fix this by declaring xfs_get_acl a static inline function. Signed-off-by: Markus Trippelsdorf <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01VFS: Reorganise shrink_dcache_for_umount_subtree() after demise of dcache_lockDavid Howells1-17/+5
Reorganise shrink_dcache_for_umount_subtree() in light of the demise of dcache_lock. Without that dcache_lock, there is no need for the batching of removal of dentries from the system under it (we wanted to make intensive use of the locked data whilst we held it, but didn't want to hold it for long at a time). This works, provided the preceding patch is correct in its removal of locking on dentry->d_lock on the basis that no one should be locking these dentries any more as the whole superblock is defunct. With this patch, the calls to dentry_lru_del() and __d_shrink() are placed at the point where each dentry is detached handled. It is possible that, as an alternative, the batching should still be done - but only for dentry_lru_del() of all a dentry's children in one go. In such a case, the batching would be done under dcache_lru_lock. Signed-off-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01VFS: Remove dentry->d_lock locking from shrink_dcache_for_umount_subtree()David Howells1-24/+24
Locks of the dcache_lock were replaced by locks of dentry->d_lock in commits such as: 2304450783dfde7b0b94ae234edd0dbffa865073 2fd6b7f50797f2e993eea59e0a0b8c6399c811dc as part of the RCU-based pathwalk changes, despite the fact that the caller (shrink_dcache_for_umount()) notes in the banner comment the reasons that d_lock is not necessary in these functions: /* * destroy the dentries attached to a superblock on unmounting * - we don't need to use dentry->d_lock because: * - the superblock is detached from all mountings and open files, so the * dentry trees will not be rearranged by the VFS * - s_umount is write-locked, so the memory pressure shrinker will ignore * any dentries belonging to this superblock that it comes across * - the filesystem itself is no longer permitted to rearrange the dentries * in this superblock */ So remove these locks. If the locks are actually necessary, then this banner comment should be altered instead. The hash table chains are protected by 1-bit locks in the hash table heads, so those shouldn't be a problem. Note that to make this work, __d_drop() has to be split so that the RCUwalk barrier can be avoided. This causes problems otherwise as it has an assertion that dentry->d_lock is locked - but there is no need for that as no one else can be trying to access this dentry, except to step over it (and that should be handled by d_free(), I think). Signed-off-by: David Howells <[email protected]> Cc: Nick Piggin <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01VFS: Remove detached-dentry counter from shrink_dcache_for_umount_subtree()David Howells1-3/+0
Remove the detached-dentry counter from shrink_dcache_for_umount_subtree() as the value it computes is no longer used as of commit 312d3ca856d369bb04d0443846b85b4cdde6fa8a which made the nr_dentry counters summed per-CPU rather than global atomic. Signed-off-by: David Howells <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01switch posix_acl_chmod() to umode_tAl Viro2-3/+3
again, that's what all callers pass to it Signed-off-by: Al Viro <[email protected]>
2011-08-01switch posix_acl_from_mode() to umode_tAl Viro2-2/+2
... seeing that this is what all callers pass to it anyway. Signed-off-by: Al Viro <[email protected]>
2011-08-01switch posix_acl_equiv_mode() to umode_t *Al Viro14-32/+15
... so that &inode->i_mode could be passed to it Signed-off-by: Al Viro <[email protected]>
2011-08-01switch posix_acl_create() to umode_t *Al Viro22-53/+35
so we can pass &inode->i_mode to it Signed-off-by: Al Viro <[email protected]>
2011-08-01block: initialise bd_super in bdget()Lachlan McIlroy1-0/+1
bd_super is currently reset to NULL in kill_block_super() so we rely on previous users of the block_device object to initialise this value for the next user. This quirk was exposed on RHEL5 when a third party filesystem did not always use kill_block_super() and therefore bd_super wasn't being reset when a block_device object was recycled within the cache. This may not be a problem upstream but makes sense to be defensive. Signed-off-by: Lachlan McIlroy <[email protected]> Reviewed-by: Eric Sandeen <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01vfs: avoid call to inode_lru_list_del() if possibleEric Dumazet1-1/+2
inode_lru_list_del() is expensive because of per superblock lru locking, while some inodes are not in lru list. Adding a check in iput_final() can speedup pipe/sockets workloads on SMP. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01vfs: avoid taking inode_hash_lock on pipes and socketsEric Dumazet2-4/+11
Some inodes (pipes, sockets, ...) are not hashed, no need to take contended inode_hash_lock at dismantle time. nice speedup on SMP machines on socket intensive workloads. Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01vfs: conditionally call inode_wb_list_del()Eric Dumazet1-1/+3
Some inodes (pipes, sockets, ...) are not in bdi writeback list. evict() can avoid calling inode_wb_list_del() and its expensive spinlock by checking inode i_wb_list being empty or not. At this point, no other cpu/user can concurrently manipulate this inode i_wb_list Signed-off-by: Eric Dumazet <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01VFS: Fix automount for negative autofs dentriesDavid Howells1-9/+15
Autofs may set the DCACHE_NEED_AUTOMOUNT flag on negative dentries. These need attention from the automounter daemon regardless of the LOOKUP_FOLLOW flag. Signed-off-by: David Howells <[email protected]> Acked-by: Ian Kent <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-08-01Btrfs: load the key from the dir item in readdir into a fake dentryJosef Bacik1-2/+45
In btrfs we have 2 indexes for inodes. One is for readdir, it's in this nice sequential order and works out brilliantly for readdir. However if you use ls, it usually stat's each file it gets from readdir. This is where the second index comes in, which is based on a hash of the name of the file. So then the lookup has to lookup this index, and then lookup the inode. The index lookup is going to be in random order (since its based on the name hash), which gives us less than stellar performance. Since we know the inode location from the readdir index, I create a dummy dentry and copy the location key into dentry->d_fsdata. Then on lookup if we have d_fsdata we use that location to lookup the inode, avoiding looking up the other directory index. Thanks, Signed-off-by: Josef Bacik <[email protected]> Signed-off-by: Al Viro <[email protected]>
2011-07-31Merge branch 'for-next' of ↵Linus Torvalds44-452/+4118
git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6 * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (46 commits) mfd: Fix mismatch in twl4030 mutex lock-unlock mfd: twl6030-pwm.c needs MODULE_LICENSE mfd: Fix the omap-usb-host clock API usage on usbhs_disable() mfd: Acknowledge WM8994 IRQs before reporting mfd: Acknowlege all WM831x IRQs before we handle them mfd: Avoid two assignments if failures happen in tps65910_i2c_probe regulator: Storing tps65912 error codes in u8 mfd: Don't leak init_data in tps65910_i2c_probe regulator: aat2870: Add AAT2870 regulator driver backlight: Add AAT2870 backlight driver mfd: Add AAT2870 mfd driver mfd: Remove dead code from max8997-irq mfd: Move TPS55910 Kconfig option mfd: Fix missing stmpe kerneldoc mfd: Fix off-by-one value range checking for tps65912_i2c_write mfd: Add devices for WM831x clocking module mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_remove mfd: Don't ask about the TPS65912 core driver in Kconfig mfd: Fix off by one in WM831x IRQ code mfd: Add tps65921 support from twl-core ...
2011-07-31Merge branch 'for-linus' of ↵Linus Torvalds12-931/+166
git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/math-emu: Remove unnecessary code m68k/math-emu: Remove commented out old code m68k: Kill warning in setup_arch() when compiling for Sun3 m68k/atari: Prefix GPIO_{IN,OUT} with CODEC_ sparc: iounmap() and *_free_coherent() - Use lookup_resource() m68k/atari: Reserve some ST-RAM early on for device buffer use m68k/amiga: Chip RAM - Use lookup_resource() resources: Add lookup_resource() sparc: _sparc_find_resource() should check for exact matches m68k/amiga: Chip RAM - Offset resource end by CHIP_PHYSADDR m68k/amiga: Chip RAM - Use resource_size() to fix off-by-one error m68k/amiga: Chip RAM - Change chipavail to an atomic_t m68k/amiga: Chip RAM - Always allocate from the start of memory m68k/amiga: Chip RAM - Convert from printk() to pr_*() m68k/amiga: Chip RAM - Use tabs for indentation
2011-07-31NFS: Re-enable compilation of nfs with !CONFIG_NFS_V4 || !CONFIG_NFS_V4_1Trond Myklebust2-2/+2
Fix two recently introduced compile problems: Fix a typo in fs/nfs/pnfs.h Move the pnfs_blksize declaration outside the CONFIG_NFS_V4 section in struct nfs_server. Reported-by: Jens Axboe <[email protected]> Signed-off-by: Trond Myklebust <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-07-31mfd: Fix mismatch in twl4030 mutex lock-unlockSanjeev Premi1-4/+4
A mutex is locked on entry into twl4030_madc_conversion(). Immediate return on some error conditions leaves the mutex locked. This patch ensures that mutex is always unlocked before leaving the function. Signed-off-by: Sanjeev Premi <[email protected]> Cc: Keerthy <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: twl6030-pwm.c needs MODULE_LICENSERandy Dunlap1-0/+2
twl6030_pwm: module license 'unspecified' taints kernel. Signed-off-by: Randy Dunlap <[email protected]> Acked-by: Hemanth V <[email protected]> Acked-by: Felipe Balbi <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Fix the omap-usb-host clock API usage on usbhs_disable()Keshava Munegowda1-2/+2
usbhs_disable function was invoking clk_enable() instead of clk_disable(), thus only increasing the clock usage counter and preventing this particular clock from being ever turned off. Because of this, the power domain of omap4 the USB Host subsystem would never reach lower power states.This patch calls clk_disable() in usbhs_disable function Signed-off-by: Keshava Munegowda <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Acknowledge WM8994 IRQs before reportingMark Brown1-6/+6
This ensures we never have a window where we've handled an interrupt but not told the hardware about it. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Acknowlege all WM831x IRQs before we handle themMark Brown1-17/+13
Ensure that we never have a window where we've handled an interrupt (and therefore need to be notified of new events) but haven't yet told the interrupt controller that this is the case (so any new events will be discarded). Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Avoid two assignments if failures happen in tps65910_i2c_probeJesper Juhl1-3/+3
In drivers/mfd/tps65910.c:tps65910_i2c_probe() there's potential for a tiny optimization. We assign to init_data->irq and init_data->irq_base long before we need them, and there are two potential exits from the function before they are needed. Moving the assignments below these two potential exits means we completely avoid doing them in these two (failure) cases. Signed-off-by: Jesper Juhl <[email protected]> Acked-by: Graeme Gregory <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31regulator: Storing tps65912 error codes in u8Dan Carpenter1-1/+1
get_ctrl_reg() returns -EINVAL so the error handling won't work here if reg is a u8. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Don't leak init_data in tps65910_i2c_probeJesper Juhl1-1/+5
There are a couple of situations where we leak init_data in drivers/mfd/tps65910.c:tps65910_i2c_probe() - this patch should take care of them. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31regulator: aat2870: Add AAT2870 regulator driverJin Park3-0/+240
Add regulator driver for AnalogicTech AAT2870. Signed-off-by: Jin Park <[email protected]> Acked-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31backlight: Add AAT2870 backlight driverJin Park3-0/+254
Add backlight driver for AnalogicTech AAT2870. Signed-off-by: Jin Park <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Add AAT2870 mfd driverJin Park4-0/+727
Add mfd core driver for AnalogicTech AAT2870. The AAT2870 is communication through I2C and contains backlight and regulator components. Signed-off-by: Jin Park <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Remove dead code from max8997-irqJesper Juhl1-2/+0
We either hit one of the case's or the default in the switch statement in get_i2c(), so the 'return ERR_PTR(-EINVAL);' at the end of the function is just dead code - remove it. Signed-off-by: Jesper Juhl <[email protected]> Acked-by: MyungJoo Ham <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Move TPS55910 Kconfig optionLinus Walleij2-10/+10
Having another TPS chip at the end of the Kconfig when all it's relatives are grouped together in their own section seems totally counter-intuitive. Move it, also in the Makefile. Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Fix missing stmpe kerneldocOm Prakash3-1/+5
Generating kerneldoc for STMPE result in warnings, so fix this by adding missing documentation. Signed-off-by: Om Prakash <[email protected]> Reviewed-by: Rabin Vincent <[email protected]> Reviewed-by: Jonas Aberg <[email protected]> Reviewed-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Fix off-by-one value range checking for tps65912_i2c_writeAxel Lin1-1/+1
If bytes == (TPS6591X_MAX_REGISTER + 1), we have a buffer overflow when doing memcpy(&msg[1], src, bytes). Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Add devices for WM831x clocking moduleMark Brown1-0/+12
With the new generic clk API that should appear at some point we should be able to support the clocking sensibly in Linux. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>
2011-07-31mfd: Remove comp{1,2}_threshold sysfs entries in tps65911_comparator_removeAxel Lin1-0/+2
Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Samuel Ortiz <[email protected]>