From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 5 Apr 2012 14:58:31 +0000 (-0600)
Subject: Merge branch 'master' into gfio
X-Git-Tag: gfio-0.1~12
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=61b29c20eb4b1d374636d5325fb56c0fa9a574ad;p=fio.git

Merge branch 'master' into gfio

Conflicts:
	fio.c
	fio.h

Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

61b29c20eb4b1d374636d5325fb56c0fa9a574ad
diff --cc fio.h
index 8246e388,6da22f03..95d9d77c
--- a/fio.h
+++ b/fio.h
@@@ -314,7 -527,8 +314,7 @@@ extern int shm_id
  extern int groupid;
  extern int terse_output;
  extern int temp_stall_ts;
- extern unsigned long page_mask, page_size;
 -extern unsigned long long mlock_size;
+ extern uintptr_t page_mask, page_size;
  extern int read_only;
  extern int eta_print;
  extern unsigned long done_secs;
diff --cc libfio.c
index acdb0ea4,668df455..36876ddf
--- a/libfio.c
+++ b/libfio.c
@@@ -41,9 -36,6 +41,9 @@@ FLIST_HEAD(disk_list)
  
  unsigned long arch_flags = 0;
  
- unsigned long page_mask;
- unsigned long page_size;
++uintptr_t page_mask;
++uintptr_t page_size;
 +
  static const char *fio_os_strings[os_nr] = {
  	"Invalid",
  	"Linux",