summaryrefslogtreecommitdiffstats
path: root/arch/cris
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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>
| * | CRIS: v10: remove all BKL usageJesper Nilsson2010-08-041-26/+13
| | | | | | | | | | | | | | | | | | | | | We don't need to take the BKL here. Also fixes compile error after last commit (smp_lock.h was not included) Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | CRIS: gpio: don't call copy_to_user()/copy_from_user() while holding spinlocksJesper Nilsson2010-08-041-32/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copy_to_user()/copy_from_user() must not be used with spinlocks held. Move locks inside each case so we have better control of when the locks are held. Also, since we use spinlocks, we don't need to hold the BKL, so remove it. Reported-by: Kulikov Vasiliy <segooon@gmail.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | arch/cris: Remove unnecessary casts of private_dataJoe Perches2010-08-041-5/+5
| | | | | | | | | | | | | | | Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | cris: autoconvert trivial BKL users to private mutexJesper Nilsson2010-08-044-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All these files use the big kernel lock in a trivial way to serialize their private file operations, typically resulting from an earlier semi-automatic pushdown from VFS. None of these drivers appears to want to lock against other code, and they all use the BKL as the top-level lock in their file operations, meaning that there is no lock-order inversion problem. Consequently, we can remove the BKL completely, replacing it with a per-file mutex in every case. Using a scripted approach means we can avoid typos. file=$1 name=$2 if grep -q lock_kernel ${file} ; then if grep -q 'include.*linux.mutex.h' ${file} ; then sed -i '/include.*<linux\/smp_lock.h>/d' ${file} else sed -i 's/include.*<linux\/smp_lock.h>.*$/include <linux\/mutex.h>/g' ${file} fi sed -i ${file} \ -e "/^#include.*linux.mutex.h/,$ { 1,/^\(static\|int\|long\)/ { /^\(static\|int\|long\)/istatic DEFINE_MUTEX(${name}_mutex); } }" \ -e "s/\(un\)*lock_kernel\>[ ]*()/mutex_\1lock(\&${name}_mutex)/g" \ -e '/[ ]*cycle_kernel_lock();/d' else sed -i -e '/include.*\<smp_lock.h\>/d' ${file} \ -e '/cycle_kernel_lock()/d' fi Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | cris: Pushdown the bkl from ioctlJesper Nilsson2010-08-047-61/+137
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From: Frederic Weisbecker <fweisbec@gmail.com> Pushdown the bkl to the remaining drivers using the deprecated .ioctl. Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: John Kacur <jkacur@redhat.com>
| * | CRIS: invoke oom-killer from page faultJesper Nilsson2010-08-041-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As explained in commit 1c0fe6e3bd, we want to call the architecture independent oom killer when getting an unexplained OOM from handle_mm_fault, rather than simply killing current. Signed-off-by: Nick Piggin <npiggin@suse.de> Acked-by: David Rientjes <rientjes@google.com> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Mikael Starvik <starvik@axis.com>
| * | CRIS: GENERIC_TIME fixesJesper Nilsson2010-08-044-106/+45
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GENERIC_TIME was not functional for CRIS, giving random backward time jumps. For CRISv32 implement a new clocksource using the free running counter and ditch the arch_gettimeoffset. The random time jumps still existed, but turned out to be the write_seqlock which was missing around our do_timer() call. So switch over to GENERIC_TIME using the clocksource for CRISv32. CRISv10 doesn't have the free running counter needed for the clocksource trick, but we can still use GENERIC_TIME with arch_gettimeoffset. Unfortunately, there were problems in using the prescaler register to timer0 for the gettimeoffset calculation, so it is now ignored, making our resolution worse by the tune of 40usec (0.4%) worst case. At the same time, clean up some formatting and use NSEC_PER_SEC instead of 1000000000. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
* | Merge branch 'timers-timekeeping-for-linus' of ↵Linus Torvalds2010-08-061-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")
| * | time: Kill off CONFIG_GENERIC_TIMEJohn Stultz2010-07-271-3/+0
| |/ | | | | | | | | | | | | | | | | | | Now that all arches have been converted over to use generic time via clocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME config option and simplify the generic code. Signed-off-by: John Stultz <johnstul@us.ibm.com> LKML-Reference: <1279068988-21864-4-git-send-email-johnstul@us.ibm.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
* | Merge branch 'perf-core-for-linus' of ↵Linus Torvalds2010-08-061-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
| * \ Merge commit 'v2.6.35-rc3' into perf/coreIngo Molnar2010-06-1814-90/+97
| |\ \ | | |/ | | | | | | Merge reason: Go from -rc1 base to -rc3 base, merge in fixes.
| * | arch: Implement local64_tPeter Zijlstra2010-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On 64bit, local_t is of size long, and thus we make local64_t an alias. On 32bit, we fall back to atomic64_t. (architecture can provide optimized 32-bit version) (This new facility is to be used by perf events optimizations.) Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: linux-arch@vger.kernel.org Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> LKML-Reference: <new-submission> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | | Merge branch 'master' into for-nextJiri Kosina2010-06-1616-139/+113
|\ \ \ | | |/ | |/|
| * | Merge branch 'for-linus' of git://www.jni.nu/crisLinus Torvalds2010-06-0114-90/+97
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | * 'for-linus' of git://www.jni.nu/cris: CRIS: Don't use mask_irq as symbol name CRIS: Simplify param.h by simply including <asm-generic/param.h> CRISv10: Whitespace fixes for hw_settings.S CRISv10: Trivial fixes. CRISv32: Fix RS485 port 4 CD Kconfig item. CRISv32: Remove duplicated Kconfig items. cris: push down BKL into some device drivers
| | * CRIS: Don't use mask_irq as symbol nameJesper Nilsson2010-05-256-22/+21
| | | | | | | | | | | | | | | | | | | | | kernel/irq/chip.c now uses these, which lead to compile error for CRISv32. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * CRIS: Simplify param.h by simply including <asm-generic/param.h>Jesper Nilsson2010-05-251-15/+2
| | | | | | | | | | | | | | | Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * CRISv10: Whitespace fixes for hw_settings.SJesper Nilsson2010-05-251-8/+6
| | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace. Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * CRISv10: Trivial fixes.Jesper Nilsson2010-05-251-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Removed CVS id tag. - Formatting fixes Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * CRISv32: Fix RS485 port 4 CD Kconfig item.Jesper Nilsson2010-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | The Kconfig item for port 4 CD was controlled by the same Kconfig item as for port 3. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * CRISv32: Remove duplicated Kconfig items.Jesper Nilsson2010-05-251-14/+0
| | | | | | | | | | | | | | | | | | The items were duplicated when they should have been moved. Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| | * cris: push down BKL into some device driversArnd Bergmann2010-04-294-22/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | A number of cris specific device drivers still use the locked ->ioctl operation. Convert them to unlocked_ioctl with explicit lock_kernel calls. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| * | cris: use asm-generic/scatterlist.hFUJITA Tomonori2010-05-271-16/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Cc: Mikael Starvik <starvik@axis.com> Cc: Jesper Nilsson <jesper.nilsson@axis.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
OpenPOWER on IntegriCloud