From: Kris Van Hees <kris.van.hees@oracle.com>
Date: Thu, 18 Oct 2012 15:53:56 +0000 (+0100)
Subject: Miscellaneous 3.6 porting work.
X-Git-Tag: v4.1.12-111.0.20170907_2225~3^2~3^2~176
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a278a1df8db9ae56d721d1bb02d747f9a0f91a47;p=users%2Fjedix%2Flinux-maple.git

Miscellaneous 3.6 porting work.

Missing headers, catering for header movement, the occasional missing
prototype, and changes in the way the syscall table is built.

Signed-off-by: Kris Van Hees <kris.van.hees@oracle.com>
---

diff --git a/dtrace/fasttrap_dev.c b/dtrace/fasttrap_dev.c
index 18d67806e2130..bf88a79e10177 100644
--- a/dtrace/fasttrap_dev.c
+++ b/dtrace/fasttrap_dev.c
@@ -28,6 +28,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 
+#include "dtrace.h"
 #include "dtrace_dev.h"
 
 static long fasttrap_ioctl(struct file *file,
diff --git a/dtrace/lockstat_dev.c b/dtrace/lockstat_dev.c
index de336b615fa45..a17a075d08092 100644
--- a/dtrace/lockstat_dev.c
+++ b/dtrace/lockstat_dev.c
@@ -28,6 +28,7 @@
 #include <linux/fs.h>
 #include <linux/miscdevice.h>
 
+#include "dtrace.h"
 #include "dtrace_dev.h"
 
 static long lockstat_ioctl(struct file *file,