6 files changed, 10 insertions, 13 deletions

diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 222b5b46d2b2..1ef6028f721e 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -149,7 +149,7 @@ unsigned long __init find_e820_area(unsigned long start, unsigned long end, unsi
                         addr = start;
                 if (addr > ei->addr + ei->size) 
                         continue; 
-                while (bad_addr(&addr, size) && addr+size < ei->addr + ei->size)
+                while (bad_addr(&addr, size) && addr+size <= ei->addr+ei->size)
                         ;
                 last = addr + size;
                 if (last > ei->addr + ei->size)
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index c946e4fe67a7..586b34c00c48 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -281,12 +281,7 @@ tracesys:
         ja  1f
         movq %r10,%rcx  /* fixup for C */
         call *sys_call_table(,%rax,8)
-        movq %rax,RAX-ARGOFFSET(%rsp)
-1:      SAVE_REST
-        movq %rsp,%rdi
-        call syscall_trace_leave
-        RESTORE_TOP_OF_STACK %rbx
-        RESTORE_REST
+1:      movq %rax,RAX-ARGOFFSET(%rsp)
         /* Use IRET because user could have changed frame */
         jmp int_ret_from_sys_call
         CFI_ENDPROC
diff --git a/arch/x86_64/kernel/pci-dma.c b/arch/x86_64/kernel/pci-dma.c
index af035ede70cd..a9275c9557cf 100644
--- a/arch/x86_64/kernel/pci-dma.c
+++ b/arch/x86_64/kernel/pci-dma.c
@@ -54,6 +54,10 @@ dma_alloc_pages(struct device *dev, gfp_t gfp, unsigned order)
         else
 #endif
                 node = numa_node_id();
+
+        if (node < first_node(node_online_map))
+                node = first_node(node_online_map);
+
         page = alloc_pages_node(node, gfp, order);
         return page ? page_address(page) : NULL;
 }
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 2480d3f08a47..82a7c9bfdfa0 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -631,10 +631,8 @@ static int __init pci_iommu_init(void)
                 printk(KERN_INFO "PCI-DMA: Disabling IOMMU.\n");
                 if (end_pfn > MAX_DMA32_PFN) {
                         printk(KERN_ERR "WARNING more than 4GB of memory "
-                                        "but IOMMU not compiled in.\n"
-                               KERN_ERR "WARNING 32bit PCI may malfunction.\n"
-                               KERN_ERR "You might want to enable "
-                                        "CONFIG_GART_IOMMU\n");
+                                        "but IOMMU not available.\n"
+                               KERN_ERR "WARNING 32bit PCI may malfunction.\n");
                 }
                 return -1;
         }
diff --git a/arch/x86_64/kernel/pmtimer.c b/arch/x86_64/kernel/pmtimer.c
index b0444a415bd6..bf421ed26808 100644
--- a/arch/x86_64/kernel/pmtimer.c
+++ b/arch/x86_64/kernel/pmtimer.c
@@ -68,7 +68,7 @@ int pmtimer_mark_offset(void)
         offset_delay = delta % (USEC_PER_SEC / HZ);
 
         rdtscll(tsc);
-        vxtime.last_tsc = tsc - offset_delay * cpu_khz;
+        vxtime.last_tsc = tsc - offset_delay * (u64)cpu_khz / 1000;
 
         /* don't calculate delay for first run,
            or if we've got less then a tick */
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index f0870bef24d1..655b9192eeb3 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -1051,7 +1051,7 @@ static void srat_detect_node(void)
            for now. */
         node = apicid_to_node[hard_smp_processor_id()];
         if (node == NUMA_NO_NODE)
-                node = 0;
+                node = first_node(node_online_map);
         numa_set_node(cpu, node);
 
         if (acpi_numa > 0)