From ec8595a1a2fc7159659b104186815dccebb8fe59 Mon Sep 17 00:00:00 2001
From: Chris Metcalf <cmetcalf@tilera.com>
Date: Fri, 2 Jul 2010 13:41:14 -0400
Subject: [PATCH] --- yaml --- r: 207169 b: refs/heads/master c:
 de5d9bf6541736dc7ad264d2b5cc99bc1b2ad958 h: refs/heads/master i:   207167:
 627dc00dc8f25a04c10b99fb1ec40e2daca7ce9c v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/list.h  | 13 +------------
 trunk/include/linux/types.h | 12 ++++++++++++
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index a8a78085f270..008d4bf2bf53 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b51cae21ee66f77a368428e6bdf75a0c012c9fd7
+refs/heads/master: de5d9bf6541736dc7ad264d2b5cc99bc1b2ad958
diff --git a/trunk/include/linux/list.h b/trunk/include/linux/list.h
index 8392884a2977..bc43e8a0d7f6 100644
--- a/trunk/include/linux/list.h
+++ b/trunk/include/linux/list.h
@@ -1,6 +1,7 @@
 #ifndef _LINUX_LIST_H
 #define _LINUX_LIST_H
 
+#include <linux/types.h>
 #include <linux/stddef.h>
 #include <linux/poison.h>
 #include <linux/prefetch.h>
@@ -16,10 +17,6 @@
  * using the generic single-entry routines.
  */
 
-struct list_head {
-	struct list_head *next, *prev;
-};
-
 #define LIST_HEAD_INIT(name) { &(name), &(name) }
 
 #define LIST_HEAD(name) \
@@ -551,14 +548,6 @@ static inline void list_splice_tail_init(struct list_head *list,
  * You lose the ability to access the tail in O(1).
  */
 
-struct hlist_head {
-	struct hlist_node *first;
-};
-
-struct hlist_node {
-	struct hlist_node *next, **pprev;
-};
-
 #define HLIST_HEAD_INIT { .first = NULL }
 #define HLIST_HEAD(name) struct hlist_head name = {  .first = NULL }
 #define INIT_HLIST_HEAD(ptr) ((ptr)->first = NULL)
diff --git a/trunk/include/linux/types.h b/trunk/include/linux/types.h
index 23d237a075e2..336cc39c46f1 100644
--- a/trunk/include/linux/types.h
+++ b/trunk/include/linux/types.h
@@ -197,6 +197,18 @@ typedef struct {
 } atomic64_t;
 #endif
 
+struct list_head {
+	struct list_head *next, *prev;
+};
+
+struct hlist_head {
+	struct hlist_node *first;
+};
+
+struct hlist_node {
+	struct hlist_node *next, **pprev;
+};
+
 struct ustat {
 	__kernel_daddr_t	f_tfree;
 	__kernel_ino_t		f_tinode;