From: Daniel Walker On Sun, 2006-12-31 at 23:04 +0800, Fengguang Wu wrote: > Hi, > > The following messages keeps popping up when CONFIG_PROFILE_LIKELY=y: > > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > init[1]: segfault at ffffffff8118c110 rip ffffffff8118c110 rsp 00007fff9a9d14d8 error 15 > Signed-off-by: Daniel Walker Acked-by: john stultz Signed-off-by: Andrew Morton --- arch/x86_64/kernel/vsyscall.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/x86_64/kernel/vsyscall.c~profile-likely-unlikely-macros-x86_64-fix arch/x86_64/kernel/vsyscall.c --- a/arch/x86_64/kernel/vsyscall.c~profile-likely-unlikely-macros-x86_64-fix +++ a/arch/x86_64/kernel/vsyscall.c @@ -111,7 +111,7 @@ static __always_inline void do_vgettimeo seq = read_seqbegin(&__vsyscall_gtod_data.lock); vread = __vsyscall_gtod_data.clock.vread; - if (unlikely(!__vsyscall_gtod_data.sysctl_enabled || !vread)) { + if (!__vsyscall_gtod_data.sysctl_enabled || !vread) { gettimeofday(tv,0); return; } @@ -151,7 +151,7 @@ int __vsyscall(0) vgettimeofday(struct t * unlikely */ time_t __vsyscall(1) vtime(time_t *t) { - if (unlikely(!__vsyscall_gtod_data.sysctl_enabled)) + if (!__vsyscall_gtod_data.sysctl_enabled) return time_syscall(t); else if (t) *t = __vsyscall_gtod_data.wall_time_tv.tv_sec; _