aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2010-10-20Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6Linus Torvalds2-3/+3
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6: [SCSI] bsg: fix incorrect device_status value [SCSI] Fix VPD inquiry page wrapper
2010-10-20x86, mm: Fix incorrect data type in vmalloc_sync_all()Borislav Petkov1-1/+1
arch/x86/mm/fault.c: In function 'vmalloc_sync_all': arch/x86/mm/fault.c:238: warning: assignment makes integer from pointer without a cast introduced by 617d34d9e5d8326ec8f188c616aa06ac59d083fe. Signed-off-by: Borislav Petkov <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-10-20spi/omap2_mcspi: Verify TX reg is empty after TX only xfer with DMAIlkka Koskinen1-13/+26
In case of TX only with DMA, the driver assumes that the data has been transferred once DMA callback in invoked. However, SPI's shift register may still contain data. Thus, the driver is supposed to verify that the register is empty and the end of the SPI transfer has been reached. Signed-off-by: Ilkka Koskinen <[email protected]> Tested-by: Tuomas Katila <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-10-20spi/omap2_mcspi: disable channel after TX_ONLY transfer in PIO modeJason Wang1-0/+6
In the TX_ONLY transfer, the SPI controller also receives data simultaneously and saves them in the rx register. After the TX_ONLY transfer, the rx register will hold the random data received during the last tx transaction. If the direct following transfer is RX_ONLY, this random data has the possibility to affect this transfer like this: When the SPI controller is changed from TX_ONLY to RX_ONLY, the random data makes the rx register full immediately and triggers a dummy write automatically(in SPI RX_ONLY transfers, we need a dummy write to trigger the first transaction). So the first data received in the RX_ONLY transfer will be that random data instead of something meaningful. We can avoid this by inserting a Disable/Re-enable toggle of the channel after the TX_ONLY transfer, since it purges the rx register. Signed-off-by: Jason Wang <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]> Acked-by: Tony Lindgren <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2010-10-20Merge branch 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvmLinus Torvalds3-44/+19
* 'kvm-updates/2.6.36' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: Fix fs/gs reload oops with invalid ldt
2010-10-20arm: remove machine_desc.io_pg_offst and .phys_ioNicolas Pitre361-852/+1
Since we're now using addruart to establish the debug mapping, we can remove the io_pg_offst and phys_io members of struct machine_desc. The various declarations were removed using the following script: grep -rl MACHINE_START arch/arm | xargs \ sed -i '/MACHINE_START/,/MACHINE_END/ { /\.\(phys_io\|io_pg_offst\)/d }' [ Initial patch was from Jeremy Kerr, example script from Russell King ] Signed-off-by: Nicolas Pitre <[email protected]> Acked-by: Eric Miao <eric.miao at canonical.com>
2010-10-20arm: use addruart macro to establish debug mappingsJeremy Kerr1-4/+19
Since we can get both physical and virtual addresses from the addruart macro, we can use this to establish the debug mappings. In the case of CONFIG_DEBUG_ICEDCC, we don't need any mappings, but may still need to setup r7 correctly. Incorporating ASM changes from Nicolas Pitre <[email protected]>. Signed-off-by: Jeremy Kerr <[email protected]> Tested-by: Kevin Hilman <[email protected]>
2010-10-20arm: return both physical and virtual addresses from addruartJeremy Kerr56-454/+440
Rather than checking the MMU status in every instance of addruart, do it once in kernel/debug.S, and change the existing addruart macros to return both physical and virtual addresses. The main debug code can then select the appropriate address to use. This will also allow us to retreive the address of a uart for the MMU state that we're not current in. Updated with fixes for OMAP from Jason Wang <[email protected]> and Tony Lindgren <[email protected]>, and fix for versatile express from Lorenzo Pieralisi <[email protected]>. Signed-off-by: Jeremy Kerr <[email protected]> Signed-off-by: Lorenzo Pieralisi <[email protected]> Signed-off-by: Jason Wang <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> Tested-by: Kevin Hilman <[email protected]>
2010-10-20arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCCJeremy Kerr1-11/+2
We have the same (empty) macro for all IDEDCC flavours, so consolidate it to one. Signed-off-by: Jeremy Kerr <[email protected]>
2010-10-20ARM: make struct machine_desc definition coherent with its commentNicolas Pitre1-1/+2
As mentioned in the comment right at the top, the first four fields are directly accessed by assembly code in head.S. Move nr_irqs so the comment is true again. Signed-off-by: Nicolas Pitre <[email protected]>
2010-10-20apic, x86: Use BIOS settings for IBS and MCE threshold interrupt LVT offsetsRobert Richter4-41/+154
We want the BIOS to setup the EILVT APIC registers. The offsets were hardcoded and BIOS settings were overwritten by the OS. Now, the subsystems for MCE threshold and IBS determine the LVT offset from the registers the BIOS has setup. If the BIOS setup is buggy on a family 10h system, a workaround enables IBS. If the OS determines an invalid register setup, a "[Firmware Bug]: " error message is reported. We need this change also for upcomming cpu families. Signed-off-by: Robert Richter <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2010-10-20apic, x86: Check if EILVT APIC registers are available (AMD only)Robert Richter2-9/+75
This patch implements checks for the availability of LVT entries (APIC500-530) and reserves it if used. The check becomes necessary since we want to let the BIOS provide the LVT offsets. The offsets should be determined by the subsystems using it like those for MCE threshold or IBS. On K8 only offset 0 (APIC500) and MCE interrupts are supported. Beginning with family 10h at least 4 offsets are available. Since offsets must be consistent for all cores, we keep track of the LVT offsets in software and reserve the offset for the same vector also to be used on other cores. An offset is freed by setting the entry to APIC_EILVT_MASKED. If the BIOS is right, there should be no conflicts. Otherwise a "[Firmware Bug]: ..." error message is generated. However, if software does not properly determines the offsets, it is not necessarily a BIOS bug. Signed-off-by: Robert Richter <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
2010-10-20Merge branch 'linus' into irq/coreIngo Molnar331-1493/+2628
Merge reason: update to almost-final-.36 Signed-off-by: Ingo Molnar <[email protected]>
2010-10-19PM / Wakeup: Show wakeup sources statistics in debugfsRafael J. Wysocki1-0/+85
There may be wakeup sources that aren't associated with any devices and their statistics information won't be available from sysfs. Also, for debugging purposes it is convenient to have all of the wakeup sources statistics available from one place. For these reasons, introduce new file "wakeup_sources" in debugfs containing those statistics. Signed-off-by: Rafael J. Wysocki <[email protected]> Acked-by: Greg Kroah-Hartman <[email protected]>
2010-10-19Merge branch 'devel-stable' into develRussell King685-5907/+21747
2010-10-19Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into ↵Russell King33-190/+1101
devel-stable
2010-10-19x86, mm: Hold mm->page_table_lock while doing vmalloc_syncJeremy Fitzhardinge4-4/+36
Take mm->page_table_lock while syncing the vmalloc region. This prevents a race with the Xen pagetable pin/unpin code, which expects that the page_table_lock is already held. If this race occurs, then Xen can see an inconsistent page type (a page can either be read/write or a pagetable page, and pin/unpin converts it between them), which will cause either the pin or the set_p[gm]d to fail; either will crash the kernel. vmalloc_sync_all() should be called rarely, so this extra use of page_table_lock should not interfere with its normal users. The mm pointer is stashed in the pgd page's index field, as that won't be otherwise used for pgds. Reported-by: Ian Campbell <[email protected]> Originally-by: Jan Beulich <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Jeremy Fitzhardinge <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-10-19x86, mm: Fix bogus whitespace in sync_global_pgds()Jeremy Fitzhardinge1-22/+22
Whitespace cleanup only. Signed-off-by: Jeremy Fitzhardinge <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
2010-10-19Merge branch 'for-rmk' of ↵Russell King244-2950/+5277
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable Conflicts: arch/arm/mach-at91/include/mach/system.h arch/arm/mach-imx/mach-cpuimx27.c AT91 conflict resolution: Acked-by: Anders Larsen <[email protected]> IMX conflict resolution confirmed by Uwe Kleine-König.
2010-10-19Merge branch 'msm-core' of ↵Russell King42-250/+5977
git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
2010-10-19Merge branch 'tip/perf/core' of ↵Ingo Molnar6-131/+373
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core
2010-10-19MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.Michel Thebeau2-6/+6
[Ralf: Michel's original patch only fixed N32; I replicated the same fix for O32.] Signed-off-by: Michel Thebeau <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Ralf Baechle <[email protected]>
2010-10-19MAINTAINERS: Change list for ioc_serial to linux-serial.Ralf Baechle1-1/+1
IOC3 is also being used on SGI MIPS systems but this particular driver is only being used on IA64 systems so linux-mips made no sense as a list. Pat also thinks [email protected] is the better list. Signed-off-by: Ralf Baechle <[email protected]>
2010-10-19SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failureJulia Lawall1-0/+1
In this code, 0 is returned on memory allocation failure, even though other failures return -ENOMEM or other similar values. A simplified version of the semantic match that finds this problem is as follows: (http://coccinelle.lip6.fr/) // <smpl> @@ expression ret; expression x,e1,e2,e3; @@ ret = 0 ... when != ret = e1 *x = \(kmalloc\|kcalloc\|kzalloc\)(...) ... when != ret = e2 if (x == NULL) { ... when != ret = e3 return ret; } // </smpl> Signed-off-by: Julia Lawall <[email protected]> To: Pat Gefre <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Patchwork: https://patchwork.linux-mips.org/patch/1704/ Signed-off-by: Ralf Baechle <[email protected]>
2010-10-19MIPS: jz4740: Fix Kbuild Platform file.David Daney1-1/+1
The platform specific files should be included via the platform-y variable. Signed-off-by: David Daney <[email protected]> Cc: Lars-Peter Clausen <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/1719/ Signed-off-by: Ralf Baechle <[email protected]>
2010-10-19MIPS: Repair Kbuild make clean breakage.David Daney2-1/+5
When running make clean, Kbuild doesn't process the .config file, so nothing generates a platform-y variable. We can get it to descend into the platform directories by setting $(obj-). The dec Platform file was unconditionally setting platform-, obliterating its previous contents and preventing some directories from being cleaned. This is change to an append operation '+=' to allow cavium-octeon to be cleaned. Signed-off-by: David Daney <[email protected]> Cc: Sam Ravnborg <[email protected]> Patchwork: https://patchwork.linux-mips.org/patch/1718/ Signed-off-by: Ralf Baechle <[email protected]>
2010-10-19Merge branch 'drm-fixes' of ↵Linus Torvalds1-16/+12
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: avivo cursor workaround applies to evergreen as well
2010-10-19eukrea_mbimxsd-baseboard: Pass the correct GPIO to gpio_freeFabio Estevam1-1/+1
Pass the correct GPIO to gpio_free Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Eric Bénard <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2010-10-19cpuimx27: fix compile when ULPI is selectedEric Bénard1-0/+1
without this patch we get : arch/arm/mach-imx/built-in.o: In function `eukrea_cpuimx27_init': eukrea_mbimx27-baseboard.c:(.init.text+0x44c): undefined reference to `mxc_ulpi_access_ops' Signed-off-by: Eric Bénard <[email protected]> Signed-off-by: Uwe Kleine-König <[email protected]>
2010-10-19mach-pcm037_eet: fix compile errorsEric Bénard1-1/+2
this patch fix the following errors : arch/arm/mach-mx3/mach-pcm037_eet.c:62: error: implicit declaration of function 'MXC_SPI_CS' arch/arm/mach-mx3/mach-pcm037_eet.c:185: error: implicit declaration of function 'imx35_add_spi_imx0' from the Kconfig pcm037 is i.MX31 based and not i.MX35 so replace imx35_add_spi_imx0 by imx31_add_spi_imx0 Signed-off-by: Eric Bénard <[email protected]> [ukl: remove unneeded #include <mach/spi.h>] Signed-off-by: Uwe Kleine-König <[email protected]>
2010-10-19Fixing ethernet driver compilation error for i.MX31 ADS boardIan Lartey2-6/+34
This is only a partial revert of "ARM: mx3/mx31ads: fold board header in its only user" [commit ccfa7c269843001077df02d98918c6c9bde91395)] As some of the the board defines are also used in the cs89x0 ethernet driver by the i.MX31 ADS. Signed-off-by: Ian Lartey <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2010-10-19cpuimx51: update board supportEric Bénard3-1/+34
add NAND, SDHC Signed-off-by: Eric Bénard <[email protected]>
2010-10-19mx5: add cpuimx51sd module and its baseboardEric Bénard6-1/+531
Signed-off-by: Eric Bénard <[email protected]>
2010-10-19iomux-mx51: fix GPIO_1_xx 's IOMUX configurationEric Bénard1-10/+10
this patch really configure the GPIO in GPIO mode. Signed-off-by: Eric Bénard <[email protected]>
2010-10-19imx-esdhc: update devices registrationEric Bénard11-45/+80
Tested on i.MX25 and i.MX35 and i.MX51 Signed-off-by: Eric Bénard <[email protected]>
2010-10-19mx51: add resources for SD/MMC on i.MX51Eric Bénard2-0/+113
the attached patch allows SD to work on i.MX51 with Wolfram's drivers Tested on i.MX51. Based on original patch from: Richard Zhu <[email protected]> Signed-off-by: Eric Bénard <[email protected]>
2010-10-19iomux-mx51: fix SD1 and SD2's iomux configurationEric Bénard1-12/+27
Based on original patch from: Richard Zhu <[email protected]> Signed-off-by: Eric Bénard <[email protected]>
2010-10-19clock-mx51: rename CLOCK1 to CLOCK_CCGR for better readabilityEric Bénard1-2/+2
Signed-off-by: Eric Bénard <[email protected]>
2010-10-19clock-mx51: factorize clk_set_parent and clk_get_rateEric Bénard1-94/+48
Signed-off-by: Eric Bénard <[email protected]>
2010-10-19eukrea_mbimxsd: add support for DVI displaysEric Bénard2-2/+68
Signed-off-by: Eric Bénard <[email protected]>
2010-10-19cpuimx25 & cpuimx35: fix OTG port registration in host modeEric Bénard2-20/+8
the PHY is UTMI so don't create an ULPI viewpoint. Signed-off-by: Eric Bénard <[email protected]>
2010-10-19i.MX31 and i.MX35 : fix errate TLSbo65953 and ENGcm09472Eric Bénard1-3/+29
Without this exiting WFI can result in cache corruption. Code taken from Freescale's 2.6.27 BSP and tested on i.MX35 Signed-off-by: Eric Bénard <[email protected]>
2010-10-19mx25: fix compile error in platform-imx-dma.cEric Bénard1-0/+2
this patch fix the following errors : arch/arm/plat-mxc/devices/platform-imx-dma.c:44: error: ‘MX25_SDMA_BASE_ADDR’ undeclared here (not in a function) arch/arm/plat-mxc/devices/platform-imx-dma.c:44: error: ‘MX25_INT_SDMA’ undeclared here (not in a function) Signed-off-by: Eric Bénard <[email protected]> Acked-by: Uwe Kleine-König <[email protected]>
2010-10-19mx25: fix clock's calculationEric Bénard1-3/+3
* get_rate_arm : when 400MHz clock is selected (cctl & 1<<14), ARM clock is 400MHz (MPLL * 3 / 4) and not 800MHz * get_rate_per : peripherals's clock is derived from AHB and not from IPG (ref manual : figure 5-1) * can2_clk : use the correct ID * without this patch, peripherals getting their clock from PER clocks work fine because of the 2 errors which fix themselves (ARM clock x 2 and per clock actually based on IPG which is AHB/2) but flexcan can't work as it gets its clock from IPG and thus calculates its bitrate using a reference value which is twice what it really is. Signed-off-by: Eric Bénard <[email protected]>
2010-10-19ARM: imx: add lost 3rd imx-i2c device for mx35Marc Kleine-Budde1-0/+1
During the reorganisation of the imx-i2c devices (in 64de5ec168d9743903e6ec482c3e9f37af49f9c1) the 3rd imx-i2c device for the mx35 got lost. This patch adds the missing device. Signed-off-by: Marc Kleine-Budde <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2010-10-19ARM: imx: Add iram allocator functionsDinh Nguyen4-0/+119
Add IRAM(Internal RAM) allocation functions using GENERIC_ALLOCATOR. The allocation size is 4KB multiples to guarantee alignment. The idea for these functions is for i.MX platforms to use them to dynamically allocate IRAM usage. Applies on 2.6.36-rc7 Signed-off-by: Dinh Nguyen <[email protected]> Reviewed-by: Amit Kucheria <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Signed-off-by: Sascha Hauer <[email protected]>
2010-10-19KVM: Fix fs/gs reload oops with invalid ldtAvi Kivity3-44/+19
kvm reloads the host's fs and gs blindly, however the underlying segment descriptors may be invalid due to the user modifying the ldt after loading them. Fix by using the safe accessors (loadsegment() and load_gs_index()) instead of home grown unsafe versions. This is CVE-2010-3698. KVM-Stable-Tag. Signed-off-by: Avi Kivity <[email protected]> Signed-off-by: Marcelo Tosatti <[email protected]>
2010-10-19tracing: Fix compile issue for trace_sched_wakeup.cSteven Rostedt1-2/+1
The function start_func_tracer() was incorrectly added in the #ifdef CONFIG_FUNCTION_TRACER condition, but is still used even when function tracing is not enabled. The calls to register_ftrace_function() and register_ftrace_graph() become nops (and their arguments are even ignored), thus there is no reason to hide start_func_tracer() when function tracing is not enabled. Reported-by: Ingo Molnar <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
2010-10-19[S390] hardirq: remove pointless header file includesHeiko Carstens1-4/+0
Remove a couple of pointless header file includes. Fixes a compile bug caused by header file include dependencies with "irq: Add tracepoint to softirq_raise" within linux-next. Reported-by: Sachin Sant <[email protected]> Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]> [ cherry-picked from the s390 tree to fix "2bf2160: irq: Add tracepoint to softirq_raise" ] Signed-off-by: Ingo Molnar <[email protected]>
2010-10-19[IA64] Move local_softirq_pending() definitionTony Luck1-6/+5
Ugly #include dependencies. We need to have local_softirq_pending() defined before it gets used in <linux/interrupt.h>. But <asm/hardirq.h> provides the definition *after* this #include chain: <linux/irq.h> <asm/irq.h> <asm/hw_irq.h> <linux/interrupt.h> Signed-off-by: Tony Luck <[email protected]> [ cherry-picked from the ia64 tree to fix "2bf2160: irq: Add tracepoint to softirq_raise" ] Signed-off-by: Ingo Molnar <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.