| Message ID | 1499625180-8067-18-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 770c0d86013e22647b15af8df2707f81ee1d5cd0 |
| Headers | show |
| Series | kbuild: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst | expand |
On 2017-07-09 at 20:32:49 +0200, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > Currently, NIOS2 has three signal.h files under arch/nios2/include: > > [1] arch/nios2/include/asm/signal.h > [2] arch/nios2/include/uapi/asm/signal.h > [3] arch/nios2/include/generated/asm/signal.h > > [3] is build-time generated by scripts/Makefile.asm-generic. > However, -I$(srctree)/arch/$(hdr-arch)/include search path is listed > before -I$(objtree)/arch/$(hdr-arch)/include/generated in LINUXINCLUDE. > Therefore [1] is always included instead of [3]. Remove [3] which > is never included. > > If we look at [1], it just includes [2]. So, [1] can be removed > as well. > > Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Tobias Klauser <tklauser@distanz.ch> Looks good, thanks!
diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild index e1a843def56f..c1c7f6736117 100644 --- a/arch/nios2/include/asm/Kbuild +++ b/arch/nios2/include/asm/Kbuild @@ -47,7 +47,6 @@ generic-y += segment.h generic-y += sembuf.h generic-y += serial.h generic-y += shmbuf.h -generic-y += signal.h generic-y += socket.h generic-y += sockios.h generic-y += spinlock.h diff --git a/arch/nios2/include/asm/signal.h b/arch/nios2/include/asm/signal.h deleted file mode 100644 index bbcf11eecb01..000000000000 --- a/arch/nios2/include/asm/signal.h +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright Altera Corporation (C) 2013. All rights reserved - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope 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. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -#ifndef _NIOS2_SIGNAL_H -#define _NIOS2_SIGNAL_H - -#include <uapi/asm/signal.h> - -#endif /* _NIOS2_SIGNAL_H */
Currently, NIOS2 has three signal.h files under arch/nios2/include: [1] arch/nios2/include/asm/signal.h [2] arch/nios2/include/uapi/asm/signal.h [3] arch/nios2/include/generated/asm/signal.h [3] is build-time generated by scripts/Makefile.asm-generic. However, -I$(srctree)/arch/$(hdr-arch)/include search path is listed before -I$(objtree)/arch/$(hdr-arch)/include/generated in LINUXINCLUDE. Therefore [1] is always included instead of [3]. Remove [3] which is never included. If we look at [1], it just includes [2]. So, [1] can be removed as well. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> --- arch/nios2/include/asm/Kbuild | 1 - arch/nios2/include/asm/signal.h | 22 ---------------------- 2 files changed, 23 deletions(-) delete mode 100644 arch/nios2/include/asm/signal.h -- 2.7.4