From 536e602258303168b2f2fe44cb58caf634ded28f Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Thu, 31 Jan 2008 22:05:43 +0100 Subject: [PATCH] --- yaml --- r: 81438 b: refs/heads/master c: c1666e663d8443f57c1c6b0acac70c3fbaea9014 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pasemi/iommu.c | 4 +--- trunk/arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +++--- trunk/drivers/lguest/x86/core.c | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index bcf77357a75e..2ac583ae3291 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e95035c61a4c3dae1aa543a5bf5b39846daca061 +refs/heads/master: c1666e663d8443f57c1c6b0acac70c3fbaea9014 diff --git a/trunk/arch/powerpc/platforms/pasemi/iommu.c b/trunk/arch/powerpc/platforms/pasemi/iommu.c index c5cfd4b04a83..9916a0f3e431 100644 --- a/trunk/arch/powerpc/platforms/pasemi/iommu.c +++ b/trunk/arch/powerpc/platforms/pasemi/iommu.c @@ -182,10 +182,8 @@ 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/arch/x86/kernel/cpu/intel_cacheinfo.c b/trunk/arch/x86/kernel/cpu/intel_cacheinfo.c index 8b4507b8469b..1b889860eb73 100644 --- a/trunk/arch/x86/kernel/cpu/intel_cacheinfo.c +++ b/trunk/arch/x86/kernel/cpu/intel_cacheinfo.c @@ -352,8 +352,8 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) */ if ((num_cache_leaves == 0 || c->x86 == 15) && c->cpuid_level > 1) { /* supports eax=2 call */ - int i, j, n; - int regs[4]; + int j, n; + unsigned int regs[4]; unsigned char *dp = (unsigned char *)regs; int only_trace = 0; @@ -368,7 +368,7 @@ unsigned int __cpuinit init_intel_cacheinfo(struct cpuinfo_x86 *c) /* If bit 31 is set, this is an unknown format */ for ( j = 0 ; j < 3 ; j++ ) { - if ( regs[j] < 0 ) regs[j] = 0; + if (regs[j] & (1 << 31)) regs[j] = 0; } /* Byte 0 is level count, not a descriptor */ diff --git a/trunk/drivers/lguest/x86/core.c b/trunk/drivers/lguest/x86/core.c index 635187812d52..61f2f8eb8cad 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.sp1 = cpu->esp1; + pages->state.guest_tss.esp1 = cpu->esp1; pages->state.guest_tss.ss1 = cpu->ss1; /* Copy direct-to-Guest trap entries. */