diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-12 15:43:39 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-12 15:43:39 +0100 |
| commit | eb42c75878e4d13941dcbcf2ef1027c257b099a6 (patch) | |
| tree | f0fa257a00b4cac528b79724f59b076f30b1dd3d /include/net/scm.h | |
| parent | kexec/i386: setup kexec page table in C (diff) | |
| parent | Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.tar.xz linux-eb42c75878e4d13941dcbcf2ef1027c257b099a6.zip | |
Merge branch 'linus' into x86/crashdump
Diffstat (limited to 'include/net/scm.h')
| -rw-r--r-- | include/net/scm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/net/scm.h b/include/net/scm.h index 06df126103ca..33e9986beb86 100644 --- a/include/net/scm.h +++ b/include/net/scm.h @@ -14,8 +14,9 @@ struct scm_fp_list { - int count; - struct file *fp[SCM_MAX_FD]; + struct list_head list; + int count; + struct file *fp[SCM_MAX_FD]; }; struct scm_cookie |