From 2489007e7d740ccbc3e0a202914e243ad5178787 Mon Sep 17 00:00:00 2001
From: codeworkx <codeworkx@cyanogenmod.com>
Date: Sat, 22 Sep 2012 09:48:20 +0200
Subject: merge opensource jb u5

Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
---
 arch/arm/mm/alignment.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'arch/arm/mm/alignment.c')

diff --git a/arch/arm/mm/alignment.c b/arch/arm/mm/alignment.c
index c6035e9..f10325f 100644
--- a/arch/arm/mm/alignment.c
+++ b/arch/arm/mm/alignment.c
@@ -916,7 +916,7 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
  */
 static int __init alignment_init(void)
 {
-#ifdef CONFIG_PROC_FS
+#if defined(CONFIG_PROC_FS) && !defined(CONFIG_FAST_RESUME)
 	struct proc_dir_entry *res;
 
 	res = proc_create("cpu/alignment", S_IWUSR | S_IRUGO, NULL,
@@ -958,5 +958,8 @@ static int __init alignment_init(void)
 
 	return 0;
 }
-
+#ifdef CONFIG_FAST_RESUME
+beforeresume_initcall(alignment_init);
+#else
 fs_initcall(alignment_init);
+#endif
-- 
cgit v1.1