Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm 

Pull ARM fixes from Russell King:
 "Three further fixes for ARM.

  Alexandre Courbot was having problems with DMA allocations with the
  GFP flags affecting where the tracking data was being allocated from.
  Vladimir Murzin noticed that the CPU feature code was not entirely
  correct, which can cause some features to be misreported"

* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
  ARM: 8564/1: fix cpu feature extracting helper
  ARM: 8563/1: fix demoting HWCAP_SWP
  ARM: 8551/2: DMA: Fix kzalloc flags in __dma_alloc
parents 90e6a689 ac36a881

arch/arm/include/asm/cputype.h

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ static inline int __attribute_const__ cpuid_feature_extract_field(u32 features, 
	int feature = (features >> field) & 15;



	/* feature registers are signed values */

	if (feature > 8)

	if (feature > 7)

		feature -= 16;



	return feature;

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ static void __init elf_hwcap_fixup(void) 
	 */

	if (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) > 1 ||

	    (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) == 1 &&

	     cpuid_feature_extract(CPUID_EXT_ISAR3, 20) >= 3))

	     cpuid_feature_extract(CPUID_EXT_ISAR4, 20) >= 3))

		elf_hwcap &= ~HWCAP_SWP;

}

arch/arm/mm/dma-mapping.c

+2 −1
Original line number Diff line number Diff line
@@ -762,7 +762,8 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, 
	if (!mask)

		return NULL;



	buf = kzalloc(sizeof(*buf), gfp);

	buf = kzalloc(sizeof(*buf),

		      gfp & ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM));

	if (!buf)

		return NULL;