aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-05-26m68k/scsi: gvp11 - Extract check_wd33c93()Geert Uytterhoeven1-77/+83
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Kill static global a3000_hostGeert Uytterhoeven1-19/+19
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: mvme147 - Kill static global mvme147_hostGeert Uytterhoeven1-14/+16
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: a3000 - Kill ugly DMA() macroGeert Uytterhoeven1-19/+25
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k/scsi: gvp11 - Kill ugly DMA() macroGeert Uytterhoeven1-24/+28
Acked-by: James Bottomley <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: set ARCH_KMALLOC_MINALIGNFUJITA Tomonori1-0/+2
Architectures that handle DMA-non-coherent memory need to set ARCH_KMALLOC_MINALIGN to make sure that kmalloc'ed buffer is DMA-safe: the buffer doesn't share a cache with the others. Signed-off-by: FUJITA Tomonori <[email protected]> Cc: Geert Uytterhoeven <[email protected]> Cc: Roman Zippel <[email protected]> Acked-by: Pekka Enberg <[email protected]> Cc: <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26m68k: Enable atomic64_tGeert Uytterhoeven2-0/+3
Signed-off-by: Geert Uytterhoeven <[email protected]>
2010-05-26do_generic_file_read: clear page errors when issuing a fresh read of the pageJeff Moyer1-0/+6
I/O errors can happen due to temporary failures, like multipath errors or losing network contact with the iSCSI server. Because of that, the VM will retry readpage on the page. However, do_generic_file_read does not clear PG_error. This causes the system to be unable to actually use the data in the page cache page, even if the subsequent readpage completes successfully! The function filemap_fault has had a ClearPageError before readpage forever. This patch simply adds the same to do_generic_file_read. Signed-off-by: Jeff Moyer <[email protected]> Signed-off-by: Rik van Riel <[email protected]> Acked-by: Larry Woodman <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26gta02: Use pcf50633 backlight driver instead of platform backlight driver.Lars-Peter Clausen1-67/+9
Use the pcf50633 backlight driver instead of the platform backlight driver. Signed-off-by: Lars-Peter Clausen <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: pcf50633: Register a pcf50633-backlight device in pcf50633 core ↵Lars-Peter Clausen2-0/+7
driver. Register a device newly added pcf50633-backlight driver as a child device in the pcf50633 core driver. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: Add pcf50633 backlight driverLars-Peter Clausen4-0/+249
This patch adds a backlight driver for controlling the pcf50633 LED module. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Samuel Ortiz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: 88pm860x_bl: fix error handling in pm860x_backlight_probeAxel Lin1-0/+1
This patch properly unregisters a previously registered backlight device object in error handling Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: max8925_bl: Fix error handling pathAxel Lin1-0/+1
Properly unregister a previously registered backlight device object in error handling of max8925_backlight_probe. Signed-off-by: Axel Lin <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: l4f00242t03: fix error handling in l4f00242t03_probeAxel Lin1-4/+3
Error handling fixes: 1. In the case of kzalloc failure, simple return -ENOMEM instead of goto err. ( priv is NULL in this case ) 2. In the case of gpio_request fail for reset_gpio and data_enable_gpio, properly release resources by goto err and err2 respectively. Signed-off-by: Axel Lin <[email protected]> Acked-by: Alberto Panizzo <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: add S6E63M0 AMOLED LCD Panel driverInKi Dae5-0/+1218
This is S6E63M0 AMOLED LCD Panel(480x800) driver using 3-wired SPI interface also almost features for lcd panel driver has been implemented in here. and I added new structure common for all the lcd panel drivers to include/linux/lcd.h file. LCD Panel driver needs interfaces for controlling device power such as power on/off and reset. these interfaces are device specific so it should be implemented to machine code at this time, we should create new structure for registering these functions as callbacks and also a header file for that structure and finally registered callback functions would be called by lcd panel driver. such header file(including new structure for lcd panel) would be added for all the lcd panel drivers. If anyone provides common structure for registering such callback functions then we could reduce unnecessary header files for lcd panel. I thought that suitable anyone could be include/linux/lcd.h so a new lcd_platform_data structure was added there. [[email protected]: coding-style fixes] [[email protected]: fix s6e63m0 kconfig] [[email protected]: fix device attribute functions return types] Signed-off-by: InKi Dae <[email protected]> Reviewed-by: KyungMin Park <kyungmin.park.samsung.com> Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26perf symbols: Add the build id cache to the vmlinux pathArnaldo Carvalho de Melo3-6/+25
So that if the kernel DSO has a build id because record inserted it in the perf.data build id table in the header, or a BUILD_ID event was inserted in the stream, we first look at the build id cache ($HOME/.debug/). If we find it there, try to use it, allowing offline annotation in addition to 'perf report'. Reported-by: Stephane Eranian <[email protected]> Cc: Frédéric Weisbecker <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Tom Zanussi <[email protected]> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2010-05-26perf tui: Reset use_browser if stdout is not a ttyArnaldo Carvalho de Melo2-1/+2
The newt initialization routines weren't being called because the output was a file (perf annotate > /tmp/bla) but use_browser was still 1, because ~/.perfconfig had it as 'on', so, later on newt routines segfaulted. Cc: Frédéric Weisbecker <[email protected]> Cc: Mike Galbraith <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Tom Zanussi <[email protected]> LKML-Reference: <new-submission> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
2010-05-26Merge git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linusLinus Torvalds14-24/+723
* git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-linus: squashfs: update documentation to include description of xattr layout squashfs: fix name reading in squashfs_xattr_get squashfs: constify xattr handlers squashfs: xattr fix sparse warnings squashfs: xattr_lookup sparse fix squashfs: add xattr support configure option squashfs: add new extended inode types squashfs: add support for xattr reading squashfs: add xattr id support
2010-05-26ASoC: Fix dB scales for WM8990Mark Brown1-9/+9
These should be regular, not linear. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [email protected]
2010-05-26ASoC: Fix dB scales for WM8400Mark Brown1-9/+9
These scales should be regular, not linear. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [email protected]
2010-05-26ASoC: Fix dB scales for WM835xMark Brown1-2/+2
These should be regular rather than linear scales. Signed-off-by: Mark Brown <[email protected]> Acked-by: Liam Girdwood <[email protected]> Cc: [email protected]
2010-05-26ASoC: Update Freescale i.MX SSI driver DMA parameter handlingStuart Longland1-3/+4
This updates the i.MX SSI driver to make it compatible with the ASoC tree following the move of DMA parameters from the DAI to the audio substream object. Signed-off-by: Stuart Longland <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2010-05-26ASoC: fix uninitialised variable in siu_dai.cGuennadi Liakhovetski1-0/+2
Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds9-12/+541
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: roccat: fix build failure if built as module HID: roccat: propagate special events of roccat hardware to userspace HID: Add the GYR4101US USB ID to hid-gyration HID: fix hid-roccat-kone for bin_attr API change
2010-05-26Merge branch 'for-linus' of ↵Linus Torvalds13-102/+219
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: emu10k1: allow high-resolution mixer controls ALSA: pcm: fix delta calculation at boundary wraparound ALSA: hda_intel: fix handling of non-completion stream interrupts ALSA: usb/caiaq: fix Traktor Kontrol X1 ABS_HAT2X axis ALSA: hda: Fix model quirk for Dell M1730 ALSA: hda - iMac9,1 sound fixes ALSA: hda: Use LPIB for Toshiba A100-259 ALSA: hda: Use LPIB for Acer Aspire 5110 ALSA: aw2-alsa.c: use pci_ids.h defines and fix checkpatch.pl noise ALSA: usb-audio: add support for Akai MPD16 ALSA: pcm: fix the fix of the runtime->boundary calculation
2010-05-26Revert "endian: #define __BYTE_ORDER"Linus Torvalds9-8/+31
This reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was also totally broken (see commit 0d2daf5cc858 that reverted the crc32 version of it). As reported by Stephen Rothwell, it causes problems on big-endian machines: > In file included from fs/jfs/jfs_types.h:33, > from fs/jfs/jfs_incore.h:26, > from fs/jfs/file.c:22: > fs/jfs/endian24.h:36:101: warning: "__LITTLE_ENDIAN" is not defined The kernel has never had that crazy "__BYTE_ORDER == __LITTLE_ENDIAN" model. It's not how we do things, and it isn't how we _should_ do things. So don't go there. Requested-by: Stephen Rothwell <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26nuc900: add maintainer entries for Wan ZongShunWan ZongShun1-0/+12
Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26revert "crc32: use __BYTE_ORDER macro for endian detection"Andrew Morton1-1/+1
It doesn't work on big-endian - those architectures don't define __LITTLE_ENDIAN. Cc: Joakim Tjernlund <[email protected]> Reported-by: Stephen Rothwell <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26fs/fscache/object-list.c: fix warning on 32-bitAndrew Morton1-1/+1
fs/fscache/object-list.c: In function 'fscache_objlist_lookup': fs/fscache/object-list.c:105: warning: cast to pointer from integer of different size Acked-by: David Howells <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26nommu: allow private mappings of read-only devicesBernd Schmidt1-14/+18
Slightly rearrange the logic that determines capabilities and vm_flags. Disable BDI_CAP_MAP_DIRECT in all cases if the device can't support the protections. Allow private readonly mappings of readonly backing devices. Signed-off-by: Bernd Schmidt <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Acked-by: David McCullough <[email protected]> Acked-by: Greg Ungerer <[email protected]> Acked-by: Paul Mundt <[email protected]> Acked-by: David Howells <[email protected]> Cc: Hugh Dickins <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26mempolicy: ERR_PTR dereference in mpol_shared_policy_init()Dan Carpenter1-1/+2
The original code called mpol_put(new) while "new" was an ERR_PTR. Signed-off-by: Dan Carpenter <[email protected]> Cc: Lee Schermerhorn <[email protected]> Cc: KOSAKI Motohiro <[email protected]> Cc: Christoph Lameter <[email protected]> Acked-by: David Rientjes <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2010-05-26Btrfs: avoid ENOSPC errors in btrfs_dirty_inodeChris Mason1-3/+11
btrfs_dirty_inode tries to sneak in without much waiting or space reservation, mostly for performance reasons. This usually works well but can cause problems when there are many many writers. When btrfs_update_inode fails with ENOSPC, we fallback to a slower btrfs_start_transaction call that will reserve some space. Signed-off-by: Chris Mason <[email protected]>
2010-05-26Btrfs: move O_DIRECT space reservation to btrfs_direct_IOChris Mason2-6/+8
This moves the delalloc space reservation done for O_DIRECT into btrfs_direct_IO. This way we don't leak reserved space if the generic O_DIRECT write code errors out before it calls into btrfs_direct_IO. Signed-off-by: Chris Mason <[email protected]>
2010-05-26hrtimer: Avoid double seqlockStanislaw Gruszka1-1/+1
hrtimer_get_softirq_time() has it's own xtime lock protection, so it's safe to use plain __current_kernel_time() and avoid the double seqlock loop. Signed-off-by: Stanislaw Gruszka <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2010-05-26timers: Move local variable into else sectionThomas Gleixner1-2/+3
Fix nit-picking coding style detail. Signed-off-by: Thomas Gleixner <[email protected]>
2010-05-26NFS: Fix another nfs_wb_page() deadlockTrond Myklebust1-2/+5
J.R. Okajima reports that the call to sync_inode() in nfs_wb_page() can deadlock with other writeback flush calls. It boils down to the fact that we cannot ever call writeback_single_inode() while holding a page lock (even if we do set nr_to_write to zero) since another process may already be waiting in the call to do_writepages(), and so will deny us the I_SYNC lock. Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26NFS: Ensure that we mark the inode as dirty if we exit early from commitTrond Myklebust1-2/+11
If we exit from nfs_commit_inode() without ensuring that the COMMIT rpc call has been completed, we must re-mark the inode as dirty. Otherwise, future calls to sync_inode() with the WB_SYNC_ALL flag set will fail to ensure that the data is on the disk. Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26NFS: Fix a lock imbalance typo in nfs_access_cache_shrinkerTrond Myklebust1-0/+1
Commit 9c7e7e23371e629dbb3b341610a418cdf1c19d91 (NFS: Don't call iput() in nfs_access_cache_shrinker) unintentionally removed the spin unlock for the inode->i_lock. Reported-by: David Howells <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26sunrpc: fix leak on error on socket xprt setupJ. Bruce Fields1-11/+18
Also collect exit code together while we're at it. Signed-off-by: J. Bruce Fields <[email protected]> Cc: Trond Myklebust <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2010-05-26backlight: adp8860: add support for ADP8861 & ADP8863Michael Hennerich3-20/+61
Signed-off-by: Michael Hennerich <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: mbp_nvidia_bl - Fix DMI_SYS_VENDOR for MacBook1,1Steffen Röcker1-1/+1
Fix DMI_SYS_VENDOR for MacBook1,1. When the MacBook1,1 came out Apple was still named Apple Computer, I am not sure if this applies to older MacBook2,1 versions aswell. Signed-off-by: Steffen Röcker <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: Add Cirrus EP93xx backlight driverH Hartley Sweeten3-0/+171
The EP9307, EP9312, and EP9315 processors include a framebuffer peripheral. This peripheral has a dedicated pwm output called BRIGHT that can be used to control the backlight on an LCD. Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: l4f00242t03: Fix regulators handling code in remove functionAlberto Panizzo1-2/+2
Simple swap of regulator free Signed-off-by: Alberto Panizzo <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: fix adp8860_bl build errorsRandy Dunlap1-1/+6
Add slab.h to fix part of build. Add a parameter in backlight_device_register() call to fix part of build. drivers/video/backlight/adp8860_bl.c:215: error: implicit declaration of function 'kzalloc' drivers/video/backlight/adp8860_bl.c:215: warning: assignment makes pointer from integer without a cast drivers/video/backlight/adp8860_bl.c:285: error: implicit declaration of function 'kfree' drivers/video/backlight/adp8860_bl.c:673: warning: assignment makes pointer from integer without a cast drivers/video/backlight/adp8860_bl.c:689: error: too few arguments to function 'backlight_device_register' Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: new driver for the ADP8860 backlight partsMichael Hennerich4-0/+959
The ADP8860 combines a programmable backlight LED charge pump driver with automatic phototransistor control. Signed-off-by: Michael Hennerich <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: 88pm860x_bl - potential memory leakDan Carpenter1-0/+1
I added a kfree() on the error path. I don't really expect it to affect anyone, but it's easy and makes the static checkers happy. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: mbp_nvidia_bl - add support for older MacBookPro and MacBook 6,1.Mario Schwalbe1-0/+45
Add support for all remaining models not yet present in Linus'/Richard Purdie's tree nor Evan McClain's patch to finally complete the list. Signed-off-by: Mario Schwalbe <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: Kconfig cleanupH Hartley Sweeten1-44/+35
Cleanup the "depends on" logic by wrapping the affected config options in appropriate if/endif blocks. Remove all the "default n" since that is the default default. Signed-off-by: H Hartley Sweeten <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26backlight: backlight_device_register() return ERR_PTR()Dan Carpenter1-2/+2
backlight_device_register() returns a valid pointer or ERR_PTR() never NULL. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Richard Purdie <[email protected]>
2010-05-26leds: Add mx31moboard MC13783 led supportPhilippe Rétornaz1-1/+44
Add two RGB led on mx31moboard using MC13783 led subsystem Signed-off-by: Philippe Rétornaz <[email protected]> Signed-off-by: Richard Purdie <[email protected]>