diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-08-30 15:33:11 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-08-30 15:33:11 +0300 |
| commit | a9f6cf965e00dd3370229417675eb0127d580f96 (patch) | |
| tree | 0fe5a9c57fdf6e8e614cdc02412876f153550be4 /include | |
| parent | e5552fd252763c74ce6a6c27c7873939062b5038 (diff) | |
| parent | bf550fc93d9855872a95e69e4002256110d89858 (diff) | |
| download | cachepc-linux-a9f6cf965e00dd3370229417675eb0127d580f96.tar.gz cachepc-linux-a9f6cf965e00dd3370229417675eb0127d580f96.zip | |
Merge branch 'kvm-ppc-next' of git://github.com/agraf/linux-2.6 into queue
* 'kvm-ppc-next' of git://github.com/agraf/linux-2.6:
KVM: PPC: Book3S PR: Rework kvmppc_mmu_book3s_64_xlate()
KVM: PPC: Book3S PR: Make instruction fetch fallback work for system calls
KVM: PPC: Book3S PR: Don't corrupt guest state when kernel uses VMX
KVM: PPC: Book3S: Fix compile error in XICS emulation
KVM: PPC: Book3S PR: return appropriate error when allocation fails
arch: powerpc: kvm: add signed type cast for comparation
powerpc/kvm: Copy the pvr value after memset
KVM: PPC: Book3S PR: Load up SPRG3 register with guest value on guest entry
kvm/ppc/booke: Don't call kvm_guest_enter twice
kvm/ppc: Call trace_hardirqs_on before entry
KVM: PPC: Book3S HV: Allow negative offsets to real-mode hcall handlers
KVM: PPC: Book3S HV: Correct tlbie usage
powerpc/kvm: Use 256K chunk to track both RMA and hash page table allocation.
powerpc/kvm: Contiguous memory allocator based RMA allocation
powerpc/kvm: Contiguous memory allocator based hash page table allocation
KVM: PPC: Book3S: Ignore DABR register
mm/cma: Move dma contiguous changes into a seperate config
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma-contiguous.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-contiguous.h b/include/linux/dma-contiguous.h index 01b5c84be828..00141d3325fe 100644 --- a/include/linux/dma-contiguous.h +++ b/include/linux/dma-contiguous.h @@ -57,7 +57,7 @@ struct cma; struct page; struct device; -#ifdef CONFIG_CMA +#ifdef CONFIG_DMA_CMA /* * There is always at least global CMA area and a few optional device |