This reverts commit cde5ccf8.

Not suitable for 3.19-stable (no PPC_FEATURE2_HTM_NOSC_COMP).
Signed-off-by: Kamal Mostafa <kamal@canonical.com>