diff options
Diffstat (limited to 'arch/x86/mm/pageattr-test.c')
| -rw-r--r-- | arch/x86/mm/pageattr-test.c | 7 | 
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/mm/pageattr-test.c b/arch/x86/mm/pageattr-test.c index b0086567271..d0b1773d9d2 100644 --- a/arch/x86/mm/pageattr-test.c +++ b/arch/x86/mm/pageattr-test.c @@ -68,7 +68,7 @@ static int print_split(struct split_state *s)  			s->gpg++;  			i += GPS/PAGE_SIZE;  		} else if (level == PG_LEVEL_2M) { -			if (!(pte_val(*pte) & _PAGE_PSE)) { +			if ((pte_val(*pte) & _PAGE_PRESENT) && !(pte_val(*pte) & _PAGE_PSE)) {  				printk(KERN_ERR  					"%lx level %d but not PSE %Lx\n",  					addr, level, (u64)pte_val(*pte)); @@ -130,13 +130,12 @@ static int pageattr_test(void)  	}  	failed += print_split(&sa); -	srandom32(100);  	for (i = 0; i < NTEST; i++) { -		unsigned long pfn = random32() % max_pfn_mapped; +		unsigned long pfn = prandom_u32() % max_pfn_mapped;  		addr[i] = (unsigned long)__va(pfn << PAGE_SHIFT); -		len[i] = random32() % 100; +		len[i] = prandom_u32() % 100;  		len[i] = min_t(unsigned long, len[i], max_pfn_mapped - pfn - 1);  		if (len[i] == 0)  |