[PATCH 2/4] makedumpfile: cleanup non-standard ULONGLONG_MAX macros
Wang Nan
wangnan0 at huawei.com
Fri Apr 25 21:07:07 PDT 2014
Macro ULONGLONG_MAX is non-standard, the standard way to defining
maximum limitation of unsigned long long is ULLONG_MAX, which is defined
in <limits.h> by C standard.
This patch replace all ULONGLONG_MAX to ULLONG_MAX.
Signed-off-by: Wang Nan <wangnan0 at huawei.com>
Cc: Atsushi Kumagai <kumagai-atsushi at mxc.nes.nec.co.jp>
Cc: Petr Tesarik <ptesarik at suse.cz>
Cc: kexec at lists.infradead.org
Cc: Geng Hui <hui.geng at huawei.com>
Cc: Liu Hua <sdu.liu at huawei.com>
---
common.h | 3 +--
makedumpfile.c | 10 +++++-----
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/common.h b/common.h
index 124f107..b86c57a 100644
--- a/common.h
+++ b/common.h
@@ -38,7 +38,6 @@
# warning ULLONG_MAX should have been defined in <limits.h>
# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
#endif
-#define ULONGLONG_MAX ULLONG_MAX
#define MAX(a,b) ((a) > (b) ? (a) : (b))
#define MIN(a,b) ((a) < (b) ? (a) : (b))
@@ -52,7 +51,7 @@
*/
#define NOT_MEMMAP_ADDR (0x0)
#define NOT_KV_ADDR (0x0)
-#define NOT_PADDR (ULONGLONG_MAX)
+#define NOT_PADDR (ULLONG_MAX)
#endif /* COMMON_H */
diff --git a/makedumpfile.c b/makedumpfile.c
index ce4a866..33c378d 100644
--- a/makedumpfile.c
+++ b/makedumpfile.c
@@ -3797,7 +3797,7 @@ unsigned long long
page_to_pfn(unsigned long page)
{
unsigned int num;
- unsigned long long pfn = ULONGLONG_MAX;
+ unsigned long long pfn = ULLONG_MAX;
unsigned long long index = 0;
struct mem_map_data *mmd;
@@ -3813,9 +3813,9 @@ page_to_pfn(unsigned long page)
pfn = mmd->pfn_start + index;
break;
}
- if (pfn == ULONGLONG_MAX) {
+ if (pfn == ULLONG_MAX) {
ERRMSG("Can't convert the address of page descriptor (%lx) to pfn.\n", page);
- return ULONGLONG_MAX;
+ return ULLONG_MAX;
}
return pfn;
}
@@ -3852,7 +3852,7 @@ reset_bitmap_of_free_pages(unsigned long node_zones, struct cycle *cycle)
for (;curr != head;) {
curr_page = curr - OFFSET(page.lru);
start_pfn = page_to_pfn(curr_page);
- if (start_pfn == ULONGLONG_MAX)
+ if (start_pfn == ULLONG_MAX)
return FALSE;
if (!readmem(VADDR, curr+OFFSET(list_head.prev),
@@ -4678,7 +4678,7 @@ __exclude_unnecessary_pages(unsigned long mem_map,
/*
* Refresh the buffer of struct page, when changing mem_map.
*/
- pfn_read_start = ULONGLONG_MAX;
+ pfn_read_start = ULLONG_MAX;
pfn_read_end = 0;
for (pfn = pfn_start; pfn < pfn_end; pfn++, mem_map += SIZE(page)) {
--
1.8.4
More information about the kexec
mailing list