diff options
| author | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-04-03 01:31:54 -0400 |
| commit | d66248326410ed0d3e813ebe974b3e6638df0717 (patch) | |
| tree | a1dbe86f5540596a70c6f3b9aab051d37f37daf5 /include/linux/signal.h | |
| parent | 8facd5fb73c6e960555e5913743dfbb6c3d984a5 (diff) | |
| parent | da241efcd9c3da2af6ba20055c7e158ec725005c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull net into net-next to get the synchronize_net() bug fix in
bonding.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/signal.h')
| -rw-r--r-- | include/linux/signal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/signal.h b/include/linux/signal.h index a2dcb94ea49d..9475c5cb28bc 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -250,11 +250,11 @@ extern int show_unhandled_signals; extern int sigsuspend(sigset_t *); struct sigaction { -#ifndef __ARCH_HAS_ODD_SIGACTION +#ifndef __ARCH_HAS_IRIX_SIGACTION __sighandler_t sa_handler; unsigned long sa_flags; #else - unsigned long sa_flags; + unsigned int sa_flags; __sighandler_t sa_handler; #endif #ifdef __ARCH_HAS_SA_RESTORER |