From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Arnd Bergmann <arnd@arndb.de>, linux-arch@vger.kernel.org
Cc: linux-kernel@vger.kernel.org,
Geert Uytterhoeven <geert@linux-m68k.org>,
Hirokazu Takata <takata@linux-m32r.org>,
linux-m32r@ml.linux-m32r.org
Subject: [PATCH 17/24] m32r: Use Kbuild logic to provide <asm/types.h>
Date: Mon, 25 Nov 2013 09:55:27 +0100 [thread overview]
Message-ID: <1385369734-24893-18-git-send-email-geert@linux-m68k.org> (raw)
In-Reply-To: <1385369734-24893-1-git-send-email-geert@linux-m68k.org>
The extra definition for BITS_PER_LONG is also indirectly provided
by <asm-generic/types.h>, via <asm-generic/int-ll64.h> and
<asm/bitsperlong.h>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Hirokazu Takata <takata@linux-m32r.org>
Cc: linux-m32r@ml.linux-m32r.org
---
arch/m32r/include/asm/Kbuild | 1 +
arch/m32r/include/asm/types.h | 12 ------------
2 files changed, 1 insertion(+), 12 deletions(-)
delete mode 100644 arch/m32r/include/asm/types.h
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild
index e03862db9b75..e1138b819fcc 100644
--- a/arch/m32r/include/asm/Kbuild
+++ b/arch/m32r/include/asm/Kbuild
@@ -5,3 +5,4 @@ generic-y += module.h
generic-y += sections.h
generic-y += trace_clock.h
generic-y += preempt.h
+generic-y += types.h
diff --git a/arch/m32r/include/asm/types.h b/arch/m32r/include/asm/types.h
deleted file mode 100644
index 04a44c6ee34d..000000000000
--- a/arch/m32r/include/asm/types.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef _ASM_M32R_TYPES_H
-#define _ASM_M32R_TYPES_H
-
-#include <uapi/asm/types.h>
-
-/*
- * These aren't exported outside the kernel to avoid name space clashes
- */
-
-#define BITS_PER_LONG 32
-
-#endif /* _ASM_M32R_TYPES_H */
--
1.7.9.5
next prev parent reply other threads:[~2013-11-25 8:57 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-25 8:55 [PATCH 0024] asm-generic: Rename int-ll64.h to types.h Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 01/24] uapi: Add missing _UAPI prefix to <asm-generic/types.h> include guard Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 02/24] avr32/uapi: Use Kbuild logic to provide <asm/types.h> Geert Uytterhoeven
2013-11-25 9:07 ` Hans-Christian Egtvedt
2013-11-25 8:55 ` [PATCH 03/24] cris/uapi: " Geert Uytterhoeven
2013-11-25 9:03 ` Jesper Nilsson
2013-11-25 8:55 ` [PATCH 04/24] frv/uapi: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 05/24] m32r/uapi: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 06/24] microblaze/uapi: Use Kbuild logic to include <asm-generic/types.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 07/24] mn10300/uapi: Use Kbuild logic to provide <asm/types.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 08/24] parisc/uapi: " Geert Uytterhoeven
2013-11-25 9:55 ` James Bottomley
2013-11-25 10:12 ` Geert Uytterhoeven
2013-11-25 10:22 ` James Bottomley
2013-11-25 8:55 ` [PATCH 09/24] score/uapi: Use Kbuild logic to include <asm-generic/types.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 10/24] sh/uapi: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 11/24] x86/uapi: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 12/24] alpha: Remove #include <uapi/asm/types.h> from <asm/types.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 13/24] mips: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 14/24] avr32: Use Kbuild logic to provide <asm/types.h> Geert Uytterhoeven
2013-11-25 9:09 ` Hans-Christian Egtvedt
2013-11-25 10:03 ` Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 15/24] cris: " Geert Uytterhoeven
2013-11-25 9:03 ` Jesper Nilsson
2013-11-25 8:55 ` [PATCH 16/24] frv: " Geert Uytterhoeven
2013-11-25 8:55 ` Geert Uytterhoeven [this message]
2013-11-25 8:55 ` [PATCH 18/24] mn10300: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 19/24] sh: Replace <uapi/asm/types.h> by <asm-generic/int-ll64.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 20/24] xtensa: Remove duplicate definition of BITS_PER_LONG Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 21/24] powerpc: Separate kernel/userspace inclusion of <asm-generic/int-ll64.h> Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 22/24] s390: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 23/24] xtensa: " Geert Uytterhoeven
2013-11-25 8:55 ` [PATCH 24/24] asm-generic: Rename int-ll64.h to types.h Geert Uytterhoeven
2013-11-25 10:16 ` [PATCH 0024] " James Bottomley
2013-11-25 10:43 ` Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385369734-24893-18-git-send-email-geert@linux-m68k.org \
--to=geert@linux-m68k.org \
--cc=arnd@arndb.de \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m32r@ml.linux-m32r.org \
--cc=takata@linux-m32r.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).