diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
| commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
| tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /miscutils/devmem.c | |
| parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
| parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
| download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'miscutils/devmem.c')
| -rw-r--r-- | miscutils/devmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/miscutils/devmem.c b/miscutils/devmem.c index e8dce5225..f9f0276bc 100644 --- a/miscutils/devmem.c +++ b/miscutils/devmem.c | |||
| @@ -75,7 +75,7 @@ int devmem_main(int argc UNUSED_PARAM, char **argv) | |||
| 75 | bb_show_usage(); /* one of bb_strtouXX failed */ | 75 | bb_show_usage(); /* one of bb_strtouXX failed */ |
| 76 | 76 | ||
| 77 | fd = xopen("/dev/mem", argv[3] ? (O_RDWR | O_SYNC) : (O_RDONLY | O_SYNC)); | 77 | fd = xopen("/dev/mem", argv[3] ? (O_RDWR | O_SYNC) : (O_RDONLY | O_SYNC)); |
| 78 | mapped_size = page_size = getpagesize(); | 78 | mapped_size = page_size = bb_getpagesize(); |
| 79 | offset_in_page = (unsigned)target & (page_size - 1); | 79 | offset_in_page = (unsigned)target & (page_size - 1); |
| 80 | if (offset_in_page + width > page_size) { | 80 | if (offset_in_page + width > page_size) { |
| 81 | /* This access spans pages. | 81 | /* This access spans pages. |