diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-30 15:51:10 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-30 15:51:10 -0700 |
commit | dbd8805b0ad46f04cababea5d01f072142961411 (patch) | |
tree | 6ac45a7687ba67362d8a39e5da032625fc2e11b1 /include/linux | |
parent | 9a2172a8d52cf14ce44e9cadd8c9df84cf832d75 (diff) | |
parent | 37aa7271d9742b574763e5ce019bde9c49aa8bfe (diff) |
Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton:
"Three fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
include/linux/property.h: fix typo/compile error
ocfs2: fix deadlock on mmapped page in ocfs2_write_begin_nolock()
mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/property.h | 2 | ||||
-rw-r--r-- | include/linux/swap.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/property.h b/include/linux/property.h index 3a2f9ae25c86..856e50b2140c 100644 --- a/include/linux/property.h +++ b/include/linux/property.h @@ -190,7 +190,7 @@ struct property_entry { .length = ARRAY_SIZE(_val_) * sizeof(_type_), \ .is_array = true, \ .is_string = false, \ - { .pointer = { _type_##_data = _val_ } }, \ + { .pointer = { ._type_##_data = _val_ } }, \ } #define PROPERTY_ENTRY_U8_ARRAY(_name_, _val_) \ diff --git a/include/linux/swap.h b/include/linux/swap.h index b17cc4830fa6..4a529c984a3f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -257,6 +257,7 @@ static inline void workingset_node_pages_inc(struct radix_tree_node *node) static inline void workingset_node_pages_dec(struct radix_tree_node *node) { + VM_BUG_ON(!workingset_node_pages(node)); node->count--; } @@ -272,6 +273,7 @@ static inline void workingset_node_shadows_inc(struct radix_tree_node *node) static inline void workingset_node_shadows_dec(struct radix_tree_node *node) { + VM_BUG_ON(!workingset_node_shadows(node)); node->count -= 1U << RADIX_TREE_COUNT_SHIFT; } |