Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b9e0d069 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: fix a couple of warnings 



Eliminate an unused variable warning in ptrace.c and a size mismatch warning
by adding a cast to __pa.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 226d97ec

arch/um/kernel/ptrace.c

+3 −16
Original line number Diff line number Diff line
@@ -322,11 +322,9 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit) 
					    UPT_SYSCALL_ARG2(regs),

					    UPT_SYSCALL_ARG3(regs),

					    UPT_SYSCALL_ARG4(regs));

		else {

                        int res = UPT_SYSCALL_RET(regs);

			audit_syscall_exit(current, AUDITSC_RESULT(res),

                                           res);

                }

		else audit_syscall_exit(current,

                                        AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),

                                        UPT_SYSCALL_RET(regs));

	}



	/* Fake a debug trap */
@@ -356,14 +354,3 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit) 
		current->exit_code = 0;

	}

}
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */

include/asm-um/page.h

+7 −1
Original line number Diff line number Diff line
@@ -98,7 +98,13 @@ extern unsigned long uml_physmem; 


extern unsigned long to_phys(void *virt);

extern void *to_virt(unsigned long phys);

#define __pa(virt) to_phys((void *) virt)



/* Cast to unsigned long before casting to void * to avoid a warning from

 * mmap_kmem about cutting a long long down to a void *.  Not sure that

 * casting is the right thing, but 32-bit UML can't have 64-bit virtual

 * addresses

 */

#define __pa(virt) to_phys((void *) (unsigned long) virt)

#define __va(phys) to_virt((unsigned long) phys)



#define page_to_pfn(page) ((page) - mem_map)