diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /include/net/sctp/structs.h | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/net/sctp/structs.h')
| -rw-r--r-- | include/net/sctp/structs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 42d00ced5eb8..6e5f0e0c7967 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h | |||
| @@ -544,7 +544,7 @@ struct sctp_af { | |||
| 544 | int level, | 544 | int level, |
| 545 | int optname, | 545 | int optname, |
| 546 | char __user *optval, | 546 | char __user *optval, |
| 547 | int optlen); | 547 | unsigned int optlen); |
| 548 | int (*getsockopt) (struct sock *sk, | 548 | int (*getsockopt) (struct sock *sk, |
| 549 | int level, | 549 | int level, |
| 550 | int optname, | 550 | int optname, |
| @@ -554,7 +554,7 @@ struct sctp_af { | |||
| 554 | int level, | 554 | int level, |
| 555 | int optname, | 555 | int optname, |
| 556 | char __user *optval, | 556 | char __user *optval, |
| 557 | int optlen); | 557 | unsigned int optlen); |
| 558 | int (*compat_getsockopt) (struct sock *sk, | 558 | int (*compat_getsockopt) (struct sock *sk, |
| 559 | int level, | 559 | int level, |
| 560 | int optname, | 560 | int optname, |