aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-11-15ARM: imx: convert smp platforms to global gic_handle_irq()Marc Zyngier4-55/+1
Convert the SMP imx platforms to use the global gic_handle_irq() function instead a private function. Cc: Sascha Hauer <[email protected]> Acked-by: Shawn Guo <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
2011-11-15ARM: GIC: Add global gic_handle_irq() functionMarc Zyngier2-0/+28
Provide the GIC code with a low level handler that can be used by platforms using CONFIG_MULTI_IRQ_HANDLER. Signed-off-by: Marc Zyngier <[email protected]>
2011-11-15ARM: mxc: rename gic_handle_irq to avoid name clashMarc Zyngier2-3/+3
Before introducing a global gic_handle_irq(), rename MXC's version to mxc_gic_handle_irq(). This function will be removed altogether in a later patch. Cc: Sascha Hauer <[email protected]> Acked-by: Shawn Guo <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
2011-11-15ARM: Make global handler and CONFIG_MULTI_IRQ_HANDLER mutually exclusiveMarc Zyngier3-49/+3
Even when CONFIG_MULTI_IRQ_HANDLER is selected, the core code requires the arch_irq_handler_default macro to be defined as a fallback. It turns out nobody is using that particular feature as both PXA and shmobile have all their machine descriptors populated with the interrupt handler, leaving unused code (or empty macros) in their entry-macro.S file just to be able to compile entry-armv.S. Make CONFIG_MULTI_IRQ_HANDLER exclusive wrt arch_irq_handler_default, which allows to remove one test from the hot path. Also cleanup both PXA and shmobile entry-macro.S. Cc: Paul Mundt <[email protected]> Acked-by: Nicolas Pitre <[email protected]> Acked-by: Eric Miao <[email protected]> Tested-by: Jamie Iles <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
2011-11-15ARM: gic: allow GIC to support non-banked setupsMarc Zyngier7-77/+132
The GIC support code is heavily using the fact that hardware implementations are exposing banked registers. Unfortunately, it looks like at least one GIC implementation (EXYNOS) offers both the distributor and the CPU interfaces at different addresses, depending on the CPU. This problem is solved by allowing the distributor and CPU interface addresses to be per-cpu variables for the platforms that require it. The EXYNOS code is updated not to mess with the GIC internals while handling interrupts, and struct gic_chip_data is back to being private. The DT binding for the gic is updated to allow an optional "cpu-offset" value, which is used to compute the various base addresses. Finally, a new config option (GIC_NON_BANKED) is used to control this feature, so the overhead is only present on kernels compiled with support for EXYNOS. Tested on Origen (EXYNOS4) and Panda (OMAP4). Cc: Kukjin Kim <[email protected]> Cc: Will Deacon <[email protected]> Cc: Thomas Abraham <[email protected]> Acked-by: Rob Herring <[email protected]> Signed-off-by: Marc Zyngier <[email protected]>
2011-11-15USB: storage: ene_ub6250: fix compile warningsFelipe Balbi1-2/+1
Fix the following compile warning: | drivers/usb/storage/ene_ub6250.c: In function ‘ms_scsi_write’: | drivers/usb/storage/ene_ub6250.c:1728:6: warning: ‘result’ may \ | be used uninitialized in this function [-Wuninitialized] | drivers/usb/storage/ene_ub6250.c:1795:77: warning: ‘offset’ may \ | be used uninitialized in this function [-Wuninitialized] Signed-off-by: Felipe Balbi <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-15USB: option: add id for 3G dongle Model VT1000 of ViettelVU Tuan Duc1-0/+5
Add VendorID/ProductID for USB 3G dongle Model VT1000 of Viettel. Signed-off-by: VU Tuan Duc <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-15USB: serial: pl2303: rm duplicate idwangyanqing2-5/+0
I get report from customer that his usb-serial converter doesn't work well,it sometimes work, but sometimes it doesn't. The usb-serial converter's id: vendor_id product_id 0x4348 0x5523 Then I search the usb-serial codes, and there are two drivers announce support this device, pl2303 and ch341, commit 026dfaf1 cause it. Through many times to test, ch341 works well with this device, and pl2303 doesn't work quite often(it just work quite little). ch341 works well with this device, so we doesn't need pl2303 to support.I try to revert 026dfaf1 first, but it failed. So I prepare this patch by hand to revert it. Signed-off-by: Wang YanQing <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-15USB: pch_udc: Change company name OKI SEMICONDUCTOR to LAPIS SemiconductorTomoya MORINAGA1-2/+2
On October 1 in 2011, OKI SEMICONDUCTOR Co., Ltd. changed the company name in to LAPIS Semiconductor Co., Ltd. Signed-off-by: Tomoya MORINAGA <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-15USB: pch_udc: Support new device LAPIS Semiconductor ML7831 IOHTomoya MORINAGA2-4/+11
ML7831 is companion chip for Intel Atom E6xx series. Signed-off-by: Tomoya MORINAGA <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-15Linux 3.2-rc2Linus Torvalds1-1/+1
2011-11-15Merge branch 'iommu/fixes' of ↵Linus Torvalds2-0/+2
git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu * 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: iommu: omap: Fix compile failure
2011-11-15Merge branch 'fixes' of git://git.linaro.org/people/triad/linux-pinctrlLinus Torvalds2-15/+8
* 'fixes' of git://git.linaro.org/people/triad/linux-pinctrl: pinctrl: hide subsystem from the populace pinctrl: fix "warning: 'struct pinctrl_dev' declared inside parameter list"
2011-11-15Merge branch 'for-linus' of ↵Linus Torvalds1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: fsl-rio: fix compile error
2011-11-15Merge branch 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6Linus Torvalds2-32/+38
* 'gpio/merge' of git://git.secretlab.ca/git/linux-2.6: gpio: pca953x: propagate the errno from the chip_init functions gpio: pca953x: remove unneeded check for chip type gpio/omap: check return value from irq_alloc_generic_chip gpio/omap: replace MOD_REG_BIT macro with static inline
2011-11-15Merge branch 'for-linus' of ↵Linus Torvalds28-56/+304
git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin: blackfin: Fixup export.h includes Blackfin: add serial TX IRQ in individual platform resource
2011-11-15hfs: add sanity check for file name lengthDan Carpenter1-0/+2
On a corrupted file system the ->len field could be wrong leading to a buffer overflow. Reported-and-acked-by: Clement LECIGNE <[email protected]> Signed-off-by: Dan Carpenter <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2011-11-15Net, libertas: Resolve memory leak in if_spi_host_to_card()Jesper Juhl1-0/+1
If we hit the default case in the switch in if_spi_host_to_card() we'll leak the memory we allocated for 'packet'. This patch resolves the leak by freeing the allocated memory in that case. Signed-off-by: Jesper Juhl <[email protected]> Acked-by: Dan Williams <[email protected]> Cc: [email protected] Signed-off-by: John W. Linville <[email protected]>
2011-11-15rt2x00: Fix sleep-while-atomic bug in powersaving code.Gertjan van Wingerde2-2/+21
The generic powersaving code that determines after reception of a frame whether the device should go back to sleep or whether is could stay awake was calling rt2x00lib_config directly from RX tasklet context. On a number of the devices this call can actually sleep, due to having to confirm that the sleeping commands have been executed successfully. Fix this by moving the call to rt2x00lib_config to a workqueue call. This fixes bug https://bugzilla.redhat.com/show_bug.cgi?id=731672 Tested-by: Tomas Trnka <[email protected]> Signed-off-by: Gertjan van Wingerde <[email protected]> Cc: <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-11-15rt2x00: Add USB device ID of Buffalo WLI-UC-GNHP.Gertjan van Wingerde1-0/+1
This is reported to be an RT3070 based device. Reported-by: Teika Kazura <[email protected]> Signed-off-by: Gertjan van Wingerde <[email protected]> Acked-by: Ivo van Doorn <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2011-11-15Btrfs: fix tree corruption after multi-thread snapshots and inode_cache flushLiu Bo3-1/+26
The btrfs snapshotting code requires that once a root has been snapshotted, we don't change it during a commit. But there are two cases to lead to tree corruptions: 1) multi-thread snapshots can commit serveral snapshots in a transaction, and this may change the src root when processing the following pending snapshots, which lead to the former snapshots corruptions; 2) the free inode cache was changing the roots when it root the cache, which lead to corruptions. This fixes things by making sure we force COW the block after we create a snapshot during commiting a transaction, then any changes to the roots will result in COW, and we get all the fs roots and snapshot roots to be consistent. Signed-off-by: Liu Bo <[email protected]> Signed-off-by: Miao Xie <[email protected]> Signed-off-by: Chris Mason <[email protected]>
2011-11-15ASoC: fsl_ssi: properly initialize the sysfs attribute objectTimur Tabi1-0/+1
Commit 6992f533 ("sysfs: Use one lockdep class per sysfs attribute") requires 'struct attribute' objects to be initialized with sysfs_attr_init(). Signed-off-by: Timur Tabi <[email protected]> Signed-off-by: Mark Brown <[email protected]> Cc: [email protected]
2011-11-15watchdog: adx_wdt.c: remove driverWim Van Sebroeck3-363/+0
Remove the driver (that was added in v2.6.32) since the architecture has never been merged into mainline. Reported-by: Paul Bolle <[email protected]> Acked-by: Thierry Reding <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
2011-11-15unicore32: drop unused Kconfig symbolsPaul Bolle1-14/+0
Signed-off-by: Paul Bolle <[email protected]> Acked-by: Guan Xuetao <[email protected]>
2011-11-15rtc: rtc-puv3: Add __devinit and __devexit markers for probe and removeAxel Lin1-2/+2
Signed-off-by: Axel Lin <[email protected]> Acked-by: Guan Xuetao <[email protected]>
2011-11-15arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGSArnaud Lacombe1-2/+2
Usage of these flags has been deprecated for nearly 4 years by: commit f77bf01425b11947eeb3b5b54685212c302741b8 Author: Sam Ravnborg <sam@neptun.(none)> Date: Mon Oct 15 22:25:06 2007 +0200 kbuild: introduce ccflags-y, asflags-y and ldflags-y Moreover, these flags (at least EXTRA_CFLAGS) have been documented for command line use. By default, gmake(1) do not override command line setting, so this is likely to result in build failure or unexpected behavior. Replace their usage by Kbuild's `{as,cc,ld}flags-y'. Cc: Sam Ravnborg <[email protected]> Cc: Guan Xuetao <[email protected]> Signed-off-by: Arnaud Lacombe <[email protected]> Acked-by: Guan Xuetao <[email protected]>
2011-11-15unicore32: fix build error for find bitopsGuan Xuetao3-14/+16
Remove the __uc32_ prefix in find bitops functions. Move find_* macros behind asm-generic/bitops.h inclusion. see commit <19de85ef574c3a2182e3ccad9581805052f14946> bitops: add #ifndef for each of find bitops also see commit <63e424c84429903c92a0f1e9654c31ccaf6694d0> arch: remove CONFIG_GENERIC_FIND_{NEXT_BIT,BIT_LE,LAST_BIT} Signed-off-by: Guan Xuetao <[email protected]> Cc: Akinobu Mita <[email protected]> Acked-by: Akinobu Mita <[email protected]> Cc: Arnd Bergmann <[email protected]>
2011-11-15drm/exynos: include linux/module.hInki Dae1-0/+1
Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: fix vblank bug.Inki Dae1-10/+36
In case that vblank_disable_allowed is 1, the problem that manager->pipe could be -1 at vsync interrupt handler could be induced so this patch fixes that. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: changed buffer structure.Inki Dae10-133/+148
the purpose of this patch is to consider IOMMU support in the future. EXYNOS4 SoC supports IOMMU also so the address for DMA could be physical address with IOMMU or device address with IOMMU. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: removed unnecessary variable.Inki Dae1-2/+0
Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: use gem create function genericallyInki Dae4-41/+59
this patch addes exynos_drm_gem_init() creating and initialzing a gem. allocation functions could use this function to create new gem and it changes size type of exynos_drm_gem_create structure to 64bit and also corrects comments to exynos_drm_gem_create structure. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: checked for null pointerSeung-Woo Kim1-2/+4
Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: added crtc dpms for disable crtcJoonyoung Shim3-11/+73
crtc dpms is called as destroying attached fb so dpms off sould be processed. crtc dpms also can be called after crtc is detached from encoder so pipe value of manager is used to find display controller for this case Signed-off-by: Joonyoung Shim <[email protected]> Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: removed meaningless parameter from fbdev updateSeung-Woo Kim1-9/+5
drm_framebuffer already has width and height so they are meaningless as parameters when updating fb_info. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: restored kernel_fb_list when reiniting fb_helperJoonyoung Shim1-0/+15
during recreating exynos_drm_fbdev as a new display device probes, fb_helper is reinitialized but kernel fb is not changed so kernel_fb_list should be restored after fb_helper is reinitialized. Signed-off-by: Joonyoung Shim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: changed exynos_drm_display to exynos_drm_display_opsInki Dae4-22/+23
exynos_drm_display has function pointes so exynos_drm_display_ops is better to describe. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: added manager object to connectorInki Dae2-8/+33
connector contains some contents for display controller so the connector also should be able to access controller through manager. Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: fixed converting between display mode and timingSeung-Woo Kim1-1/+8
missing members are added into converting function between timing and display mode and refresh rate of display mode is calculated by drm mode function. Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: fixed connector flag with hpd and interlace scan for hdmiSeung-Woo Kim1-0/+2
hdmi display in exynos supports hotplug event and interlace scan mode Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-15drm/exynos: added kms poll for handling hpd eventSeung-Woo Kim2-0/+17
this patch adds kms poll infrastructure to handle hotplug detection event Signed-off-by: Seung-Woo Kim <[email protected]> Signed-off-by: Inki Dae <[email protected]> Signed-off-by: Kyungmin Park <[email protected]>
2011-11-14sparc: Fix handling of orig_i0 wrt. debugging when restarting syscalls.David S. Miller3-27/+43
Although we provide a proper way for a debugger to control whether syscall restart occurs, we run into problems because orig_i0 is not saved and restored properly. Luckily we can solve this problem without having to make debuggers aware of the issue. Across system calls, several registers are considered volatile and can be safely clobbered. Therefore we use the pt_regs save area of one of those registers, %g2, as a place to save and restore orig_i0. Debuggers transparently will do the right thing because they save and restore this register already. Signed-off-by: David S. Miller <[email protected]>
2011-11-14net/packet: Revert incorrect dead-code changes to prb_setup_retire_blk_timerJesper Juhl1-2/+4
Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-11-14usb-storage: Accept 8020i-protocol commands longer than 12 bytesAlan Stern1-4/+3
The 8020i protocol (also 8070i and QIC-157) uses 12-byte commands; shorter commands must be padded. Simon Detheridge reports that his 3-TB USB disk drive claims to use the 8020i protocol (which is normally meant for ATAPI devices like CD drives), and because of its large size, the disk drive requires the use of 16-byte commands. However the usb_stor_pad12_command() routine in usb-storage always sets the command length to 12, making the drive impossible to use. Since the SFF-8020i specification allows for 16-byte commands in future extensions, we may as well accept them. This patch (as1490) changes usb_stor_pad12_command() to leave commands larger than 12 bytes alone rather than truncating them. Signed-off-by: Alan Stern <[email protected]> Tested-by: Simon Detheridge <[email protected]> CC: Matthew Dharm <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-14USB: quirks: adding more quirky webcams to avoid squeaky audiosordna1-0/+24
The following patch contains additional affected webcam models, on top of the patches commited to linux-next 2394d67e446bf616a0885167d5f0d397bdacfdfc and 5b253d88cc6c65a23cefc457a5a4ef139913c5fc Signed-off-by: sordna <[email protected]> Cc: Oliver Neukum <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-14pcie-gadget-spear: Add "platform:" prefix for platform modaliasAxel Lin1-1/+1
Since 43cc71eed1250755986da4c0f9898f9a635cb3bf (platform: prefix MODALIAS with "platform:"), the platform modalias is prefixed with "platform:". Signed-off-by: Axel Lin <[email protected]> Acked-by: Pratyush Anand <[email protected]> Cc: stable <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-14MAINTAINERS: add CHAR and MISC driver maintainersGreg Kroah-Hartman1-0/+8
Yes, we are fools, but humor us. Signed-off-by: Greg Kroah-Hartman <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2011-11-14powerpc/usb: fix type cast for address of ioremap to compatible with 64-bitShaohui Xie1-2/+1
Below are codes for accessing usb sysif_regs in driver: usb_sys_regs = (struct usb_sys_interface *) ((u32)dr_regs + USB_DR_SYS_OFFSET); these codes work in 32-bit, but in 64-bit, use u32 to type cast the address of ioremap is not right, and accessing members of 'usb_sys_regs' will cause call trace, so use (void *) for both 32-bit and 64-bit. Signed-off-by: Shaohui Xie <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-14USB: at91: at91-ohci: fix set/get powerJean-Christophe PLAGNIOL-VILLARD1-0/+6
in commit aa6e52a35 we introduce the support of overcurrent notification but the set and get of the power without checking if the gpio is valid or not Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Acked-by: Thomas Petazzoni <[email protected]> Acked-by: Nicolas Ferre <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-11-14PM / devfreq: correct Kconfig dependencyMyungJoo Ham1-24/+17
Devfreq does not depend on OPP. The dependency is removed. Signed-off-by: MyungJoo Ham <[email protected]> Signed-off-by: Kyungmin Park <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>