Merge branch 'akpm' (incoming from Andrew)

Merge third batch of fixes from Andrew Morton:
 "Most of the rest.  I still have two large patchsets against AIO and
  IPC, but they're a bit stuck behind other trees and I'm about to
  vanish for six days.

   - random fixlets
   - inotify
   - more of the MM queue
   - show_stack() cleanups
   - DMI update
   - kthread/workqueue things
   - compat cleanups
   - epoll udpates
   - binfmt updates
   - nilfs2
   - hfs
   - hfsplus
   - ptrace
   - kmod
   - coredump
   - kexec
   - rbtree
   - pids
   - pidns
   - pps
   - semaphore tweaks
   - some w1 patches
   - relay updates
   - core Kconfig changes
   - sysrq tweaks"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (109 commits)
  Documentation/sysrq: fix inconstistent help message of sysrq key
  ethernet/emac/sysrq: fix inconstistent help message of sysrq key
  sparc/sysrq: fix inconstistent help message of sysrq key
  powerpc/xmon/sysrq: fix inconstistent help message of sysrq key
  ARM/etm/sysrq: fix inconstistent help message of sysrq key
  power/sysrq: fix inconstistent help message of sysrq key
  kgdb/sysrq: fix inconstistent help message of sysrq key
  lib/decompress.c: fix initconst
  notifier-error-inject: fix module names in Kconfig
  kernel/sys.c: make prctl(PR_SET_MM) generally available
  UAPI: remove empty Kbuild files
  menuconfig: print more info for symbol without prompts
  init/Kconfig: re-order CONFIG_EXPERT options to fix menuconfig display
  kconfig menu: move Virtualization drivers near other virtualization options
  Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS
  relay: use macro PAGE_ALIGN instead of FIX_SIZE
  kernel/relay.c: move FIX_SIZE macro into relay.c
  kernel/relay.c: remove unused function argument actor
  drivers/w1/slaves/w1_ds2760.c: fix the error handling in w1_ds2760_add_slave()
  drivers/w1/slaves/w1_ds2781.c: fix the error handling in w1_ds2781_add_slave()
  ...

32 files changed, 269 insertions, 189 deletions

diff --git a/drivers/Kconfig b/drivers/Kconfig
index 78a956e286e6..8d96238549fa 100644
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -120,6 +120,8 @@ source "drivers/vfio/Kconfig"
 
 source "drivers/vlynq/Kconfig"
 
+source "drivers/virt/Kconfig"
+
 source "drivers/virtio/Kconfig"
 
 source "drivers/hv/Kconfig"
@@ -144,8 +146,6 @@ source "drivers/remoteproc/Kconfig"
 
 source "drivers/rpmsg/Kconfig"
 
-source "drivers/virt/Kconfig"
-
 source "drivers/devfreq/Kconfig"
 
 source "drivers/extcon/Kconfig"
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c
index 42e67ad6bd20..ab41be625a53 100644
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
@@ -139,13 +139,12 @@ bail:		spin_unlock_irqrestore(&emsgs_lock, flags);
                 return;
         }
 
-        mp = kmalloc(n, GFP_ATOMIC);
+        mp = kmemdup(msg, n, GFP_ATOMIC);
         if (mp == NULL) {
                 printk(KERN_ERR "aoe: allocation failure, len=%ld\n", n);
                 goto bail;
         }
 
-        memcpy(mp, msg, n);
         em->msg = mp;
         em->flags |= EMFL_VALID;
         em->len = n;
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 7fecc784be01..037288e7874d 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -856,6 +856,8 @@ static int __init nbd_init(void)
                 disk->queue->limits.discard_granularity = 512;
                 disk->queue->limits.max_discard_sectors = UINT_MAX;
                 disk->queue->limits.discard_zeroes_data = 0;
+                blk_queue_max_hw_sectors(disk->queue, 65536);
+                disk->queue->limits.max_sectors = 256;
         }
 
         if (register_blkdev(NBD_MAJOR, "nbd")) {
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 32a6c5764950..cd9a6211dcad 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1485,6 +1485,7 @@ unsigned int get_random_int(void)
 
         return ret;
 }
+EXPORT_SYMBOL(get_random_int);
 
 /*
  * randomize_range() returns a start address such that
diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c
index 4cd392dbf115..b95159b33c39 100644
--- a/drivers/firmware/dmi_scan.c
+++ b/drivers/firmware/dmi_scan.c
@@ -22,6 +22,9 @@ static u16 __initdata dmi_ver;
  */
 static int dmi_initialized;
 
+/* DMI system identification string used during boot */
+static char dmi_ids_string[128] __initdata;
+
 static const char * __init dmi_string_nosave(const struct dmi_header *dm, u8 s)
 {
         const u8 *bp = ((u8 *) dm) + dm->length;
@@ -376,99 +379,103 @@ static void __init dmi_decode(const struct dmi_header *dm, void *dummy)
         }
 }
 
-static void __init print_filtered(const char *info)
+static int __init print_filtered(char *buf, size_t len, const char *info)
 {
+        int c = 0;
         const char *p;
 
         if (!info)
-                return;
+                return c;
 
         for (p = info; *p; p++)
                 if (isprint(*p))
-                        printk(KERN_CONT "%c", *p);
+                        c += scnprintf(buf + c, len - c, "%c", *p);
                 else
-                        printk(KERN_CONT "\\x%02x", *p & 0xff);
+                        c += scnprintf(buf + c, len - c, "\\x%02x", *p & 0xff);
+        return c;
 }
 
-static void __init dmi_dump_ids(void)
+static void __init dmi_format_ids(char *buf, size_t len)
 {
+        int c = 0;
         const char *board;      /* Board Name is optional */
 
-        printk(KERN_DEBUG "DMI: ");
-        print_filtered(dmi_get_system_info(DMI_SYS_VENDOR));
-        printk(KERN_CONT " ");
-        print_filtered(dmi_get_system_info(DMI_PRODUCT_NAME));
+        c += print_filtered(buf + c, len - c,
+                            dmi_get_system_info(DMI_SYS_VENDOR));
+        c += scnprintf(buf + c, len - c, " ");
+        c += print_filtered(buf + c, len - c,
+                            dmi_get_system_info(DMI_PRODUCT_NAME));
+
         board = dmi_get_system_info(DMI_BOARD_NAME);
         if (board) {
-                printk(KERN_CONT "/");
-                print_filtered(board);
+                c += scnprintf(buf + c, len - c, "/");
+                c += print_filtered(buf + c, len - c, board);
         }
-        printk(KERN_CONT ", BIOS ");
-        print_filtered(dmi_get_system_info(DMI_BIOS_VERSION));
-        printk(KERN_CONT " ");
-        print_filtered(dmi_get_system_info(DMI_BIOS_DATE));
-        printk(KERN_CONT "\n");
+        c += scnprintf(buf + c, len - c, ", BIOS ");
+        c += print_filtered(buf + c, len - c,
+                            dmi_get_system_info(DMI_BIOS_VERSION));
+        c += scnprintf(buf + c, len - c, " ");
+        c += print_filtered(buf + c, len - c,
+                            dmi_get_system_info(DMI_BIOS_DATE));
 }
 
