summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Vorontsov <anton.vorontsov@linaro.org>2012-05-16 05:43:08 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-16 08:06:37 -0700
commit1894a253db97059bc299b834b76f665bc6586b1d (patch)
tree791ad2d33cc1d28c32fa340b0a8f0c2a645c4b26
parentd109a674a3685d43f16da5cc4cb8b927d07c436d (diff)
downloadarm64-stable-rc-1894a253db97059bc299b834b76f665bc6586b1d.tar.gz
ramoops: Move to fs/pstore/ram.c
Since ramoops was converted to pstore, it has nothing to do with character devices nowadays. Instead, today it is just a RAM backend for pstore. The patch just moves things around. There are a few changes were needed because of the move: 1. Kconfig and Makefiles fixups, of course. 2. In pstore/ram.c we have to play a bit with MODULE_PARAM_PREFIX, this is needed to keep user experience the same as with ramoops driver (i.e. so that ramoops.foo kernel command line arguments would still work). Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org> Acked-by: Marco Stornelli <marco.stornelli@gmail.com> Acked-by: Kees Cook <keescook@chromium.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--Documentation/ramoops.txt2
-rw-r--r--drivers/char/Kconfig9
-rw-r--r--drivers/char/Makefile1
-rw-r--r--fs/pstore/Kconfig14
-rw-r--r--fs/pstore/Makefile3
-rw-r--r--fs/pstore/ram.c (renamed from drivers/char/ramoops.c)2
-rw-r--r--include/linux/pstore_ram.h (renamed from include/linux/ramoops.h)4
7 files changed, 21 insertions, 14 deletions
diff --git a/Documentation/ramoops.txt b/Documentation/ramoops.txt
index a0b9d8e75380..470d2c4db6ff 100644
--- a/Documentation/ramoops.txt
+++ b/Documentation/ramoops.txt
@@ -38,7 +38,7 @@ Setting the ramoops parameters can be done in 2 different manners:
2. Use a platform device and set the platform data. The parameters can then
be set through that platform data. An example of doing that is:
-#include <linux/ramoops.h>
+#include <linux/pstore_ram.h>
[...]
static struct ramoops_platform_data ramoops_data = {
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index fab778d471c5..ea6f6325f9ba 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -585,15 +585,6 @@ config DEVPORT
source "drivers/s390/char/Kconfig"
-config RAMOOPS
- tristate "Log panic/oops to a RAM buffer"
- depends on HAS_IOMEM
- depends on PSTORE
- default n
- help
- This enables panic and oops messages to be logged to a circular
- buffer in RAM where it can be read back at some later point.
-
config MSM_SMD_PKT
bool "Enable device interface for some SMD packet ports"
default n
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 0dc5d7ce4864..d0b27a39f1d4 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -58,7 +58,6 @@ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
obj-$(CONFIG_TCG_TPM) += tpm/
obj-$(CONFIG_PS3_FLASH) += ps3flash.o
-obj-$(CONFIG_RAMOOPS) += ramoops.o
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig
index 8007ae7c0d8c..b75ee51b2714 100644
--- a/fs/pstore/Kconfig
+++ b/fs/pstore/Kconfig
@@ -11,3 +11,17 @@ config PSTORE
(e.g. ACPI_APEI on X86) which will select this for you.
If you don't have a platform persistent store driver,
say N.
+
+config PSTORE_RAM
+ tristate "Log panic/oops to a RAM buffer"
+ depends on HAS_IOMEM
+ depends on PSTORE
+ default n
+ help
+ This enables panic and oops messages to be logged to a circular
+ buffer in RAM where it can be read back at some later point.
+
+ Note that for historical reasons, the module will be named
+ "ramoops.ko".
+
+ For more information, see Documentation/ramoops.txt.
diff --git a/fs/pstore/Makefile b/fs/pstore/Makefile
index 760f4bce7d1d..2ab3d0d55ef6 100644
--- a/fs/pstore/Makefile
+++ b/fs/pstore/Makefile
@@ -5,3 +5,6 @@
obj-y += pstore.o
pstore-objs += inode.o platform.o
+
+ramoops-objs += ram.o
+obj-$(CONFIG_PSTORE_RAM) += ramoops.o
diff --git a/drivers/char/ramoops.c b/fs/pstore/ram.c
index b8b8542a5105..e443c9c6914f 100644
--- a/drivers/char/ramoops.c
+++ b/fs/pstore/ram.c
@@ -31,7 +31,7 @@
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/slab.h>
-#include <linux/ramoops.h>
+#include <linux/pstore_ram.h>
#define RAMOOPS_KERNMSG_HDR "===="
#define MIN_MEM_SIZE 4096UL
diff --git a/include/linux/ramoops.h b/include/linux/pstore_ram.h
index 484fef81cd3a..fa4cb02da413 100644
--- a/include/linux/ramoops.h
+++ b/include/linux/pstore_ram.h
@@ -1,5 +1,5 @@
-#ifndef __RAMOOPS_H
-#define __RAMOOPS_H
+#ifndef __LINUX_PSTORE_RAM_H__
+#define __LINUX_PSTORE_RAM_H__
/*
* Ramoops platform data