gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a few more harmless compiler warnings:

Browse Source 
- myfree in pager.c was called with an argument, so add one to the
dummy definition
- pgoff is offset_t (unsigned) and doesn't need to be compared to 0
- clang says '*(int *)0 = 0' will be optimized away instead of keeping
the segfault without a volatile hint (?! that is wrong!), but it causes
no harm to add anyway.
This commit is contained in:
Dominique Martinet
2017-09-13 09:50:46 +09:00
parent d213efac79
commit 196379854b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/kernel/vsyscall.c
View File

@@ -102,7 +102,7 @@ int vsyscall_gettimeofday(struct timeval *tv, void *tz)
: "%rcx", "%r11", "memory"); : "%rcx", "%r11", "memory");
if (error) { if (error) {
*(int *)0 = 0; /* i.e. raise(SIGSEGV) */ *(volatile int *)0 = 0; /* i.e. raise(SIGSEGV) */
} }
return error; return error;
} /* vsyscall_gettimeofday() */ } /* vsyscall_gettimeofday() */

2
kernel/pager.c
View File

@@ -161,7 +161,7 @@ myalloc(struct swapinfo *si, size_t sz)
} }
void void
myfree() myfree(void *p)
{ {
/* nothing so far */ /* nothing so far */
} }

2
kernel/syscall.c
View File

@@ -7589,7 +7589,7 @@ SYSCALL_DECLARE(remap_file_pages)
ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock); ihk_mc_spinlock_lock_noirq(&thread->vm->memory_range_lock);
#define PGOFF_LIMIT ((off_t)1 << ((8*sizeof(off_t) - 1) - PAGE_SHIFT)) #define PGOFF_LIMIT ((off_t)1 << ((8*sizeof(off_t) - 1) - PAGE_SHIFT))
if ((size <= 0) || (size & (PAGE_SIZE - 1)) || (prot != 0) if ((size <= 0) || (size & (PAGE_SIZE - 1)) || (prot != 0)
|| (pgoff < 0) || (PGOFF_LIMIT <= pgoff) || (PGOFF_LIMIT <= pgoff)
|| ((PGOFF_LIMIT - pgoff) < (size / PAGE_SIZE)) || ((PGOFF_LIMIT - pgoff) < (size / PAGE_SIZE))
|| !((start < end) || (end == 0))) { || !((start < end) || (end == 0))) {
ekprintf("sys_remap_file_pages(%#lx,%#lx,%#x,%#lx,%#x):" ekprintf("sys_remap_file_pages(%#lx,%#lx,%#x,%#lx,%#x):"