| Message ID | 20190306142944.834167-1-arnd@arndb.de |
|---|---|
| State | Accepted |
| Commit | 7e89a37c477c4caacde7b511c64720e20104945f |
| Headers | show |
| Series | ipc: Fix building compat mode without sysvipc | expand |
On 3/6/19 6:29 AM, Arnd Bergmann wrote: > As John Stultz noticed, my y2038 syscall series caused a link > failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is > enabled: > is this supposed to be "CONFIG_SYSVIPC is disabled" to match the subject? > arch/arm64/kernel/sys32.o:(.rodata+0x960): undefined reference to `__arm64_compat_sys_old_semctl' > arch/arm64/kernel/sys32.o:(.rodata+0x980): undefined reference to `__arm64_compat_sys_old_msgctl' > arch/arm64/kernel/sys32.o:(.rodata+0x9a0): undefined reference to `__arm64_compat_sys_old_shmctl' > > Add the missing entries in kernel/sys_ni.c for the new system > calls. > > Cc: Laura Abbott <labbott@redhat.com> > Cc: John Stultz <john.stultz@linaro.org> > Cc: Thomas Gleixner <tglx@linutronix.de> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > I'm about to send off my pull requests for arm-soc, so I'd just > send another one with just this common from my y2038 tree. > --- > kernel/sys_ni.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c > index 85e5ccec0955..62a6c8707799 100644 > --- a/kernel/sys_ni.c > +++ b/kernel/sys_ni.c > @@ -202,6 +202,7 @@ COND_SYSCALL(msgget); > COND_SYSCALL(old_msgctl); > COND_SYSCALL(msgctl); > COND_SYSCALL_COMPAT(msgctl); > +COND_SYSCALL_COMPAT(old_msgctl); > COND_SYSCALL(msgrcv); > COND_SYSCALL_COMPAT(msgrcv); > COND_SYSCALL(msgsnd); > @@ -212,6 +213,7 @@ COND_SYSCALL(semget); > COND_SYSCALL(old_semctl); > COND_SYSCALL(semctl); > COND_SYSCALL_COMPAT(semctl); > +COND_SYSCALL_COMPAT(old_semctl); > COND_SYSCALL(semtimedop); > COND_SYSCALL(semtimedop_time32); > COND_SYSCALL(semop); > @@ -221,6 +223,7 @@ COND_SYSCALL(shmget); > COND_SYSCALL(old_shmctl); > COND_SYSCALL(shmctl); > COND_SYSCALL_COMPAT(shmctl); > +COND_SYSCALL_COMPAT(old_shmctl); > COND_SYSCALL(shmat); > COND_SYSCALL_COMPAT(shmat); > COND_SYSCALL(shmdt); >
On Wed, Mar 6, 2019 at 3:44 PM Laura Abbott <labbott@redhat.com> wrote: > > On 3/6/19 6:29 AM, Arnd Bergmann wrote: > > As John Stultz noticed, my y2038 syscall series caused a link > > failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is > > enabled: > > > > is this supposed to be "CONFIG_SYSVIPC is disabled" to match the > subject? Fixing it now, thanks! Arnd
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 85e5ccec0955..62a6c8707799 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -202,6 +202,7 @@ COND_SYSCALL(msgget); COND_SYSCALL(old_msgctl); COND_SYSCALL(msgctl); COND_SYSCALL_COMPAT(msgctl); +COND_SYSCALL_COMPAT(old_msgctl); COND_SYSCALL(msgrcv); COND_SYSCALL_COMPAT(msgrcv); COND_SYSCALL(msgsnd); @@ -212,6 +213,7 @@ COND_SYSCALL(semget); COND_SYSCALL(old_semctl); COND_SYSCALL(semctl); COND_SYSCALL_COMPAT(semctl); +COND_SYSCALL_COMPAT(old_semctl); COND_SYSCALL(semtimedop); COND_SYSCALL(semtimedop_time32); COND_SYSCALL(semop); @@ -221,6 +223,7 @@ COND_SYSCALL(shmget); COND_SYSCALL(old_shmctl); COND_SYSCALL(shmctl); COND_SYSCALL_COMPAT(shmctl); +COND_SYSCALL_COMPAT(old_shmctl); COND_SYSCALL(shmat); COND_SYSCALL_COMPAT(shmat); COND_SYSCALL(shmdt);
As John Stultz noticed, my y2038 syscall series caused a link failure when CONFIG_SYSVIPC is enabled but CONFIG_COMPAT is enabled: arch/arm64/kernel/sys32.o:(.rodata+0x960): undefined reference to `__arm64_compat_sys_old_semctl' arch/arm64/kernel/sys32.o:(.rodata+0x980): undefined reference to `__arm64_compat_sys_old_msgctl' arch/arm64/kernel/sys32.o:(.rodata+0x9a0): undefined reference to `__arm64_compat_sys_old_shmctl' Add the missing entries in kernel/sys_ni.c for the new system calls. Cc: Laura Abbott <labbott@redhat.com> Cc: John Stultz <john.stultz@linaro.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- I'm about to send off my pull requests for arm-soc, so I'd just send another one with just this common from my y2038 tree. --- kernel/sys_ni.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.20.0