Commit bd4f203e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge third patch-bomb from Andrew Morton:
 "We're pretty much done over here - I'm still waiting for a nouveau
  merge so I can cleanly finish up Christoph's dma-mapping rework.

   - bunch of small misc stuff

   - fold abs64() into abs(), remove abs64()

   - new_valid_dev() cleanups

   - binfmt_elf_fdpic feature work"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (24 commits)
  fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
  fs/stat.c: remove unnecessary new_valid_dev() check
  fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
  fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
  fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
  fs/jfs: remove unnecessary new_valid_dev() checks
  fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
  fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
  fs/ext2/namei.c: remove unnecessary new_valid_dev() check
  fs/exofs/namei.c: remove unnecessary new_valid_dev() check
  fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
  fs/9p: remove unnecessary new_valid_dev() checks
  include/linux/kdev_t.h: old/new_valid_dev() can return bool
  include/linux/kdev_t.h: remove unused huge_valid_dev()
  kmap_atomic_to_page() has no users, remove it
  drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
  dma: remove external references to dma_supported
  Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
  remove abs64()
  kernel.h: make abs() work with 64-bit types
  ...
parents e6604ecb 1bde925d

Documentation/DMA-API.txt

+0 −13
Original line number Diff line number Diff line
@@ -141,19 +141,6 @@ memory back to the pool before you destroy it. 
Part Ic - DMA addressing limitations

------------------------------------



int

dma_supported(struct device *dev, u64 mask)



Checks to see if the device can support DMA to the memory described by

mask.



Returns: 1 if it can and 0 if it can't.



Notes: This routine merely tests to see if the mask is possible.  It

won't change the current mask settings.  It is more intended as an

internal API for use by the platform than an external API for use by

driver writers.



int

dma_set_mask_and_coherent(struct device *dev, u64 mask)

Documentation/sysctl/vm.txt

+1 −1
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ and don't use much of it. 
The default value is 0.



See Documentation/vm/overcommit-accounting and

security/commoncap.c::cap_vm_enough_memory() for more information.

mm/mmap.c::__vm_enough_memory() for more information.



==============================================================

arch/arm/include/asm/highmem.h

+0 −1
Original line number Diff line number Diff line
@@ -68,7 +68,6 @@ extern void kunmap(struct page *page); 
extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(const void *ptr);

#endif



#endif

arch/arm/mm/highmem.c

+0 −10
Original line number Diff line number Diff line
@@ -147,13 +147,3 @@ void *kmap_atomic_pfn(unsigned long pfn) 


	return (void *)vaddr;

}
 


struct page *kmap_atomic_to_page(const void *ptr)

{

	unsigned long vaddr = (unsigned long)ptr;



	if (vaddr < FIXADDR_START)

		return virt_to_page(ptr);



	return pte_page(get_fixmap_pte(vaddr));

}

arch/frv/include/asm/highmem.h

+0 −2
Original line number Diff line number Diff line
@@ -62,8 +62,6 @@ extern void kunmap_high(struct page *page); 
extern void *kmap(struct page *page);

extern void kunmap(struct page *page);



extern struct page *kmap_atomic_to_page(void *ptr);



#endif /* !__ASSEMBLY__ */



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE