Skip to content

Commit b4a08a1

Browse files
Al ViroLinus Torvalds
authored andcommitted
misc uml annotation and section fixes
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 27bb628 commit b4a08a1

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

arch/um/kernel/mem.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ static void __init kmap_init(void)
165165
kmap_prot = PAGE_KERNEL;
166166
}
167167

168-
static void init_highmem(void)
168+
static void __init init_highmem(void)
169169
{
170170
pgd_t *pgd;
171171
pud_t *pud;

arch/um/sys-i386/ptrace.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
155155
if (err)
156156
return err;
157157

158-
n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
158+
n = copy_to_user(buf, fpregs, sizeof(fpregs));
159159
if(n > 0)
160160
return -EFAULT;
161161

@@ -168,7 +168,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
168168
long fpregs[HOST_FP_SIZE];
169169

170170
BUG_ON(sizeof(*buf) != sizeof(fpregs));
171-
n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
171+
n = copy_from_user(fpregs, buf, sizeof(fpregs));
172172
if (n > 0)
173173
return -EFAULT;
174174

@@ -185,7 +185,7 @@ int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
185185
if (err)
186186
return err;
187187

188-
n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
188+
n = copy_to_user(buf, fpregs, sizeof(fpregs));
189189
if(n > 0)
190190
return -EFAULT;
191191

@@ -198,7 +198,7 @@ int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
198198
long fpregs[HOST_XFP_SIZE];
199199

200200
BUG_ON(sizeof(*buf) != sizeof(fpregs));
201-
n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
201+
n = copy_from_user(fpregs, buf, sizeof(fpregs));
202202
if (n > 0)
203203
return -EFAULT;
204204

arch/um/sys-x86_64/ptrace.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
154154
if (err)
155155
return err;
156156

157-
n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
157+
n = copy_to_user(buf, fpregs, sizeof(fpregs));
158158
if(n > 0)
159159
return -EFAULT;
160160

@@ -167,7 +167,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
167167
long fpregs[HOST_FP_SIZE];
168168

169169
BUG_ON(sizeof(*buf) != sizeof(fpregs));
170-
n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
170+
n = copy_from_user(fpregs, buf, sizeof(fpregs));
171171
if (n > 0)
172172
return -EFAULT;
173173

0 commit comments

Comments
 (0)