Procházet zdrojové kódy

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>
Al Viro před 17 roky
rodič
revize
b4a08a10b1
3 změnil soubory, kde provedl 7 přidání a 7 odebrání
  1. 1 1
      arch/um/kernel/mem.c
  2. 4 4
      arch/um/sys-i386/ptrace.c
  3. 2 2
      arch/um/sys-x86_64/ptrace.c

+ 1 - 1
arch/um/kernel/mem.c

@@ -165,7 +165,7 @@ static void __init kmap_init(void)
 	kmap_prot = PAGE_KERNEL;
 	kmap_prot = PAGE_KERNEL;
 }
 }
 
 
-static void init_highmem(void)
+static void __init init_highmem(void)
 {
 {
 	pgd_t *pgd;
 	pgd_t *pgd;
 	pud_t *pud;
 	pud_t *pud;

+ 4 - 4
arch/um/sys-i386/ptrace.c

@@ -155,7 +155,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 	if (err)
 	if (err)
 		return err;
 		return err;
 
 
-	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
+	n = copy_to_user(buf, fpregs, sizeof(fpregs));
 	if(n > 0)
 	if(n > 0)
 		return -EFAULT;
 		return -EFAULT;
 
 
@@ -168,7 +168,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 	long fpregs[HOST_FP_SIZE];
 	long fpregs[HOST_FP_SIZE];
 
 
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
-	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
+	n = copy_from_user(fpregs, buf, sizeof(fpregs));
 	if (n > 0)
 	if (n > 0)
 		return -EFAULT;
 		return -EFAULT;
 
 
@@ -185,7 +185,7 @@ int get_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 	if (err)
 	if (err)
 		return err;
 		return err;
 
 
-	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
+	n = copy_to_user(buf, fpregs, sizeof(fpregs));
 	if(n > 0)
 	if(n > 0)
 		return -EFAULT;
 		return -EFAULT;
 
 
@@ -198,7 +198,7 @@ int set_fpxregs(struct user_fxsr_struct __user *buf, struct task_struct *child)
 	long fpregs[HOST_XFP_SIZE];
 	long fpregs[HOST_XFP_SIZE];
 
 
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
-	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
+	n = copy_from_user(fpregs, buf, sizeof(fpregs));
 	if (n > 0)
 	if (n > 0)
 		return -EFAULT;
 		return -EFAULT;
 
 

+ 2 - 2
arch/um/sys-x86_64/ptrace.c

@@ -154,7 +154,7 @@ int get_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 	if (err)
 	if (err)
 		return err;
 		return err;
 
 
-	n = copy_to_user((void *) buf, fpregs, sizeof(fpregs));
+	n = copy_to_user(buf, fpregs, sizeof(fpregs));
 	if(n > 0)
 	if(n > 0)
 		return -EFAULT;
 		return -EFAULT;
 
 
@@ -167,7 +167,7 @@ int set_fpregs(struct user_i387_struct __user *buf, struct task_struct *child)
 	long fpregs[HOST_FP_SIZE];
 	long fpregs[HOST_FP_SIZE];
 
 
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
 	BUG_ON(sizeof(*buf) != sizeof(fpregs));
-	n = copy_from_user(fpregs, (void *) buf, sizeof(fpregs));
+	n = copy_from_user(fpregs, buf, sizeof(fpregs));
 	if (n > 0)
 	if (n > 0)
 		return -EFAULT;
 		return -EFAULT;