Add hwpmc.
Merge branch 'markj-kernel-config' into markj-develop