aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-12-13 18:50:12 +0000
committerMark Brown <broonie@linaro.org>2013-12-13 18:50:12 +0000
commit679160a872dfe88bf34e50f1939e190ba59e534e (patch)
treefe342d02e224d006a23745a657148ce62b54fee4 /arch/arm/include
parenteed4bafd63b5584adb832a582a931ecba41dec55 (diff)
parent8f1c42284159ebd6851e1e75507f2ad6fba87d0f (diff)
Merge branch 'android-3.10' of https://android.googlesource.com/kernel/common into lsk-v3.10-aospv3.10/topic/aosp
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/fiq_glue.h3
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);