Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1894a253 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Greg Kroah-Hartman
Browse files

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: default avatarAnton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: default avatarMarco Stornelli <marco.stornelli@gmail.com>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d109a674

Documentation/ramoops.txt

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

drivers/char/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -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

drivers/char/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

fs/pstore/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -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.

fs/pstore/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,3 +5,6 @@ 
obj-y += pstore.o



pstore-objs += inode.o platform.o



ramoops-objs += ram.o

obj-$(CONFIG_PSTORE_RAM)	+= ramoops.o