From ebc702624b0e47d5c98d53b1be092c2e37d3ab9c Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Tue, 7 Aug 2018 15:28:05 +0900 Subject: [PATCH] devobj: fix object size (POSTK_DEBUG_TEMP_FIX_36) Fujitsu: POSTK_DEBUG_TEMP_FIX_36 Change-Id: I5f020708f97b7468f19496b44c98e164d856598d --- kernel/devobj.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/kernel/devobj.c b/kernel/devobj.c index 8b3e5e6f..f280ac05 100644 --- a/kernel/devobj.c +++ b/kernel/devobj.c @@ -86,12 +86,9 @@ int devobj_create(int fd, size_t len, off_t off, struct memobj **objp, int *maxp int error; struct devobj *obj = NULL; const size_t npages = (len + PAGE_SIZE - 1) / PAGE_SIZE; -#ifdef POSTK_DEBUG_TEMP_FIX_36 const size_t uintptr_per_page = (PAGE_SIZE / sizeof(uintptr_t)); - const size_t pfn_npages = (npages + uintptr_per_page - 1) / uintptr_per_page; -#else - const size_t pfn_npages = (npages / (PAGE_SIZE / sizeof(uintptr_t))) + 1; -#endif /*POSTK_DEBUG_TEMP_FIX_36*/ + const size_t pfn_npages = + (npages + uintptr_per_page - 1) / uintptr_per_page; dkprintf("%s: fd: %d, len: %lu, off: %lu \n", __FUNCTION__, fd, len, off); @@ -186,10 +183,9 @@ static void devobj_release(struct memobj *memobj) struct devobj *obj = to_devobj(memobj); struct devobj *free_obj = NULL; uintptr_t handle; -#ifndef POSTK_DEBUG_TEMP_FIX_36 + const size_t uintptr_per_page = (PAGE_SIZE / sizeof(uintptr_t)); const size_t pfn_npages = - (obj->npages / (PAGE_SIZE / sizeof(uintptr_t))) + 1; -#endif /*!POSTK_DEBUG_TEMP_FIX_36*/ + (obj->npages + uintptr_per_page - 1) / uintptr_per_page; dkprintf("devobj_release(%p %lx)\n", obj, obj->handle); @@ -221,13 +217,7 @@ static void devobj_release(struct memobj *memobj) if (obj->pfn_table) { // Don't call memory_stat_rss_sub() because devobj related pages don't reside in main memory -#ifdef POSTK_DEBUG_TEMP_FIX_36 - const size_t uintptr_per_page = (PAGE_SIZE / sizeof(uintptr_t)); - const size_t pfn_npages = (obj->npages + uintptr_per_page - 1) / uintptr_per_page; ihk_mc_free_pages(obj->pfn_table, pfn_npages); -#else - ihk_mc_free_pages(obj->pfn_table, pfn_npages); -#endif /*POSTK_DEBUG_TEMP_FIX_36*/ } if (to_memobj(free_obj)->path) {