-static int __init dmi_present(const char __iomem *p)
+static int __init dmi_present(const u8 *buf)
 {
-        u8 buf[15];
+        int smbios_ver;
+
+        if (memcmp(buf, "_SM_", 4) == 0 &&
+            buf[5] < 32 && dmi_checksum(buf, buf[5])) {
+                smbios_ver = (buf[6] << 8) + buf[7];
+
+                /* Some BIOS report weird SMBIOS version, fix that up */
+                switch (smbios_ver) {
+                case 0x021F:
+                case 0x0221:
+                        pr_debug("SMBIOS version fixup(2.%d->2.%d)\n",
+                                 smbios_ver & 0xFF, 3);
+                        smbios_ver = 0x0203;
+                        break;
+                case 0x0233:
+                        pr_debug("SMBIOS version fixup(2.%d->2.%d)\n", 51, 6);
+                        smbios_ver = 0x0206;
+                        break;
+                }
+        } else {
+                smbios_ver = 0;
+        }
 
-        memcpy_fromio(buf, p, 15);
-        if (dmi_checksum(buf, 15)) {
+        buf += 16;
+
+        if (memcmp(buf, "_DMI_", 5) == 0 && dmi_checksum(buf, 15)) {
                 dmi_num = (buf[13] << 8) | buf[12];
                 dmi_len = (buf[7] << 8) | buf[6];
                 dmi_base = (buf[11] << 24) | (buf[10] << 16) |
                         (buf[9] << 8) | buf[8];
 
                 if (dmi_walk_early(dmi_decode) == 0) {
-                        if (dmi_ver)
+                        if (smbios_ver) {
+                                dmi_ver = smbios_ver;
                                 pr_info("SMBIOS %d.%d present.\n",
                                        dmi_ver >> 8, dmi_ver & 0xFF);
-                        else {
+                        } else {
                                 dmi_ver = (buf[14] & 0xF0) << 4 |
                                            (buf[14] & 0x0F);
                                 pr_info("Legacy DMI %d.%d present.\n",
                                        dmi_ver >> 8, dmi_ver & 0xFF);
                         }
-                        dmi_dump_ids();
+                        dmi_format_ids(dmi_ids_string, sizeof(dmi_ids_string));
+                        printk(KERN_DEBUG "DMI: %s\n", dmi_ids_string);
                         return 0;
                 }
         }
-        dmi_ver = 0;
-        return 1;
-}
-
-static int __init smbios_present(const char __iomem *p)
-{
-        u8 buf[32];
 
-        memcpy_fromio(buf, p, 32);
-        if ((buf[5] < 32) && dmi_checksum(buf, buf[5])) {
-                dmi_ver = (buf[6] << 8) + buf[7];
-
-                /* Some BIOS report weird SMBIOS version, fix that up */
-                switch (dmi_ver) {
-                case 0x021F:
-                case 0x0221:
-                        pr_debug("SMBIOS version fixup(2.%d->2.%d)\n",
-                               dmi_ver & 0xFF, 3);
-                        dmi_ver = 0x0203;
-                        break;
-                case 0x0233:
-                        pr_debug("SMBIOS version fixup(2.%d->2.%d)\n", 51, 6);
-                        dmi_ver = 0x0206;
-                        break;
-                }
-                return memcmp(p + 16, "_DMI_", 5) || dmi_present(p + 16);
-        }
         return 1;
 }
 
 void __init dmi_scan_machine(void)
 {
         char __iomem *p, *q;
-        int rc;
+        char buf[32];
 
         if (efi_enabled(EFI_CONFIG_TABLES)) {
                 if (efi.smbios == EFI_INVALID_TABLE_ADDR)
@@ -481,10 +488,10 @@ void __init dmi_scan_machine(void)
                 p = dmi_ioremap(efi.smbios, 32);
                 if (p == NULL)
                         goto error;
-
-                rc = smbios_present(p);
+                memcpy_fromio(buf, p, 32);
                 dmi_iounmap(p, 32);
-                if (!rc) {
+
+                if (!dmi_present(buf)) {
                         dmi_available = 1;
                         goto out;
                 }
@@ -499,18 +506,15 @@ void __init dmi_scan_machine(void)
                 if (p == NULL)
                         goto error;
 
+                memset(buf, 0, 16);
                 for (q = p; q < p + 0x10000; q += 16) {
-                        if (memcmp(q, "_SM_", 4) == 0 && q - p <= 0xFFE0)
-                                rc = smbios_present(q);
-                        else if (memcmp(q, "_DMI_", 5) == 0)
-                                rc = dmi_present(q);
-                        else
-                                continue;
-                        if (!rc) {
+                        memcpy_fromio(buf + 16, q, 16);
+                        if (!dmi_present(buf)) {
                                 dmi_available = 1;
                                 dmi_iounmap(p, 0x10000);
                                 goto out;
                         }
+                        memcpy(buf, buf + 16, 16);
                 }
                 dmi_iounmap(p, 0x10000);
         }
@@ -521,6 +525,19 @@ void __init dmi_scan_machine(void)
 }
 
 /**
+ * dmi_set_dump_stack_arch_desc - set arch description for dump_stack()
+ *
+ * Invoke dump_stack_set_arch_desc() with DMI system information so that
+ * DMI identifiers are printed out on task dumps.  Arch boot code should
+ * call this function after dmi_scan_machine() if it wants to print out DMI
+ * identifiers on task dumps.
+ */
+void __init dmi_set_dump_stack_arch_desc(void)
+{
+        dump_stack_set_arch_desc("%s", dmi_ids_string);
+}
+
+/**
  *      dmi_matches - check if dmi_system_id structure matches system DMI data
  *      @dmi: pointer to the dmi_system_id structure to check
  */
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c
index a7c5b31c0d50..9718661c1fb6 100644
--- a/drivers/memstick/host/r592.c
+++ b/drivers/memstick/host/r592.c
@@ -847,7 +847,7 @@ static void r592_remove(struct pci_dev *pdev)
                         dev->dummy_dma_page_physical_address);
 }
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
 static int r592_suspend(struct device *core_dev)
 {
         struct pci_dev *pdev = to_pci_dev(core_dev);
@@ -870,10 +870,10 @@ static int r592_resume(struct device *core_dev)
         r592_update_card_detect(dev);
         return 0;
 }
-
-SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
 #endif
 
+static SIMPLE_DEV_PM_OPS(r592_pm_ops, r592_suspend, r592_resume);
+
 MODULE_DEVICE_TABLE(pci, r592_pci_id_tbl);
 
 static struct pci_driver r852_pci_driver = {
@@ -881,9 +881,7 @@ static struct pci_driver r852_pci_driver = {
         .id_table       = r592_pci_id_tbl,
         .probe          = r592_probe,
         .remove         = r592_remove,
-#ifdef CONFIG_PM
         .driver.pm      = &r592_pm_ops,
-#endif
 };
 
 static __init int r592_module_init(void)
diff --git a/drivers/message/i2o/i2o_config.c b/drivers/message/i2o/i2o_config.c
index 5451beff183f..a60c188c2bd9 100644
--- a/drivers/message/i2o/i2o_config.c
+++ b/drivers/message/i2o/i2o_config.c
@@ -687,6 +687,11 @@ static int i2o_cfg_passthru32(struct file *file, unsigned cmnd,
                 }
                 size = size >> 16;
                 size *= 4;
+                if (size > sizeof(rmsg)) {
+                        rcode = -EINVAL;
+                        goto sg_list_cleanup;
+                }
+
                 /* Copy in the user's I2O command */
                 if (copy_from_user(rmsg, user_msg, size)) {
                         rcode = -EFAULT;
@@ -922,6 +927,11 @@ static int i2o_cfg_passthru(unsigned long arg)
                 }
                 size = size >> 16;
                 size *= 4;
+                if (size > sizeof(rmsg)) {
+                        rcode = -EFAULT;
+                        goto sg_list_cleanup;
+                }
+
                 /* Copy in the user's I2O command */
                 if (copy_from_user(rmsg, user_msg, size)) {
                         rcode = -EFAULT;
diff --git a/drivers/net/ethernet/ibm/emac/debug.c b/drivers/net/ethernet/ibm/emac/debug.c
index b16b4828b64d..a559f326bf63 100644
--- a/drivers/net/ethernet/ibm/emac/debug.c
+++ b/drivers/net/ethernet/ibm/emac/debug.c
@@ -245,7 +245,7 @@ static void emac_sysrq_handler(int key)
 
 static struct sysrq_key_op emac_sysrq_op = {
         .handler = emac_sysrq_handler,
-        .help_msg = "emaC",
+        .help_msg = "emac(c)",
         .action_msg = "Show EMAC(s) status",
 };
 
diff --git a/drivers/pps/Kconfig b/drivers/pps/Kconfig
index 982d16b5a846..7512e98e9311 100644
--- a/drivers/pps/Kconfig
+++ b/drivers/pps/Kconfig
@@ -20,10 +20,10 @@ config PPS
 
           To compile this driver as a module, choose M here: the module
           will be called pps_core.ko.
+if PPS
 
 config PPS_DEBUG
         bool "PPS debugging messages"
-        depends on PPS
         help
           Say Y here if you want the PPS support to produce a bunch of debug
           messages to the system log.  Select this if you are having a
@@ -31,13 +31,15 @@ config PPS_DEBUG
 
 config NTP_PPS
         bool "PPS kernel consumer support"
-        depends on PPS && !NO_HZ
+        depends on !NO_HZ
         help
           This option adds support for direct in-kernel time
           synchronization using an external PPS signal.
 
           It doesn't work on tickless systems at the moment.
 
+endif
+
 source drivers/pps/clients/Kconfig
 
 source drivers/pps/generators/Kconfig
diff --git a/drivers/pps/kc.c b/drivers/pps/kc.c
index 079e930b1938..e219db1f1c84 100644
--- a/drivers/pps/kc.c
+++ b/drivers/pps/kc.c
@@ -34,10 +34,10 @@
  */
 
 /* state variables to bind kernel consumer */
-DEFINE_SPINLOCK(pps_kc_hardpps_lock);
+static DEFINE_SPINLOCK(pps_kc_hardpps_lock);
 /* PPS API (RFC 2783): current source and mode for kernel consumer */
-struct pps_device *pps_kc_hardpps_dev;  /* unique pointer to device */
-int pps_kc_hardpps_mode;                /* mode bits for kernel consumer */
+static struct pps_device *pps_kc_hardpps_dev;   /* unique pointer to device */
+static int pps_kc_hardpps_mode;         /* mode bits for kernel consumer */
 
 /* pps_kc_bind - control PPS kernel consumer binding
  * @pps: the PPS source
diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
index d6d9264e4ca7..943b6c134a22 100644
--- a/drivers/staging/speakup/kobjects.c
+++ b/drivers/staging/speakup/kobjects.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/kobject.h>
 #include <linux/string.h>
+#include <linux/string_helpers.h>
 #include <linux/sysfs.h>
 #include <linux/ctype.h>
 
@@ -417,7 +418,7 @@ static ssize_t synth_direct_store(struct kobject *kobj,
                 bytes = min_t(size_t, len, 250);
                 strncpy(tmp, ptr, bytes);
                 tmp[bytes] = '\0';
-                spk_xlate(tmp);
+                string_unescape_any_inplace(tmp);
                 synth_printf("%s", tmp);
                 ptr += bytes;
                 len -= bytes;
@@ -605,7 +606,8 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr,
         if (param->data == NULL)
                 return 0;
         ret = 0;
-        cp = spk_xlate((char *) buf);
+        cp = (char *)buf;
+        string_unescape_any_inplace(cp);
 
         spk_lock(flags);
         switch (param->var_type) {
diff --git a/drivers/staging/speakup/speakup.h b/drivers/staging/speakup/speakup.h
index c387a02fc1c2..0126f714821a 100644
--- a/drivers/staging/speakup/speakup.h
+++ b/drivers/staging/speakup/speakup.h
@@ -54,7 +54,6 @@ void spk_get_index_count(int *linecount, int *sentcount);
 extern int spk_set_key_info(const u_char *key_info, u_char *k_buffer);
 extern char *spk_strlwr(char *s);
 extern char *spk_s2uchar(char *start, char *dest);
-extern char *spk_xlate(char *s);
 extern int speakup_kobj_init(void);
 extern void speakup_kobj_exit(void);
 extern int spk_chartab_get_value(char *keyword);
diff --git a/drivers/staging/speakup/varhandlers.c b/drivers/staging/speakup/varhandlers.c
index 0099cb12e560..7f6288fc2299 100644
--- a/drivers/staging/speakup/varhandlers.c
+++ b/drivers/staging/speakup/varhandlers.c
@@ -328,49 +328,3 @@ char *spk_s2uchar(char *start, char *dest)
         *dest = (u_char)val;
         return start;
 }
-
-char *spk_xlate(char *s)
-{
-        static const char finds[] = "nrtvafe";
-        static const char subs[] = "\n\r\t\013\001\014\033";
-        static const char hx[] = "0123456789abcdefABCDEF";
-        char *p = s, *p1, *p2, c;
-        int num;
-        while ((p = strchr(p, '\\'))) {
-                p1 = p+1;
-                p2 = strchr(finds, *p1);
-                if (p2) {
-                        *p++ = subs[p2-finds];
-                        p1++;
-                } else if (*p1 >= '0' && *p1 <= '7') {
-                        num = (*p1++)&7;
-                        while (num < 32 && *p1 >= '0' && *p1 <= '7') {
-                                num <<= 3;
-                                num += (*p1++)&7;
-                        }
-                        *p++ = num;
-                } else if (*p1 == 'x' &&
-                                strchr(hx, p1[1]) && strchr(hx, p1[2])) {
-                        p1++;
-                        c = *p1++;
-                        if (c > '9')
-                                c = (c - '7') & 0x0f;
-                        else
-                                c -= '0';
-                        num = c << 4;
-                        c = *p1++;
-                        if (c > '9')
-                                c = (c-'7')&0x0f;
-                        else
-                                c -= '0';
-                        num += c;
-                        *p++ = num;
-                } else
-                        *p++ = *p1++;
-                p2 = p;
-                while (*p1)
-                        *p2++ = *p1++;
-                *p2 = '\0';
-        }
-        return s;
-}
diff --git a/drivers/staging/zcache/Kconfig b/drivers/staging/zcache/Kconfig
index 05e87a1e5d93..2d7b2da3b9e0 100644
--- a/drivers/staging/zcache/Kconfig
+++ b/drivers/staging/zcache/Kconfig
@@ -1,5 +1,5 @@
 config ZCACHE
-        bool "Dynamic compression of swap pages and clean pagecache pages"
+        tristate "Dynamic compression of swap pages and clean pagecache pages"
         depends on CRYPTO=y && SWAP=y && CLEANCACHE && FRONTSWAP
         select CRYPTO_LZO
         default n
@@ -19,8 +19,8 @@ config ZCACHE_DEBUG
           how zcache is doing. You probably want to set this to 'N'.
 
 config RAMSTER
-        bool "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
-        depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE=y
+        tristate "Cross-machine RAM capacity sharing, aka peer-to-peer tmem"
+        depends on CONFIGFS_FS=y && SYSFS=y && !HIGHMEM && ZCACHE
         depends on NET
         # must ensure struct page is 8-byte aligned
         select HAVE_ALIGNED_STRUCT_PAGE if !64BIT
diff --git a/drivers/staging/zcache/ramster.h b/drivers/staging/zcache/ramster.h
index 1b71aea2ff62..e1f91d5a0f6a 100644
--- a/drivers/staging/zcache/ramster.h
+++ b/drivers/staging/zcache/ramster.h
@@ -11,10 +11,14 @@
 #ifndef _ZCACHE_RAMSTER_H_
 #define _ZCACHE_RAMSTER_H_
 
+#ifdef CONFIG_RAMSTER_MODULE
+#define CONFIG_RAMSTER
+#endif
+
 #ifdef CONFIG_RAMSTER
 #include "ramster/ramster.h"
 #else
-static inline void ramster_init(bool x, bool y, bool z)
+static inline void ramster_init(bool x, bool y, bool z, bool w)
 {
 }
 
diff --git a/drivers/staging/zcache/ramster/debug.c b/drivers/staging/zcache/ramster/debug.c
index bf34133cc631..327e4f0d98e1 100644
--- a/drivers/staging/zcache/ramster/debug.c
+++ b/drivers/staging/zcache/ramster/debug.c
@@ -43,7 +43,7 @@ static struct debug_entry {
 };
 #undef ATTR
 
-int __init ramster_debugfs_init(void)
+int ramster_debugfs_init(void)
 {
         int i;
         struct dentry *root = debugfs_create_dir("ramster", NULL);
diff --git a/drivers/staging/zcache/ramster/nodemanager.c b/drivers/staging/zcache/ramster/nodemanager.c
index c0f48158735d..2cfe93342c0d 100644
--- a/drivers/staging/zcache/ramster/nodemanager.c
+++ b/drivers/staging/zcache/ramster/nodemanager.c
@@ -949,7 +949,7 @@ static void __exit exit_r2nm(void)
         r2hb_exit();
 }
 
-static int __init init_r2nm(void)
+int r2nm_init(void)
 {
         int ret = -1;
 
@@ -986,10 +986,11 @@ out_r2hb:
 out:
         return ret;
 }
+EXPORT_SYMBOL_GPL(r2nm_init);
 
 MODULE_AUTHOR("Oracle");
 MODULE_LICENSE("GPL");
 
-/* module_init(init_r2nm) */
-late_initcall(init_r2nm);
-/* module_exit(exit_r2nm) */
+#ifndef CONFIG_RAMSTER_MODULE
+late_initcall(r2nm_init);
+#endif
diff --git a/drivers/staging/zcache/ramster/ramster.c b/drivers/staging/zcache/ramster/ramster.c
index 87816279ce3c..b18b887db79f 100644
--- a/drivers/staging/zcache/ramster/ramster.c
+++ b/drivers/staging/zcache/ramster/ramster.c
@@ -121,6 +121,7 @@ int ramster_do_preload_flnode(struct tmem_pool *pool)
                 kmem_cache_free(ramster_flnode_cache, flnode);
         return ret;
 }
+EXPORT_SYMBOL_GPL(ramster_do_preload_flnode);
 
 /*
  * Called by the message handler after a (still compressed) page has been
@@ -388,6 +389,7 @@ void *ramster_pampd_free(void *pampd, struct tmem_pool *pool,
         }
         return local_pampd;
 }
+EXPORT_SYMBOL_GPL(ramster_pampd_free);
 
 void ramster_count_foreign_pages(bool eph, int count)
 {
@@ -408,6 +410,7 @@ void ramster_count_foreign_pages(bool eph, int count)
                 }
         }
 }
+EXPORT_SYMBOL_GPL(ramster_count_foreign_pages);
 
 /*
  * For now, just push over a few pages every few seconds to
@@ -593,7 +596,7 @@ requeue:
         ramster_remotify_queue_delayed_work(HZ);
 }
 
-void __init ramster_remotify_init(void)
+void ramster_remotify_init(void)
 {
         unsigned long n = 60UL;
         ramster_remotify_workqueue =
@@ -768,8 +771,10 @@ static bool frontswap_selfshrinking __read_mostly;
 static void selfshrink_process(struct work_struct *work);
 static DECLARE_DELAYED_WORK(selfshrink_worker, selfshrink_process);
 
+#ifndef CONFIG_RAMSTER_MODULE
 /* Enable/disable with kernel boot option. */
-static bool use_frontswap_selfshrink __initdata = true;
+static bool use_frontswap_selfshrink = true;
+#endif
 
 /*
  * The default values for the following parameters were deemed reasonable
@@ -824,6 +829,7 @@ static void frontswap_selfshrink(void)
         frontswap_shrink(tgt_frontswap_pages);
 }
 
+#ifndef CONFIG_RAMSTER_MODULE
 static int __init ramster_nofrontswap_selfshrink_setup(char *s)
 {
         use_frontswap_selfshrink = false;
@@ -831,6 +837,7 @@ static int __init ramster_nofrontswap_selfshrink_setup(char *s)
 }
 
 __setup("noselfshrink", ramster_nofrontswap_selfshrink_setup);
+#endif
 
 static void selfshrink_process(struct work_struct *work)
 {
@@ -849,6 +856,7 @@ void ramster_cpu_up(int cpu)
         per_cpu(ramster_remoteputmem1, cpu) = p1;
         per_cpu(ramster_remoteputmem2, cpu) = p2;
 }
+EXPORT_SYMBOL_GPL(ramster_cpu_up);
 
 void ramster_cpu_down(int cpu)
 {
@@ -864,6 +872,7 @@ void ramster_cpu_down(int cpu)
                 kp->flnode = NULL;
         }
 }
+EXPORT_SYMBOL_GPL(ramster_cpu_down);
 
 void ramster_register_pamops(struct tmem_pamops *pamops)
 {
@@ -874,9 +883,11 @@ void ramster_register_pamops(struct tmem_pamops *pamops)
         pamops->repatriate = ramster_pampd_repatriate;
         pamops->repatriate_preload = ramster_pampd_repatriate_preload;
 }
+EXPORT_SYMBOL_GPL(ramster_register_pamops);
 
-void __init ramster_init(bool cleancache, bool frontswap,
-                                bool frontswap_exclusive_gets)
+void ramster_init(bool cleancache, bool frontswap,
+                                bool frontswap_exclusive_gets,
+                                bool frontswap_selfshrink)
 {
         int ret = 0;
 
@@ -891,10 +902,17 @@ void __init ramster_init(bool cleancache, bool frontswap,
         if (ret)
                 pr_err("ramster: can't create sysfs for ramster\n");
         (void)r2net_register_handlers();
+#ifdef CONFIG_RAMSTER_MODULE
+        ret = r2nm_init();
+        if (ret)
+                pr_err("ramster: can't init r2net\n");
+        frontswap_selfshrinking = frontswap_selfshrink;
+#else
+        frontswap_selfshrinking = use_frontswap_selfshrink;
+#endif
         INIT_LIST_HEAD(&ramster_rem_op_list);
         ramster_flnode_cache = kmem_cache_create("ramster_flnode",
                                 sizeof(struct flushlist_node), 0, 0, NULL);
-        frontswap_selfshrinking = use_frontswap_selfshrink;
         if (frontswap_selfshrinking) {
                 pr_info("ramster: Initializing frontswap selfshrink driver.\n");
                 schedule_delayed_work(&selfshrink_worker,
@@ -902,3 +920,4 @@ void __init ramster_init(bool cleancache, bool frontswap,
         }
         ramster_remotify_init();
 }
+EXPORT_SYMBOL_GPL(ramster_init);
diff --git a/drivers/staging/zcache/ramster/ramster.h b/drivers/staging/zcache/ramster/ramster.h
index 12ae56f09ca4..6d41a7a772e3 100644
--- a/drivers/staging/zcache/ramster/ramster.h
+++ b/drivers/staging/zcache/ramster/ramster.h
@@ -147,7 +147,7 @@ extern int r2net_register_handlers(void);
 extern int r2net_remote_target_node_set(int);
 
 extern int ramster_remotify_pageframe(bool);
-extern void ramster_init(bool, bool, bool);
+extern void ramster_init(bool, bool, bool, bool);
 extern void ramster_register_pamops(struct tmem_pamops *);
 extern int ramster_localify(int, struct tmem_oid *oidp, uint32_t, char *,
                                 unsigned int, void *);
diff --git a/drivers/staging/zcache/ramster/ramster_nodemanager.h b/drivers/staging/zcache/ramster/ramster_nodemanager.h
index 49f879d943ab..dbaae34ea613 100644
--- a/drivers/staging/zcache/ramster/ramster_nodemanager.h
+++ b/drivers/staging/zcache/ramster/ramster_nodemanager.h
@@ -36,4 +36,6 @@
 /* host name, group name, cluster name all 64 bytes */
 #define R2NM_MAX_NAME_LEN        64    /* __NEW_UTS_LEN */
 
+extern int r2nm_init(void);
+
 #endif /* _RAMSTER_NODEMANAGER_H */
diff --git a/drivers/staging/zcache/tmem.c b/drivers/staging/zcache/tmem.c
index a2b7e03b6062..d7e51e4152eb 100644
--- a/drivers/staging/zcache/tmem.c
+++ b/drivers/staging/zcache/tmem.c
@@ -35,7 +35,8 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/atomic.h>
-#ifdef CONFIG_RAMSTER
+#include <linux/export.h>
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
 #include <linux/delay.h>
 #endif
 
@@ -641,6 +642,7 @@ void *tmem_localify_get_pampd(struct tmem_pool *pool, struct tmem_oid *oidp,
         /* note, hashbucket remains locked */
         return pampd;
 }
+EXPORT_SYMBOL_GPL(tmem_localify_get_pampd);
 
 void tmem_localify_finish(struct tmem_obj *obj, uint32_t index,
                           void *pampd, void *saved_hb, bool delete)
@@ -658,6 +660,7 @@ void tmem_localify_finish(struct tmem_obj *obj, uint32_t index,
         }
         spin_unlock(&hb->lock);
 }
+EXPORT_SYMBOL_GPL(tmem_localify_finish);
 
 /*
  * For ramster only.  Helper function to support asynchronous tmem_get.
@@ -719,6 +722,7 @@ out:
         spin_unlock(&hb->lock);
         return ret;
 }
+EXPORT_SYMBOL_GPL(tmem_replace);
 #endif
 
 /*
diff --git a/drivers/staging/zcache/tmem.h b/drivers/staging/zcache/tmem.h
index adbe5a8f28aa..d128ce290f1f 100644
--- a/drivers/staging/zcache/tmem.h
+++ b/drivers/staging/zcache/tmem.h
@@ -126,7 +126,7 @@ static inline unsigned tmem_oid_hash(struct tmem_oid *oidp)
                                 TMEM_HASH_BUCKET_BITS);
 }
 
-#ifdef CONFIG_RAMSTER
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
 struct tmem_xhandle {
         uint8_t client_id;
         uint8_t xh_data_cksum;
@@ -171,7 +171,7 @@ struct tmem_obj {
         unsigned int objnode_tree_height;
         unsigned long objnode_count;
         long pampd_count;
-#ifdef CONFIG_RAMSTER
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
         /*
          * for current design of ramster, all pages belonging to
          * an object reside on the same remotenode and extra is
@@ -215,7 +215,7 @@ struct tmem_pamops {
                                 uint32_t);
         void (*free)(void *, struct tmem_pool *,
                                 struct tmem_oid *, uint32_t, bool);
-#ifdef CONFIG_RAMSTER
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
         void (*new_obj)(struct tmem_obj *);
         void (*free_obj)(struct tmem_pool *, struct tmem_obj *, bool);
         void *(*repatriate_preload)(void *, struct tmem_pool *,
@@ -247,7 +247,7 @@ extern int tmem_flush_page(struct tmem_pool *, struct tmem_oid *,
 extern int tmem_flush_object(struct tmem_pool *, struct tmem_oid *);
 extern int tmem_destroy_pool(struct tmem_pool *);
 extern void tmem_new_pool(struct tmem_pool *, uint32_t);
-#ifdef CONFIG_RAMSTER
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
 extern int tmem_replace(struct tmem_pool *, struct tmem_oid *, uint32_t index,
                         void *);
 extern void *tmem_localify_get_pampd(struct tmem_pool *, struct tmem_oid *,
diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index e23d814b5392..522cb8e55142 100644
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -37,8 +37,10 @@
 #include "debug.h"
 #ifdef CONFIG_RAMSTER
 static bool ramster_enabled __read_mostly;
+static int disable_frontswap_selfshrink;
 #else
 #define ramster_enabled false
+#define disable_frontswap_selfshrink 0
 #endif
 
 #ifndef __PG_WAS_ACTIVE
@@ -81,8 +83,12 @@ static char *namestr __read_mostly = "zcache";
         (__GFP_FS | __GFP_NORETRY | __GFP_NOWARN | __GFP_NOMEMALLOC)
 
 /* crypto API for zcache  */
+#ifdef CONFIG_ZCACHE_MODULE
+static char *zcache_comp_name = "lzo";
+#else
 #define ZCACHE_COMP_NAME_SZ CRYPTO_MAX_ALG_NAME
 static char zcache_comp_name[ZCACHE_COMP_NAME_SZ] __read_mostly;
+#endif
 static struct crypto_comp * __percpu *zcache_comp_pcpu_tfms __read_mostly;
 
 enum comp_op {
@@ -1576,9 +1582,9 @@ static struct cleancache_ops zcache_cleancache_ops = {
         .init_fs = zcache_cleancache_init_fs
 };
 
-struct cleancache_ops zcache_cleancache_register_ops(void)
+struct cleancache_ops *zcache_cleancache_register_ops(void)
 {
-        struct cleancache_ops old_ops =
+        struct cleancache_ops *old_ops =
                 cleancache_register_ops(&zcache_cleancache_ops);
 
         return old_ops;
@@ -1707,9 +1713,9 @@ static struct frontswap_ops zcache_frontswap_ops = {
         .init = zcache_frontswap_init
 };
 
-struct frontswap_ops zcache_frontswap_register_ops(void)
+struct frontswap_ops *zcache_frontswap_register_ops(void)
 {
-        struct frontswap_ops old_ops =
+        struct frontswap_ops *old_ops =
                 frontswap_register_ops(&zcache_frontswap_ops);
 
         return old_ops;
@@ -1721,6 +1727,7 @@ struct frontswap_ops zcache_frontswap_register_ops(void)
  * OR NOTHING HAPPENS!
  */
 
+#ifndef CONFIG_ZCACHE_MODULE
 static int __init enable_zcache(char *s)
 {
         zcache_enabled = true;
@@ -1787,18 +1794,27 @@ static int __init enable_zcache_compressor(char *s)
         return 1;
 }
 __setup("zcache=", enable_zcache_compressor);
+#endif
 
 
-static int __init zcache_comp_init(void)
+static int zcache_comp_init(void)
 {
         int ret = 0;
 
         /* check crypto algorithm */
+#ifdef CONFIG_ZCACHE_MODULE
+        ret = crypto_has_comp(zcache_comp_name, 0, 0);
+        if (!ret) {
+                ret = -1;
+                goto out;
+        }
+#else
         if (*zcache_comp_name != '\0') {
                 ret = crypto_has_comp(zcache_comp_name, 0, 0);
                 if (!ret)
                         pr_info("zcache: %s not supported\n",
                                         zcache_comp_name);
+                goto out;
         }
         if (!ret)
                 strcpy(zcache_comp_name, "lzo");
@@ -1807,6 +1823,7 @@ static int __init zcache_comp_init(void)
                 ret = 1;
                 goto out;
         }
+#endif
         pr_info("zcache: using %s compressor\n", zcache_comp_name);
 
         /* alloc percpu transforms */
@@ -1818,10 +1835,13 @@ out:
         return ret;
 }
 
-static int __init zcache_init(void)
+static int zcache_init(void)
 {
         int ret = 0;
 
+#ifdef CONFIG_ZCACHE_MODULE
+        zcache_enabled = 1;
+#endif
         if (ramster_enabled) {
                 namestr = "ramster";
                 ramster_register_pamops(&zcache_pamops);
@@ -1860,7 +1880,7 @@ static int __init zcache_init(void)
         }
         zbud_init();
         if (zcache_enabled && !disable_cleancache) {
-                struct cleancache_ops old_ops;
+                struct cleancache_ops *old_ops;
 
                 register_shrinker(&zcache_shrinker);
                 old_ops = zcache_cleancache_register_ops();
@@ -1870,11 +1890,11 @@ static int __init zcache_init(void)
                 pr_info("%s: cleancache: ignorenonactive = %d\n",
                         namestr, !disable_cleancache_ignore_nonactive);
 #endif
-                if (old_ops.init_fs != NULL)
+                if (old_ops != NULL)
                         pr_warn("%s: cleancache_ops overridden\n", namestr);
         }
         if (zcache_enabled && !disable_frontswap) {
-                struct frontswap_ops old_ops;
+                struct frontswap_ops *old_ops;
 
                 old_ops = zcache_frontswap_register_ops();
                 if (frontswap_has_exclusive_gets)
@@ -1886,14 +1906,36 @@ static int __init zcache_init(void)
                         namestr, frontswap_has_exclusive_gets,
                         !disable_frontswap_ignore_nonactive);
 #endif
-                if (old_ops.init != NULL)
+                if (IS_ERR(old_ops) || old_ops) {
+                        if (IS_ERR(old_ops))
+                                return PTR_RET(old_ops);
                         pr_warn("%s: frontswap_ops overridden\n", namestr);
+                }
         }
         if (ramster_enabled)
                 ramster_init(!disable_cleancache, !disable_frontswap,
-                                frontswap_has_exclusive_gets);
+                                frontswap_has_exclusive_gets,
+                                !disable_frontswap_selfshrink);
 out:
         return ret;
 }
 
+#ifdef CONFIG_ZCACHE_MODULE
+#ifdef CONFIG_RAMSTER
+module_param(ramster_enabled, int, S_IRUGO);
+module_param(disable_frontswap_selfshrink, int, S_IRUGO);
+#endif
+module_param(disable_cleancache, int, S_IRUGO);
+module_param(disable_frontswap, int, S_IRUGO);
+#ifdef FRONTSWAP_HAS_EXCLUSIVE_GETS
+module_param(frontswap_has_exclusive_gets, bool, S_IRUGO);
+#endif
+module_param(disable_frontswap_ignore_nonactive, int, S_IRUGO);
+module_param(zcache_comp_name, charp, S_IRUGO);
+module_init(zcache_init);
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Dan Magenheimer <dan.magenheimer@oracle.com>");
+MODULE_DESCRIPTION("In-kernel compression of cleancache/frontswap pages");
+#else
 late_initcall(zcache_init);
+#endif
diff --git a/drivers/staging/zcache/zcache.h b/drivers/staging/zcache/zcache.h
index 81722b33b087..849120095e79 100644
--- a/drivers/staging/zcache/zcache.h
+++ b/drivers/staging/zcache/zcache.h
@@ -39,7 +39,7 @@ extern int zcache_flush_page(int, int, struct tmem_oid *, uint32_t);
 extern int zcache_flush_object(int, int, struct tmem_oid *);
 extern void zcache_decompress_to_page(char *, unsigned int, struct page *);
 
-#ifdef CONFIG_RAMSTER
+#if defined(CONFIG_RAMSTER) || defined(CONFIG_RAMSTER_MODULE)
 extern void *zcache_pampd_create(char *, unsigned int, bool, int,
                                 struct tmem_handle *);
 int zcache_autocreate_pool(unsigned int cli_id, unsigned int pool_id, bool eph);
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 4797228747fb..8623577bbbe7 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -933,14 +933,11 @@ static int realtek_cr_autosuspend_setup(struct us_data *us)
 
 static void realtek_cr_destructor(void *extra)
 {
-        struct rts51x_chip *chip = (struct rts51x_chip *)extra;
-        struct us_data *us;
+        struct rts51x_chip *chip = extra;
 
         if (!chip)
                 return;
 
-        us = chip->us;
-
 #ifdef CONFIG_REALTEK_AUTOPM
         if (ss_en) {
                 del_timer(&chip->rts51x_suspend_timer);
diff --git a/drivers/w1/slaves/w1_bq27000.c b/drivers/w1/slaves/w1_bq27000.c
index 773dca5beafe..afbefed5f2c9 100644
--- a/drivers/w1/slaves/w1_bq27000.c
+++ b/drivers/w1/slaves/w1_bq27000.c
@@ -57,6 +57,8 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
         ret = platform_device_add_data(pdev,
                                        &bq27000_battery_info,
                                        sizeof(bq27000_battery_info));
+        if (ret)
+                goto pdev_add_failed;
         pdev->dev.parent = &sl->dev;
 
         ret = platform_device_add(pdev);
@@ -68,7 +70,7 @@ static int w1_bq27000_add_slave(struct w1_slave *sl)
         goto success;
 
 pdev_add_failed:
-        platform_device_unregister(pdev);
+        platform_device_put(pdev);
 success:
         return ret;
 }
diff --git a/drivers/w1/slaves/w1_ds2760.c b/drivers/w1/slaves/w1_ds2760.c
index aa7bd5fa2fa8..e86a69dc411e 100644
--- a/drivers/w1/slaves/w1_ds2760.c
+++ b/drivers/w1/slaves/w1_ds2760.c
@@ -148,8 +148,9 @@ static int w1_ds2760_add_slave(struct w1_slave *sl)
         goto success;
 
 bin_attr_failed:
+        platform_device_del(pdev);
 pdev_add_failed:
-        platform_device_unregister(pdev);
+        platform_device_put(pdev);
 pdev_alloc_failed:
         ida_simple_remove(&bat_ida, id);
 noid:
diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c
index 7b09307de0ef..98ed9c49cf50 100644
--- a/drivers/w1/slaves/w1_ds2780.c
+++ b/drivers/w1/slaves/w1_ds2780.c
@@ -141,8 +141,9 @@ static int w1_ds2780_add_slave(struct w1_slave *sl)
         return 0;
 
 bin_attr_failed:
+        platform_device_del(pdev);
 pdev_add_failed:
-        platform_device_unregister(pdev);
+        platform_device_put(pdev);
 pdev_alloc_failed:
         ida_simple_remove(&bat_ida, id);
 noid:
diff --git a/drivers/w1/slaves/w1_ds2781.c b/drivers/w1/slaves/w1_ds2781.c
index 877daf74159c..5140d7be67ab 100644
--- a/drivers/w1/slaves/w1_ds2781.c
+++ b/drivers/w1/slaves/w1_ds2781.c
@@ -139,8 +139,9 @@ static int w1_ds2781_add_slave(struct w1_slave *sl)
         return 0;
 
 bin_attr_failed:
+        platform_device_del(pdev);
 pdev_add_failed:
-        platform_device_unregister(pdev);
+        platform_device_put(pdev);
 pdev_alloc_failed:
         ida_simple_remove(&bat_ida, id);
 noid:
diff --git a/drivers/xen/Kconfig b/drivers/xen/Kconfig
index 67af155cf602..dd4d9cb86243 100644
--- a/drivers/xen/Kconfig
+++ b/drivers/xen/Kconfig
@@ -145,9 +145,9 @@ config SWIOTLB_XEN
         select SWIOTLB
 
 config XEN_TMEM
-        bool
+        tristate
         depends on !ARM
-        default y if (CLEANCACHE || FRONTSWAP)
+        default m if (CLEANCACHE || FRONTSWAP)
         help
           Shim to interface in-kernel Transcendent Memory hooks
           (e.g. cleancache and frontswap) to Xen tmem hypercalls.
diff --git a/drivers/xen/tmem.c b/drivers/xen/tmem.c
index 3ee836d42581..e3600be4e7fa 100644
--- a/drivers/xen/tmem.c
+++ b/drivers/xen/tmem.c
@@ -5,6 +5,7 @@
  * Author: Dan Magenheimer
  */
 
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/init.h>
@@ -128,6 +129,7 @@ static int xen_tmem_flush_object(u32 pool_id, struct tmem_oid oid)
         return xen_tmem_op(TMEM_FLUSH_OBJECT, pool_id, oid, 0, 0, 0, 0, 0);
 }
 
+#ifndef CONFIG_XEN_TMEM_MODULE
 bool __read_mostly tmem_enabled = false;
 
 static int __init enable_tmem(char *s)
@@ -136,6 +138,7 @@ static int __init enable_tmem(char *s)
         return 1;
 }
 __setup("tmem", enable_tmem);
+#endif
 
 #ifdef CONFIG_CLEANCACHE
 static int xen_tmem_destroy_pool(u32 pool_id)
@@ -227,16 +230,21 @@ static int tmem_cleancache_init_shared_fs(char *uuid, size_t pagesize)
         return xen_tmem_new_pool(shared_uuid, TMEM_POOL_SHARED, pagesize);
 }
 
