Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
forked fromtorvalds/linux

Commitfd3e454

Browse files
Ganapatrao Kulkarnirafaeljw
Ganapatrao Kulkarni
authored andcommitted
ACPI / NUMA: ia64: Parse all entries of SRAT memory affinity table
In current implementation, SRAT Memory Affinity Structure tableparsing is restricted to number of maximum memblocks allowed(NR_NODE_MEMBLKS). However NR_NODE_MEMBLKS is defined individuallyas per architecture requirements. Hence removing the restriction ofSRAT Memory Affinity Structure parsing in ACPI driver code andlet architecture code check for allowed memblocks count.This check is already there in the x86 code, so do the same on ia64.Signed-off-by: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>Acked-by: Tony Luck <tony.luck@intel.com>Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent4fbd8d1 commitfd3e454

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

‎arch/ia64/kernel/acpi.c‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,11 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
504504
if (!(ma->flags&ACPI_SRAT_MEM_ENABLED))
505505
return-1;
506506

507+
if (num_node_memblks >=NR_NODE_MEMBLKS) {
508+
pr_err("NUMA: too many memblk ranges\n");
509+
return-EINVAL;
510+
}
511+
507512
/* record this node in proximity bitmap */
508513
pxm_bit_set(pxm);
509514

‎drivers/acpi/numa.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -460,8 +460,7 @@ int __init acpi_numa_init(void)
460460
srat_proc,ARRAY_SIZE(srat_proc),0);
461461

462462
cnt=acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
463-
acpi_parse_memory_affinity,
464-
NR_NODE_MEMBLKS);
463+
acpi_parse_memory_affinity,0);
465464
}
466465

467466
/* SLIT: System Locality Information Table */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp