This makes merging easier.  They are readded a few patches later.
Signed-off-by: NAndi Kleen <ak@suse.de>