diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-19 01:44:58 +0100 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2013-11-19 01:44:58 +0100 |
commit | 448d06e8dc5c06f111bb6baae7d456e174225729 (patch) | |
tree | 0ddcedd3ca2d516b5e103c2b6ceee631871c651d /mach-defpager | |
parent | 4d6828ca04636d331f9a050f05b576e489022a1f (diff) | |
parent | e971ab1a229d1ef1d5c1e5e1ff52ec597c55270e (diff) |
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/hurd
Diffstat (limited to 'mach-defpager')
-rw-r--r-- | mach-defpager/Makefile | 3 | ||||
-rw-r--r-- | mach-defpager/default_pager.c | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/mach-defpager/Makefile b/mach-defpager/Makefile index 5a98d690..e38a0bea 100644 --- a/mach-defpager/Makefile +++ b/mach-defpager/Makefile @@ -35,6 +35,3 @@ LDFLAGS += -static include ../Makeconf MIGSFLAGS = -DSEQNOS - -# Don't even bother. -CFLAGS := $(filter-out -Wall,$(CFLAGS)) diff --git a/mach-defpager/default_pager.c b/mach-defpager/default_pager.c index 8e466f72..a65a5fe1 100644 --- a/mach-defpager/default_pager.c +++ b/mach-defpager/default_pager.c @@ -879,12 +879,13 @@ pager_pages(pager, pages, numpages) offset += vm_page_size; } } else { - for (emap = &map[size]; map < emap; map++) + for (emap = &map[size]; map < emap; map++) { if ( ! no_block(*map) ) { if (actual++ < numpages) pages++->dpp_offset = offset; } - offset += vm_page_size; + offset += vm_page_size; + } } return actual; } |