From da870585b312d3fd9e1ffdfacd284b952a25ad24 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Jun 2012 21:20:06 +0200 Subject: [PATCH 1/3] Remove useless wrappers of asm-generic/cpumask.h frv and xtensa both have a header (in their include/asm directories) that are thin wrappers around asm-generic/cpumask.h. These wrappers are useless, since that header doesn't exist. They are also unused (all files including asm/cpumask.h are x86 specific). hexagon and openrisc generate similar headers at build time (using a generic-y entry in include/asm/Kbuild). These generated headers are useless and unused too. Remove these headers and generic-y entries. Signed-off-by: Paul Bolle Acked-by: Richard Kuo Acked-by: David Howells [FRV] Signed-off-by: Michal Marek --- arch/frv/include/asm/cpumask.h | 6 ------ arch/hexagon/include/asm/Kbuild | 1 - arch/openrisc/include/asm/Kbuild | 1 - arch/xtensa/include/asm/cpumask.h | 16 ---------------- 4 files changed, 24 deletions(-) delete mode 100644 arch/frv/include/asm/cpumask.h delete mode 100644 arch/xtensa/include/asm/cpumask.h diff --git a/arch/frv/include/asm/cpumask.h b/arch/frv/include/asm/cpumask.h deleted file mode 100644 index d999c20c84d2..000000000000 --- a/arch/frv/include/asm/cpumask.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _ASM_CPUMASK_H -#define _ASM_CPUMASK_H - -#include - -#endif /* _ASM_CPUMASK_H */ diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 9aa17f1917ea..8ecd2029f80e 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -7,7 +7,6 @@ header-y += user.h generic-y += auxvec.h generic-y += bug.h generic-y += bugs.h -generic-y += cpumask.h generic-y += cputime.h generic-y += current.h generic-y += device.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 3f35c38d7b64..08484f7665ad 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -13,7 +13,6 @@ generic-y += cacheflush.h generic-y += checksum.h generic-y += cmpxchg.h generic-y += cmpxchg-local.h -generic-y += cpumask.h generic-y += cputime.h generic-y += current.h generic-y += device.h diff --git a/arch/xtensa/include/asm/cpumask.h b/arch/xtensa/include/asm/cpumask.h deleted file mode 100644 index ebeede397db3..000000000000 --- a/arch/xtensa/include/asm/cpumask.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * include/asm-xtensa/cpumask.h - * - * 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. - * - * Copyright (C) 2001 - 2005 Tensilica Inc. - */ - -#ifndef _XTENSA_CPUMASK_H -#define _XTENSA_CPUMASK_H - -#include - -#endif /* _XTENSA_CPUMASK_H */ From 00cd7dc702147f9ce1838f2193f36b7e6c8b9b2d Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Jun 2012 21:21:06 +0200 Subject: [PATCH 2/3] Remove useless wrappers of asm-generic/ipc.h mn10300 has a header (in its include/asm directory) that is a thin wrapper around asm-generic/ipc.h. This wrapper is useless, since that header doesn't exist. It is also unused (no file includes asm/ipc.h). hexagon and tile generate similar headers at build time (using a generic-y entry in include/asm/Kbuild). These generated headers are useless and unused too. Remove this header and these generic-y entries. Signed-off-by: Paul Bolle Acked-by: Richard Kuo Acked-by: Chris Metcalf Acked-by: David Howells [MN10300] Signed-off-by: Michal Marek --- arch/hexagon/include/asm/Kbuild | 1 - arch/mn10300/include/asm/ipc.h | 1 - arch/tile/include/asm/Kbuild | 1 - 3 files changed, 3 deletions(-) delete mode 100644 arch/mn10300/include/asm/ipc.h diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 8ecd2029f80e..06906427c0ac 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -22,7 +22,6 @@ generic-y += ioctl.h generic-y += ioctls.h generic-y += iomap.h generic-y += ipcbuf.h -generic-y += ipc.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += kmap_types.h diff --git a/arch/mn10300/include/asm/ipc.h b/arch/mn10300/include/asm/ipc.h deleted file mode 100644 index a46e3d9c2a3f..000000000000 --- a/arch/mn10300/include/asm/ipc.h +++ /dev/null @@ -1 +0,0 @@ -#include diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild index 143473e3a0bb..ab7640ab7aaa 100644 --- a/arch/tile/include/asm/Kbuild +++ b/arch/tile/include/asm/Kbuild @@ -17,7 +17,6 @@ generic-y += fb.h generic-y += fcntl.h generic-y += ioctl.h generic-y += ioctls.h -generic-y += ipc.h generic-y += ipcbuf.h generic-y += irq_regs.h generic-y += kdebug.h From 459dac82b587cc4afe6e04b43c8e8b25e78bda15 Mon Sep 17 00:00:00 2001 From: Paul Bolle Date: Thu, 21 Jun 2012 21:21:37 +0200 Subject: [PATCH 3/3] Remove useless wrappers of asm-generic/rmap.h xtensa has a header (in its include/asm directory) that is a thin wrapper around asm-generic/rmap.h. This wrapper is useless, since that header doesn't exist. It is also unused (no file includes asm/rmap.h). openrisc generates a similar header at build time (using a generic-y entry in include/asm/Kbuild). This generated header is useless and unused too. Remove this header and this generic-y entry. Signed-off-by: Paul Bolle Signed-off-by: Michal Marek --- arch/openrisc/include/asm/Kbuild | 1 - arch/xtensa/include/asm/rmap.h | 16 ---------------- 2 files changed, 17 deletions(-) delete mode 100644 arch/xtensa/include/asm/rmap.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index 08484f7665ad..0922959663a0 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -42,7 +42,6 @@ generic-y += percpu.h generic-y += poll.h generic-y += posix_types.h generic-y += resource.h -generic-y += rmap.h generic-y += scatterlist.h generic-y += sections.h generic-y += segment.h diff --git a/arch/xtensa/include/asm/rmap.h b/arch/xtensa/include/asm/rmap.h deleted file mode 100644 index 649588b7e9ad..000000000000 --- a/arch/xtensa/include/asm/rmap.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * include/asm-xtensa/rmap.h - * - * 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. - * - * Copyright (C) 2001 - 2005 Tensilica Inc. - */ - -#ifndef _XTENSA_RMAP_H -#define _XTENSA_RMAP_H - -#include - -#endif