Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 23:15:32 +0000 (10:15 +1100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 31 Jan 2008 23:15:32 +0000 (10:15 +1100)
* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
  asm-generic/tlb.h: build fix
  x86: uninline __pte_free_tlb() and __pmd_free_tlb()
  x86: fix small sparse warning
  x86: fix sparse warning in kernel/scx200_32.c
  x86: early_ioremap_reset fix 2
  x86: c_p_a clflush_cache_range fix
  x86: change_page_attr_clear fix
  x86: fix sparse warnings in intel_cacheinfo.c

arch/powerpc/platforms/pasemi/iommu.c
drivers/lguest/x86/core.c

index 9916a0f3e431955ba78117207e96038841b22ce6..c5cfd4b04a830d81ef1ca59ced3db5a35a6590bb 100644 (file)
@@ -182,8 +182,10 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
         * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time.
         */
        if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
-           !firmware_has_feature(FW_FEATURE_LPAR))
+           !firmware_has_feature(FW_FEATURE_LPAR)) {
                dev->dev.archdata.dma_ops = &dma_direct_ops;
+               dev->dev.archdata.dma_data = 0;
+       }
 #endif
 
        dev->dev.archdata.dma_data = &iommu_table_iobmap;
index 61f2f8eb8cad7edb744559c873a854b483a3fcdc..635187812d52b11cf85ed65a3ae88ef6fabf6f7f 100644 (file)
@@ -94,7 +94,7 @@ static void copy_in_guest_info(struct lg_cpu *cpu, struct lguest_pages *pages)
        /* Set up the two "TSS" members which tell the CPU what stack to use
         * for traps which do directly into the Guest (ie. traps at privilege
         * level 1). */
-       pages->state.guest_tss.esp1 = cpu->esp1;
+       pages->state.guest_tss.sp1 = cpu->esp1;
        pages->state.guest_tss.ss1 = cpu->ss1;
 
        /* Copy direct-to-Guest trap entries. */