From c76a363af8bfc7b83558253fae38ae3d255e0aa9 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" Date: Tue, 5 Mar 2013 14:58:24 +0000 Subject: [PATCH] Use sysconf(_SC_PAGESIZE) instead of hardcoded PAGE_SHIFT PAGE_SHIFT couldn't be reliably obtained at compile time, thanks to Chris Metcalf for the hint. * mem.c: Do not include . [SH64] Do not include . (get_pagesize): New function. (sys_mmap_pgoff, sys_old_mmap_pgoff): Use it. --- mem.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/mem.c b/mem.c index 6f22922d..3bd41b46 100644 --- a/mem.c +++ b/mem.c @@ -40,14 +40,15 @@ # endif #endif -#include /* for PAGE_SHIFT */ -#if defined(SH64) -# include /* for PAGE_SHIFT */ -#endif -#if !defined(PAGE_SHIFT) -# warning Failed to get PAGE_SHIFT, assuming 12 -# define PAGE_SHIFT 12 -#endif +static unsigned long +get_pagesize() +{ + static unsigned long pagesize; + + if (!pagesize) + pagesize = sysconf(_SC_PAGESIZE); + return pagesize; +} int sys_brk(struct tcb *tcp) @@ -295,7 +296,7 @@ sys_old_mmap_pgoff(struct tcb *tcp) for (i = 0; i < 5; i++) u_arg[i] = (unsigned long) narrow_arg[i]; offset = narrow_arg[5]; - offset <<= PAGE_SHIFT; + offset *= get_pagesize(); return print_mmap(tcp, u_arg, offset); } #endif @@ -324,7 +325,7 @@ sys_mmap_pgoff(struct tcb *tcp) /* Try test/mmap_offset_decode.c */ unsigned long long offset; offset = (unsigned long) tcp->u_arg[5]; - offset <<= PAGE_SHIFT; + offset *= get_pagesize(); return print_mmap(tcp, tcp->u_arg, offset); } -- 2.50.1