aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-06-03genirq: Print threaded handler in spurious debug outputSebastian Andrzej Siewior1-4/+5
In forced threaded mode (or with an explicit threaded handler) we only see the primary handler, but not the threaded handler. Signed-off-by: Sebastian Andrzej Siewior <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Thomas Gleixner <[email protected]>
2011-06-03ALSA: asihpi: Use angle brackets for system includesJoe Perches1-1/+1
Use the normal include style. Signed-off-by: Joe Perches <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-06-03clockevents: Handle empty cpumask gracefullyThomas Gleixner1-1/+4
For UP it's stupid to request an initialized cpumask for the clock event devices. Though we need the mask set even on UP to avoid a horrible ifdeffery especially in the broadcast code. For SMP we can at least try to survive with a warning and set the cpumask of the cpu we're running on. That gives a decent chance to bring the machine up and retrieve the debug info. Signed-off-by: Thomas Gleixner <[email protected]> Cc: Linus Walleij <[email protected] Cc: Lee Jones <[email protected]> Cc: Russell King - ARM Linux <[email protected]> Cc: Stephen Boyd <[email protected]>
2011-06-03ALSA: fm801: add error handling if auto-detect failsDan Carpenter1-2/+11
In the original code if auto detect failed and tea575x_tuner == 4 then we copy bogus information to chip->tea.card. I've changed the autodetect code to cleanup and return -ENODEV on error instead. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-06-03ALSA: hda - Check pin support EAPD in ad198x_power_eapd_writeRaymond Yau1-2/+4
Check whether the pin supports EAPD in ad198x_power_eapd_write. Signed-off-by: Raymond Yau <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-06-03ALSA: hda - Fix HP and Front pins of ad1988/ad1989 in ad198x_power_eapd()Takashi Iwai1-6/+4
In ad198x_power_eapd(), wrong pin NIDs are used for controlling EAPD for HP and Front outputs of AD1988/AD1989. These are actually same with the ones for AD1984 & co, port-A is 0x11 and port-D 0x12. Reported-by: Raymond Yau <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-06-03tg3: Fix tg3_skb_error_unmap()Matt Carlson1-1/+1
This function attempts to free one fragment beyond the number of fragments that were actually mapped. This patch brings back the limit to the correct spot. Signed-off-by: Matt Carlson <[email protected]> Tested-by: Alex Williamson <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-02net: tracepoint of net_dev_xmit sees freed skb and causes panicKoki Sanagi2-7/+12
Because there is a possibility that skb is kfree_skb()ed and zero cleared after ndo_start_xmit, we should not see the contents of skb like skb->len and skb->dev->name after ndo_start_xmit. But trace_net_dev_xmit does that and causes panic by NULL pointer dereference. This patch fixes trace_net_dev_xmit not to see the contents of skb directly. If you want to reproduce this panic, 1. Get tracepoint of net_dev_xmit on 2. Create 2 guests on KVM 2. Make 2 guests use virtio_net 4. Execute netperf from one to another for a long time as a network burden 5. host will panic(It takes about 30 minutes) Signed-off-by: Koki Sanagi <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-02asm-generic/unistd.h: support sendmmsg syscallChris Metcalf1-1/+3
Signed-off-by: Chris Metcalf <[email protected]> Acked-by: Arnd Bergmann <[email protected]>
2011-06-02ALSA: 6fire: Don't leak firmware in error pathJesper Juhl1-0/+1
One of the error paths in sound/usb/6fire/firmware.c::usb6fire_fw_ezusb_upload() neglects to free the memory allocated for the firmware before returning, thus leaking the memory. Signed-off-by: Jesper Juhl <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2011-06-02ktest: Ignore unset values of the minconfig in config_bisectSteven Rostedt1-1/+1
By ignoring the unset values of the minconfig in deciding what to test in the config_bisect can cause the problem config from being tested too. Just do not test the configs that are set in the minconfig. Signed-off-by: Steven Rostedt <[email protected]>
2011-06-02ktest: Fix result of rebooting the kernelSteven Rostedt1-1/+1
The command that is called that reboots the kernel may fail but the return code is not passed back to the ktest.pl script. This is because a ';' is used between the two commands and if the second command fails, only the first command's return code is returned. Using a '&&' between the two commands fixes this. Signed-off-by: Steven Rostedt <[email protected]>
2011-06-02ktest: Fix off-by-one in config bisect resultSteven Rostedt1-2/+2
Because in perl the array size returned by $#arr, is the last index and not the actually size of the array, we end the config bisect early, thinking there is only one config left when there are in fact two. Thus the result has a 50% chance of picking the correct config that caused the problem. Signed-off-by: Steven Rostedt <[email protected]>
2011-06-02Merge branch 'for-jens/xen-blkback.fixes' of ↵Jens Axboe2-6/+7
git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen into for-linus
2011-06-02block: Use hlist_entry() for io_context.cic_list.firstPaul Bolle1-2/+2
list_entry() and hlist_entry() are both simply aliases for container_of(), but since io_context.cic_list.first is an hlist_node one should at least use the correct alias. Signed-off-by: Paul Bolle <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-06-02cfq-iosched: Remove bogus check in queue_fail pathPaul Bolle1-3/+0
queue_fail can only be reached if cic is NULL, so its check for cic must be bogus. Signed-off-by: Paul Bolle <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-06-02[SCSI] Fix oops caused by queue refcounting failureJames Bottomley2-1/+2
In certain circumstances, we can get an oops from a torn down device. Most notably this is from CD roms trying to call scsi_ioctl. The root cause of the problem is the fact that after scsi_remove_device() has been called, the queue is fully torn down. This is actually wrong since the queue can be used until the sdev release function is called. Therefore, we add an extra reference to the queue which is released in sdev->release, so the queue always exists. Reported-by: Parag Warudkar <[email protected]> Cc: [email protected] Signed-off-by: James Bottomley <[email protected]>
2011-06-02video: Convert vmalloc/memset to vzallocJoe Perches5-14/+7
Signed-off-by: Joe Perches <[email protected]> Acked-by: Konrad Rzeszutek Wilk <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02efifb: Disallow manual bind and unbindAndy Lutomirski1-7/+14
Both were buggy: bind would happily scribble over a real graphics device and unbind wouldn't destroy the framebuffer. Hotplugging efifb makes no sense anyway, so just disable it. As an added benefit, we save some runtime memory. Signed-off-by: Andy Lutomirski <[email protected]> Signed-off-by: Peter Jones <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02efifb: Fix mismatched request/release_mem_regionAndy Lutomirski1-4/+7
Signed-off-by: Andy Lutomirski <[email protected]> Signed-off-by: Peter Jones <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02efifb: Enable write-combiningAndy Lutomirski1-1/+1
Running fbcon on an uncached framebuffer is remarkably slow. So try to enable write combining in efifb. Without this patch, it takes 5.8 seconds from efifb probe to i915 probe (default options; no plymouth or quiet mode). With this patch, it only takes 1.7 seconds. That means we wasted over 4 seconds just writing to UC memory. Signed-off-by: Andy Lutomirski <[email protected]> Signed-off-by: Peter Jones <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02drivers/video/pxa168fb.c: add missing clk_putJulia Lawall1-7/+10
Add a label for error-handling code in the case where only clk_get has succeeded. Rename the label failed to be consistent with the rest. A simplified version of the semantic match that finds the missing clk_put is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02drivers/video/imxfb.c: add missing clk_putJulia Lawall1-2/+2
Reorder the labels at the end of the function to correspond to the order in which the resources are allocated. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // </smpl> Signed-off-by: Julia Lawall <[email protected]> Acked-by: Sascha Hauer <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02fbdev: bf537-lq035: add missing blacklight properties typeSteven Miao1-0/+1
Seems this new field was missed, probably due to this driver being merged around the time this new backlight field was being added. At any rate, initial the type field to avoid ugly WARN() dumps. Signed-off-by: Steven Miao <[email protected]> Signed-off-by: Mike Frysinger <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02savagefb: Use panel CVT mode as defaultTormod Volden2-0/+17
If there is no EDID but an LCD panel is detected, generate a CVT mode from the panel resolution (at 60 Hz), and use this as a default mode instead of the hardcoded 800x600x8 mode. Signed-off-by: Tormod Volden <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02fbdev: sh_mobile_lcdcfb: Fix up fallout from MERAM changes.Paul Mundt1-2/+2
The LCDC driver does no longer compile: CC drivers/video/sh_mobile_meram.o CC drivers/video/sh_mobile_lcdcfb.o drivers/video/sh_mobile_lcdcfb.c: In function 'sh_mobile_lcdc_start': drivers/video/sh_mobile_lcdcfb.c:640:4: error: 'ret' undeclared (first use in this function) drivers/video/sh_mobile_lcdcfb.c:640:4: note: each undeclared identifier is reported only once for each function it appears in make[2]: *** [drivers/video/sh_mobile_lcdcfb.o] Error 1 make[1]: *** [drivers/video] Error 2 make: *** [drivers] Error 2 Reported-by: Magnus Damm <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02drivers/net/can/flexcan.c: add missing clk_putJulia Lawall1-3/+2
The failed_get label is used after the call to clk_get has succeeded, so it should be moved up above the call to clk_put. The failed_req labels doesn't do anything different than failed_get, so delete it. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // </smpl> Signed-off-by: Julia Lawall <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-02ARM: mach-shmobile: add DMAC clock definitions on SH7372Guennadi Liakhovetski1-0/+7
These definitions are needed to let the runtime PM subsystem turn off DMAC clocks, when it is suspended by the driver. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-02dmaengine: shdma: fix a regression: initialise DMA channels for memcpyGuennadi Liakhovetski1-1/+1
A recent patch has introduced a regression, where repeating a memcpy DMA test with shdma module unloading between them skips the DMA channel configuration. Fix this regression by always configuring the channel during its allocation. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Paul Mundt <[email protected]>
2011-06-01net: dm9000: Get the chip in a known good state before enabling interruptsMark Brown1-3/+3
Currently the DM9000 driver requests the primary interrupt before it resets the chip and puts it into a known good state. This means that if the chip is asserting interrupt for some reason we can end up with a screaming IRQ that the interrupt handler is unable to deal with. Avoid this by only requesting the interrupt after we've reset the chip so we know what state it's in. This started manifesting itself on one of my boards in the past month or so, I suspect as a result of some core infrastructure changes removing some form of mitigation against bad behaviour here, even when things boot it seems that the new code brings the interface up more quickly. Signed-off-by: Mark Brown <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01drivers/net/davinci_emac.c: add missing clk_putJulia Lawall1-4/+6
Go to existing error handling code at the end of the function that calls clk_put. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @r exists@ expression e1,e2; statement S; @@ e1 = clk_get@p1(...); ... when != e1 = e2 when != clk_put(e1) when any if (...) { ... when != clk_put(e1) when != if (...) { ... clk_put(e1) ... } * return@p3 ...; } else S // </smpl> Signed-off-by: Julia Lawall <[email protected]> Acked-by: Kevin Hilman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01af-packet: Add flag to distinguish VID 0 from no-vlan.Ben Greear2-3/+13
Currently, user-space cannot determine if a 0 tcp_vlan_tci means there is no VLAN tag or the VLAN ID was zero. Add flag to make this explicit. User-space can check for TP_STATUS_VLAN_VALID || tp_vlan_tci > 0, which will be backwards compatible. Older could would have just checked for tp_vlan_tci, so it will work no worse than before. Signed-off-by: Ben Greear <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01caif: Fix race when conditionally taking rtnl lock[email protected]1-6/+3
Take the RTNL lock unconditionally when calling dev_close. Taking the lock conditionally may cause race conditions. Signed-off-by: Sjur Brændeland <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01usbnet/cdc_ncm: add missing .reset_resume hookStefan Metzmacher1-1/+2
This avoids messages like this after suspend: cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.6: usb0: unregister 'cdc_ncm' usb-0000:00:1d.0-1.4, CDC NCM This is important for the Ericsson F5521gw GSM/UMTS modem. Otherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices belong together. The cdc_ether module does the same. Signed-off-by: Stefan Metzmacher <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01vlan: fix typo in vlan_dev_hard_start_xmit()Wei Yongjun1-1/+1
commit 4af429d29b341bb1735f04c2fb960178ed5d52e7 (vlan: lockless transmit path) have a typo in vlan_dev_hard_start_xmit(), using u64_stats_update_begin() to end the stat update, it should be u64_stats_update_end(). Signed-off-by: Wei Yongjun <[email protected]> Reviewed-by: WANG Cong <[email protected]> Acked-by: Eric Dumazet <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01net/ipv4: Check for mistakenly passed in non-IPv4 addressMarcus Meissner1-0/+3
Check against mistakenly passing in IPv6 addresses (which would result in an INADDR_ANY bind) or similar incompatible sockaddrs. Signed-off-by: Marcus Meissner <[email protected]> Cc: Reinhard Max <[email protected]> Signed-off-by: David S. Miller <[email protected]>
2011-06-01hwmon: (coretemp) Further relax temperature range checksGuenter Roeck1-2/+2
Further relax temperature range checks after reading the IA32_TEMPERATURE_TARGET register. If the register returns a value other than 0 in bits 16..32, assume that the returned value is correct. This change applies to both packet and core temperature limits. Cc: Carsten Emde <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Jean Delvare <[email protected]> Signed-off-by: Guenter Roeck <[email protected]> Acked-by: Fenghua Yu <[email protected]>
2011-06-01hwmon: (coretemp) Fix TjMax detection for older CPUsGuenter Roeck1-17/+2
Commit a321cedb12904114e2ba5041a3673ca24deb09c9 excludes CPU models 0xe, 0xf, 0x16, and 0x1a from TjMax temperature adjustment, even though several of those CPUs are known to have TiMax other than 100 degrees C, and even though the code in adjust_tjmax() explicitly handles those CPUs and points to a Web document listing several of the affected CPU IDs. Reinstate original TjMax adjustment if TjMax can not be determined using the IA32_TEMPERATURE_TARGET register. https://bugzilla.kernel.org/show_bug.cgi?id=32582 Signed-off-by: Guenter Roeck <[email protected]> Cc: Huaxu Wan <[email protected]> Cc: Carsten Emde <[email protected]> Cc: Valdis Kletnieks <[email protected]> Cc: Henrique de Moraes Holschuh <[email protected]> Cc: Yong Wang <[email protected]> Cc: Rudolf Marek <[email protected]> Cc: Fenghua Yu <[email protected]> Tested-by: Jean Delvare <[email protected]> Acked-by: Jean Delvare <[email protected]> Acked-by: Fenghua Yu <[email protected]> Cc: <[email protected]> # .35.x .36.x .37.x .38.x .39.x
2011-06-02drm/radeon/kms: add missing Evergreen texture formats to the CS parserMarek Olšák2-10/+21
BC6 and BC7 are described in ARB_texture_compression_bptc. No idea what FMT_32_AS_32_32_32_32 is good for. Signed-off-by: Marek Olšák <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: viewport height has to be evenAlex Deucher1-4/+8
Otherwise, no vblank interrupts. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=37522 Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: remove duplicate reg from r600 safe regsAlex Deucher1-1/+0
It got added twice by accident. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: add support for Llano Fusion APUsAlex Deucher3-0/+116
- add gpu init support - add blit support - add ucode loader Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: add llano pci idsAlex Deucher1-0/+11
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: fill in asic struct for llanoAlex Deucher1-0/+2
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon/kms: add family ids for llano APUsAlex Deucher2-0/+4
Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02drm/radeon: fix oops in ttm reserve when pageflipping (v2)Dave Airlie1-5/+8
We need to take a reference to this object, pinning doesn't take a reference so if userspace deletes the object it can disappear even if pinned. v2: fix error paths to unreference properly also. should fix: https://bugzilla.kernel.org/show_bug.cgi?id=32402 and https://bugzilla.redhat.com/show_bug.cgi?id=680651 Acked-By: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-06-02Revert "mm: fail GFP_DMA allocations when ZONE_DMA is not configured"Linus Torvalds1-4/+0
This reverts commit a197b59ae6e8bee56fcef37ea2482dc08414e2ac. As rmk says: "Commit a197b59ae6e8 (mm: fail GFP_DMA allocations when ZONE_DMA is not configured) is causing regressions on ARM with various drivers which use GFP_DMA. The behaviour up until now has been to silently ignore that flag when CONFIG_ZONE_DMA is not enabled, and to allocate from the normal zone. However, as a result of the above commit, such allocations now fail which causes drivers to fail. These are regressions compared to the previous kernel version." so just revert it. Requested-by: Russell King <[email protected]> Acked-by: Andrew Morton <[email protected]> Cc: David Rientjes <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-06-02Merge git://git.infradead.org/iommu-2.6Linus Torvalds5-48/+220
* git://git.infradead.org/iommu-2.6: intel-iommu: Fix off-by-one in RMRR setup intel-iommu: Add domain check in domain_remove_one_dev_info intel-iommu: Remove Host Bridge devices from identity mapping intel-iommu: Use coherent DMA mask when requested intel-iommu: Dont cache iova above 32bit intel-iommu: Speed up processing of the identity_mapping function intel-iommu: Check for identity mapping candidate using system dma mask intel-iommu: Only unlink device domains from iommu intel-iommu: Enable super page (2MiB, 1GiB, etc.) support intel-iommu: Flush unmaps at domain_exit intel-iommu: Remove obsolete comment from detect_intel_iommu intel-iommu: fix VT-d PMR disable for TXT on S3 resume
2011-06-02block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removalLinus Torvalds3-3/+0
Jens' back-merge commit 698567f3fa79 ("Merge commit 'v2.6.39' into for-2.6.40/core") was incorrectly done, and re-introduced the DISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits - 9fd097b14918 ("block: unexport DISK_EVENT_MEDIA_CHANGE for legacy/fringe drivers") - 7eec77a1816a ("ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd and ide-cd") because of conflicts with the "g->flags" updates near-by by commit d4dc210f69bc ("block: don't block events on excl write for non-optical devices") As a result, we re-introduced the hanging behavior due to infinite disk media change reports. Tssk, tssk, people! Don't do back-merges at all, and *definitely* don't do them to hide merge conflicts from me - especially as I'm likely better at merging them than you are, since I do so many merges. Reported-by: Steven Rostedt <[email protected]> Cc: Jens Axboe <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-06-01tile: enable CONFIG_BUGVERBOSEChris Metcalf1-1/+1
Trivial config change to enable backtraces on panic. Signed-off-by: Chris Metcalf <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.