summaryrefslogtreecommitdiffstats
path: root/arch/cris
AgeCommit message (Collapse)AuthorFilesLines
2010-08-17Make do_execve() take a const filename pointerDavid Howells2-3/+7
Make do_execve() take a const filename pointer so that kernel_execve() compiles correctly on ARM: arch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of 'do_execve' discards qualifiers from pointer target type This also requires the argv and envp arguments to be consted twice, once for the pointer array and once for the strings the array points to. This is because do_execve() passes a pointer to the filename (now const) to copy_strings_kernel(). A simpler alternative would be to cast the filename pointer in do_execve() when it's passed to copy_strings_kernel(). do_execve() may not change any of the strings it is passed as part of the argv or envp lists as they are some of them in .rodata, so marking these strings as const should be fine. Further kernel_execve() and sys_execve() need to be changed to match. This has been test built on x86_64, frv, arm and mips. Signed-off-by: David Howells <dhowells@redhat.com> Tested-by: Ralf Baechle <ralf@linux-mips.org> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-08-14defconfig reductionSam Ravnborg4-2104/+5
Use the defconfig files generated by "make savedefconfig" for remaining defconfig files. Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2010-08-14archs: replace unifdef-y with header-ySam Ravnborg1-3/+2
unifdef-y and header-y have same semantic, so drop unifdef-y Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
2010-08-12Merge branch 'io_remap_pfn_range' of git://www.jni.nu/crisLinus Torvalds1-0/+3
* 'io_remap_pfn_range' of git://www.jni.nu/cris: CRIS: Define io_remap_pfn_range as remap_pfn_range
2010-08-12CRIS: Define io_remap_pfn_range as remap_pfn_rangeJesper Nilsson1-0/+3
CRIS don't need any special mapping for io, but didn't define this, meaning that all uses of io_remap_pfn_range lead to compile errors. This fixes a compile error introduced in CRIS when drivers/mtd/mtdchar.c mmap handling was changed in commit dd02b67d5e9e7896891fa27eb5db65f55a290998 Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-11dma-mapping: remove dma_is_consistent APIFUJITA Tomonori1-2/+0
Architectures implement dma_is_consistent() in different ways (some misinterpret the definition of API in DMA-API.txt). So it hasn't been so useful for drivers. We have only one user of the API in tree. Unlikely out-of-tree drivers use the API. Even if we fix dma_is_consistent() in some architectures, it doesn't look useful at all. It was invented long ago for some old systems that can't allocate coherent memory at all. It's better to export only APIs that are definitely necessary for drivers. Let's remove this API. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: James Bottomley <James.Bottomley@HansenPartnership.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-08-11dma-mapping: unify dma_get_cache_alignment implementationsFUJITA Tomonori1-6/+0
dma_get_cache_alignment returns the minimum DMA alignment. Architectures defines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we can unify dma_get_cache_alignment implementations. Note that some architectures implement dma_get_cache_alignment wrongly. dma_get_cache_alignment() should return the minimum DMA alignment. So fully-coherent architectures should return 1. This patch also fixes this issue. Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: <linux-arch@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-08-10Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds1-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.
2010-08-10tty: Add EXTPROC support for LINEMODEhyc@symas.com2-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>
2010-08-10tty: remove remaining Hayes ESP ioctlsGreg Kroah-Hartman1-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>
2010-08-09Merge branch 'rs485fix' of git://www.jni.nu/crisLinus Torvalds1-0/+1
* 'rs485fix' of git://www.jni.nu/cris: CRIS: ioctl for getting RS485 information
2010-08-09CRIS: ioctl for getting RS485 informationClaudio Scordino1-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>
2010-08-08Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds54-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 ...
2010-08-07remove needless ISA_DMA_THRESHOLDFUJITA Tomonori1-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>
2010-08-06Merge branch 'timers-timekeeping-for-linus' of ↵Linus Torvalds1-3/+0
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'timers-timekeeping-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: um: Fix read_persistent_clock fallout kgdb: Do not access xtime directly powerpc: Clean up obsolete code relating to decrementer and timebase powerpc: Rework VDSO gettimeofday to prevent time going backwards clocksource: Add __clocksource_updatefreq_hz/khz methods x86: Convert common clocksources to use clocksource_register_hz/khz timekeeping: Make xtime and wall_to_monotonic static hrtimer: Cleanup direct access to wall_to_monotonic um: Convert to use read_persistent_clock timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset powerpc: Cleanup xtime usage powerpc: Simplify update_vsyscall time: Kill off CONFIG_GENERIC_TIME time: Implement timespec_add x86: Fix vtime/file timestamp inconsistencies Trivial conflicts in Documentation/feature-removal-schedule.txt Much less trivial conflicts in arch/powerpc/kernel/time.c resolved as per Thomas' earlier merge commit 47916be4e28c ("Merge branch 'powerpc.cherry-picks' into timers/clocksource")
2010-08-06Merge branch 'perf-core-for-linus' of ↵Linus Torvalds1-0/+1
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits) tracing/kprobes: unregister_trace_probe needs to be called under mutex perf: expose event__process function perf events: Fix mmap offset determination perf, powerpc: fsl_emb: Restore setting perf_sample_data.period perf, powerpc: Convert the FSL driver to use local64_t perf tools: Don't keep unreferenced maps when unmaps are detected perf session: Invalidate last_match when removing threads from rb_tree perf session: Free the ref_reloc_sym memory at the right place x86,mmiotrace: Add support for tracing STOS instruction perf, sched migration: Librarize task states and event headers helpers perf, sched migration: Librarize the GUI class perf, sched migration: Make the GUI class client agnostic perf, sched migration: Make it vertically scrollable perf, sched migration: Parameterize cpu height and spacing perf, sched migration: Fix key bindings perf, sched migration: Ignore unhandled task states perf, sched migration: Handle ignored migrate out events perf: New migration tool overview tracing: Drop cpparg() macro perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call ... Fix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c
2010-08-04CRIS: Fix alignment problem for older ldJesper Nilsson1-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>
2010-08-04CRIS: Always dump registers for segfaulting process.Jesper Nilsson1-0/+6
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add config for pausing a seg-faulting processJesper Nilsson2-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>
2010-08-04CRIS: Don't take faults while in_atomicJesper Nilsson1-8/+5
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Fixup lookup for delay slot faultsJesper Nilsson1-1/+4
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Discard exit.text and .data at runtimeJesper Nilsson1-0/+10
This allows us to handle references from __bug_table. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add cache aligned and read mostly data sectionsJesper Nilsson1-0/+2
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Return something from profile writeJesper Nilsson1-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>
2010-08-04CRIS: Add ARTPEC-3 and timestamps for sync-serialJesper Nilsson1-1/+26
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Better ARTPEC-3 support for gpioJesper Nilsson1-18/+78
Add PWM support, correct comment for ARTPEC-3. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add include guardJesper Nilsson1-0/+5
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Better handling of pinmux settingsJesper Nilsson1-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>
2010-08-04CRIS: New DMA defines for ARTPEC-3Jesper Nilsson1-0/+27
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: __do_strncpy_from_user: Don't read the byte beyond the nilJesper Nilsson1-4/+3
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Pagetable for ARTPEC-3Jesper Nilsson1-0/+8
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Machine dependent memmap.hJesper Nilsson2-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>
2010-08-04CRIS: Check if pointer is set before using itJesper Nilsson1-8/+12
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Machine dependent dma.hJesper Nilsson2-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>
2010-08-04CRIS: Define __read_mostly for CRISv32Jesper Nilsson1-0/+2
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Discard .note.gnu.build-id sectionJesper Nilsson1-1/+1
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Avoid compilation warning for putsJesper Nilsson1-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>
2010-08-04CRIS: Add debug for assembler macrosJesper Nilsson1-0/+4
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Update for ARTPEC-3Jesper Nilsson1-5/+18
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add more delays in DDR setupJesper Nilsson3-1/+21
Also, make DDR latency configurable. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add debug info for assembler codeJesper Nilsson1-0/+7
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add debug info for assembler codeJesper Nilsson1-0/+3
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Add debug symbols for assembler codeJesper Nilsson1-0/+3
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Minor formatting fix in traps.cJesper Nilsson1-4/+2
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: v32: Correct auto-restart of syscallsJesper Nilsson1-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>
2010-08-04CRIS: More ARTPEC-3 support and i2c-boardinfo.Jesper Nilsson1-8/+66
Add standard i2d-devices. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: Remove obsolete pinmux.c, now machine dependent.Jesper Nilsson1-229/+0
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: kgdb: Fix compilation errorsJesper Nilsson1-8/+8
Paths were not correct and pack_hex_byte() takes two arguments. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: v32: Correct path for intr_vect.hJesper Nilsson1-1/+1
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
2010-08-04CRIS: v32: Better irq mapping codeJesper Nilsson1-25/+22
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-07 10:38:51 +0000