aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2011-05-11Merge branch 'samsung-irq' of ↵Russell King6-215/+68
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc-2.6 into devel-stable
2011-05-11Merge branch 'irq-davinci' of ↵Russell King10-130/+607
git://gitorious.org/linux-davinci/linux-davinci into devel-stable
2011-05-11Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stableRussell King142-1586/+1952
2011-05-11arm: davinci: Use generic irq chipThomas Gleixner1-73/+20
Simple conversion which simply uses the fact that the second irq chip base address has offset 0x04 to the first one. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-and-Tested-by: Kevin Hilman <[email protected]> Tested-by: Sekhar Nori <[email protected]>
2011-05-11ARM: GIC: Convert GIC library to use the IO relaxed operationsSantosh Shilimkar1-24/+30
The GIC register accesses today make use of readl()/writel() which prove to be very expensive when used along with mandatory barriers. This mandatory barriers also introduces an un-necessary and expensive l2x0_sync() operation. On Cortex-A9 MP cores, GIC IO accesses from CPU are direct and doesn't go through L2X0 write buffer. A DSB before writel_relaxed() in gic_raise_softirq() is added to be compliant with the Barrier Litmus document - the mailbox scenario. Signed-off-by: Santosh Shilimkar <[email protected]> Acked-by: Catalin Marinas <[email protected]> Cc: Will Deacon <[email protected]>
2011-05-11ARM: gic: use handle_fasteoi_irq for SPIsWill Deacon1-16/+16
Currently, the gic uses handle_level_irq for handling SPIs (Shared Peripheral Interrupts), requiring active interrupts to be masked at the distributor level during IRQ handling. On a virtualised system, only the CPU interfaces are virtualised in hardware. Accesses to the distributor must be trapped by the hypervisor, adding latency to the critical interrupt path in Linux. This patch modifies the GIC code to use handle_fasteoi_irq for handling interrupts, which only requires us to signal EOI to the CPU interface when handling is complete. Cascaded IRQ handling is also updated to use the chained IRQ enter/exit functions to honour the flow control of the parent chip. Note that commit 846afbd1 ("GIC: Dont disable INT in ack callback") broke cascading interrupts by forgetting to add IRQ masking. This is no longer an issue because the unmask call is now unnecessary. Tested on Versatile Express and Realview EB (1176 w/ cascaded GICs). Tested-and-reviewed-by: Abhijeet Dharmapurikar <[email protected]> Tested-and-acked-by: Santosh Shilimkar <[email protected]> Acked-by: Catalin Marinas <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-11ARM: tegra: irq: Add tegra_eoiColin Cross1-0/+9
Implement irq_eoi to allow the GIC irq chip flow controller to be changed to fasteoi. Signed-off-by: Colin Cross <[email protected]>
2011-05-11ARM: tegra: irq: Move legacy_irq.c into irq.cColin Cross4-183/+66
Now that irq.c is just an interface layer between the gic and legacy_irq.c, move the contents of legacy_irq.c into irq.c. Signed-off-by: Colin Cross <[email protected]>
2011-05-11ARM: tegra: irq: Remove PM supportColin Cross3-146/+0
Tegra PM irq support is being improved, remove it for now until the rest of the platform gets PM support. Signed-off-by: Colin Cross <[email protected]>
2011-05-11ARM: tegra: irq: convert to gic arch extensionsColin Cross1-38/+16
Replace the ugly hack that inserts legacy irq controller calls into the irq call paths by reading and replacing the gic irq chip with the new gic arch extensions. Signed-off-by: Colin Cross <[email protected]>
2011-05-11ARM: tegra: update GPIO chained IRQ handler to use entry/exit functionsWill Deacon1-3/+6
This patch updates the Tegra gpio chained IRQ handler to use the chained IRQ enter/exit functions in order to function correctly on primary controllers with different methods of flow control. This is required for the GIC to move to fasteoi interrupt handling. Acked-by: Colin Cross <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-11ARM: nmk: update GPIO chained IRQ handler to entry/exit functionsWill Deacon1-8/+4
This patch updates the Nomadik gpio chained IRQ handler to use the chained IRQ enter/exit functions in order to function correctly on primary controllers with different methods of flow control. Cc: Rabin Vincent <[email protected]> Cc: Grant Likely <[email protected]> Acked-by: Linus Walleij <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-11ARM: msm: update GPIO chained IRQ handler to use entry/exit functionsWill Deacon1-2/+8
This patch updates the MSM gpio chained IRQ handler to use the chained IRQ enter/exit functions in order to function correctly on primary controllers with different methods of flow control. Tested-and-reviewed-by: Abhijeet Dharmapurikar <[email protected]> Acked-by: David Brown <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-11ARM: s5pv310: update IRQ combiner to use chained entry/exit functionsWill Deacon1-4/+2
This patch updates the IRQ combiner chained IRQ handler code to use the chained IRQ enter/exit functions in order to function correctly on primary controllers with different methods of flow control. This is required for the GIC to move to fasteoi interrupt handling. Cc: Kyungmin Park <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-11ARM: omap: update GPIO chained IRQ handler to use entry/exit functionsWill Deacon1-3/+4
This patch updates the OMAP gpio chained IRQ handler to use the chained IRQ enter/exit functions in order to function correctly on primary controllers with different methods of flow control. Cc: Colin Cross <[email protected]> Cc: Tony Lindgren <[email protected]> Tested-and-acked-by: Santosh Shilimkar <[email protected]> Signed-off-by: Will Deacon <[email protected]>
2011-05-09Linux 2.6.39-rc7Linus Torvalds1-1/+1
2011-05-09vm: fix vm_pgoff wrap in upward expansionHugh Dickins1-4/+7
Commit a626ca6a6564 ("vm: fix vm_pgoff wrap in stack expansion") fixed the case of an expanding mapping causing vm_pgoff wrapping when you had downward stack expansion. But there was another case where IA64 and PA-RISC expand mappings: upward expansion. This fixes that case too. Signed-off-by: Hugh Dickins <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09Merge branch 'drm-intel-fixes' of ↵Linus Torvalds3-7/+23
git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6 * 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keithp/linux-2.6: drm/i915/lvds: Only act on lid notify when the device is on drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup" drm/i915: Only enable the plane after setting the fb base (pre-ILK) drm/i915/dp: Be paranoid in case we disable a DP before it is attached drm/i915: Release object along create user fb error path
2011-05-09Don't lock guardpage if the stack is growing upMikulas Patocka3-15/+37
Linux kernel excludes guard page when performing mlock on a VMA with down-growing stack. However, some architectures have up-growing stack and locking the guard page should be excluded in this case too. This patch fixes lvm2 on PA-RISC (and possibly other architectures with up-growing stack). lvm2 calculates number of used pages when locking and when unlocking and reports an internal error if the numbers mismatch. [ Patch changed fairly extensively to also fix /proc/<pid>/maps for the grows-up case, and to move things around a bit to clean it all up and share the infrstructure with the /proc bits. Tested on ia64 that has both grow-up and grow-down segments - Linus ] Signed-off-by: Mikulas Patocka <[email protected]> Tested-by: Tony Luck <[email protected]> Cc: [email protected] Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09Merge branch 'for_linus' of ↵Linus Torvalds3-43/+150
git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86 * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: eeepc-laptop: Use ACPI handle to identify rfkill port [PATCH] sony-laptop: limit brightness range to DSDT provided ones sony-laptop: report failures on setting LCD brightness thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.
2011-05-09drm/i915/lvds: Only act on lid notify when the device is onAlex Williamson1-0/+3
If we're using vga switcheroo, the device may be turned off and poking it can return random state. This provokes an OOPS fixed separately by 8ff887c847 (drm/i915/dp: Be paranoid in case we disable a DP before it is attached). Trying to use and respond to events on a device that has been turned off by the user is in principle a silly thing to do. Signed-off-by: Alex Williamson <[email protected]> Signed-off-by: Chris Wilson <[email protected]> Cc: [email protected] Signed-off-by: Keith Packard <[email protected]>
2011-05-09drm/i915: fix intel_crtc_clock_get pipe reads after "cleanup cleanup"Chris Wilson1-2/+2
Despite the fixes in 548f245ba6a31 (drm/i915: fix per-pipe reads after "cleanup"), we missed one neighbouring read that was mistakenly replaced with the reg value in 9db4a9c (drm/i915: cleanup per-pipe reg usage). This was preventing us from correctly determining the mode the BIOS left the panel in for machines that neither have an OpRegion nor access to the VBT, (e.g. the EeePC 700). Signed-off-by: Chris Wilson <[email protected]> Cc: Jesse Barnes <[email protected]> Cc: [email protected] Reviewed-by: Jesse Barnes <[email protected]> Signed-off-by: Keith Packard <[email protected]>
2011-05-09drm/i915: Only enable the plane after setting the fb base (pre-ILK)Chris Wilson1-2/+0
When enabling the plane, it is helpful to have already pointed that plane to valid memory or else we may incur the wrath of a PGTBL_ER. This code preserved the behaviour from the bad old days for unknown reasons... Found by assert_fb_bound_for_plane(). References: https://bugs.freedesktop.org/show_bug.cgi?id=36246 Signed-off-by: Chris Wilson <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Jesse Barnes <[email protected]> Signed-off-by: Keith Packard <[email protected]>
2011-05-09Merge branch 'fix/asoc' of ↵Linus Torvalds2-11/+16
git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'fix/asoc' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: Fix CODEC DAI names for Goni ASoC: Fix CODEC name in Goni davinci-mcasp: fix _CBM_CFS pin directions davinci-mcasp: fix _CBM_CFS hw_params davinci-mcasp: use bitfield definitions for PDIR ASoC: davinci-mcasp: correct tdm_slots limit
2011-05-09Merge branch 'drm-fixes' of ↵Linus Torvalds7-13/+41
git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon/kms: add pci id to acer travelmate quirk for 5730 drm/radeon: fix order of doing things in radeon_crtc_cursor_set drm: mm: fix debug output drm/radeon/kms: ATPX switcheroo fixes drm/nouveau: Fix a crash at card takedown for NV40 and older cards
2011-05-09Merge branch 'hpfs'Linus Torvalds15-793/+730
* hpfs: HPFS: Remove unused variable HPFS: Move declaration up, so that there are no out-of-scope pointers HPFS: Fix some unaligned accesses HPFS: Fix endianity. Make hpfs work on big-endian machines HPFS: Implement fsync for hpfs HPFS: Fix a bug that filesystem was not marked dirty when remounting it HPFS: Restrict uid and gid to 16-bit values HPFS: When marking or clearing the dirty bit, sync the filesystem HPFS: Use types with defined width HPFS: Remove mark_inode_dirty HPFS: Remove CR/LF conversion option HPFS: Remove remaining locks HPFS: Introduce a global mutex and lock it on every callback from VFS. HPFS: Make HPFS compile on preempt and SMP
2011-05-09HPFS: Remove unused variableMikulas Patocka1-4/+0
Remove unused variable Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Move declaration up, so that there are no out-of-scope pointersMikulas Patocka1-1/+1
Move declaration up, so that there are no out-of-scope pointers Reported-by: Jesper Juhl <[email protected]> Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Fix some unaligned accessesMikulas Patocka3-24/+32
Fix some unaligned accesses Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Fix endianity. Make hpfs work on big-endian machinesMikulas Patocka11-418/+498
Fix endianity. Make hpfs work on big-endian machines. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Implement fsync for hpfsMikulas Patocka1-2/+2
Implement fsync for hpfs. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Fix a bug that filesystem was not marked dirty when remounting itMikulas Patocka1-8/+8
Fix a bug that filesystem was not marked dirty when remounting it Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Restrict uid and gid to 16-bit valuesMikulas Patocka1-0/+4
Restrict uid and gid to 16-bit values. HPFS stores only 2 bytes in the EAs. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: When marking or clearing the dirty bit, sync the filesystemMikulas Patocka1-0/+3
When marking or clearing the dirty bit, sync the filesystem Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Use types with defined widthMikulas Patocka1-112/+107
Use types with defined width Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Remove mark_inode_dirtyMikulas Patocka1-3/+0
Remove mark_inode_dirty HPFS doesn't use kernel's dirty inode indicator anyway because writing an inode requires directory's mutex. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Remove CR/LF conversion optionMikulas Patocka6-75/+7
Remove CR/LF conversion option It is unused anyway. It was used on 2.2 kernels or so. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Remove remaining locksMikulas Patocka9-155/+50
Remove remaining locks Because of a new global per-fs lock, no other locks are needed Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Introduce a global mutex and lock it on every callback from VFS.Mikulas Patocka4-18/+51
Introduce a global mutex and lock it on every callback from VFS. Performance doesn't matter, reviewing the whole code for locking correctness would be too complicated, so simply lock it all. Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09HPFS: Make HPFS compile on preempt and SMPMikulas Patocka2-6/+0
Make HPFS compile on preempt and SMP Signed-off-by: Mikulas Patocka <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
2011-05-09eeepc-laptop: Use ACPI handle to identify rfkill portMatthew Garrett1-16/+41
The ACPI notification we get from rfkill events on these machines gives us all the information we need to identify the port that's changed. Do so rather than assuming that it's always bus 1. Signed-off-by: Matthew Garrett <[email protected]>
2011-05-09[PATCH] sony-laptop: limit brightness range to DSDT provided onesMattia Dongili1-24/+103
The new style brightness control provides an operating range of 9 values (seems consistent over a large number of models sharing the same brightness control methods). Read and use the minimum and maximum values to limit the backlight interface between those boundaries. Signed-off-by: Mattia Dongili <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-09sony-laptop: report failures on setting LCD brightnessMattia Dongili1-2/+3
Check if we were successful in setting the requested brightness and report failure in that case. Signed-off-by: Mattia Dongili <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-09thinkpad-acpi: module autoloading for newer Lenovo ThinkPads.Manoj Iyer1-2/+4
The newer Lenovo ThinkPads have HKEY HID of LEN0068 instead of IBM0068. Added new HID so that thinkpad_acpi module will auto load on these newer Lenovo ThinkPads. Acked-by: Henrique de Moraes Holschuh <[email protected]> Cc: [email protected] Signed-off-by: Manoj Iyer <[email protected]> Signed-off-by: Andy Lutomirski <[email protected]> Signed-off-by: Matthew Garrett <[email protected]>
2011-05-09ARM: SAMSUNG: Convert irq-uart to generic irq chipThomas Gleixner1-71/+12
Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-09ARM: SAMSUNG: Convert irq-vic-timer to generic irq chipThomas Gleixner4-55/+29
Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-09ARM: SAMSUNG: S5P: Convert irq-gpioint to generic irq chipThomas Gleixner1-89/+27
Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Kukjin Kim <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-05-09drm/radeon/kms: add pci id to acer travelmate quirk for 5730Alex Deucher1-2/+2
Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=34082 Reported by: Sampo Laaksonen <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Cc: [email protected] Signed-off-by: Dave Airlie <[email protected]>
2011-05-09drm/radeon: fix order of doing things in radeon_crtc_cursor_setIlija Hadzic1-3/+3
if object pin or object lookup in radeon_cursor_set fail, the function could leave inconsistent mouse width and hight values in radeon_crtc fixed by moving cursor width and height assignments after all checks have passed Signed-off-by: Ilija Hadzic <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
2011-05-09drm: mm: fix debug outputDaniel Vetter2-4/+4
The looping helper didn't do anything due to a superficial semicolon. Furthermore one of the two dump functions suffered from copy&paste fail. While staring at the code I've also noticed that the replace helper (currently unused) is a bit broken. Signed-off-by: Daniel Vetter <[email protected]> Signed-off-by: Dave Airlie <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.