diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-05-02 05:02:41 -0400 |
| commit | 4d6ca227c768b50b05cf183974b40abe444e9d0c (patch) | |
| tree | bf953d8e895281053548b9967a2c4b58d641df00 /lib/rbtree.c | |
| parent | 800f3eef8ebc1264e9c135bfa892c8ae41fa4792 (diff) | |
| parent | af22a610bc38508d5ea760507d31be6b6983dfa8 (diff) | |
Merge branch 'for-4.12/asus' into for-linus
Diffstat (limited to 'lib/rbtree.c')
| -rw-r--r-- | lib/rbtree.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/rbtree.c b/lib/rbtree.c index 1f8b112a7c35..4ba2828a67c0 100644 --- a/lib/rbtree.c +++ b/lib/rbtree.c | |||
| @@ -427,7 +427,9 @@ static inline void dummy_copy(struct rb_node *old, struct rb_node *new) {} | |||
| 427 | static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {} | 427 | static inline void dummy_rotate(struct rb_node *old, struct rb_node *new) {} |
| 428 | 428 | ||
| 429 | static const struct rb_augment_callbacks dummy_callbacks = { | 429 | static const struct rb_augment_callbacks dummy_callbacks = { |
| 430 | dummy_propagate, dummy_copy, dummy_rotate | 430 | .propagate = dummy_propagate, |
| 431 | .copy = dummy_copy, | ||
| 432 | .rotate = dummy_rotate | ||
| 431 | }; | 433 | }; |
| 432 | 434 | ||
| 433 | void rb_insert_color(struct rb_node *node, struct rb_root *root) | 435 | void rb_insert_color(struct rb_node *node, struct rb_root *root) |