diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-15 22:49:21 +0200 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-15 22:49:21 +0200 |
commit | d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0 (patch) | |
tree | 79e832eb50d3b416bdada4903b2a2e2fefcc2800 /arch/arm/kernel/signal.h | |
parent | regulator: tps6586x: add support for input supply (diff) | |
parent | Linux 3.5-rc7 (diff) | |
download | linux-d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0.tar.xz linux-d5b2e30bdc695a1735b3c970e1f9738e9ca3dbf0.zip |
Merge tag 'v3.5-rc7' into regulator-drivers
Linux 3.5-rc7
Diffstat (limited to 'arch/arm/kernel/signal.h')
-rw-r--r-- | arch/arm/kernel/signal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/signal.h b/arch/arm/kernel/signal.h index 5ff067b7c752..6fcfe8398aa4 100644 --- a/arch/arm/kernel/signal.h +++ b/arch/arm/kernel/signal.h @@ -8,5 +8,7 @@ * published by the Free Software Foundation. */ #define KERN_SIGRETURN_CODE (CONFIG_VECTORS_BASE + 0x00000500) +#define KERN_RESTART_CODE (KERN_SIGRETURN_CODE + sizeof(sigreturn_codes)) extern const unsigned long sigreturn_codes[7]; +extern const unsigned long syscall_restart_code[2]; |