-static bool __initdata use_cleancache = true;
-
+static bool disable_cleancache __read_mostly;
+static bool disable_selfballooning __read_mostly;
+#ifdef CONFIG_XEN_TMEM_MODULE
+module_param(disable_cleancache, bool, S_IRUGO);
+module_param(disable_selfballooning, bool, S_IRUGO);
+#else
 static int __init no_cleancache(char *s)
 {
-        use_cleancache = false;
+        disable_cleancache = true;
         return 1;
 }
 __setup("nocleancache", no_cleancache);
+#endif
 
-static struct cleancache_ops __initdata tmem_cleancache_ops = {
+static struct cleancache_ops tmem_cleancache_ops = {
         .put_page = tmem_cleancache_put_page,
         .get_page = tmem_cleancache_get_page,
         .invalidate_page = tmem_cleancache_flush_page,
@@ -353,54 +361,71 @@ static void tmem_frontswap_init(unsigned ignored)
                     xen_tmem_new_pool(private, TMEM_POOL_PERSIST, PAGE_SIZE);
 }
 
-static bool __initdata use_frontswap = true;
-
+static bool disable_frontswap __read_mostly;
+static bool disable_frontswap_selfshrinking __read_mostly;
+#ifdef CONFIG_XEN_TMEM_MODULE
+module_param(disable_frontswap, bool, S_IRUGO);
+module_param(disable_frontswap_selfshrinking, bool, S_IRUGO);
+#else
 static int __init no_frontswap(char *s)
 {
-        use_frontswap = false;
+        disable_frontswap = true;
         return 1;
 }
 __setup("nofrontswap", no_frontswap);
+#endif
 
-static struct frontswap_ops __initdata tmem_frontswap_ops = {
+static struct frontswap_ops tmem_frontswap_ops = {
         .store = tmem_frontswap_store,
         .load = tmem_frontswap_load,
         .invalidate_page = tmem_frontswap_flush_page,
         .invalidate_area = tmem_frontswap_flush_area,
         .init = tmem_frontswap_init
 };
+#else   /* CONFIG_FRONTSWAP */
+#define disable_frontswap_selfshrinking 1
 #endif
 
-static int __init xen_tmem_init(void)
+static int xen_tmem_init(void)
 {
         if (!xen_domain())
                 return 0;
 #ifdef CONFIG_FRONTSWAP
-        if (tmem_enabled && use_frontswap) {
+        if (tmem_enabled && !disable_frontswap) {
                 char *s = "";
-                struct frontswap_ops old_ops =
+                struct frontswap_ops *old_ops =
                         frontswap_register_ops(&tmem_frontswap_ops);
 
                 tmem_frontswap_poolid = -1;
-                if (old_ops.init != NULL)
+                if (IS_ERR(old_ops) || old_ops) {
+                        if (IS_ERR(old_ops))
+                                return PTR_ERR(old_ops);
                         s = " (WARNING: frontswap_ops overridden)";
+                }
                 printk(KERN_INFO "frontswap enabled, RAM provided by "
                                  "Xen Transcendent Memory%s\n", s);
         }
 #endif
 #ifdef CONFIG_CLEANCACHE
         BUG_ON(sizeof(struct cleancache_filekey) != sizeof(struct tmem_oid));
-        if (tmem_enabled && use_cleancache) {
+        if (tmem_enabled && !disable_cleancache) {
                 char *s = "";
-                struct cleancache_ops old_ops =
+                struct cleancache_ops *old_ops =
                         cleancache_register_ops(&tmem_cleancache_ops);
-                if (old_ops.init_fs != NULL)
+                if (old_ops)
                         s = " (WARNING: cleancache_ops overridden)";
                 printk(KERN_INFO "cleancache enabled, RAM provided by "
                                  "Xen Transcendent Memory%s\n", s);
         }
 #endif
+#ifdef CONFIG_XEN_SELFBALLOONING
+        xen_selfballoon_init(!disable_selfballooning,
+                                !disable_frontswap_selfshrinking);
+#endif
         return 0;
 }
 
 module_init(xen_tmem_init)
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Dan Magenheimer <dan.magenheimer@oracle.com>");
+MODULE_DESCRIPTION("Shim to Xen transcendent memory");
diff --git a/drivers/xen/xen-selfballoon.c b/drivers/xen/xen-selfballoon.c
index 2552d3e0a70f..f2ef569c7cc1 100644
--- a/drivers/xen/xen-selfballoon.c
+++ b/drivers/xen/xen-selfballoon.c
@@ -121,7 +121,7 @@ static DECLARE_DELAYED_WORK(selfballoon_worker, selfballoon_process);
 static bool frontswap_selfshrinking __read_mostly;
 
 /* Enable/disable with kernel boot option. */
-static bool use_frontswap_selfshrink __initdata = true;
+static bool use_frontswap_selfshrink = true;
 
 /*
  * The default values for the following parameters were deemed reasonable
@@ -185,7 +185,7 @@ static int __init xen_nofrontswap_selfshrink_setup(char *s)
 __setup("noselfshrink", xen_nofrontswap_selfshrink_setup);
 
 /* Disable with kernel boot option. */
-static bool use_selfballooning __initdata = true;
+static bool use_selfballooning = true;
 
 static int __init xen_noselfballooning_setup(char *s)
 {
@@ -196,7 +196,7 @@ static int __init xen_noselfballooning_setup(char *s)
 __setup("noselfballooning", xen_noselfballooning_setup);
 #else /* !CONFIG_FRONTSWAP */
 /* Enable with kernel boot option. */
-static bool use_selfballooning __initdata = false;
+static bool use_selfballooning;
 
 static int __init xen_selfballooning_setup(char *s)
 {
@@ -537,7 +537,7 @@ int register_xen_selfballooning(struct device *dev)
 }
 EXPORT_SYMBOL(register_xen_selfballooning);
 
-static int __init xen_selfballoon_init(void)
+int xen_selfballoon_init(bool use_selfballooning, bool use_frontswap_selfshrink)
 {
         bool enable = false;
 
@@ -571,7 +571,4 @@ static int __init xen_selfballoon_init(void)
 
         return 0;
 }
-
-subsys_initcall(xen_selfballoon_init);
-
-MODULE_LICENSE("GPL");
+EXPORT_SYMBOL(xen_selfballoon_init);