From 4f0147cfe098573d36bafe55a7e09ae028824234 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 21 Dec 2012 15:02:05 -0800
Subject: [PATCH] --- yaml --- r: 348207 b: refs/heads/master c:
 f568f6ca811fe681ecfd11c4ce78b6aa488020c0 h: refs/heads/master i:   348205:
 0570889aaed864c7fef3fdc129f3331898801139   348203:
 65b0e50a622334b7a5ea2372533ab5d0e3bf21d8   348199:
 798b4b65833a3356341a343c1b8453c9310bc74c   348191:
 ed017036c33a2f2f1e9a11b993e1e616ead05e09 v: v3

---
 [refs]                           |  2 +-
 trunk/fs/pstore/ram.c            | 14 ++++++--------
 trunk/fs/pstore/ram_core.c       |  9 ++++-----
 trunk/include/linux/pstore_ram.h |  5 ++---
 4 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 69835fd54bbc..43c60ed028ad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb35a9bac6710851bbca1b7908ca85e83aecb4a
+refs/heads/master: f568f6ca811fe681ecfd11c4ce78b6aa488020c0
diff --git a/trunk/fs/pstore/ram.c b/trunk/fs/pstore/ram.c
index f883e7e74305..7003e5266f25 100644
--- a/trunk/fs/pstore/ram.c
+++ b/trunk/fs/pstore/ram.c
@@ -291,9 +291,8 @@ static void ramoops_free_przs(struct ramoops_context *cxt)
 	kfree(cxt->przs);
 }
 
-static int __devinit ramoops_init_przs(struct device *dev,
-				       struct ramoops_context *cxt,
-				       phys_addr_t *paddr, size_t dump_mem_sz)
+static int ramoops_init_przs(struct device *dev, struct ramoops_context *cxt,
+			     phys_addr_t *paddr, size_t dump_mem_sz)
 {
 	int err = -ENOMEM;
 	int i;
@@ -336,10 +335,9 @@ static int __devinit ramoops_init_przs(struct device *dev,
 	return err;
 }
 
-static int __devinit ramoops_init_prz(struct device *dev,
-				      struct ramoops_context *cxt,
-				      struct persistent_ram_zone **prz,
-				      phys_addr_t *paddr, size_t sz, u32 sig)
+static int ramoops_init_prz(struct device *dev, struct ramoops_context *cxt,
+			    struct persistent_ram_zone **prz,
+			    phys_addr_t *paddr, size_t sz, u32 sig)
 {
 	if (!sz)
 		return 0;
@@ -367,7 +365,7 @@ static int __devinit ramoops_init_prz(struct device *dev,
 	return 0;
 }
 
-static int __devinit ramoops_probe(struct platform_device *pdev)
+static int ramoops_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct ramoops_platform_data *pdata = pdev->dev.platform_data;
diff --git a/trunk/fs/pstore/ram_core.c b/trunk/fs/pstore/ram_core.c
index eecd2a8a84dd..0306303be372 100644
--- a/trunk/fs/pstore/ram_core.c
+++ b/trunk/fs/pstore/ram_core.c
@@ -390,8 +390,8 @@ static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size,
 	return 0;
 }
 
-static int __devinit persistent_ram_post_init(struct persistent_ram_zone *prz,
-					      u32 sig, int ecc_size)
+static int persistent_ram_post_init(struct persistent_ram_zone *prz, u32 sig,
+				    int ecc_size)
 {
 	int ret;
 
@@ -443,9 +443,8 @@ void persistent_ram_free(struct persistent_ram_zone *prz)
 	kfree(prz);
 }
 
-struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
-							  size_t size, u32 sig,
-							  int ecc_size)
+struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
+					       u32 sig, int ecc_size)
 {
 	struct persistent_ram_zone *prz;
 	int ret = -ENOMEM;
diff --git a/trunk/include/linux/pstore_ram.h b/trunk/include/linux/pstore_ram.h
index 098d2a838296..cb6ab5feab67 100644
--- a/trunk/include/linux/pstore_ram.h
+++ b/trunk/include/linux/pstore_ram.h
@@ -46,9 +46,8 @@ struct persistent_ram_zone {
 	size_t old_log_size;
 };
 
-struct persistent_ram_zone * __devinit persistent_ram_new(phys_addr_t start,
-							  size_t size, u32 sig,
-							  int ecc_size);
+struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size,
+					       u32 sig, int ecc_size);
 void persistent_ram_free(struct persistent_ram_zone *prz);
 void persistent_ram_zap(struct persistent_ram_zone *prz);