aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/x86/mm/pat.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 1489aafbfa71..ef8b64b89c7d 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -284,7 +284,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
284 struct memtype *saved_ptr; 284 struct memtype *saved_ptr;
285 285
286 if (parse->start >= end) { 286 if (parse->start >= end) {
287 printk("New Entry\n"); 287 pr_debug("New Entry\n");
288 list_add(&new_entry->nd, parse->nd.prev); 288 list_add(&new_entry->nd, parse->nd.prev);
289 new_entry = NULL; 289 new_entry = NULL;
290 break; 290 break;
@@ -386,7 +386,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
386 break; 386 break;
387 } 387 }
388 388
389 printk("Overlap at 0x%Lx-0x%Lx\n", 389 printk(KERN_INFO "Overlap at 0x%Lx-0x%Lx\n",
390 saved_ptr->start, saved_ptr->end); 390 saved_ptr->start, saved_ptr->end);
391 /* No conflict. Go ahead and add this new entry */ 391 /* No conflict. Go ahead and add this new entry */
392 list_add(&new_entry->nd, &saved_ptr->nd); 392 list_add(&new_entry->nd, &saved_ptr->nd);
@@ -396,7 +396,7 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
396 } 396 }
397 397
398 if (err) { 398 if (err) {
399 printk( 399 printk(KERN_INFO
400 "reserve_memtype failed 0x%Lx-0x%Lx, track %s, req %s\n", 400 "reserve_memtype failed 0x%Lx-0x%Lx, track %s, req %s\n",
401 start, end, cattr_name(new_entry->type), 401 start, end, cattr_name(new_entry->type),
402 cattr_name(req_type)); 402 cattr_name(req_type));
@@ -408,16 +408,16 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type,
408 if (new_entry) { 408 if (new_entry) {
409 /* No conflict. Not yet added to the list. Add to the tail */ 409 /* No conflict. Not yet added to the list. Add to the tail */
410 list_add_tail(&new_entry->nd, &memtype_list); 410 list_add_tail(&new_entry->nd, &memtype_list);
411 printk("New Entry\n"); 411 pr_debug("New Entry\n");
412 } 412 }
413 413
414 if (ret_type) { 414 if (ret_type) {
415 printk( 415 pr_debug(
416 "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n", 416 "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s, ret %s\n",
417 start, end, cattr_name(actual_type), 417 start, end, cattr_name(actual_type),
418 cattr_name(req_type), cattr_name(*ret_type)); 418 cattr_name(req_type), cattr_name(*ret_type));
419 } else { 419 } else {
420 printk( 420 pr_debug(
421 "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s\n", 421 "reserve_memtype added 0x%Lx-0x%Lx, track %s, req %s\n",
422 start, end, cattr_name(actual_type), 422 start, end, cattr_name(actual_type),
423 cattr_name(req_type)); 423 cattr_name(req_type));
@@ -454,11 +454,11 @@ int free_memtype(u64 start, u64 end)
454 spin_unlock(&memtype_lock); 454 spin_unlock(&memtype_lock);
455 455
456 if (err) { 456 if (err) {
457 printk(KERN_DEBUG "%s:%d freeing invalid memtype %Lx-%Lx\n", 457 printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n",
458 current->comm, current->pid, start, end); 458 current->comm, current->pid, start, end);
459 } 459 }
460 460
461 printk( "free_memtype request 0x%Lx-0x%Lx\n", start, end); 461 pr_debug("free_memtype request 0x%Lx-0x%Lx\n", start, end);
462 return err; 462 return err;
463} 463}
464 464
@@ -529,7 +529,7 @@ int phys_mem_access_prot_allowed(struct file *file, unsigned long pfn,
529 if (pfn <= max_pfn_mapped && 529 if (pfn <= max_pfn_mapped &&
530 ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) { 530 ioremap_change_attr((unsigned long)__va(offset), size, flags) < 0) {
531 free_memtype(offset, offset + size); 531 free_memtype(offset, offset + size);
532 printk(KERN_DEBUG 532 printk(KERN_INFO
533 "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", 533 "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n",
534 current->comm, current->pid, 534 current->comm, current->pid,
535 cattr_name(flags), 535 cattr_name(flags),
@@ -550,7 +550,7 @@ void map_devmem(unsigned long pfn, unsigned long size, pgprot_t vma_prot)
550 550
551 reserve_memtype(addr, addr + size, want_flags, &flags); 551 reserve_memtype(addr, addr + size, want_flags, &flags);
552 if (flags != want_flags) { 552 if (flags != want_flags) {
553 printk(KERN_DEBUG 553 printk(KERN_INFO
554 "%s:%d /dev/mem expected mapping type %s for %Lx-%Lx, got %s\n", 554 "%s:%d /dev/mem expected mapping type %s for %Lx-%Lx, got %s\n",
555 current->comm, current->pid, 555 current->comm, current->pid,
556 cattr_name(want_flags), 556 cattr_name(want_flags),