diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-02-24 00:34:36 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-02-24 00:34:36 -0800 |
| commit | b3fdfc1b4b641d372e35ced98814289bc60bc5d1 (patch) | |
| tree | 5f11d5ba885031dde45690745646519fb887f447 /arch/mips/include/asm/amon.h | |
| parent | xtensa: fix fast_syscall_spill_registers (diff) | |
| parent | xtensa: wire up sched_setattr and sched_getattr syscalls (diff) | |
| download | linux-dev-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.tar.xz linux-dev-b3fdfc1b4b641d372e35ced98814289bc60bc5d1.zip | |
Merge tag 'xtensa-for-next-20140221-1' into for_next
Xtensa fixes for 3.14:
- allow booting xtfpga on boards with new uBoot and >128MBytes memory;
- drop nonexistent GPIO32 support from fsf variant;
- don't select USE_GENERIC_SMP_HELPERS;
- enable common clock framework support, set up ethoc clock on xtfpga;
- wire up sched_setattr and sched_getattr syscalls.
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/mips/include/asm/amon.h')
| -rw-r--r-- | arch/mips/include/asm/amon.h | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/arch/mips/include/asm/amon.h b/arch/mips/include/asm/amon.h index c3dc1a68dd8d..3cc03c64a9c7 100644 --- a/arch/mips/include/asm/amon.h +++ b/arch/mips/include/asm/amon.h @@ -1,7 +1,12 @@ /* - * Amon support + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive + * for more details. + * + * Copyright (C) 2013 Imagination Technologies Ltd. + * + * Arbitrary Monitor Support (AMON) */ - -int amon_cpu_avail(int); -void amon_cpu_start(int, unsigned long, unsigned long, - unsigned long, unsigned long); +int amon_cpu_avail(int cpu); +int amon_cpu_start(int cpu, unsigned long pc, unsigned long sp, + unsigned long gp, unsigned long a0); |