Commit cf034616 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'microblaze-4.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze

Pull Microblaze fixes from Michal Simek:

 - Kbuild fix

 - use vma_pages

 - setup default little endians

* tag 'microblaze-4.14-rc3' of git://git.monstr.eu/linux-2.6-microblaze:
  arch: change default endian for microblaze
  microblaze: Cocci spatch "vma_pages"
  microblaze: Add missing kvm_para.h to Kbuild
parents ac0a3646 428dbf15
...@@ -39,7 +39,7 @@ config MICROBLAZE ...@@ -39,7 +39,7 @@ config MICROBLAZE
# Endianness selection # Endianness selection
choice choice
prompt "Endianness selection" prompt "Endianness selection"
default CPU_BIG_ENDIAN default CPU_LITTLE_ENDIAN
help help
microblaze architectures can be configured for either little or microblaze architectures can be configured for either little or
big endian formats. Be sure to select the appropriate mode. big endian formats. Be sure to select the appropriate mode.
......
...@@ -7,6 +7,7 @@ generic-y += fcntl.h ...@@ -7,6 +7,7 @@ generic-y += fcntl.h
generic-y += ioctl.h generic-y += ioctl.h
generic-y += ioctls.h generic-y += ioctls.h
generic-y += ipcbuf.h generic-y += ipcbuf.h
generic-y += kvm_para.h
generic-y += mman.h generic-y += mman.h
generic-y += msgbuf.h generic-y += msgbuf.h
generic-y += param.h generic-y += param.h
......
...@@ -165,7 +165,7 @@ int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma, ...@@ -165,7 +165,7 @@ int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
unsigned long attrs) unsigned long attrs)
{ {
#ifdef CONFIG_MMU #ifdef CONFIG_MMU
unsigned long user_count = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; unsigned long user_count = vma_pages(vma);
unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT; unsigned long count = PAGE_ALIGN(size) >> PAGE_SHIFT;
unsigned long off = vma->vm_pgoff; unsigned long off = vma->vm_pgoff;
unsigned long pfn; unsigned long pfn;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment