The patch titled
Generic boolean
has been removed from the -mm tree. Its filename is
generic-boolean.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Generic boolean
From: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx>
This patch defines:
* a generic boolean-type, named 'bool'
* aliases to 0 and 1, named 'false' and 'true'
Removing colliding definitions of 'bool', 'false' and 'true'.
Signed-off-by: Richard Knutsson <ricknu-0@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/block/DAC960.h | 2 +-
drivers/media/video/cpia2/cpia2.h | 4 ----
drivers/net/dgrs.c | 1 -
drivers/scsi/BusLogic.h | 5 +----
include/linux/stddef.h | 6 ++++++
include/linux/types.h | 2 ++
6 files changed, 10 insertions(+), 10 deletions(-)
diff -puN drivers/block/DAC960.h~generic-boolean drivers/block/DAC960.h
--- a/drivers/block/DAC960.h~generic-boolean
+++ a/drivers/block/DAC960.h
@@ -71,7 +71,7 @@
Define a Boolean data type.
*/
-typedef enum { false, true } __attribute__ ((packed)) boolean;
+typedef bool boolean;
/*
diff -puN drivers/media/video/cpia2/cpia2.h~generic-boolean drivers/media/video/cpia2/cpia2.h
--- a/drivers/media/video/cpia2/cpia2.h~generic-boolean
+++ a/drivers/media/video/cpia2/cpia2.h
@@ -50,10 +50,6 @@
/***
* Image defines
***/
-#ifndef true
-#define true 1
-#define false 0
-#endif
/* Misc constants */
#define ALLOW_CORRUPT 0 /* Causes collater to discard checksum */
diff -puN drivers/net/dgrs.c~generic-boolean drivers/net/dgrs.c
--- a/drivers/net/dgrs.c~generic-boolean
+++ a/drivers/net/dgrs.c
@@ -110,7 +110,6 @@ static char version[] __initdata =
* DGRS include files
*/
typedef unsigned char uchar;
-typedef unsigned int bool;
#define vol volatile
#include "dgrs.h"
diff -puN drivers/scsi/BusLogic.h~generic-boolean drivers/scsi/BusLogic.h
--- a/drivers/scsi/BusLogic.h~generic-boolean
+++ a/drivers/scsi/BusLogic.h
@@ -237,10 +237,7 @@ enum BusLogic_BIOS_DiskGeometryTranslati
Define a Boolean data type.
*/
-typedef enum {
- false,
- true
-} PACKED boolean;
+typedef bool boolean;
/*
Define a 10^18 Statistics Byte Counter data type.
diff -puN include/linux/stddef.h~generic-boolean include/linux/stddef.h
--- a/include/linux/stddef.h~generic-boolean
+++ a/include/linux/stddef.h
@@ -11,6 +11,12 @@
#endif
#ifdef __KERNEL__
+
+enum {
+ false = 0,
+ true = 1
+};
+
#undef offsetof
#ifdef __compiler_offsetof
#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER)
diff -puN include/linux/types.h~generic-boolean include/linux/types.h
--- a/include/linux/types.h~generic-boolean
+++ a/include/linux/types.h
@@ -33,6 +33,8 @@ typedef __kernel_clockid_t clockid_t;
typedef __kernel_mqd_t mqd_t;
#ifdef __KERNEL__
+typedef _Bool bool;
+
typedef __kernel_uid32_t uid_t;
typedef __kernel_gid32_t gid_t;
typedef __kernel_uid16_t uid16_t;
_
Patches currently in -mm which might be from ricknu-0@xxxxxxxxxxxxxx are
origin.patch
git-dvb.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
