summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-08-101-2/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block: (149 commits) block: make sure that REQ_* types are seen even with CONFIG_BLOCK=n xen-blkfront: fix missing out label blkdev: fix blkdev_issue_zeroout return value block: update request stacking methods to support discards block: fix missing export of blk_types.h writeback: fix bad _bh spinlock nesting drbd: revert "delay probes", feature is being re-implemented differently drbd: Initialize all members of sync_conf to their defaults [Bugz 315] drbd: Disable delay probes for the upcomming release writeback: cleanup bdi_register writeback: add new tracepoints writeback: remove unnecessary init_timer call writeback: optimize periodic bdi thread wakeups writeback: prevent unnecessary bdi threads wakeups writeback: move bdi threads exiting logic to the forker thread writeback: restructure bdi forker loop a little writeback: move last_active to bdi writeback: do not remove bdi from bdi_list writeback: simplify bdi code a little writeback: do not lose wake-ups in bdi threads ... Fixed up pretty trivial conflicts in drivers/block/virtio_blk.c and drivers/scsi/scsi_error.c as per Jens.
| * remove needless ISA_DMA_THRESHOLDFUJITA Tomonori2010-08-071-2/+0
| | | | | | | | | | | | | | | | | | Architectures don't need to define ISA_DMA_THRESHOLD anymore. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Acked-by: James Bottomley <James.Bottomley@suse.de> Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
* | tty: Add EXTPROC support for LINEMODEhyc@symas.com2010-08-102-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is against the 2.6.34 source. Paraphrased from the 1989 BSD patch by David Borman @ cray.com: These are the changes needed for the kernel to support LINEMODE in the server. There is a new bit in the termios local flag word, EXTPROC. When this bit is set, several aspects of the terminal driver are disabled. Input line editing, character echo, and mapping of signals are all disabled. This allows the telnetd to turn off these functions when in linemode, but still keep track of what state the user wants the terminal to be in. New ioctl: TIOCSIG Generate a signal to processes in the current process group of the pty. There is a new mode for packet driver, the TIOCPKT_IOCTL bit. When packet mode is turned on in the pty, and the EXTPROC bit is set, then whenever the state of the pty is changed, the next read on the master side of the pty will have the TIOCPKT_IOCTL bit set. This allows the process on the server side of the pty to know when the state of the terminal has changed; it can then issue the appropriate ioctl to retrieve the new state. Since the original BSD patches accompanied the source code for telnet I've left that reference here, but obviously the feature is useful for any remote terminal protocol, including ssh. The corresponding feature has existed in the BSD tty driver since 1989. For historical reference, a good copy of the relevant files can be found here: http://anonsvn.mit.edu/viewvc/krb5/trunk/src/appl/telnet/?pathrev=17741 Signed-off-by: Howard Chu <hyc@symas.com> Cc: Alan Cox <alan@lxorguk.ukuu.org.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | tty: remove remaining Hayes ESP ioctlsGreg Kroah-Hartman2010-08-101-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As Jeff Dike pointed out, the Hayes ESP driver was removed in commit f53a2ade0bb9f2a81f473e6469155172a96b7c38, so these ioctl definitions should also be removed. This cleans up the remaining arch-specific locations of this ioctl value. Thanks to Arnd for pointing these out. Cc: Jeff Dike <jdike@addtoit.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
* | Merge branch 'rs485fix' of git://www.jni.nu/crisLinus Torvalds2010-08-091-0/+1
|\ \ | | | | | | | | | | | | * 'rs485fix' of git://www.jni.nu/cris: CRIS: ioctl for getting RS485 information
| * | CRIS: ioctl for getting RS485 informationClaudio Scordino2010-08-091-0/+1
| |/ | | | | | | | | | | | | Add ioctl to CRIS serial driver to get RS485 data from user-space. Signed-off-by: Claudio Scordino <claudio@evidence.eu.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* | Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2010-08-0854-742/+857
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://www.jni.nu/cris: (51 commits) CRIS: Fix alignment problem for older ld CRIS: Always dump registers for segfaulting process. CRIS: Add config for pausing a seg-faulting process CRIS: Don't take faults while in_atomic CRIS: Fixup lookup for delay slot faults CRIS: Discard exit.text and .data at runtime CRIS: Add cache aligned and read mostly data sections CRIS: Return something from profile write CRIS: Add ARTPEC-3 and timestamps for sync-serial CRIS: Better ARTPEC-3 support for gpio CRIS: Add include guard CRIS: Better handling of pinmux settings CRIS: New DMA defines for ARTPEC-3 CRIS: __do_strncpy_from_user: Don't read the byte beyond the nil CRIS: Pagetable for ARTPEC-3 CRIS: Machine dependent memmap.h CRIS: Check if pointer is set before using it CRIS: Machine dependent dma.h CRIS: Define __read_mostly for CRISv32 CRIS: Discard .note.gnu.build-id section ...
| * | CRIS: Fix alignment problem for older ldJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | CRISv10 uses a pretty old ld, which does not allow ALIGN(0), (It becomes . = 0;) so instead we align to 1 byte. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Always dump registers for segfaulting process.Jesper Nilsson2010-08-041-0/+6
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add config for pausing a seg-faulting processJesper Nilsson2010-08-042-3/+16
| | | | | | | | | | | | | | | | | | | | | Put it on a wait queue, so we can attach gdb to the process to debug it instead of just killing it. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Don't take faults while in_atomicJesper Nilsson2010-08-041-8/+5
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Fixup lookup for delay slot faultsJesper Nilsson2010-08-041-1/+4
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Discard exit.text and .data at runtimeJesper Nilsson2010-08-041-0/+10
| | | | | | | | | | | | | | | | | | This allows us to handle references from __bug_table. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add cache aligned and read mostly data sectionsJesper Nilsson2010-08-041-0/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Return something from profile writeJesper Nilsson2010-08-041-8/+7
| | | | | | | | | | | | | | | | | | | | | Even if it doesn't matter, we should return something. Also, clean up some formatting. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add ARTPEC-3 and timestamps for sync-serialJesper Nilsson2010-08-041-1/+26
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better ARTPEC-3 support for gpioJesper Nilsson2010-08-041-18/+78
| | | | | | | | | | | | | | | | | | Add PWM support, correct comment for ARTPEC-3. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add include guardJesper Nilsson2010-08-041-0/+5
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better handling of pinmux settingsJesper Nilsson2010-08-041-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | Depending on eth, eth_mido and geth fields in wr_hwprot, don't set corresponding pins on gpio port b to gpio mode. This avoids re-resetting the ethernet PHY should this already have been done. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: New DMA defines for ARTPEC-3Jesper Nilsson2010-08-041-0/+27
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: __do_strncpy_from_user: Don't read the byte beyond the nilJesper Nilsson2010-08-041-4/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Pagetable for ARTPEC-3Jesper Nilsson2010-08-041-0/+8
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Machine dependent memmap.hJesper Nilsson2010-08-042-24/+25
| | | | | | | | | | | | | | | | | | | | | Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Check if pointer is set before using itJesper Nilsson2010-08-041-8/+12
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Machine dependent dma.hJesper Nilsson2010-08-042-79/+80
| | | | | | | | | | | | | | | | | | | | | Move the old one to mach-fs and replace with a new one that only include the correct one for the machine architecture. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Define __read_mostly for CRISv32Jesper Nilsson2010-08-041-0/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Discard .note.gnu.build-id sectionJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Avoid compilation warning for putsJesper Nilsson2010-08-041-40/+25
| | | | | | | | | | | | | | | | | | | | | Rename to aputs. Also, simplify code by moving some common code out to macros. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug for assembler macrosJesper Nilsson2010-08-041-0/+4
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Update for ARTPEC-3Jesper Nilsson2010-08-041-5/+18
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add more delays in DDR setupJesper Nilsson2010-08-043-1/+21
| | | | | | | | | | | | | | | | | | Also, make DDR latency configurable. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug info for assembler codeJesper Nilsson2010-08-041-0/+7
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug info for assembler codeJesper Nilsson2010-08-041-0/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug symbols for assembler codeJesper Nilsson2010-08-041-0/+3
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Minor formatting fix in traps.cJesper Nilsson2010-08-041-4/+2
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct auto-restart of syscallsJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Register number was incorrect in syscalls that go via the restartblock (e.g, poll). Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: More ARTPEC-3 support and i2c-boardinfo.Jesper Nilsson2010-08-041-8/+66
| | | | | | | | | | | | | | | | | | Add standard i2d-devices. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Remove obsolete pinmux.c, now machine dependent.Jesper Nilsson2010-08-041-229/+0
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: kgdb: Fix compilation errorsJesper Nilsson2010-08-041-8/+8
| | | | | | | | | | | | | | | | | | Paths were not correct and pack_hex_byte() takes two arguments. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct path for intr_vect.hJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Better irq mapping codeJesper Nilsson2010-08-041-25/+22
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: v32: Correct address for romfs in the imageJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | Is after __bss_start, not __vmlinux_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Additional mmu settings for ARTPEC-3Jesper Nilsson2010-08-041-2/+40
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Faster syscall entry for CRISv32.Jesper Nilsson2010-08-041-20/+17
| | | | | | | | | | | | | | | Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Simple insn reschedule to avoid interlocks.Jesper Nilsson2010-08-041-9/+9
| | | | | | | | | | | | | | | | | | | | | Brings down the CPI from ~1.5 to ~1.1. Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Add debug for assembler functionsJesper Nilsson2010-08-042-1/+29
| | | | | | | | | | | | | | | Signed-off-by: Edgar Iglesias <Edgar.Iglesias@axis.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Correct address of the romfs in boot imageJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | | | | | | | The romfs should land after __init_end Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Fasttimer: Remove obsolete ifdefJesper Nilsson2010-08-041-5/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Better link to rs485 in helpJesper Nilsson2010-08-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: Remove CVS tag.Jesper Nilsson2010-08-041-2/+1
| | | | | | | | | | | | Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
OpenPOWER on IntegriCloud