Merge branch 'akpm' (patches from Andrew)
Merge updates from Andrew Morton: - a few misc bits - ocfs2 updates - almost all of MM * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (131 commits) memory hotplug: fix comments when adding section mm: make alloc_node_mem_map a void call if we don't have CONFIG_FLAT_NODE_MEM_MAP mm: simplify nodemask printing mm,oom_reaper: remove pointless kthread_run() error check mm/page_ext.c: check if page_ext is not prepared writeback: remove unused function parameter mm: do not rely on preempt_count in print_vma_addr mm, sparse: do not swamp log with huge vmemmap allocation failures mm/hmm: remove redundant variable align_end mm/list_lru.c: mark expected switch fall-through mm/shmem.c: mark expected switch fall-through mm/page_alloc.c: broken deferred calculation mm: don't warn about allocations which stall for too long fs: fuse: account fuse_inode slab memory as reclaimable mm, page_alloc: fix potential false positive in __zone_watermark_ok mm: mlock: remove lru_add_drain_all() mm, sysctl: make NUMA stats configurable shmem: convert shmem_init_inodecache() to void Unify migrate_pages and move_pages access checks mm, pagevec: rename pagevec drained field ...
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
#define _INET_SOCK_H
|
||||
|
||||
#include <linux/bitops.h>
|
||||
#include <linux/kmemcheck.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/jhash.h>
|
||||
@@ -84,7 +83,6 @@ struct inet_request_sock {
|
||||
#define ireq_state req.__req_common.skc_state
|
||||
#define ireq_family req.__req_common.skc_family
|
||||
|
||||
kmemcheck_bitfield_begin(flags);
|
||||
u16 snd_wscale : 4,
|
||||
rcv_wscale : 4,
|
||||
tstamp_ok : 1,
|
||||
@@ -94,7 +92,6 @@ struct inet_request_sock {
|
||||
acked : 1,
|
||||
no_srccheck: 1,
|
||||
smc_ok : 1;
|
||||
kmemcheck_bitfield_end(flags);
|
||||
u32 ir_mark;
|
||||
union {
|
||||
struct ip_options_rcu __rcu *ireq_opt;
|
||||
|
||||
Reference in New Issue
Block a user