From 2cd1551ffbab5328352091b8d62b82d6a4a6bb41 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 1 Feb 2008 10:15:32 +1100 Subject: [PATCH] --- yaml --- r: 81446 b: refs/heads/master c: fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pasemi/iommu.c | 4 +++- trunk/drivers/lguest/x86/core.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a7cdf1b6017c..4175d03564c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 62152d0ea7012382cd814c7b361b4ef2029f26e6 +refs/heads/master: fcc3ff4f9d695a80dc6e6058e0d631a3026ed4c3 diff --git a/trunk/arch/powerpc/platforms/pasemi/iommu.c b/trunk/arch/powerpc/platforms/pasemi/iommu.c index 9916a0f3e431..c5cfd4b04a83 100644 --- a/trunk/arch/powerpc/platforms/pasemi/iommu.c +++ b/trunk/arch/powerpc/platforms/pasemi/iommu.c @@ -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; diff --git a/trunk/drivers/lguest/x86/core.c b/trunk/drivers/lguest/x86/core.c index 61f2f8eb8cad..635187812d52 100644 --- a/trunk/drivers/lguest/x86/core.c +++ b/trunk/drivers/lguest/x86/core.c @@ -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. */