OSDN Git Service
(root)
/
android-x86
/
system-extras.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove canned_fs_config from ext4_utils
[android-x86/system-extras.git]
/
ksmutils
/
ksminfo.c
diff --git
a/ksmutils/ksminfo.c
b/ksmutils/ksminfo.c
index
4ac39bc
..
278692f
100644
(file)
--- a/
ksmutils/ksminfo.c
+++ b/
ksmutils/ksminfo.c
@@
-189,7
+189,6
@@
exit:
static int read_pages(struct ksm_pages *kp, pm_map_t **maps, size_t num_maps, uint8_t pr_flags) {
size_t i, j, k;
static int read_pages(struct ksm_pages *kp, pm_map_t **maps, size_t num_maps, uint8_t pr_flags) {
size_t i, j, k;
- size_t len;
uint64_t *pagemap;
size_t map_len;
uint64_t flags;
uint64_t *pagemap;
size_t map_len;
uint64_t flags;
@@
-251,7
+250,7
@@
static int read_pages(struct ksm_pages *kp, pm_map_t **maps, size_t num_maps, ui
fprintf(stderr, "warning: could not lseek to 0x%08lx\n", vaddr);
continue;
}
fprintf(stderr, "warning: could not lseek to 0x%08lx\n", vaddr);
continue;
}
- len = read(fd, data, pm_kernel_pagesize(ker));
+
ssize_t
len = read(fd, data, pm_kernel_pagesize(ker));
if (len != pm_kernel_pagesize(ker)) {
fprintf(stderr, "warning: could not read page at 0x%08lx\n", vaddr);
continue;
if (len != pm_kernel_pagesize(ker)) {
fprintf(stderr, "warning: could not read page at 0x%08lx\n", vaddr);
continue;