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

Commit 46dd98a5 authored by Andrew Morton's avatar Andrew Morton Committed by Thomas Gleixner
Browse files

arch/x86/mm/pat.c: use boot_cpu_has() 



arch/x86/mm/pat.c: In function 'phys_mem_access_prot_allowed':
arch/x86/mm/pat.c:526: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:526: warning: passing argument 2 of 'variable_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:527: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:527: warning: passing argument 2 of 'variable_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:528: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:528: warning: passing argument 2 of 'variable_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:529: warning: passing argument 2 of 'constant_test_bit' from incompatible pointer type
arch/x86/mm/pat.c:529: warning: passing argument 2 of 'variable_test_bit' from incompatible pointer type

Don't open-code test_bit() on a __u32

Cc: Andrea Arcangeli <andrea@qumranet.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 873b274a

arch/x86/mm/pat.c

+4 −4
Original line number Diff line number Diff line
@@ -536,10 +536,10 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn, 
	 * we maintain the tradition of paranoia in this code.

	 */

	if (!pat_wc_enabled &&

	    ! ( test_bit(X86_FEATURE_MTRR, boot_cpu_data.x86_capability) ||

		test_bit(X86_FEATURE_K6_MTRR, boot_cpu_data.x86_capability) ||

		test_bit(X86_FEATURE_CYRIX_ARR, boot_cpu_data.x86_capability) ||

		test_bit(X86_FEATURE_CENTAUR_MCR, boot_cpu_data.x86_capability)) &&

	    ! ( boot_cpu_has(X86_FEATURE_MTRR) ||

		boot_cpu_has(X86_FEATURE_K6_MTRR) ||

		boot_cpu_has(X86_FEATURE_CYRIX_ARR) ||

		boot_cpu_has(X86_FEATURE_CENTAUR_MCR)) &&

	   (pfn << PAGE_SHIFT) >= __pa(high_memory)) {

		flags = _PAGE_CACHE_UC;

	}