Subject: [folded-merged] arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix.patch removed from -mm tree To: toshi.kani@xxxxxx,hpa@xxxxxxxxx,mingo@xxxxxxx,rientjes@xxxxxxxxxx,tglx@xxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 21 Jan 2014 14:31:28 -0800 The patch titled Subject: arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix has been removed from the -mm tree. Its filename was arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix.patch This patch was dropped because it was folded into arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit.patch ------------------------------------------------------ From: Toshi Kani <toshi.kani@xxxxxx> Subject: arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix Signed-off-by: Toshi Kani <toshi.kani@xxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: "H. Peter Anvin" <hpa@xxxxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Acked-by: David Rientjes <rientjes@xxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/mm/srat.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff -puN arch/x86/mm/srat.c~arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix arch/x86/mm/srat.c --- a/arch/x86/mm/srat.c~arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit-fix +++ a/arch/x86/mm/srat.c @@ -42,7 +42,11 @@ static __init inline int srat_disabled(v return acpi_numa < 0; } -/* Callback for SLIT parsing */ +/** + * Callback for SLIT parsing. pxm_to_node() returns NUMA_NO_NODE for + * I/O localities since SRAT does not list them. I/O localities are + * not supported at this point. + */ void __init acpi_numa_slit_init(struct acpi_table_slit *slit) { int i, j; _ Patches currently in -mm which might be from toshi.kani@xxxxxx are origin.patch arch-x86-mm-sratc-skip-numa_no_node-while-parsing-slit.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html