5 files changed, 31 insertions, 0 deletions

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index e319c67c5964..f62c2d125b69 100644
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -95,5 +95,7 @@ source "drivers/staging/android/Kconfig"
 
 source "drivers/staging/dst/Kconfig"
 
+source "drivers/staging/pohmelfs/Kconfig"
+
 endif # !STAGING_EXCLUDE_BUILD
 endif # STAGING
diff --git a/drivers/staging/Makefile b/drivers/staging/Makefile
index 1971299a82fd..16a8d703319f 100644
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -30,3 +30,4 @@ obj-$(CONFIG_TRANZPORT)		+= frontier/
 obj-$(CONFIG_EPL)               += epl/
 obj-$(CONFIG_ANDROID)           += android/
 obj-$(CONFIG_DST)               += dst/
+obj-$(CONFIG_POHMELFS)          += pohmelfs/
diff --git a/drivers/staging/pohmelfs/Kconfig b/drivers/staging/pohmelfs/Kconfig
new file mode 100644
index 000000000000..82d13ad67c86
--- /dev/null
+++ b/drivers/staging/pohmelfs/Kconfig
@@ -0,0 +1,23 @@
+config POHMELFS
+        tristate "POHMELFS filesystem support"
+        select CONNECTOR
+        help
+          POHMELFS stands for Parallel Optimized Host Message Exchange Layered File System.
+          This is a network filesystem which supports coherent caching of data and metadata
+          on clients.
+
+config POHMELFS_DEBUG
+        bool "POHMELFS debugging"
+        depends on POHMELFS
+        default n
+        help
+          Turns on excessive POHMELFS debugging facilities.
+          You usually do not want to slow things down noticebly and get really lots of kernel
+          messages in syslog.
+
+config POHMELFS_CRYPTO
+        bool "POHMELFS crypto support"
+        depends on CONFIG_CRYPTO_BLKCIPHER && CONFIG_CRYPTO_HASH
+        help
+          This option allows to encrypt and/or protect with strong cryptographic hash all dataflow
+          between server and clients. Each config group can have own keys.
diff --git a/drivers/staging/pohmelfs/Makefile b/drivers/staging/pohmelfs/Makefile
new file mode 100644
index 000000000000..196561ca26bc
--- /dev/null
+++ b/drivers/staging/pohmelfs/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_POHMELFS)  += pohmelfs.o
+
+pohmelfs-y := inode.o config.o dir.o net.o path_entry.o trans.o crypto.o lock.o mcache.o
diff --git a/mm/filemap.c b/mm/filemap.c
index fc11974f2bee..2e2d38ebda4b 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -513,6 +513,7 @@ int add_to_page_cache_lru(struct page *page, struct address_space *mapping,
         }
         return ret;
 }
+EXPORT_SYMBOL_GPL(add_to_page_cache_lru);
 
 #ifdef CONFIG_NUMA
 struct page *__page_cache_alloc(gfp_t gfp)
@@ -645,6 +646,7 @@ int __lock_page_killable(struct page *page)
         return __wait_on_bit_lock(page_waitqueue(page), &wait,
                                         sync_page_killable, TASK_KILLABLE);
 }
+EXPORT_SYMBOL_GPL(__lock_page_killable);
 
 /**
  * __lock_page_nosync - get a lock on the page, without calling sync_page()