diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-13 18:52:59 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-13 18:52:59 +0000 |
| commit | 358194677ff980dd058b521295f3f76c20cfdfc8 (patch) | |
| tree | 40ddafbf592743e04a01717f3ba5e52953630ab5 /arch/arm/include/asm | |
| parent | 5a4b318f126a97d1ec0ef12ce5833576698e88de (diff) | |
| parent | 679160a872dfe88bf34e50f1939e190ba59e534e (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android
Conflicts:
drivers/staging/android/ion/ion_chunk_heap.c
kernel/printk.c
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/fiq_glue.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/include/asm/fiq_glue.h b/arch/arm/include/asm/fiq_glue.h index d54c29db97a..a9e244f9f19 100644 --- a/arch/arm/include/asm/fiq_glue.h +++ b/arch/arm/include/asm/fiq_glue.h @@ -18,8 +18,11 @@ struct fiq_glue_handler { void (*fiq)(struct fiq_glue_handler *h, void *regs, void *svc_sp); void (*resume)(struct fiq_glue_handler *h); }; +typedef void (*fiq_return_handler_t)(void); int fiq_glue_register_handler(struct fiq_glue_handler *handler); +int fiq_glue_set_return_handler(fiq_return_handler_t fiq_return); +int fiq_glue_clear_return_handler(fiq_return_handler_t fiq_return); #ifdef CONFIG_FIQ_GLUE void fiq_glue_resume(void); |