Revert "fix warning with linaro 4.9.1"

This reverts commit dda3fbe072b06e97fc5c84f6d4e032de25edc989.
fix warning with linaro 4.9.1
fix compile error