linux-kernel - linux-next: manual merge of the kmemcheck tree with the tracing tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20090601175539.a3a3d60c.sfr@canb.auug.org.au>
Date:	Mon, 1 Jun 2009 17:55:39 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Vegard Nossum <vegard.nossum@...il.com>,
	Pekka Enberg <penberg@...helsinki.fi>,
	Ingo Molnar <mingo@...e.hu>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Lai Jiangshan <laijs@...fujitsu.com>,
	Steven Rostedt <rostedt@...dmis.org>
Subject: linux-next: manual merge of the kmemcheck tree with the tracing
 tree

Hi all,

Today's linux-next merge of the kmemcheck tree got a conflict in
include/linux/ring_buffer.h between commit
334d4169a6592d3fcd863bbe822a8f6985ffa9af ("ring_buffer: compressed event
header") from the tracing tree and commits
9b7ff384ee76ced9638ab236db588a6f13916336 ("trace: annotate bitfields in
struct ring_buffer_event") and 3467e18b1cf34c7d316af5717e7053ce845d014e
("kmemcheck: make bitfield annotations be valid C") from the kmemcheck
tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/linux/ring_buffer.h
index f134582,771ee90..0000000
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
@@@ -11,7 -12,10 +12,10 @@@ struct ring_buffer_iter
   * Don't refer to this struct directly, use functions below.
   */
  struct ring_buffer_event {
+ 	kmemcheck_bitfield_begin(bitfield);
 -	u32		type:2, len:3, time_delta:27;
 +	u32		type_len:5, time_delta:27;
+ 	kmemcheck_bitfield_end(bitfield);
+ 
  	u32		array[];
  };
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/