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>
This commit is contained in:
parent
d109a674a3
commit
1894a253db
|
@ -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
|
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:
|
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 = {
|
static struct ramoops_platform_data ramoops_data = {
|
||||||
|
|
|
@ -585,15 +585,6 @@ config DEVPORT
|
||||||
|
|
||||||
source "drivers/s390/char/Kconfig"
|
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
|
config MSM_SMD_PKT
|
||||||
bool "Enable device interface for some SMD packet ports"
|
bool "Enable device interface for some SMD packet ports"
|
||||||
default n
|
default n
|
||||||
|
|
|
@ -58,7 +58,6 @@ obj-$(CONFIG_HANGCHECK_TIMER) += hangcheck-timer.o
|
||||||
obj-$(CONFIG_TCG_TPM) += tpm/
|
obj-$(CONFIG_TCG_TPM) += tpm/
|
||||||
|
|
||||||
obj-$(CONFIG_PS3_FLASH) += ps3flash.o
|
obj-$(CONFIG_PS3_FLASH) += ps3flash.o
|
||||||
obj-$(CONFIG_RAMOOPS) += ramoops.o
|
|
||||||
|
|
||||||
obj-$(CONFIG_JS_RTC) += js-rtc.o
|
obj-$(CONFIG_JS_RTC) += js-rtc.o
|
||||||
js-rtc-y = rtc.o
|
js-rtc-y = rtc.o
|
||||||
|
|
|
@ -11,3 +11,17 @@ config PSTORE
|
||||||
(e.g. ACPI_APEI on X86) which will select this for you.
|
(e.g. ACPI_APEI on X86) which will select this for you.
|
||||||
If you don't have a platform persistent store driver,
|
If you don't have a platform persistent store driver,
|
||||||
say N.
|
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.
|
||||||
|
|
|
@ -5,3 +5,6 @@
|
||||||
obj-y += pstore.o
|
obj-y += pstore.o
|
||||||
|
|
||||||
pstore-objs += inode.o platform.o
|
pstore-objs += inode.o platform.o
|
||||||
|
|
||||||
|
ramoops-objs += ram.o
|
||||||
|
obj-$(CONFIG_PSTORE_RAM) += ramoops.o
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
#include <linux/ioport.h>
|
#include <linux/ioport.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
#include <linux/slab.h>
|
#include <linux/slab.h>
|
||||||
#include <linux/ramoops.h>
|
#include <linux/pstore_ram.h>
|
||||||
|
|
||||||
#define RAMOOPS_KERNMSG_HDR "===="
|
#define RAMOOPS_KERNMSG_HDR "===="
|
||||||
#define MIN_MEM_SIZE 4096UL
|
#define MIN_MEM_SIZE 4096UL
|
|
@ -1,5 +1,5 @@
|
||||||
#ifndef __RAMOOPS_H
|
#ifndef __LINUX_PSTORE_RAM_H__
|
||||||
#define __RAMOOPS_H
|
#define __LINUX_PSTORE_RAM_H__
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ramoops platform data
|
* Ramoops platform data
|
Loading…
Reference in a new issue