Re: [tip:x86/cleanups] x86: Delete non-required instances of include <linux/init.h>

[Richard Weinberger]

On Sun, Jan 12, 2014 at 1:03 PM, Ingo Molnar <mingo@xxxxxxxxxx> wrote:
>
> * tip-bot for Paul Gortmaker <tipbot@xxxxxxxxx> wrote:
>
>> Commit-ID:  663b55b9b39fa9c848cca273ca4e12bf29b32c71
>> Gitweb:     http://git.kernel.org/tip/663b55b9b39fa9c848cca273ca4e12bf29b32c71
>> Author:     Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
>> AuthorDate: Mon, 6 Jan 2014 19:20:26 -0500
>> Committer:  H. Peter Anvin <hpa@xxxxxxxxx>
>> CommitDate: Mon, 6 Jan 2014 21:25:18 -0800
>>
>> x86: Delete non-required instances of include <linux/init.h>
>>
>> None of these files are actually using any __init type directives
>> and hence don't need to include <linux/init.h>.  Most are just a
>> left over from __devinit and __cpuinit removal, or simply due to
>> code getting copied from one driver to the next.
>>
>> [ hpa: undid incorrect removal from arch/x86/kernel/head_32.S ]
>>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
>> Link: http://lkml.kernel.org/r/1389054026-12947-1-git-send-email-paul.gortmaker@xxxxxxxxxxxxx
>> Signed-off-by: H. Peter Anvin <hpa@xxxxxxxxx>
>
> FYI, this patch breaks the UML build:
>
> /home/mingo/tip/arch/x86/um/vdso/vdso.S: Assembler messages:
> /home/mingo/tip/arch/x86/um/vdso/vdso.S:2: Error: no such instruction: `__initdata'
> /home/mingo/tip/arch/x86/um/vdso/vdso.S:9: Error: no such instruction: `__finit'

Thanks for reporting this Ingo!
Feel free to CC me in future too. :)

UML's vdso fails to build because it uses __INITDATA and __FINIT.

Paul, please remove that hunk from your patch.
diff --git a/arch/x86/um/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 1cb468a..4b4bd4c 100644
--- a/arch/x86/um/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -1,4 +1,3 @@
-#include <linux/init.h>

 __INITDATA

-- 
Thanks,
//richard
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/