diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 02:13:28 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-15 02:13:28 (GMT) |
| commit | 11b397e6eb12191300ca19290f29f51f61118953 (patch) | |
| tree | 6e0f8cb52cbcdb02108755f3d643a025a943bd79 /arch/arm/mach-imx/common.h | |
| parent | e1c969f7814dcd23bbfe8d777544321a492b6fee (diff) | |
| parent | 41ef2d5678d83af030125550329b6ae8b74618fa (diff) | |
| download | linux-fsl-qoriq-11b397e6eb12191300ca19290f29f51f61118953.tar.xz | |
Merge 3.9-rc7 intp tty-next
We want the fixes here.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-imx/common.h')
| -rw-r--r-- | arch/arm/mach-imx/common.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h index 5a800bf..5bf4a97 100644 --- a/arch/arm/mach-imx/common.h +++ b/arch/arm/mach-imx/common.h @@ -110,6 +110,8 @@ void tzic_handle_irq(struct pt_regs *); extern void imx_enable_cpu(int cpu, bool enable); extern void imx_set_cpu_jump(int cpu, void *jump_addr); +extern u32 imx_get_cpu_arg(int cpu); +extern void imx_set_cpu_arg(int cpu, u32 arg); extern void v7_cpu_resume(void); extern u32 *pl310_get_save_ptr(void); #ifdef CONFIG_SMP |