lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: fix a couple of warnings

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

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jeff Dike
2005-05-28 15:51:53 -07:00
committed by Linus Torvalds
parent 226d97ec3e
commit b9e0d0696c
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/um/kernel/ptrace.c
View File

@@ -322,11 +322,9 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
UPT_SYSCALL_ARG2(regs), UPT_SYSCALL_ARG2(regs),
UPT_SYSCALL_ARG3(regs), UPT_SYSCALL_ARG3(regs),
UPT_SYSCALL_ARG4(regs)); UPT_SYSCALL_ARG4(regs));
else { else audit_syscall_exit(current,
int res = UPT_SYSCALL_RET(regs); AUDITSC_RESULT(UPT_SYSCALL_RET(regs)),
audit_syscall_exit(current, AUDITSC_RESULT(res), UPT_SYSCALL_RET(regs));
res);
}
} }
/* Fake a debug trap */ /* Fake a debug trap */
@@ -356,14 +354,3 @@ void syscall_trace(union uml_pt_regs *regs, int entryexit)
current->exit_code = 0; 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:
*/

8
include/asm-um/page.h
View File

@@ -98,7 +98,13 @@ extern unsigned long uml_physmem;
extern unsigned long to_phys(void *virt); extern unsigned long to_phys(void *virt);
extern void *to_virt(unsigned long phys); 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 __va(phys) to_virt((unsigned long) phys)
#define page_to_pfn(page) ((page) - mem_map) #define page_to_pfn(page) ((page) - mem_map)