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