Pull non-mm updates from Andrew Morton: "Mainly singleton patches, documented in their respective changelogs. Notable series include: - Some maintenance and performance work for ocfs2 in Heming Zhao's series "improve write IO performance when fragmentation is high". - Some ocfs2 bugfixes from Su Yue in the series "ocfs2 bugs fixes exposed by fstests". - kfifo header rework from Andy Shevchenko in the series "kfifo: Clean up kfifo.h". - GDB script fixes from Florian Rommel in the series "scripts/gdb: Fixes for $lx_current and $lx_per_cpu". - After much discussion, a coding-style update from Barry Song explaining one reason why inline functions are preferred over macros. The series is "codingstyle: avoid unused parameters for a function-like macro"" * tag 'mm-nonmm-stable-2024-05-19-11-56' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm: (62 commits) fs/proc: fix softlockup in __read_vmcore nilfs2: convert BUG_ON() in nilfs_finish_roll_forward() to WARN_ON() scripts: checkpatch: check unused parameters for function-like macro Documentation: coding-style: ask function-like macros to evaluate parameters nilfs2: use __field_struct() for a bitwise field selftests/kcmp: remove unused open mode nilfs2: remove calls to folio_set_error() and folio_clear_error() kernel/watchdog_perf.c: tidy up kerneldoc watchdog: allow nmi watchdog to use raw perf event watchdog: handle comma separated nmi_watchdog command line nilfs2: make superblock data array index computation sparse friendly squashfs: remove calls to set the folio error flag squashfs: convert squashfs_symlink_read_folio to use folio APIs scripts/gdb: fix detection of current CPU in KGDB scripts/gdb: make get_thread_info accept pointers scripts/gdb: fix parameter handling in $lx_per_cpu scripts/gdb: fix failing KGDB detection during probe kfifo: don't use "proxy" headers media: stih-cec: add missing io.h media: rc: add missing io.h ...
Showing the changes to tools/include/linux (1 of 77 files). Show all
Unified · Split
| @@ -158,13 +158,13 @@ RB_DECLARE_CALLBACKS(RBSTATIC, RBNAME, \ · 157 unmodified lines | |||
| 158 | 158 | ||
| 159 | static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p) | 159 | static inline void rb_set_parent(struct rb_node *rb, struct rb_node *p) |
| 160 | { | 160 | { |
| 161 | rb->__rb_parent_color = rb_color(rb) | (unsigned long)p; | 161 | rb->__rb_parent_color = rb_color(rb) + (unsigned long)p; |
| 162 | } | 162 | } |
| 163 | 163 | ||
| 164 | static inline void rb_set_parent_color(struct rb_node *rb, | 164 | static inline void rb_set_parent_color(struct rb_node *rb, |
| 165 | struct rb_node *p, int color) | 165 | struct rb_node *p, int color) |
| 166 | { | 166 | { |
| 167 | rb->__rb_parent_color = (unsigned long)p | color; | 167 | rb->__rb_parent_color = (unsigned long)p + color; |
| 168 | } | 168 | } |
| 169 | 169 | ||
| 170 | static inline void | 170 | static inline void |