Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
AuthorDate: Thu, 26 Feb 2009 14:05:59 +0100
Commit: Vegard Nossum <vegard.nossum@xxxxxxxxx>
CommitDate: Thu, 26 Feb 2009 14:09:27 +0100
c2port: annotate bitfield for kmemcheck
This silences a false positive warning with kmemcheck.
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
---
drivers/misc/c2port/core.c | 2 ++
include/linux/c2port.h | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c
index 0207dd5..fc15042 100644
--- a/drivers/misc/c2port/core.c
+++ b/drivers/misc/c2port/core.c
@@ -15,6 +15,7 @@
#include <linux/errno.h>
#include <linux/err.h>
#include <linux/kernel.h>
+#include <linux/kmemcheck.h>
#include <linux/ctype.h>
#include <linux/delay.h>
#include <linux/idr.h>
@@ -893,6 +894,7 @@ struct c2port_device *c2port_device_register(char *name,
c2dev = kmalloc(sizeof(struct c2port_device), GFP_KERNEL);
if (unlikely(!c2dev))
return ERR_PTR(-ENOMEM);
+ kmemcheck_annotate_bitfield(c2dev->flags);
ret = idr_pre_get(&c2port_idr, GFP_KERNEL);
if (!ret) {
diff --git a/include/linux/c2port.h b/include/linux/c2port.h
index 7b5a238..2556499 100644
--- a/include/linux/c2port.h
+++ b/include/linux/c2port.h
@@ -10,6 +10,7 @@
*/
#include <linux/device.h>
+#include <linux/kmemcheck.h>
#define C2PORT_NAME_LEN 32
@@ -20,8 +21,10 @@
/* Main struct */
struct c2port_ops;
struct c2port_device {
- unsigned int access:1;
- unsigned int flash_access:1;
+ kmemcheck_define_bitfield(flags, {
+ unsigned int access:1;
+ unsigned int flash_access:1;
+ });
int id;
char name[C2PORT_NAME_LEN];
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|