Revert "Some small fixes"

This reverts commit c3d0c2252f6f4be19ed6c6a5ebb72d06fc2f045a.

Conflicts:
	arch/arm/configs/cm_fusion3_yuga_defconfig
	arch/arm/kernel/perf_event.c

Change-Id: I391a5c82ab257c63be30ae2450fb69f3f7e56015