diff mbox series

[v12,01/16] asm-generic: add kexec_file_load system call to unistd.h

Message ID 20180724065759.19186-2-takahiro.akashi@linaro.org
State New
Headers show
Series arm64: kexec: add kexec_file_load() support | expand

Commit Message

AKASHI Takahiro July 24, 2018, 6:57 a.m. UTC 
The initial user of this system call number is arm64.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>

Acked-by: Arnd Bergmann <arnd@arndb.de>

---
 include/uapi/asm-generic/unistd.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

-- 
2.18.0

Comments

James Morse July 26, 2018, 1:35 p.m. UTC | #1 
Hi Akashi,

On 24/07/18 07:57, AKASHI Takahiro wrote:
> The initial user of this system call number is arm64.


This patch conflicts with commit db7a2d1809a5 ("asm-generic: unistd.h: Wire up
sys_rseq") in the arm64 tree.

Thanks,

James

> diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h

> index 42990676a55e..c81f4a0df51f 100644

> --- a/include/uapi/asm-generic/unistd.h

> +++ b/include/uapi/asm-generic/unistd.h

> @@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free,     sys_pkey_free)

>  __SYSCALL(__NR_statx,     sys_statx)

>  #define __NR_io_pgetevents 292

>  __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)

> +#define __NR_kexec_file_load 293

> +__SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)

>  

>  #undef __NR_syscalls

> -#define __NR_syscalls 293

> +#define __NR_syscalls 294

>  

>  /*

>   * 32 bit systems traditionally used different

>
AKASHI Takahiro July 27, 2018, 5:22 a.m. UTC | #2 
On Thu, Jul 26, 2018 at 02:35:50PM +0100, James Morse wrote:
> Hi Akashi,

> 

> On 24/07/18 07:57, AKASHI Takahiro wrote:

> > The initial user of this system call number is arm64.

> 

> This patch conflicts with commit db7a2d1809a5 ("asm-generic: unistd.h: Wire up

> sys_rseq") in the arm64 tree.


OK. I will try to rebase my code to arm64/for-next/core at v13.

Thanks,
-Takahiro AKASHI

> Thanks,

> 

> James

> 

> > diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h

> > index 42990676a55e..c81f4a0df51f 100644

> > --- a/include/uapi/asm-generic/unistd.h

> > +++ b/include/uapi/asm-generic/unistd.h

> > @@ -734,9 +734,11 @@ __SYSCALL(__NR_pkey_free,     sys_pkey_free)

> >  __SYSCALL(__NR_statx,     sys_statx)

> >  #define __NR_io_pgetevents 292

> >  __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)

> > +#define __NR_kexec_file_load 293

> > +__SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)

> >  

> >  #undef __NR_syscalls

> > -#define __NR_syscalls 293

> > +#define __NR_syscalls 294

> >  

> >  /*

> >   * 32 bit systems traditionally used different

> >
diff mbox series

Patch

diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h
index 42990676a55e..c81f4a0df51f 100644
--- a/include/uapi/asm-generic/unistd.h
+++ b/include/uapi/asm-generic/unistd.h
@@ -734,9 +734,11 @@  __SYSCALL(__NR_pkey_free,     sys_pkey_free)
 __SYSCALL(__NR_statx,     sys_statx)
 #define __NR_io_pgetevents 292
 __SC_COMP(__NR_io_pgetevents, sys_io_pgetevents, compat_sys_io_pgetevents)
+#define __NR_kexec_file_load 293
+__SYSCALL(__NR_kexec_file_load,     sys_kexec_file_load)
 
 #undef __NR_syscalls
-#define __NR_syscalls 293
+#define __NR_syscalls 294
 
 /*
  * 32 bit systems traditionally used different