aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 16:09:51 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-16 16:09:51 -0400
commitb3fec0fe35a4ff048484f1408385a27695d4273b (patch)
tree088c23f098421ea681d9976a83aad73d15be1027 /drivers/ieee1394
parente1f5b94fd0c93c3e27ede88b7ab652d086dc960f (diff)
parent722f2a6c87f34ee0fd0130a8cf45f81e0705594a (diff)
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard/kmemcheck: (39 commits) signal: fix __send_signal() false positive kmemcheck warning fs: fix do_mount_root() false positive kmemcheck warning fs: introduce __getname_gfp() trace: annotate bitfields in struct ring_buffer_event net: annotate struct sock bitfield c2port: annotate bitfield for kmemcheck net: annotate inet_timewait_sock bitfields ieee1394/csr1212: fix false positive kmemcheck report ieee1394: annotate bitfield net: annotate bitfields in struct inet_sock net: use kmemcheck bitfields API for skbuff kmemcheck: introduce bitfield API kmemcheck: add opcode self-testing at boot x86: unify pte_hidden x86: make _PAGE_HIDDEN conditional kmemcheck: make kconfig accessible for other architectures kmemcheck: enable in the x86 Kconfig kmemcheck: add hooks for the page allocator kmemcheck: add hooks for page- and sg-dma-mappings kmemcheck: don't track page tables ...
Diffstat (limited to 'drivers/ieee1394')
-rw-r--r--drivers/ieee1394/csr1212.c2
-rw-r--r--drivers/ieee1394/nodemgr.c5
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/ieee1394/csr1212.c b/drivers/ieee1394/csr1212.c
index a6dfeb0b337..e76cac64c53 100644
--- a/drivers/ieee1394/csr1212.c
+++ b/drivers/ieee1394/csr1212.c
@@ -35,6 +35,7 @@
35 35
36#include <linux/errno.h> 36#include <linux/errno.h>
37#include <linux/kernel.h> 37#include <linux/kernel.h>
38#include <linux/kmemcheck.h>
38#include <linux/string.h> 39#include <linux/string.h>
39#include <asm/bug.h> 40#include <asm/bug.h>
40#include <asm/byteorder.h> 41#include <asm/byteorder.h>
@@ -387,6 +388,7 @@ csr1212_new_descriptor_leaf(u8 dtype, u32 specifier_id,
387 if (!kv) 388 if (!kv)
388 return NULL; 389 return NULL;
389 390
391 kmemcheck_annotate_variable(kv->value.leaf.data[0]);
390 CSR1212_DESCRIPTOR_LEAF_SET_TYPE(kv, dtype); 392 CSR1212_DESCRIPTOR_LEAF_SET_TYPE(kv, dtype);
391 CSR1212_DESCRIPTOR_LEAF_SET_SPECIFIER_ID(kv, specifier_id); 393 CSR1212_DESCRIPTOR_LEAF_SET_SPECIFIER_ID(kv, specifier_id);
392 394
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index a6d55bebe61..5122b5a8aa2 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -10,6 +10,7 @@
10 10
11#include <linux/bitmap.h> 11#include <linux/bitmap.h>
12#include <linux/kernel.h> 12#include <linux/kernel.h>
13#include <linux/kmemcheck.h>
13#include <linux/list.h> 14#include <linux/list.h>
14#include <linux/slab.h> 15#include <linux/slab.h>
15#include <linux/delay.h> 16#include <linux/delay.h>
@@ -39,7 +40,10 @@ struct nodemgr_csr_info {
39 struct hpsb_host *host; 40 struct hpsb_host *host;
40 nodeid_t nodeid; 41 nodeid_t nodeid;
41 unsigned int generation; 42 unsigned int generation;
43
44 kmemcheck_bitfield_begin(flags);
42 unsigned int speed_unverified:1; 45 unsigned int speed_unverified:1;
46 kmemcheck_bitfield_end(flags);
43}; 47};
44 48
45 49
@@ -1293,6 +1297,7 @@ static void nodemgr_node_scan_one(struct hpsb_host *host,
1293 u8 *speed; 1297 u8 *speed;
1294 1298
1295 ci = kmalloc(sizeof(*ci), GFP_KERNEL); 1299 ci = kmalloc(sizeof(*ci), GFP_KERNEL);
1300 kmemcheck_annotate_bitfield(ci, flags);
1296 if (!ci) 1301 if (!ci)
1297 return; 1302 return;
1298 1303