Marasmus is a condition involving both severe protein deficiency and markedly inadequate intake of calories.
Kwashiorkor is a condition involving severe protein deficiency, but in the context of sufficient or only mildly deficient intake of carbohydrates and calories, overall.