diff for duplicates of <200711281432.09178.arnd@arndb.de> diff --git a/a/1.txt b/N1/1.txt index ec2135a..e05845f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,13 @@ On Wednesday 28 November 2007, Kamalesh Babulal wrote: > Kernel build fails, with build error ->=20 -> =C2=A0 CC =C2=A0 =C2=A0 =C2=A0arch/powerpc/platforms/cell/spu_callbacks.o +> +> CC arch/powerpc/platforms/cell/spu_callbacks.o > In file included from arch/powerpc/platforms/cell/spu_callbacks.c:49: -> include/asm/systbl.h:312: error: =E2=80=98sys_timerfd=E2=80=99 undeclared= - here (not in a function) +> include/asm/systbl.h:312: error: ‘sys_timerfd’ undeclared here (not in a function) > make[2]: *** [arch/powerpc/platforms/cell/spu_callbacks.o] Error 1 > make[1]: *** [arch/powerpc/platforms/cell] Error 2 > make: *** [arch/powerpc/platforms] Error 2 ->=20 +> I guess all architectures except x86 are currently broken because they reference the old sys_timerfd function. This patch should add the missing @@ -16,7 +15,7 @@ bits to powerpc. Signed-off-by: Arnd Bergmann <arnd@arndb.de> -=2D-- +--- Disclaimer: Not tested at all, just applied common sense. Disclaimer2: conflicts with the sys_indirect kernel implementation @@ -24,13 +23,13 @@ sent by paulus last week. diff --git a/include/asm-powerpc/systbl.h b/include/asm-powerpc/systbl.h index 11d5383..b029368 100644 -=2D-- a/include/asm-powerpc/systbl.h +--- a/include/asm-powerpc/systbl.h +++ b/include/asm-powerpc/systbl.h @@ -309,7 +309,9 @@ SYSCALL_SPU(getcpu) COMPAT_SYS(epoll_pwait) COMPAT_SYS_SPU(utimensat) COMPAT_SYS_SPU(signalfd) -=2DCOMPAT_SYS_SPU(timerfd) +-COMPAT_SYS_SPU(timerfd) +COMPAT_SYS_SPU(timerfd_create) SYSCALL_SPU(eventfd) COMPAT_SYS_SPU(sync_file_range2) @@ -39,24 +38,24 @@ index 11d5383..b029368 100644 +COMPAT_SYS_SPU(sys_timerfd_gettime) diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h index 97d82b6..4ba2d20 100644 -=2D-- a/include/asm-powerpc/unistd.h +--- a/include/asm-powerpc/unistd.h +++ b/include/asm-powerpc/unistd.h @@ -328,14 +328,16 @@ #define __NR_epoll_pwait 303 #define __NR_utimensat 304 #define __NR_signalfd 305 -=2D#define __NR_timerfd 306 +-#define __NR_timerfd 306 +#define __NR_timerfd_create 306 #define __NR_eventfd 307 #define __NR_sync_file_range2 308 #define __NR_fallocate 309 +#define __NR_sys_timerfd_settime 310 +#define __NR_sys_timerfd_gettime 311 -=20 + #ifdef __KERNEL__ -=20 -=2D#define __NR_syscalls 310 + +-#define __NR_syscalls 310 +#define __NR_syscalls 312 -=20 + #define __NR__exit __NR_exit #define NR_syscalls __NR_syscalls diff --git a/a/content_digest b/N1/content_digest index d745784..649ae4b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,24 +4,23 @@ "Subject\0Re: 2.6.24-rc3-mm2 - Build Failure on powerpc timerfd() undeclared\0" "Date\0Wed, 28 Nov 2007 14:32:07 +0100\0" "To\0linuxppc-dev@ozlabs.org\0" - "Cc\0Andrew Morton <akpm@linux-foundation.org>" + "Cc\0Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>" + Andrew Morton <akpm@linux-foundation.org> Balbir Singh <balbir@linux.vnet.ibm.com> - Paul Mackerras <paulus@samba.org> linux-kernel@vger.kernel.org - " Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>\0" + " Paul Mackerras <paulus@samba.org>\0" "\00:1\0" "b\0" "On Wednesday 28 November 2007, Kamalesh Babulal wrote:\n" "> Kernel build fails, with build error\n" - ">=20\n" - "> =C2=A0 CC =C2=A0 =C2=A0 =C2=A0arch/powerpc/platforms/cell/spu_callbacks.o\n" + "> \n" + "> \302\240 CC \302\240 \302\240 \302\240arch/powerpc/platforms/cell/spu_callbacks.o\n" "> In file included from arch/powerpc/platforms/cell/spu_callbacks.c:49:\n" - "> include/asm/systbl.h:312: error: =E2=80=98sys_timerfd=E2=80=99 undeclared=\n" - " here (not in a function)\n" + "> include/asm/systbl.h:312: error: \342\200\230sys_timerfd\342\200\231 undeclared here (not in a function)\n" "> make[2]: *** [arch/powerpc/platforms/cell/spu_callbacks.o] Error 1\n" "> make[1]: *** [arch/powerpc/platforms/cell] Error 2\n" "> make: *** [arch/powerpc/platforms] Error 2\n" - ">=20\n" + "> \n" "\n" "I guess all architectures except x86 are currently broken because they\n" "reference the old sys_timerfd function. This patch should add the missing\n" @@ -29,7 +28,7 @@ "\n" "Signed-off-by: Arnd Bergmann <arnd@arndb.de>\n" "\n" - "=2D--\n" + "---\n" "\n" "Disclaimer: Not tested at all, just applied common sense.\n" "Disclaimer2: conflicts with the sys_indirect kernel implementation\n" @@ -37,13 +36,13 @@ "\n" "diff --git a/include/asm-powerpc/systbl.h b/include/asm-powerpc/systbl.h\n" "index 11d5383..b029368 100644\n" - "=2D-- a/include/asm-powerpc/systbl.h\n" + "--- a/include/asm-powerpc/systbl.h\n" "+++ b/include/asm-powerpc/systbl.h\n" "@@ -309,7 +309,9 @@ SYSCALL_SPU(getcpu)\n" " COMPAT_SYS(epoll_pwait)\n" " COMPAT_SYS_SPU(utimensat)\n" " COMPAT_SYS_SPU(signalfd)\n" - "=2DCOMPAT_SYS_SPU(timerfd)\n" + "-COMPAT_SYS_SPU(timerfd)\n" "+COMPAT_SYS_SPU(timerfd_create)\n" " SYSCALL_SPU(eventfd)\n" " COMPAT_SYS_SPU(sync_file_range2)\n" @@ -52,26 +51,26 @@ "+COMPAT_SYS_SPU(sys_timerfd_gettime)\n" "diff --git a/include/asm-powerpc/unistd.h b/include/asm-powerpc/unistd.h\n" "index 97d82b6..4ba2d20 100644\n" - "=2D-- a/include/asm-powerpc/unistd.h\n" + "--- a/include/asm-powerpc/unistd.h\n" "+++ b/include/asm-powerpc/unistd.h\n" "@@ -328,14 +328,16 @@\n" " #define __NR_epoll_pwait\t303\n" " #define __NR_utimensat\t\t304\n" " #define __NR_signalfd\t\t305\n" - "=2D#define __NR_timerfd\t\t306\n" + "-#define __NR_timerfd\t\t306\n" "+#define __NR_timerfd_create\t306\n" " #define __NR_eventfd\t\t307\n" " #define __NR_sync_file_range2\t308\n" " #define __NR_fallocate\t\t309\n" "+#define __NR_sys_timerfd_settime 310\n" "+#define __NR_sys_timerfd_gettime 311\n" - "=20\n" + " \n" " #ifdef __KERNEL__\n" - "=20\n" - "=2D#define __NR_syscalls\t\t310\n" + " \n" + "-#define __NR_syscalls\t\t310\n" "+#define __NR_syscalls\t\t312\n" - "=20\n" + " \n" " #define __NR__exit __NR_exit\n" " #define NR_syscalls\t__NR_syscalls" -d603b6112f01a4d5ff5ab9c6057e501e14d53fb295c5106f72e2c907a318203b +97d4679e7417b4dcd5d1d96479832177e4ceba41c760b22b87514640f3839673
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.