summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-07-17 11:37:07 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-07-17 12:15:30 -0700
commit67a101f573b0cb1043c8c305112113450cb9fdbf (patch)
treea7683be1ef70c4843c82ac5981f15e79033f33d6
parentbfce7cf68673216168020f369365dfc8ccbf23de (diff)
pstore: Headers should include all stuff they use
Headers should really include all the needed prototypes, types, defines etc. to be self-contained. This is a long-standing issue, but apparently the new tracing code unearthed it (SMP=n is also a prerequisite): In file included from fs/pstore/internal.h:4:0, from fs/pstore/ftrace.c:21: include/linux/pstore.h:43:15: error: field ‘read_mutex’ has incomplete type While at it, I also added the following: linux/types.h -> size_t, phys_addr_t, uXX and friends linux/spinlock.h -> spinlock_t linux/errno.h -> Exxxx linux/time.h -> struct timespec (struct passed by value) struct module and rs_control forward declaration (passed via pointers). Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--fs/pstore/internal.h2
-rw-r--r--include/linux/pstore.h6
-rw-r--r--include/linux/pstore_ram.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/fs/pstore/internal.h b/fs/pstore/internal.h
index 958c48d8905c..0d0d3b7d5f12 100644
--- a/fs/pstore/internal.h
+++ b/fs/pstore/internal.h
@@ -1,6 +1,8 @@
#ifndef __PSTORE_INTERNAL_H__
#define __PSTORE_INTERNAL_H__
+#include <linux/types.h>
+#include <linux/time.h>
#include <linux/pstore.h>
#if NR_CPUS <= 2 && defined(CONFIG_ARM_THUMB)
diff --git a/include/linux/pstore.h b/include/linux/pstore.h
index 120443b0fda5..c892587d9b81 100644
--- a/include/linux/pstore.h
+++ b/include/linux/pstore.h
@@ -24,6 +24,10 @@
#include <linux/time.h>
#include <linux/kmsg_dump.h>
+#include <linux/mutex.h>
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/errno.h>
/* types */
enum pstore_type_id {
@@ -34,6 +38,8 @@ enum pstore_type_id {
PSTORE_TYPE_UNKNOWN = 255
};
+struct module;
+
struct pstore_info {
struct module *owner;
char *name;
diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index af848e1593b9..ba2b211aaa81 100644
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -24,6 +24,7 @@
#include <linux/init.h>
struct persistent_ram_buffer;
+struct rs_control;
struct persistent_ram_zone {
phys_addr_t paddr;