Merge ../torvalds-2.6/

2 files changed, 4 insertions, 4 deletions

diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 156822e3cc79..80598cfd728c 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -32,7 +32,7 @@ config MAGIC_SYSRQ
 config LOG_BUF_SHIFT
         int "Kernel log buffer size (16 => 64KB, 17 => 128KB)" if DEBUG_KERNEL
         range 12 21
-        default 17 if ARCH_S390
+        default 17 if S390
         default 16 if X86_NUMAQ || IA64
         default 15 if SMP
         default 14
@@ -172,7 +172,8 @@ config DEBUG_VM
         bool "Debug VM"
         depends on DEBUG_KERNEL
         help
-          Enable this to debug the virtual-memory system.
+          Enable this to turn on extended checks in the virtual-memory system
+          that may impact performance.
 
           If unsure, say N.
 
diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 1ff8dcebf7c6..3b482052f403 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -142,8 +142,7 @@ swiotlb_init_with_default_size (size_t default_size)
         /*
          * Get IO TLB memory from the low pages
          */
-        io_tlb_start = alloc_bootmem_low_pages_limit(io_tlb_nslabs *
-                                             (1 << IO_TLB_SHIFT), 0x100000000);
+        io_tlb_start = alloc_bootmem_low_pages(io_tlb_nslabs * (1 << IO_TLB_SHIFT));
         if (!io_tlb_start)
                 panic("Cannot allocate SWIOTLB buffer");
         io_tlb_end = io_tlb_start + io_tlb_nslabs * (1 << IO_TLB_SHIFT);