linux-next: build failure after merge of the moduleh tree

[Stephen Rothwell]

Hi Paul,

After merging the moduleh tree, today's linux-next build (x86_64
allmodconfig) failed like this:

arch/x86/kernel/sys_x86_64.c:28:10: warning: 'enum align_flags' declared inside parameter list
arch/x86/kernel/sys_x86_64.c:28:10: warning: its scope is only this definition or declaration, which is probably not what you want
arch/x86/kernel/sys_x86_64.c:28:22: error: parameter 3 ('flags') has incomplete type
arch/x86/kernel/sys_x86_64.c:27:15: warning: function declaration isn't a prototype
arch/x86/kernel/sys_x86_64.c: In function 'align_addr':
arch/x86/kernel/sys_x86_64.c:33:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:33:6: note: each undeclared identifier is reported only once for each function it appears in
arch/x86/kernel/sys_x86_64.c:33:2: error: implicit declaration of function 'mmap_is_ia32'
arch/x86/kernel/sys_x86_64.c:39:17: error: 'ALIGN_VDSO' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:48:16: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'control_va_addr_alignment':
arch/x86/kernel/sys_x86_64.c:59:6: error: 'va_align' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:69:20: error: 'ALIGN_VA_32' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c:71:20: error: 'ALIGN_VA_64' undeclared (first use in this function)
arch/x86/kernel/sys_x86_64.c: In function 'arch_get_unmapped_area_topdown':
arch/x86/kernel/sys_x86_64.c:231:11: error: 'ALIGN_TOPDOWN' undeclared (first use in this function)

Presumably caused by commit dfb09f9b7ab0 ("x86, amd: Avoid cache aliasing
penalties on AMD family 15h") from the tip tree interacting with the
module.h split up.

I applied the following patch (which could be applied to the tip
tree ...).