From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 20 Jun 2006 21:51:22 +0000 (-0700)
Subject: Merge git://git.infradead.org/~dwmw2/rbtree-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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
---

2edc322d420a4cec8dbc184a1220ecd7fa9f8ae6
diff --cc kernel/hrtimer.c
index 01fa2ae98a85,04ab27ddfd90..18324305724a
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@@ -582,9 -578,8 +582,9 @@@ void hrtimer_init(struct hrtimer *timer
  		clock_id = CLOCK_MONOTONIC;
  
  	timer->base = &bases[clock_id];
- 	timer->node.rb_parent = HRTIMER_INACTIVE;
+ 	rb_set_parent(&timer->node, &timer->node);
  }
 +EXPORT_SYMBOL_GPL(hrtimer_init);
  
  /**
   * hrtimer_get_res - get the timer resolution for a clock