Merge branch 'busybox' into merge

1 files changed, 7 insertions, 5 deletions

diff --git a/archival/rpm.c b/archival/rpm.c
index 0d8f641b9..63d13d0e1 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -83,7 +83,9 @@ struct globals {
         void *map;
         rpm_index *mytags;
         int tagcount;
-        unsigned mapsize, pagesize;
+        unsigned mapsize;
+        IF_VARIABLE_ARCH_PAGESIZE(unsigned pagesize;)
+#define G_pagesize cached_pagesize(G.pagesize)
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define INIT_G() do { setup_common_bufsiz(); } while (0)
@@ -142,11 +144,11 @@ static int rpm_gettags(const char *filename)
 
 #if !ENABLE_PLATFORM_MINGW32
         /* Map the store */
-        storepos = (storepos + G.pagesize) & -(int)G.pagesize;
+        storepos = (storepos + G_pagesize) & -(int)G_pagesize;
         /* remember size for munmap */
         G.mapsize = storepos;
         /* some NOMMU systems prefer MAP_PRIVATE over MAP_SHARED */
-        G.map = mmap(0, storepos, PROT_READ, MAP_PRIVATE, fd, 0);
+        G.map = mmap_read(fd, storepos);
         if (G.map == MAP_FAILED)
                 bb_perror_msg_and_die("mmap '%s'", filename);
 #else
@@ -368,7 +370,7 @@ int rpm_main(int argc, char **argv)
         int opt, func = 0;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         while ((opt = getopt(argc, argv, "iqpldc")) != -1) {
                 switch (opt) {
@@ -535,7 +537,7 @@ int rpm2cpio_main(int argc UNUSED_PARAM, char **argv)
         int rpm_fd;
 
         INIT_G();
-        G.pagesize = getpagesize();
+        INIT_PAGESIZE(G.pagesize);
 
         rpm_fd = rpm_gettags(argv[1]);