From b5cffcd8ad36084e699ff10999bd72e217d1c2d2 Mon Sep 17 00:00:00 2001 From: Gregory Haskins Date: Mon, 29 Dec 2008 09:39:53 -0500 Subject: [PATCH] --- yaml --- r: 135678 b: refs/heads/master c: 4075134e40804821f90866d7de56802e4dcecb1e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/plist.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf819101f78e..692dff6260c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 967fc04671feea4dbf780c9e55a0bc8fcf68a14e +refs/heads/master: 4075134e40804821f90866d7de56802e4dcecb1e diff --git a/trunk/include/linux/plist.h b/trunk/include/linux/plist.h index 85de2f055874..45926d77d6ac 100644 --- a/trunk/include/linux/plist.h +++ b/trunk/include/linux/plist.h @@ -96,6 +96,10 @@ struct plist_node { # define PLIST_HEAD_LOCK_INIT(_lock) #endif +#define _PLIST_HEAD_INIT(head) \ + .prio_list = LIST_HEAD_INIT((head).prio_list), \ + .node_list = LIST_HEAD_INIT((head).node_list) + /** * PLIST_HEAD_INIT - static struct plist_head initializer * @head: struct plist_head variable name @@ -103,8 +107,7 @@ struct plist_node { */ #define PLIST_HEAD_INIT(head, _lock) \ { \ - .prio_list = LIST_HEAD_INIT((head).prio_list), \ - .node_list = LIST_HEAD_INIT((head).node_list), \ + _PLIST_HEAD_INIT(head), \ PLIST_HEAD_LOCK_INIT(&(_lock)) \ } @@ -116,7 +119,7 @@ struct plist_node { #define PLIST_NODE_INIT(node, __prio) \ { \ .prio = (__prio), \ - .plist = PLIST_HEAD_INIT((node).plist, NULL), \ + .plist = { _PLIST_HEAD_INIT((node).plist) }, \ } /**