diff options
| author | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:58:34 -0800 |
|---|---|---|
| committer | Paul Walmsley <paul.walmsley@sifive.com> | 2019-11-22 18:58:34 -0800 |
| commit | 4a979862dde46b738316014ca4995eae2f428413 (patch) | |
| tree | f9365962647e2fc92a6af614e305e46a0ae1928d /arch/riscv/include/asm/futex.h | |
| parent | e8cad25b7e8ac8a1ecd7d7243cbea9cfa7049bee (diff) | |
| parent | c5ab54e9945b5f3dc8e9c31b93bb334fcea126f4 (diff) | |
| download | linux-next-4a979862dde46b738316014ca4995eae2f428413.tar.gz linux-next-4a979862dde46b738316014ca4995eae2f428413.zip | |
Merge branch 'next/misc' into for-next
Diffstat (limited to 'arch/riscv/include/asm/futex.h')
| -rw-r--r-- | arch/riscv/include/asm/futex.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/riscv/include/asm/futex.h b/arch/riscv/include/asm/futex.h index 4ad6409c4647..207310584422 100644 --- a/arch/riscv/include/asm/futex.h +++ b/arch/riscv/include/asm/futex.h @@ -4,8 +4,8 @@ * Copyright (c) 2018 Jim Wilson (jimw@sifive.com) */ -#ifndef _ASM_FUTEX_H -#define _ASM_FUTEX_H +#ifndef _ASM_RISCV_FUTEX_H +#define _ASM_RISCV_FUTEX_H #include <linux/futex.h> #include <linux/uaccess.h> @@ -112,4 +112,4 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, return ret; } -#endif /* _ASM_FUTEX_H */ +#endif /* _ASM_RISCV_FUTEX_H */ |