diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2009-02-26 08:05:59 -0500 |
|---|---|---|
| committer | Vegard Nossum <vegard.nossum@gmail.com> | 2009-06-15 09:49:34 -0400 |
| commit | c53bd2e1949ddbe06fe2a6079c0658d58ce25edb (patch) | |
| tree | a9663b949ab413031f09115aef2bf3bf5305ab27 | |
| parent | 9e337b0fb3baa3c22490365b1bdee6f4741413d4 (diff) | |
c2port: annotate bitfield for kmemcheck
This silences a false positive warning with kmemcheck.
Signed-off-by: Vegard Nossum <vegard.nossum@gmail.com>
| -rw-r--r-- | drivers/misc/c2port/core.c | 2 | ||||
| -rw-r--r-- | include/linux/c2port.h | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c index 0207dd59090d..b5346b4db91a 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c | |||
| @@ -15,6 +15,7 @@ | |||
| 15 | #include <linux/errno.h> | 15 | #include <linux/errno.h> |
| 16 | #include <linux/err.h> | 16 | #include <linux/err.h> |
| 17 | #include <linux/kernel.h> | 17 | #include <linux/kernel.h> |
| 18 | #include <linux/kmemcheck.h> | ||
| 18 | #include <linux/ctype.h> | 19 | #include <linux/ctype.h> |
| 19 | #include <linux/delay.h> | 20 | #include <linux/delay.h> |
| 20 | #include <linux/idr.h> | 21 | #include <linux/idr.h> |
| @@ -891,6 +892,7 @@ struct c2port_device *c2port_device_register(char *name, | |||
| 891 | return ERR_PTR(-EINVAL); | 892 | return ERR_PTR(-EINVAL); |
| 892 | 893 | ||
| 893 | c2dev = kmalloc(sizeof(struct c2port_device), GFP_KERNEL); | 894 | c2dev = kmalloc(sizeof(struct c2port_device), GFP_KERNEL); |
| 895 | kmemcheck_annotate_bitfield(c2dev, flags); | ||
| 894 | if (unlikely(!c2dev)) | 896 | if (unlikely(!c2dev)) |
| 895 | return ERR_PTR(-ENOMEM); | 897 | return ERR_PTR(-ENOMEM); |
| 896 | 898 | ||
diff --git a/include/linux/c2port.h b/include/linux/c2port.h index 7b5a2388ba67..2a5cd867c365 100644 --- a/include/linux/c2port.h +++ b/include/linux/c2port.h | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | */ | 10 | */ |
| 11 | 11 | ||
| 12 | #include <linux/device.h> | 12 | #include <linux/device.h> |
| 13 | #include <linux/kmemcheck.h> | ||
| 13 | 14 | ||
| 14 | #define C2PORT_NAME_LEN 32 | 15 | #define C2PORT_NAME_LEN 32 |
| 15 | 16 | ||
| @@ -20,8 +21,10 @@ | |||
| 20 | /* Main struct */ | 21 | /* Main struct */ |
| 21 | struct c2port_ops; | 22 | struct c2port_ops; |
| 22 | struct c2port_device { | 23 | struct c2port_device { |
| 24 | kmemcheck_bitfield_begin(flags); | ||
| 23 | unsigned int access:1; | 25 | unsigned int access:1; |
| 24 | unsigned int flash_access:1; | 26 | unsigned int flash_access:1; |
| 27 | kmemcheck_bitfield_end(flags); | ||
| 25 | 28 | ||
| 26 | int id; | 29 | int id; |
| 27 | char name[C2PORT_NAME_LEN]; | 30 | char name[C2PORT_NAME_LEN]; |
