[PATCH] Add kernel portion of user CM implementation (fix)