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;