diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:34:38 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2014-09-14 09:35:36 -0400 |
| commit | db985cbd67c45f875ef43cb5febfaa8cbd203c27 (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /include/linux/list.h | |
| parent | c6f1224573c3b609bd8073b39f496637a16cc06f (diff) | |
| parent | 468a903c0e5147e3f93187f0b808a3ef957fd00e (diff) | |
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18
- renesas: suspend to RAM, runtime PM, cleanups and DT binding docs
- keystone: add new driver
- hip04: add Hisilicon HiP04 driver (without touching irq-gic.c)
- gic: Use defines instead of magic number, preserve v2 bybass bits
- handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'include/linux/list.h')
| -rw-r--r-- | include/linux/list.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/list.h b/include/linux/list.h index ef9594171062..cbbb96fcead9 100644 --- a/include/linux/list.h +++ b/include/linux/list.h | |||
| @@ -654,15 +654,15 @@ static inline void hlist_add_before(struct hlist_node *n, | |||
| 654 | *(n->pprev) = n; | 654 | *(n->pprev) = n; |
| 655 | } | 655 | } |
| 656 | 656 | ||
| 657 | static inline void hlist_add_after(struct hlist_node *n, | 657 | static inline void hlist_add_behind(struct hlist_node *n, |
| 658 | struct hlist_node *next) | 658 | struct hlist_node *prev) |
| 659 | { | 659 | { |
| 660 | next->next = n->next; | 660 | n->next = prev->next; |
| 661 | n->next = next; | 661 | prev->next = n; |
| 662 | next->pprev = &n->next; | 662 | n->pprev = &prev->next; |
| 663 | 663 | ||
| 664 | if(next->next) | 664 | if (n->next) |
| 665 | next->next->pprev = &next->next; | 665 | n->next->pprev = &n->next; |
| 666 | } | 666 | } |
| 667 | 667 | ||
| 668 | /* after that we'll appear to be on some hlist and hlist_del will work */ | 668 | /* after that we'll appear to be on some hlist and hlist_del will work */ |
