diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2017-04-03 05:08:40 +0200 |
|---|---|---|
| committer | Ley Foon Tan <ley.foon.tan@intel.com> | 2017-05-08 10:59:19 +0200 |
| commit | f679b311f0683be352cb73b28d7108eed79ef795 (patch) | |
| tree | ea8785918a26784ce564af44a43f463ccd3881e5 | |
| parent | nios2: add .gitignore entries for auto-generated files (diff) | |
| download | linux-f679b311f0683be352cb73b28d7108eed79ef795.tar.xz linux-f679b311f0683be352cb73b28d7108eed79ef795.zip | |
nios2: remove wrapper header for cmpxchg.h
Since commit 713e9b802e21 ("nios2: Switch to generic __xchg()")
asm/cmpxchg.h for nios2 is merely including asm-generic/cmpxchg.h. Thus,
the wrapper can be omitted and the generic header can be used directly.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Ley Foon Tan <ley.foon.tan@intel.com>
| -rw-r--r-- | arch/nios2/include/asm/Kbuild | 1 | ||||
| -rw-r--r-- | arch/nios2/include/asm/cmpxchg.h | 14 |
2 files changed, 1 insertions, 14 deletions
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild index 87e70f2b463f..727dbb333f60 100644 --- a/arch/nios2/include/asm/Kbuild +++ b/arch/nios2/include/asm/Kbuild @@ -6,6 +6,7 @@ generic-y += bitsperlong.h generic-y += bug.h generic-y += bugs.h generic-y += clkdev.h +generic-y += cmpxchg.h generic-y += current.h generic-y += device.h generic-y += div64.h diff --git a/arch/nios2/include/asm/cmpxchg.h b/arch/nios2/include/asm/cmpxchg.h deleted file mode 100644 index a7978f14d157..000000000000 --- a/arch/nios2/include/asm/cmpxchg.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) 2004 Microtronix Datacom Ltd. - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - */ - -#ifndef _ASM_NIOS2_CMPXCHG_H -#define _ASM_NIOS2_CMPXCHG_H - -#include <asm-generic/cmpxchg.h> - -#endif /* _ASM_NIOS2_CMPXCHG_H */ |