diff options
Diffstat (limited to 'fs/signalfd.c')
-rw-r--r-- | fs/signalfd.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/fs/signalfd.c b/fs/signalfd.c index aefb0be07942..fb7f7e8034df 100644 --- a/fs/signalfd.c +++ b/fs/signalfd.c | |||
@@ -74,45 +74,45 @@ static int signalfd_copyinfo(struct signalfd_siginfo __user *uinfo, | |||
74 | * If you change siginfo_t structure, please be sure | 74 | * If you change siginfo_t structure, please be sure |
75 | * this code is fixed accordingly. | 75 | * this code is fixed accordingly. |
76 | */ | 76 | */ |
77 | err |= __put_user(kinfo->si_signo, &uinfo->signo); | 77 | err |= __put_user(kinfo->si_signo, &uinfo->ssi_signo); |
78 | err |= __put_user(kinfo->si_errno, &uinfo->err); | 78 | err |= __put_user(kinfo->si_errno, &uinfo->ssi_errno); |
79 | err |= __put_user((short)kinfo->si_code, &uinfo->code); | 79 | err |= __put_user((short) kinfo->si_code, &uinfo->ssi_code); |
80 | switch (kinfo->si_code & __SI_MASK) { | 80 | switch (kinfo->si_code & __SI_MASK) { |
81 | case __SI_KILL: | 81 | case __SI_KILL: |
82 | err |= __put_user(kinfo->si_pid, &uinfo->pid); | 82 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |
83 | err |= __put_user(kinfo->si_uid, &uinfo->uid); | 83 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
84 | break; | 84 | break; |
85 | case __SI_TIMER: | 85 | case __SI_TIMER: |
86 | err |= __put_user(kinfo->si_tid, &uinfo->tid); | 86 | err |= __put_user(kinfo->si_tid, &uinfo->ssi_tid); |
87 | err |= __put_user(kinfo->si_overrun, &uinfo->overrun); | 87 | err |= __put_user(kinfo->si_overrun, &uinfo->ssi_overrun); |
88 | err |= __put_user((long)kinfo->si_ptr, &uinfo->svptr); | 88 | err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); |
89 | break; | 89 | break; |
90 | case __SI_POLL: | 90 | case __SI_POLL: |
91 | err |= __put_user(kinfo->si_band, &uinfo->band); | 91 | err |= __put_user(kinfo->si_band, &uinfo->ssi_band); |
92 | err |= __put_user(kinfo->si_fd, &uinfo->fd); | 92 | err |= __put_user(kinfo->si_fd, &uinfo->ssi_fd); |
93 | break; | 93 | break; |
94 | case __SI_FAULT: | 94 | case __SI_FAULT: |
95 | err |= __put_user((long)kinfo->si_addr, &uinfo->addr); | 95 | err |= __put_user((long) kinfo->si_addr, &uinfo->ssi_addr); |
96 | #ifdef __ARCH_SI_TRAPNO | 96 | #ifdef __ARCH_SI_TRAPNO |
97 | err |= __put_user(kinfo->si_trapno, &uinfo->trapno); | 97 | err |= __put_user(kinfo->si_trapno, &uinfo->ssi_trapno); |
98 | #endif | 98 | #endif |
99 | break; | 99 | break; |
100 | case __SI_CHLD: | 100 | case __SI_CHLD: |
101 | err |= __put_user(kinfo->si_pid, &uinfo->pid); | 101 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |
102 | err |= __put_user(kinfo->si_uid, &uinfo->uid); | 102 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
103 | err |= __put_user(kinfo->si_status, &uinfo->status); | 103 | err |= __put_user(kinfo->si_status, &uinfo->ssi_status); |
104 | err |= __put_user(kinfo->si_utime, &uinfo->utime); | 104 | err |= __put_user(kinfo->si_utime, &uinfo->ssi_utime); |
105 | err |= __put_user(kinfo->si_stime, &uinfo->stime); | 105 | err |= __put_user(kinfo->si_stime, &uinfo->ssi_stime); |
106 | break; | 106 | break; |
107 | case __SI_RT: /* This is not generated by the kernel as of now. */ | 107 | case __SI_RT: /* This is not generated by the kernel as of now. */ |
108 | case __SI_MESGQ: /* But this is */ | 108 | case __SI_MESGQ: /* But this is */ |
109 | err |= __put_user(kinfo->si_pid, &uinfo->pid); | 109 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |
110 | err |= __put_user(kinfo->si_uid, &uinfo->uid); | 110 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
111 | err |= __put_user((long)kinfo->si_ptr, &uinfo->svptr); | 111 | err |= __put_user((long) kinfo->si_ptr, &uinfo->ssi_ptr); |
112 | break; | 112 | break; |
113 | default: /* this is just in case for now ... */ | 113 | default: /* this is just in case for now ... */ |
114 | err |= __put_user(kinfo->si_pid, &uinfo->pid); | 114 | err |= __put_user(kinfo->si_pid, &uinfo->ssi_pid); |
115 | err |= __put_user(kinfo->si_uid, &uinfo->uid); | 115 | err |= __put_user(kinfo->si_uid, &uinfo->ssi_uid); |
116 | break; | 116 | break; |
117 | } | 117 | } |
118 | 118 | ||