diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 03:43:45 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 03:43:45 -0400 |
| commit | cada23f308e3869ceb5c75f164d249448dfaec07 (patch) | |
| tree | 97c7aebcad0eb2a93a7519251a01f5be9255ee75 /arch/parisc/kernel/signal.c | |
| parent | e769ece3b129698d2b09811a6f6d304e4eaa8c29 (diff) | |
| parent | 6c8c0c4dc0e98ee2191211d66e9f876e95787073 (diff) | |
Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-master
Diffstat (limited to 'arch/parisc/kernel/signal.c')
| -rw-r--r-- | arch/parisc/kernel/signal.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c index 940188d1942c..07349b002687 100644 --- a/arch/parisc/kernel/signal.c +++ b/arch/parisc/kernel/signal.c | |||
| @@ -56,13 +56,6 @@ | |||
| 56 | #define A(__x) ((unsigned long)(__x)) | 56 | #define A(__x) ((unsigned long)(__x)) |
| 57 | 57 | ||
| 58 | /* | 58 | /* |
| 59 | * Atomically swap in the new signal mask, and wait for a signal. | ||
| 60 | */ | ||
| 61 | #ifdef CONFIG_64BIT | ||
| 62 | #include "sys32.h" | ||
| 63 | #endif | ||
| 64 | |||
| 65 | /* | ||
| 66 | * Do a signal return - restore sigcontext. | 59 | * Do a signal return - restore sigcontext. |
| 67 | */ | 60 | */ |
| 68 | 61 | ||