diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 05:30:39 +0200 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2013-08-09 05:30:39 +0200 |
| commit | 11489736177c5930514482b4db7af862d945335d (patch) | |
| tree | 8590ec4ba037b79c94982e15922fe50a1f0193a3 /arch/arm/kernel/signal.h | |
| parent | virtio: console: cleanup an error message (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egt... (diff) | |
| download | linux-11489736177c5930514482b4db7af862d945335d.tar.xz linux-11489736177c5930514482b4db7af862d945335d.zip | |
Merge branch 'master' into virtio-next
The next commit gets conflicts because it relies on patches which were
cc:stable and thus had to be merged into Linus' tree before the coming
merge window. So pull in master now.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/arm/kernel/signal.h')
| -rw-r--r-- | arch/arm/kernel/signal.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/kernel/signal.h b/arch/arm/kernel/signal.h deleted file mode 100644 index 5ff067b7c752..000000000000 --- a/arch/arm/kernel/signal.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * linux/arch/arm/kernel/signal.h - * - * Copyright (C) 2005-2009 Russell King. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#define KERN_SIGRETURN_CODE (CONFIG_VECTORS_BASE + 0x00000500) - -extern const unsigned long sigreturn_codes[7]; |