This reverts commit43e172e31bwhich is commit7ef282e051upstream. This is being reverted as is can cause some crc changes in modversions due to the changes in trace.h. From the description of the patch itself: This is marked as "Fixes" but is more of a clean up than a true fix. Backport if you want, but its not critical. Bug: 161946584 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I781e50e6ebe6a2d09c3a4ec2703e7bdbffe8e632