From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 16 Jun 2009 20:09:51 +0000 (-0700)
Subject: Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vegard... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b3fec0fe35a4ff048484f1408385a27695d4273b;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branch 'for-linus2' of git://git./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
  ...
---

b3fec0fe35a4ff048484f1408385a27695d4273b
diff --cc include/linux/skbuff.h
index fa51293f2708,ed6537fc5b48..63ef24bc01d0
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@@ -377,7 -385,10 +382,9 @@@ struct sk_buff 
  #endif
  #if defined(CONFIG_MAC80211) || defined(CONFIG_MAC80211_MODULE)
  	__u8			do_not_encrypt:1;
 -	__u8			requeue:1;
  #endif
+ 	kmemcheck_bitfield_end(flags2);
+ 
  	/* 0/13/14 bit hole */
  
  #ifdef CONFIG_NET_DMA