aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-06-08ARM: 6166/1: Proper prefetch abort handling on pre-ARMv6Anfei1-0/+3
Instruction faults on pre-ARMv6 CPUs are interpreted as a 'translation fault', but do_translation_fault doesn't handle well if user mode trying to run instruction above TASK_SIZE, and result in the infinite retry of that instruction. CC: <[email protected]> Signed-off-by: Anfei Zhou <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-06-08iwlwifi: add missing rcu_read_lockJohannes Berg1-0/+2
Using ieee80211_find_sta() needs to be under RCU read lock, which iwlwifi currently misses, so fix it. Cc: [email protected] Reported-by: Miles Lane <[email protected]> Signed-off-by: Johannes Berg <[email protected]> Acked-by: Reinette Chatre <[email protected]> Tested-by: Miles Lane <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-06-08ARM: 6165/1: trap overflows on highmem pages from kmap_atomic when debuggingNicolas Pitre1-1/+10
When CONFIG_DEBUG_HIGHMEM is used, the fixmap entry used for a highmem page by kmap_atomic() is always cleared by kunmap_atomic(). This helps find bad usages such as dereferences after the unmap, or overflow into the adjacent fixmap areas. But this debugging aid is completely bypassed when a kmap for the same page already exists as the kmap is reused instead. ON VIVT systems we have no choice but to reuse that kmap due to cache coherency issues, but on non VIVT systems we should always force the fixmap usage when debugging is active. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-06-08ARM: 6152/1: ux500 make it possible to disable localtimersLinus Walleij1-1/+2
Currently compilation of ux500 fails if you deselect the kernel feature for localtimers. Acked-by: Srinidhi Kasagar <[email protected]> Signed-off-by: Linus Walleij <[email protected]> Signed-off-by: Russell King <[email protected]>
2010-06-08Merge branch 'for-tip' of ↵Ingo Molnar1-1/+1
git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/urgent
2010-06-08[S390] Update default configuration.Martin Schwidefsky1-10/+13
Signed-off-by: Martin Schwidefsky <[email protected]>
2010-06-08[S390] arch/s390/kvm: Use GFP_ATOMIC when a lock is heldJulia Lawall1-1/+1
The containing function is called from several places. At one of them, in the function __sigp_stop, the spin lock &fi->lock is held. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // <smpl> @gfp exists@ identifier fn; position p; @@ fn(...) { ... when != spin_unlock when any GFP_KERNEL@p ... when any } @locked@ identifier gfp.fn; @@ spin_lock(...) ... when != spin_unlock fn(...) @depends on locked@ position gfp.p; @@ - GFP_KERNEL@p + GFP_ATOMIC // </smpl> Signed-off-by: Julia Lawall <[email protected]> Acked-by: Christian Borntraeger <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2010-06-08[S390] kprobes: add parameter check to module_free()Hendrik Brueckner1-2/+4
When unregistering kprobes, kprobes calls module_free() and always passes NULL for the mod parameter. Add a check to prevent NULL pointer dereferences. See commit 740a8de0796dd12890b3c8ddcfabfcb528b78d40 for more details. Signed-off-by: Hendrik Brueckner <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2010-06-08[S390] appldata/extmem/kvm: add missing GFP_KERNEL flagHeiko Carstens4-12/+13
Add missing GFP flag to memory allocations. The part in cio only changes a comment. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2010-06-08perf: Fix signed comparison in perf_adjust_period()Peter Zijlstra1-1/+4
Frederic reported that frequency driven swevents didn't work properly and even caused a division-by-zero error. It turns out there are two bugs, the division-by-zero comes from a failure to deal with that in perf_calculate_period(). The other was more interesting and turned out to be a wrong comparison in perf_adjust_period(). The comparison was between an s64 and u64 and got implicitly converted to an unsigned comparison. The problem is that period_left is typically < 0, so it ended up being always true. Cure this by making the local period variables s64. Reported-by: Frederic Weisbecker <[email protected]> Tested-by: Frederic Weisbecker <[email protected]> Signed-off-by: Peter Zijlstra <[email protected]> Cc: <[email protected]> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <[email protected]>
2010-06-08ALSA: sound/spi: patch for the unuseful variable removalWan ZongShun1-1/+0
The '*bitclk' of structure 'snd_at73c213' seems no use, so I make a patch to remove the unnecessary variable. Signed-off-by: Wan ZongShun <[email protected]> Acked-by: Liam Girdwood <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: hda - Add SSID table for iMac7,1.Justin P. Mattock1-0/+1
This patch add's the iMac7,1 SSID entry to patch_realtek.c which adds sound support. bug entry: https://bugs.launchpad.net/mactel-support/+bug/360866 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. Signed-off-by: Justin P. Mattock <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: hda - Add SSID table for MacBookAir1,1Justin P. Mattock1-0/+1
This patch add's the MacBookAir1,1 SSID entry to patch_realtek.c which adds sound support. bug entry: https://bugs.launchpad.net/mactel-support/+bug/268301 Note:I do not have this machine on hand only codec#0 file for the machine so please test if you have the appropriate equipment. Signed-off-by: Justin P. Mattock <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: hda - Add SSID table for MacBookAir2,1Justin P. Mattock1-0/+1
This adds the SSID number to snd_pci_quirk for the MacBookAir2,1 taken from codec#0 at: http://launchpadlibrarian.net/49455483/Card0.Codecs.codec.0.txt keep in mind I do not have one of these machines on hand so please if you do have this machine please test for me.. Signed-off-by: Justin P. Mattock <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08ALSA: atmel: set "channel A event" output to debugYegor Yefremov1-1/+1
Signed-off-by: Yegor Yefremov <[email protected]> Signed-off-by: Takashi Iwai <[email protected]>
2010-06-08drm/radeon: don't poll tv dac if crtc2 is in use.Dave Airlie1-0/+11
So when we added output polling, we'd suddenly use this code more often, and the fact that it always takes over crtc2 and messes with it during probing isn't what we really want to be happening. A more complete fix would to change it to use whatever crtc was free at the time, but for now lets stay simple and just don't poll if crtc2 is already in use. Although a more correct fix was found I suspect we should do this as well, until we get a chance to readdres the tv out polling issues. Reported-by: Torsten Kaiser <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon: reset i2c valid to avoid incorrect tv-out polling.Dave Airlie1-0/+2
We really don't want to be polling tv-out but since we weren't forcing the i2c lines to invalid (tv-out has no DDC), we were adding tv connectors to the polling setup and this was causing blinking on secondary displays. This fixes the regression Torsten reported. Reported-by: Torsten Kaiser <[email protected]> Tested-by: Torsten Kaiser <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/nv50: fix iommu errors caused by device reading from address 0Ben Skeggs1-2/+8
Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/nouveau: off by one in init_i2c_device_find()Dan Carpenter1-1/+1
dcb->i2c[] has DCB_MAX_NUM_I2C_ENTRIES entries. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08nouveau: off by one in nv50_gpio_location()Dan Carpenter1-1/+1
If "gpio->line" is 32 then "nv50_gpio_reg[gpio->line >> 3]" reads past the end of the array. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/nouveau: completely fail init if we fail to map the PRAMIN BARBen Skeggs1-12/+7
On cards where there's a specific BAR for PRAMIN, we used to try and fall back to the "legacy" aperture within the mmio BAR. This is doomed to cause problems, so lets just fail completely as there's obviously something else very wrong anyway. Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/nouveau: match U/DP script against SOR linkBen Skeggs1-3/+20
It appears version 0x21 'U' and 'd' tables require us to take the SOR link into account when selecting the appropriate table for a particular output. Signed-off-by: Ben Skeggs <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-07Merge git://git.infradead.org/~dwmw2/mtd-2.6.35Linus Torvalds6-90/+106
* git://git.infradead.org/~dwmw2/mtd-2.6.35: jffs2: update ctime when changing the file's permission by setfacl jffs2: Fix NFS race by using insert_inode_locked() jffs2: Fix in-core inode leaks on error paths mtd: Fix NAND submenu mtd/r852: update card detect early. mtd/r852: Fixes in case of DMA timeout mtd/r852: register IRQ as last step drivers/mtd: Use memdup_user docbook: make mtd nand module init static
2010-06-07Merge branch 'upstream-linus' of ↵Linus Torvalds5-27/+30
git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev: ahci: redo stopping DMA engines on empty ports sata_sil24: fix kernel panic on ARM caused by unaligned access in sata_sil24 ahci: add pci quirk for JMB362 sata_via: explain the magic fix
2010-06-08drm/radeon/kms/pm: resurrect printing power statesRafał Miłecki1-0/+45
debug only agd5f: rebased Signed-off-by: Rafał Miłecki <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms: add trivial debugging for voltageRafał Miłecki4-0/+5
agd5f: rebased Signed-off-by: Rafał Miłecki <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/r600+: use voltage from requested clock mode (v3)Rafał Miłecki3-10/+12
This fixes FDO bug #28375, it's kind of regression, so quite important to have it for .35. V2: Fix on RV770+ as well. All other chipsets have only one clock mode per state. V3: I'm out of luck today. Grepped for voltage in r*.c and missed evergreen. agd5f: rebased Signed-off-by: Rafał Miłecki <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/pm: track current voltage (v2)Alex Deucher6-7/+22
track the current voltage level and avoid setting it if the requested voltage is already set. v2: check voltage type before checking current voltage Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/pm: Disable voltage adjust on RS780/RS880Alex Deucher1-4/+1
The vddc value in the power tables is not an actual voltage like on discrete r6xx/r7xx/evergreen systems, but instead has a symbolic meaning (e.g., NONE, LOW, HIGH, etc.). See atombios.h Most RS780/RS880 vbioses don't have a SetVoltage table anyway, so it shouldn't be doing anything to the hardware at the moment. I need to figure out how voltage is supposed to work on the newer IGPs; until then, disable it. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms: fix typo in printing the HPD infoAlex Deucher1-2/+1
I forgot to fix this in 8e36ed00842668a39a6ed1b0a00b8ac92b7c4cd5 Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/pm: add mid profileAlex Deucher5-13/+126
This adds an additional profile, mid, to the pm profile code which takes the place of the old low profile. The default behavior remains the same, e.g., auto profile now selects between mid and high profiles based on power source, however, you can now manually force the low profile which was previously only available as a dpms off state. Enabling the low profile when the displays are on has been known to cause display corruption in some cases. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/pm: Misc fixesAlex Deucher1-16/+10
- don't rest the power state in pm_init() We already boot up to the default power state. Note this patch relies on: drm/radeon/kms/pm: patch default power state with default clocks/voltages on r6xx+ To make sure the default power state matches the boot up state. - In the pm resume path asic init will have set the power state back to the default so reset the tracking state values. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/combios: fix typo in voltage fixAlex Deucher1-1/+1
Noticed by Rafał Miłecki. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon/kms/evergreen: set accel_enabledAlex Deucher4-3/+12
This is needed to enable accel in the ddx. However, due to a bug in older versions of the ddx, it relies on accel being disabled in order to load properly on evergreen chips. To maintain compatility, we add a new get accel param and call that from the ddx. The old one always returns false for evergreen cards. [this fixes a regression with older userspaces on newer kernels]. Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/vmwgfx: return -EFAULT for copy_to_user errorsDan Carpenter2-2/+7
copy_to/from_user() returns the number of bytes remaining to be copied but we want to return a negative error code here. This gets returned to userspace. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/drm_crtc: return -EFAULT on copy_to_user errorsDan Carpenter1-1/+3
copy_from_user() returns the number of bytes left to be copied but we want to return a negative error code here. This is in the ioctl handler so the error code get returned to userspace. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/fb: use printk to print out the switching to text mode error.Dave Airlie1-1/+1
using DRM_ERROR, results in people blaming the drm code for the oops, and not looking at the oops. (sadly yes I've gotten reports). Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/radeon: fix PM on non-vram cards.Dave Airlie1-9/+0
PM attemps to unmap objects that aren't actually mapped into userspace ever, so just don't bother unmapping them at this point, since all you are doing is nothing. We should be making sure all access to these objects are locked in kernel space instead. In theory the VRAM gart table is already done, and both the shaders and stolen vga memory blocks are never accessed at runtime. fixes: https://bugzilla.kernel.org/show_bug.cgi?id=16127 Reported-by: Jure Repnic <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm: Propagate error from drm_fb_helper_init().Chris Wilson4-11/+38
The previous commit fixes the problem, these commits make sure we actually fail properly if it happens again. I've squashed the commits from Chris since they are all fixing one issue. Signed-off-by: Chris Wilson <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-08drm/i915: fix oops on single crtc devices.Dave Airlie3-6/+6
(regression fix since fbdev/kms rework). My fb rework didn't remember about the 84/65s. Reported-by: Ondrej Zary <[email protected]> Tested-by: Ondrej Zary <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2010-06-07msm: dma: add completion.h headerDaniel Walker1-0/+1
At some point this was exposed (not sure how), linux-2.6/arch/arm/mach-msm/dma.c:92: error: field 'complete' has incomplete type linux-2.6/arch/arm/mach-msm/dma.c: In function 'dmov_exec_cmdptr_complete_func': linux-2.6/arch/arm/mach-msm/dma.c:108: error: implicit declaration of function 'complete' linux-2.6/arch/arm/mach-msm/dma.c: In function 'msm_dmov_exec_cmd': linux-2.6/arch/arm/mach-msm/dma.c:120: error: implicit declaration of function 'init_completion' linux-2.6/arch/arm/mach-msm/dma.c:123: error: implicit declaration of function 'wait_for_completion' and the fix is just to add the header. Signed-off-by: Daniel Walker <[email protected]>
2010-06-08PM / x86: Save/restore MISC_ENABLE registerOndrej Zary3-0/+8
Save/restore MISC_ENABLE register on suspend/resume. This fixes OOPS (invalid opcode) on resume from STR on Asus P4P800-VM, which wakes up with MWAIT disabled. Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15385 Signed-off-by: Ondrej Zary <[email protected]> Tested-by: Alan Stern <[email protected]> Acked-by: H. Peter Anvin <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]>
2010-06-07ahci: redo stopping DMA engines on empty portsTejun Heo1-18/+3
Commit 96d60303fd (ahci: Turn off DMA engines when there's no device) implemented stopping DMA engines on empty ports but it used single sampling of status registers to determine device presence which led to disabling of DMA engines on occupied ports. Do it after all EH actions are complete using device presence state determined by EH. This avoids spurious disabling of DMA engines and simplifies the code. Signed-off-by: Tejun Heo <[email protected]> Tested-by: Marc Dionne <[email protected]> Cc: Matthew Garrett <[email protected]> Cc: Robert Hancock <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-07sata_sil24: fix kernel panic on ARM caused by unaligned access in sata_sil24Colin Tuckley1-6/+6
The sata_sil24 driver has six 16-bit registers that are initialised with 32-bit writes. This cause a kernel panic on ARM due to the unaligned accesses which result. This patch changes the accesses to the correct 16-bit ones. Signed-off-by: Colin Tuckley <[email protected]> Signed-off-by: Tejun Heo <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-07ahci: add pci quirk for JMB362Tejun Heo2-1/+5
JMB362 is a new variant of jmicron controller which is similar to JMB360 but has two SATA ports instead of one. As there is no PATA port, single function AHCI mode can be used as in JMB360. Add pci quirk for JMB362. Signed-off-by: Tejun Heo <[email protected]> Reported-by: Aries Lee <[email protected]> Cc: [email protected] Signed-off-by: Jeff Garzik <[email protected]>
2010-06-07sata_via: explain the magic fixTejun Heo1-2/+16
Add Joseph Chan's explanation of the problem and workaround to the VT6421 magic fix. Signed-off-by: Tejun Heo <[email protected]> Cc: Joseph Chan <[email protected]> Signed-off-by: Jeff Garzik <[email protected]>
2010-06-07mac80211: fix function pointer checkHolger Schurig1-1/+1
This makes "iw wlan0 dump survey" work again with mac80211-based drivers that support it, e.g. ath5k. Signed-off-by: Holger Schurig <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-06-07wireless: remove my name from the maintainer listZhu Yi1-4/+0
Remove my name from the MAINTAINERS file. Signed-off-by: Zhu Yi <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-06-07ath5k: fix NULL pointer in antenna configurationBruno Randolf1-0/+7
If the channel is not set yet and we configure the antennas just store the setting. It will be activated during the next reset, when the channel is set. Signed-off-by: Bruno Randolf <[email protected]> Signed-off-by: John W. Linville <[email protected]>
2010-06-07p54usb: Add device ID for Dell WLA3310 USBJason Dravet1-0/+1
Add Dell WLA3310 USB wireless card, which has a Z-Com XG-705A chipset, to the USB Ids in p54usb. Signed-off-by: Jason Dravet <[email protected]> Tested-by: Richard Gregory Tillmore <[email protected]> Signed-off-by: Larry Finger <[email protected]> Acked-by: Christian Lamparter <[email protected]> Cc: <[email protected]> Signed-off-by: John W. Linville <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.