Merge branch 'bugfixes' into replace-lists

Conflicts:
	ncr-int.h
	ncr.c

2 files changed, 0 insertions, 4 deletions

diff --git a/ncr-int.h b/ncr-int.h
index d8c4912..9b66cbd 100644
--- a/ncr-int.h
+++ b/ncr-int.h
@@ -97,7 +97,6 @@ struct list_sem_st {
  * are here.
  */
 struct ncr_lists {
-	struct list_sem_st data;
 	struct mutex key_idr_mutex;
 	struct idr key_idr;
 
diff --git a/ncr.c b/ncr.c
index 6ee74d4..0ea834b 100644
--- a/ncr.c
+++ b/ncr.c
@@ -52,9 +52,6 @@ void* ncr_init_lists(void)
 
 	memset(lst, 0, sizeof(*lst));
 
-	init_MUTEX(&lst->data.sem);
-	INIT_LIST_HEAD(&lst->data.list);
-
 	mutex_init(&lst->key_idr_mutex);
 	idr_init(&lst->key_idr);