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

Commit 8fafa0a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-debug-for-linus' of... 

Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Decrease the level of some NUMA messages to KERN_DEBUG
parents c7208de3 23b6c52c

arch/x86/mm/srat_32.c

+2 −2
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ int __init get_memcfg_from_srat(void) 
		goto out_fail;



	if (num_memory_chunks == 0) {

		printk(KERN_WARNING

		printk(KERN_DEBUG

			 "could not find any ACPI SRAT memory areas.\n");

		goto out_fail;

	}
@@ -277,7 +277,7 @@ int __init get_memcfg_from_srat(void) 
	}

	return 1;

out_fail:

	printk(KERN_ERR "failed to get NUMA memory information from SRAT"

	printk(KERN_DEBUG "failed to get NUMA memory information from SRAT"

			" table\n");

	return 0;

}