tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds f862d66a 90e6a689

+4 -3
+1 -1
arch/arm/include/asm/cputype.h
··· 276 276 int feature = (features >> field) & 15; 277 277 278 278 /* feature registers are signed values */ 279 - if (feature > 8) 279 + if (feature > 7) 280 280 feature -= 16; 281 281 282 282 return feature;
+1 -1
arch/arm/kernel/setup.c
··· 512 512 */ 513 513 if (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) > 1 || 514 514 (cpuid_feature_extract(CPUID_EXT_ISAR3, 12) == 1 && 515 - cpuid_feature_extract(CPUID_EXT_ISAR3, 20) >= 3)) 515 + cpuid_feature_extract(CPUID_EXT_ISAR4, 20) >= 3)) 516 516 elf_hwcap &= ~HWCAP_SWP; 517 517 } 518 518
+2 -1
arch/arm/mm/dma-mapping.c
··· 762 762 if (!mask) 763 763 return NULL; 764 764 765 - buf = kzalloc(sizeof(*buf), gfp); 765 + buf = kzalloc(sizeof(*buf), 766 + gfp & ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM)); 766 767 if (!buf) 767 768 return NULL; 768 769