From: Nick Alcock <nick.alcock@oracle.com>
Date: Tue, 4 Oct 2011 11:58:17 +0000 (+0100)
Subject: Move cyclic.h into include/linux.
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~214
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=607396e62a7b841c6640742e9009dcced7bfa015;p=users%2Fjedix%2Flinux-maple.git

Move cyclic.h into include/linux.

This is so that things in dtrace/ can pick it up.

Signed-off-by: Nick Alcock <nick.alcock@oracle.com>
---

diff --git a/dtrace/dtrace.h b/dtrace/dtrace.h
index 3bd0079d93aca..94cb46e7462cc 100644
--- a/dtrace/dtrace.h
+++ b/dtrace/dtrace.h
@@ -2,6 +2,7 @@
 #define _DTRACE_H_
 
 #include <linux/cred.h>
+#include <linux/cyclic.h>
 #include <linux/idr.h>
 #include <linux/ktime.h>
 #include <linux/module.h>
@@ -12,8 +13,6 @@
 #include <asm/ptrace.h>
 #include <asm/sections.h>
 
-#include "cyclic.h"
-
 #define UINT8_MAX		(0xff)
 #define UINT8_MIN		0
 #define UINT16_MAX		(0xffff)
diff --git a/dtrace/dtrace_state.c b/dtrace/dtrace_state.c
index 2a75812b208ae..2fdcd285d8ae5 100644
--- a/dtrace/dtrace_state.c
+++ b/dtrace/dtrace_state.c
@@ -25,6 +25,7 @@
  * Use is subject to license terms.
  */
 
+#include <linux/cyclic.h>
 #include <linux/fs.h>
 #include <linux/idr.h>
 #include <linux/slab.h>
@@ -32,7 +33,6 @@
 #include <linux/vmalloc.h>
 #include <asm/cmpxchg.h>
 
-#include "cyclic.h"
 #include "dtrace.h"
 
 struct kmem_cache	*dtrace_state_cache;