diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 21:51:22 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 21:51:22 (GMT) |
commit | 2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6 (patch) | |
tree | e7be2cf442626316b6b6fb212960fe1f77ff2725 /arch/um/kernel | |
parent | be967b7e2f7747a5ebf2a07ee627d9338491e784 (diff) | |
parent | 2f3243aebd8df4d9eecaeca04bbff6c7dbfb2142 (diff) | |
download | linux-fsl-qoriq-2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6.tar.xz |
Merge git://git.infradead.org/~dwmw2/rbtree-2.6
* git://git.infradead.org/~dwmw2/rbtree-2.6:
[RBTREE] Switch rb_colour() et al to en_US spelling of 'color' for consistency
Update UML kernel/physmem.c to use rb_parent() accessor macro
[RBTREE] Update hrtimers to use rb_parent() accessor macro.
[RBTREE] Add explicit alignment to sizeof(long) for struct rb_node.
[RBTREE] Merge colour and parent fields of struct rb_node.
[RBTREE] Remove dead code in rb_erase()
[RBTREE] Update JFFS2 to use rb_parent() accessor macro.
[RBTREE] Update eventpoll.c to use rb_parent() accessor macro.
[RBTREE] Update key.c to use rb_parent() accessor macro.
[RBTREE] Update ext3 to use rb_parent() accessor macro.
[RBTREE] Change rbtree off-tree marking in I/O schedulers.
[RBTREE] Add accessor macros for colour and parent fields of rb_node
Diffstat (limited to 'arch/um/kernel')
-rw-r--r-- | arch/um/kernel/physmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index fc0f0b0..166cb09 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c @@ -69,7 +69,7 @@ static void insert_phys_mapping(struct phys_desc *desc) panic("Physical remapping for %p already present", desc->virt); - rb_link_node(&desc->rb, (*n)->rb_parent, n); + rb_link_node(&desc->rb, rb_parent(*n), n); rb_insert_color(&desc->rb, &phys_mappings); } |