From: "Randy.Dunlap" <rddunlap@osdl.org>

This patch changes no code, just swaps macro arg names to match reality.