From 65524a515855477c7066cc42d7669847c50c9f49 Mon Sep 17 00:00:00 2001 From: Davidlohr Bueso Date: Mon, 5 Dec 2011 22:13:41 +0100 Subject: [PATCH] --- yaml --- r: 281471 b: refs/heads/master c: 52dcf8a1f8ac09b6ea21266ebdc4db6d52eea1fc h: refs/heads/master i: 281469: fc7f8e478dcc2675c4b9c3299bd902354f324521 281467: 87df04d6db4a73956e93d82c605ebd825aa23214 281463: aa8a15c1962032469c341d893d80a5b65c16c971 281455: 67a2fac36de01f9c3db5d0f9593ed255dc3e251e 281439: c62e999d34166ec21e12c4df9db7275d510dd2e8 281407: 08f12033c13b8df0aa3ccdeffcdeec8febe9e4fb 281343: 1e38ce082daa447e0b916079cdb84bca2e4a515e v: v3 --- [refs] | 2 +- trunk/kernel/res_counter.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ff5f687b400f..5f00c40b6e99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 494c167cf76d02000adf740c215adc69a824ecc9 +refs/heads/master: 52dcf8a1f8ac09b6ea21266ebdc4db6d52eea1fc diff --git a/trunk/kernel/res_counter.c b/trunk/kernel/res_counter.c index 34683efa2cce..6d269cce7aa1 100644 --- a/trunk/kernel/res_counter.c +++ b/trunk/kernel/res_counter.c @@ -159,8 +159,7 @@ int res_counter_memparse_write_strategy(const char *buf, return 0; } - /* FIXME - make memparse() take const char* args */ - *res = memparse((char *)buf, &end); + *res = memparse(buf, &end); if (*end != '\0') return -EINVAL;