diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-06 15:27:17 +0100 |
| commit | e8cd29b774ddd28bfe6d693c82241e294dc91e09 (patch) | |
| tree | c8f904220eab7c50771558642b6c6d9240fb5368 /arch/riscv/kernel/vdso/gettimeofday.S | |
| parent | 7e739297cdbe8383bf4a5e423959107eccc01fa1 (diff) | |
| parent | 73996933b53ff396d63a7fccd8e824758634dc19 (diff) | |
| download | blackbird-op-linux-e8cd29b774ddd28bfe6d693c82241e294dc91e09.tar.gz blackbird-op-linux-e8cd29b774ddd28bfe6d693c82241e294dc91e09.zip | |
Merge Linus's staging merge point into staging-next
This resolves the merge issue pointed out by Stephen in
drivers/iio/adc/meson_saradc.c.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/riscv/kernel/vdso/gettimeofday.S')
| -rw-r--r-- | arch/riscv/kernel/vdso/gettimeofday.S | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/arch/riscv/kernel/vdso/gettimeofday.S b/arch/riscv/kernel/vdso/gettimeofday.S new file mode 100644 index 000000000000..da85d33e8990 --- /dev/null +++ b/arch/riscv/kernel/vdso/gettimeofday.S @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2017 SiFive + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation, version 2. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#include <linux/linkage.h> +#include <asm/unistd.h> + + .text +/* int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz); */ +ENTRY(__vdso_gettimeofday) + .cfi_startproc + /* For now, just do the syscall. */ + li a7, __NR_gettimeofday + ecall + ret + .cfi_endproc +ENDPROC(__vdso_gettimeofday) |
