2 files changed, 8 insertions, 12 deletions

diff --git a/init/Kconfig b/init/Kconfig
index 6199d1120900..a50bdfed2df7 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -856,8 +856,8 @@ config MODULE_UNLOAD
         help
           Without this option you will not be able to unload any
           modules (note that some modules may not be unloadable
-          anyway), which makes your kernel slightly smaller and
-          simpler.  If unsure, say Y.
+          anyway), which makes your kernel smaller, faster
+          and simpler.  If unsure, say Y.
 
 config MODULE_FORCE_UNLOAD
         bool "Forced module unloading"
@@ -893,16 +893,11 @@ config MODULE_SRCVERSION_ALL
           will be created for all modules.  If unsure, say N.
 
 config KMOD
-        bool "Automatic kernel module loading"
+        def_bool y
         depends on MODULES
         help
-          Normally when you have selected some parts of the kernel to
-          be created as kernel modules, you must load them (using the
-          "modprobe" command) before you can use them. If you say Y
-          here, some parts of the kernel will be able to load modules
-          automatically: when a part of the kernel needs a module, it
-          runs modprobe with the appropriate arguments, thereby
-          loading the module if it is available.  If unsure, say Y.
+          This is being removed soon.  These days, CONFIG_MODULES
+          implies CONFIG_KMOD, so use that instead.
 
 config STOP_MACHINE
         bool
diff --git a/init/main.c b/init/main.c
index dd25259530ea..2769dc031c62 100644
--- a/init/main.c
+++ b/init/main.c
@@ -637,9 +637,10 @@ asmlinkage void __init start_kernel(void)
 
 #ifdef CONFIG_BLK_DEV_INITRD
         if (initrd_start && !initrd_below_start_ok &&
-                        initrd_start < min_low_pfn << PAGE_SHIFT) {
+            page_to_pfn(virt_to_page(initrd_start)) < min_low_pfn) {
                 printk(KERN_CRIT "initrd overwritten (0x%08lx < 0x%08lx) - "
-                    "disabling it.\n",initrd_start,min_low_pfn << PAGE_SHIFT);
+                    "disabling it.\n",
+                    page_to_pfn(virt_to_page(initrd_start)), min_low_pfn);
                 initrd_start = 0;
         }
 #endif