From 34c7f8df1d178fee784cd2b813ed9c9f19ff5ac7 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Fri, 9 Oct 2009 14:52:04 -0500 Subject: [PATCH 22/22] Use div_u64_rem instead of div_long_long_rem --- tests/slub_test.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/slub_test.c b/tests/slub_test.c index 64ba3b6..c0628cd 100644 --- a/tests/slub_test.c +++ b/tests/slub_test.c @@ -5,6 +5,7 @@ * Compiled as a module. The module needs to be loaded to run. * * (C) 2007 SGI, Christoph Lameter + * (C) 2009 Linux Foundation */ @@ -12,7 +13,6 @@ #include #include #include -#include #include #include #include @@ -274,7 +274,7 @@ static int slub_test_init(void) void **v = kmalloc(TEST_COUNT * sizeof(void *), GFP_KERNEL); unsigned int i; cycles_t time1, time2, time; - long rem; + int rem; int size; printk(KERN_ALERT "test init\n"); @@ -294,7 +294,7 @@ static int slub_test_init(void) time = time2 - time1; printk(KERN_ALERT "%i times kmalloc(%d) ", i, size); - time = div_long_long_rem(time, TEST_COUNT, &rem); + time = div_u64_rem(time, TEST_COUNT, &rem); printk("-> %llu cycles ", time); time1 = get_cycles(); @@ -308,7 +308,7 @@ static int slub_test_init(void) time = time2 - time1; printk("kfree "); - time = div_long_long_rem(time, TEST_COUNT, &rem); + time = div_u64_rem(time, TEST_COUNT, &rem); printk("-> %llu cycles\n", time); } @@ -324,7 +324,7 @@ static int slub_test_init(void) time = time2 - time1; printk(KERN_ALERT "%i times kmalloc(%d)/kfree ", i, size); - time = div_long_long_rem(time, TEST_COUNT, &rem); + time = div_u64_rem(time, TEST_COUNT, &rem); printk("-> %llu cycles\n", time); } kfree(v); -- 1.6.4.3