aboutsummaryrefslogtreecommitdiff
path: root/arch
AgeCommit message (Collapse)AuthorFilesLines
2012-07-30ARM: dma-mapping: fix error path for memory allocation failureMarek Szyprowski1-1/+1
This patch fixes incorrect check in error path. When the allocation of first page fails, the kernel ops appears due to accessing -1 element of the pages array. Reported-by: Sylwester Nawrocki <[email protected]> Signed-off-by: Marek Szyprowski <[email protected]>
2012-07-30ARM: dma-mapping: add more sanity checks in arm_dma_mmap()Marek Szyprowski1-4/+10
Add some sanity checks and forbid mmaping of buffers into vma areas larger than allocated dma buffer. Signed-off-by: Marek Szyprowski <[email protected]>
2012-07-30ARM: dma-mapping: remove custom consistent dma regionMarek Szyprowski3-321/+170
This patch changes dma-mapping subsystem to use generic vmalloc areas for all consistent dma allocations. This increases the total size limit of the consistent allocations and removes platform hacks and a lot of duplicated code. Atomic allocations are served from special pool preallocated on boot, because vmalloc areas cannot be reliably created in atomic context. Signed-off-by: Marek Szyprowski <[email protected]> Reviewed-by: Kyungmin Park <[email protected]> Reviewed-by: Minchan Kim <[email protected]>
2012-07-30s390: make use of user_mode() macro where possibleHeiko Carstens4-15/+15
We use the user_mode() helper already at several places but also have the open coded variant at other places. Convert the code to always use the helper function. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2012-07-30s390/mm: rename user_mode variable to addressing_modeHeiko Carstens6-14/+15
Fix name clash with user_mode() define which is also used in common code. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2012-07-30s390/mm: fix fault handling for page table walk caseHeiko Carstens1-6/+7
Make sure the kernel does not incorrectly create a SIGBUS signal during user space accesses: For user space accesses in the switched addressing mode case the kernel may walk page tables and access user address space via the kernel mapping. If a page table entry is invalid the function __handle_fault() gets called in order to emulate a page fault and trigger all the usual actions like paging in a missing page etc. by calling handle_mm_fault(). If handle_mm_fault() returns with an error fixup handling is necessary. For the switched addressing mode case all errors need to be mapped to -EFAULT, so that the calling uaccess function can return -EFAULT to user space. Unfortunately the __handle_fault() incorrectly calls do_sigbus() if VM_FAULT_SIGBUS is set. This however should only happen if a page fault was triggered by a user space instruction. For kernel mode uaccesses the correct action is to only return -EFAULT. So user space may incorrectly see SIGBUS signals because of this bug. For current machines this would only be possible for the switched addressing mode case in conjunction with futex operations. Cc: [email protected] Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2012-07-30s390/mm: make page faults killableHeiko Carstens1-1/+11
This is the s390 variant of 37b23e05 "x86,mm: make pagefault killable". Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Martin Schwidefsky <[email protected]>
2012-07-29Merge branch 'devel'Mauro Carvalho Chehab1-0/+12
* devel: (33 commits) edac i5000, i5400: fix pointer math in i5000_get_mc_regs() edac: allow specifying the error count with fake_inject edac: add support for Calxeda highbank L2 cache ecc edac: add support for Calxeda highbank memory controller edac: create top-level debugfs directory sb_edac: properly handle error count i7core_edac: properly handle error count edac: edac_mc_handle_error(): add an error_count parameter edac: remove arch-specific parameter for the error handler amd64_edac: Don't pass driver name as an error parameter edac_mc: check for allocation failure in edac_mc_alloc() edac: Increase version to 3.0.0 edac_mc: Cleanup per-dimm_info debug messages edac: Convert debugfX to edac_dbg(X, edac: Use more normal debugging macro style edac: Don't add __func__ or __FILE__ for debugf[0-9] msgs Edac: Add ABI Documentation for the new device nodes edac: move documentation ABI to ABI/testing/sysfs-devices-edac i7core_edac: change the mem allocation scheme to make Documentation/kobject.txt happy edac: change the mem allocation scheme to make Documentation/kobject.txt happy ...
2012-07-29ARM: 7465/1: Handle >4GB memory sizes in device tree and mem=size@start optionPeter Maydell2-5/+5
The memory regions which are passed to arm_add_memory() from device tree blobs via early_init_dt_add_memory_arch() can have sizes which are larger than will fit in a 32 bit integer, so switch to using a phys_addr_t to hold them, to avoid silently dropping the top 32 bits of the size. Similarly, use phys_addr_t in early_mem() so that mem=size@start command line options specifying more than 4GB behave sensibly. Acked-by: Will Deacon <[email protected]> Signed-off-by: Peter Maydell <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-29Merge branch 'marvell/dt' into late2/dtOlof Johansson38-581/+1342
* marvell/dt: (41 commits) ARM: Kirkwood: Replace mrvl with marvell ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT. ARM: Kirkwood: Describe Dreamplug LEDs in DT. ARM: Kirkwood: Describe iConnects LEDs in DT. ARM: Kirkwood: Describe iConnects temperature sensor in DT. ARM: Kirkwood: Describe IB62x0 LEDs in DT. ARM: Kirkwood: Describe IB62x0 gpio-keys in DT. ARM: Kirkwood: Describe DNS32? gpio-keys in DT. ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsi ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindings ARM: Kirkwood: Describe DNS325 temperature sensor in DT. ARM: Kirkwood: Use DT to configure SATA device. ARM: kirkwood: use devicetree for SPI on dreamplug ARM: kirkwood: Add LS-XHL and LS-CHLv2 support ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net ARM: Kirkwood: Add basic device tree support for QNAP TS219. ATA: sata_mv: Add device tree support ARM: Orion: DTify the watchdog timer. ARM: Orion: Add arch support needed for I2C via DT. ARM: kirkwood: use devicetree for orion-spi ...
2012-07-29new helper: done_path_create()Al Viro1-3/+1
releases what needs to be released after {kern,user}_path_create() Signed-off-by: Al Viro <[email protected]>
2012-07-29pull unlock+dput() out into do_spu_create()Al Viro2-16/+11
... and cleaning spufs_create() a bit, while we are at it Signed-off-by: Al Viro <[email protected]>
2012-07-29spufs: pull unlock-and-dput() up into spufs_create()Al Viro1-23/+10
Signed-off-by: Al Viro <[email protected]>
2012-07-29spufs_create_context(): simplify failure exitsAl Viro1-7/+1
Signed-off-by: Al Viro <[email protected]>
2012-07-29move spu_forget() into spufs_rmdir()Al Viro1-6/+5
now that __fput() is *not* done in any callchain containing mmput(), we can do that... Signed-off-by: Al Viro <[email protected]>
2012-07-29arm: da850: configure LCDC fifo thresholdManjunathappa, Prakash1-0/+1
Configure fifo threshold in raster dma_control register to 512 bytes. This reduces LCDC underflow errors. Signed-off-by: Manjunathappa, Prakash <[email protected]> Signed-off-by: Florian Tobias Schandinat <[email protected]>
2012-07-28ARM: mxc: Include missing irqs.h headerFabio Estevam1-0/+1
Include irqs.h in order to fix the following build error: arch/arm/plat-mxc/tzic.c:195:11: error: 'FIQ_START' undeclared (first use in this function) Signed-off-by: Fabio Estevam <[email protected]> Acked-by: Dirk Behme <[email protected]> Signed-off-by: Olof Johansson <[email protected]>
2012-07-28Merge branch 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linuxLinus Torvalds5-59/+10
Pull embedded i2c changes from Wolfram Sang: "Changes for the "embedded" part of the I2C subsystem: - lots of devicetree conversions of drivers (and preparations for that) - big cleanups for drivers for OMAP, Tegra, Nomadik, Blackfin - Rafael's struct dev_pm_ops conversion patches for I2C - usual driver cleanups and fixes All patches have been in linux-next for an apropriate time and all patches touching files outside of i2c-folders should have proper acks from the maintainers." * 'i2c-embedded/for-next' of git://git.pengutronix.de/git/wsa/linux: (60 commits) Revert "i2c: tegra: convert normal suspend/resume to *_noirq" I2C: MV64XYZ: Add Device Tree support i2c: stu300: use devm managed resources i2c: i2c-ocores: support for 16bit and 32bit IO V4L/DVB: mfd: use reg_shift instead of regstep i2c: i2c-ocores: Use reg-shift property i2c: i2c-ocores: DT bindings and minor fixes. i2c: mv64xxxx: remove EXPERIMENTAL tag i2c-s3c2410: Use plain pm_runtime_put() i2c: s3c2410: Fix pointer type passed to of_match_node() i2c: mxs: Set I2C timing registers for mxs-i2c i2c: i2c-bfin-twi: Move blackfin TWI register access Macro to head file. i2c: i2c-bfin-twi: Move TWI peripheral pin request array to platform data. i2c:i2c-bfin-twi: include twi head file i2c:i2c-bfin-twi: TWI fails to restart next transfer in high system load. i2c: i2c-bfin-twi: Tighten condition when failing I2C transfer if MEN bit is reset unexpectedly. i2c: i2c-bfin-twi: Break dead waiting loop if i2c device misbehaves. i2c: i2c-bfin-twi: Improve the patch for bug "Illegal i2c bus lock upon certain transfer scenarios". i2c: i2c-bfin-twi: Illegal i2c bus lock upon certain transfer scenarios. i2c-mv64xxxx: allow more than one driver instance ... Conflicts: drivers/i2c/busses/i2c-nomadik.c
2012-07-28um: set BLK_CGROUP=y in defconfigRichard Weinberger1-1/+1
BLK_CGROUP=m is no longer valid. Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28um: remove count_lockRichard Weinberger2-7/+0
this lock is no longer needed. Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28um: fully use tty_portRichard Weinberger4-78/+65
... use all tty_port helpers Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28um: Remove dead codeRichard Weinberger1-26/+0
Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28um: remove line_ioctl()Richard Weinberger4-90/+0
line_ioctl() has no real function. Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28TTY: um/line, use tty from tty_portJiri Slaby3-9/+21
This means switching to the tty refcounted model so that we will not race with interrupts. Signed-off-by: Jiri Slaby <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: [email protected] Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28TTY: um/line, add tty_portJiri Slaby2-4/+5
And use count from there. Signed-off-by: Jiri Slaby <[email protected]> Cc: Jeff Dike <[email protected]> Cc: Richard Weinberger <[email protected]> Cc: [email protected] Signed-off-by: Richard Weinberger <[email protected]>
2012-07-28ARM: 7475/1: sys_trace: allow all syscall arguments to be updated via ptraceWill Deacon1-1/+2
Prior to syscall invocation, __sys_trace only reloads r0-r3 from the kernel stack, preventing the debugger from updating arguments 5-7 when signalled via ptrace. This patch updates the code to reload r0-r6, updating arguments 5 and 6 on the stack (argument 7 is only used by OABI indirect syscalls and can remain in a register). Reported-by: Al Viro <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-28ARM: 7474/1: get rid of TIF_SYSCALL_RESTARTSYSAl Viro4-20/+10
just let do_work_pending() return 1 on normal local restarts and -1 on those that had been caused by ERESTART_RESTARTBLOCK (and 0 is still "all done, sod off to userland now"). And let the asm glue flip scno to restart_syscall(2) one if it got negative from us... [will: resolved conflicts with audit fixes] Signed-off-by: Al Viro <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-28ARM: 7473/1: deal with handlerless restarts without leaving the kernelAl Viro2-22/+35
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-28ARM: 7472/1: pull all work_pending logics into C functionAl Viro2-23/+21
Signed-off-by: Al Viro <[email protected]> Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-28ARM: 7471/1: Revert "7442/1: Revert "remove unused restart trampoline""Will Deacon3-17/+0
This reverts commit 3b0c06226783ffc836217eb34f7eca311b1e63f7. We no longer require the restart trampoline for syscall restarting. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-28ARM: 7470/1: Revert "7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK""Will Deacon3-29/+17
This reverts commit 433e2f307beff8adba241646ce9108544e0c5a03. Conflicts: arch/arm/kernel/ptrace.c Reintroduce the new syscall restart handling in preparation for further patches from Al Viro. Signed-off-by: Will Deacon <[email protected]> Signed-off-by: Russell King <[email protected]>
2012-07-27Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-armLinus Torvalds60-691/+897
Pull ARM updates from Russell King: "First ARM push of this merge window, post me coming back from holiday. This is what has been in linux-next for the last few weeks. Not much to say which isn't described by the commit summaries." * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (32 commits) ARM: 7463/1: topology: Update cpu_power according to DT information ARM: 7462/1: topology: factorize the update of sibling masks ARM: 7461/1: topology: Add arch_scale_freq_power function ARM: 7456/1: ptrace: provide separate functions for tracing syscall {entry,exit} ARM: 7455/1: audit: move syscall auditing until after ptrace SIGTRAP handling ARM: 7454/1: entry: don't bother with syscall tracing on ret_from_fork path ARM: 7453/1: audit: only allow syscall auditing for pure EABI userspace ARM: 7452/1: delay: allow timer-based delay implementation to be selected ARM: 7451/1: arch timer: implement read_current_timer and get_cycles ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs ARM: 7449/1: use generic strnlen_user and strncpy_from_user functions ARM: 7448/1: perf: remove arm_perf_pmu_ids global enumeration ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation ARM: 7445/1: mm: update CONTEXTIDR register to contain PID of current process ARM: 7444/1: kernel: add arch-timer C3STOP feature ARM: 7460/1: remove asm/locks.h ARM: 7439/1: head.S: simplify initial page table mapping ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE ARM: 7436/1: Do not map the vectors page as write-through on UP systems ...
2012-07-27Merge branches 'audit', 'delay', 'fixes', 'misc' and 'sta2x11' into for-linusRussell King60-691/+897
2012-07-27Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds11-189/+33
Pull final kmap_atomic cleanups from Cong Wang: "This should be the final round of cleanup, as the definitions of enum km_type finally get removed from the whole tree. The patches have been in linux-next for a long time." * 'kmap_atomic' of git://github.com/congwang/linux: pipe: remove KM_USER0 from comments vmalloc: remove KM_USER0 from comments feature-removal-schedule.txt: remove kmap_atomic(page, km_type) tile: remove km_type definitions um: remove km_type definitions asm-generic: remove km_type definitions avr32: remove km_type definitions frv: remove km_type definitions powerpc: remove km_type definitions arm: remove km_type definitions highmem: remove the deprecated form of kmap_atomic tile: remove usage of enum km_type frv: remove the second parameter of kmap_atomic_primary() jbd2: remove the second argument of kmap_atomic
2012-07-27Merge branch 'merge' of ↵Linus Torvalds7-124/+93
git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Pull powerpc fixes from Benjamin Herrenschmidt: "Here's a handful of powerpc patches, a couple of regression fixes for problems introduced in the main batch in this merge window, a couple of defconfig updates, and some trivials. The radeonfb one is something that was long standing in SLES which I forgot to pickup earlier." * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/ftrace: Trace function graph entry before updating index radeonfb: Add quirk for the graphics adapter in some JSxx powerpc: Lack of firmware flash support is not an error powerpc: Enable pseries hardware RNG and crypto modules powerpc: Update g5_defconfig powerpc/kvm/bookehv: Fix build regression powerpc: Set stack limit properly in crit_transfer_to_handler
2012-07-27ARM: Kirkwood: Replace mrvl with marvellAndrew Lunn6-6/+6
It has been decided to use marvell, not mrvl, in the compatibility property. Search & replace. Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe GoFlex Net LEDs and SATA in DT.Andrew Lunn2-84/+50
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Josh Coombs <[email protected]>
2012-07-27ARM: Kirkwood: Describe Dreamplug LEDs in DT.Andrew Lunn2-34/+16
Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe iConnects LEDs in DT.Andrew Lunn2-46/+34
Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe iConnects temperature sensor in DT.Andrew Lunn2-10/+8
Now that we have I2C support in DT, describe the LM63 in the DT file for the iConnect. Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe IB62x0 LEDs in DT.Andrew Lunn2-36/+17
Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: Kirkwood: Describe IB62x0 gpio-keys in DT.Andrew Lunn2-31/+16
Now that the GPIO controllers have been converted over to DT, described the gpio-keys in DT. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: Kirkwood: Describe DNS32? gpio-keys in DT.Jamie Lentin2-37/+21
Move description of GPIO keys on both the DNS320 and DNS325 into DT. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Move common portions into a kirkwood-dnskw.dtsiJamie Lentin3-82/+50
A lot of device setup is shared between DNS-320 and DNS-325, move the definitions into a common include. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Replace DNS-320/DNS-325 leds with dt bindingsJamie Lentin3-90/+50
Replace code in board-dnskw with the equivalent devicetree bindings. Signed-off-by: Jamie Lentin <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Describe DNS325 temperature sensor in DT.Andrew Lunn2-13/+10
Now that we have I2C support in DT, describe the LM75 in the DT file for the DNS325. Signed-off-by: Andrew Lunn <[email protected]> Signed-off-by: Jamie Lentin <[email protected]>
2012-07-27ARM: Kirkwood: Use DT to configure SATA device.Andrew Lunn9-20/+24
Convert boards using DT, but the old way of configuring SATA to now use properties in there DT file. Signed-off-by: Andrew Lunn <[email protected]> Tested-by: Simon Baatz <[email protected]>
2012-07-27ARM: kirkwood: use devicetree for SPI on dreamplugMichael Walle2-41/+29
Use the device tree for the SPI driver and partition layout. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: kirkwood: Add LS-XHL and LS-CHLv2 supportMichael Walle9-0/+291
Add support for Buffalo Linkstation LS-XHL and LS-CHLv2 using the device tree where possible. Signed-off-by: Michael Walle <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
2012-07-27ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex NetJosh Coombs7-0/+224
This patch supplies the necessary DTS and supporting files to boot up a Seagate GoFlex Net with 3.5.0-rc3. Signed-off-by: Joshua Coombs <[email protected]> Signed-off-by: Andrew Lunn <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.