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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1071 bytes --]

Hi Srikar,

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

In file included from include/linux/compat.h:18:0,
                 from arch/x86/include/asm/ia32.h:7,
                 from arch/x86/include/asm/sigframe.h:17,
                 from arch/x86/kernel/asm-offsets.c:16:
arch/x86/include/asm/compat.h:238:20: error: redefinition of 'is_ia32_task'
arch/x86/include/asm/thread_info.h:272:20: note: previous definition of 'is_ia32_task' was here

Caused by commit 081c056eccf3 ("x86: Move is_ia32_task to
asm/thread_info.h from asm/compat.h") which added the function to
asm/thread_info.h but did not remove it from asm/compat.h.  The version
of this patch that is in the tip tree is correct (but that is not in
tip's auto-latest branch (and hence linux-next) today).

I would have used the uprobes tree from next-20130309, but trying that
produced a large number of conflicts, so I just dropped the uprobes tree
for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 651 bytes --]

Hi Srikar,

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

In file included from include/trace/events/syscalls.h:11:0,
                 from kernel/trace/trace_syscalls.c:2:
arch/x86/include/asm/syscall.h: In function 'syscall_get_arguments':
arch/x86/include/asm/syscall.h:98:2: error: implicit declaration of function 'is_ia32_compat_task' [-Werror=implicit-function-declaration]

Caused by commit 1e1e2cddc33d ("x86/trivial: use is_ia32_compat_task").

I have used the uprobes tree from next-20120309 for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1054 bytes --]

Hi Srikar,

After merging the uprobes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/notifier.h:15:0,
                 from include/linux/memory_hotplug.h:6,
                 from include/linux/mmzone.h:676,
                 from include/linux/topology.h:32,
                 from include/linux/sched.h:78,
                 from arch/powerpc/kernel/asm-offsets.c:17:
include/linux/srcu.h:247:19: error: redefinition of 'srcu_read_lock_raw'
include/linux/srcu.h:204:19: note: previous definition of 'srcu_read_lock_raw' was here
include/linux/srcu.h:266:20: error: redefinition of 'srcu_read_unlock_raw'
include/linux/srcu.h:223:20: note: previous definition of 'srcu_read_unlock_raw' was here

Caused by a bad automatic merge (commit e73ddde54141 from the uprobes
tree is the same patch as commit 0c53dd8b3140 from the tip and rcu
trees).  I fixed it up (removed the second copy of the functions).
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]