linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mel Gorman <mel@csn.ul.ie>
To: mingo@elte.hu
Cc: linux-mm@kvack.org, Mel Gorman <mel@csn.ul.ie>,
	linux-kernel@vger.kernel.org, apw@shadowen.org
Subject: [PATCH 2/2] Allow any x86 sub-architecture type to set CONFIG_NUMA
Date: Fri, 18 Jan 2008 15:36:09 +0000 (GMT)	[thread overview]
Message-ID: <20080118153609.12646.97784.sendpatchset@skynet.skynet.ie> (raw)
In-Reply-To: <20080118153529.12646.5260.sendpatchset@skynet.skynet.ie>


While there are a limited number of x86 sub-architecture types that can
really support NUMA, there is nothing stopping other machines booting that
type of kernel. The fact that X86_GENERICARCH can set NUMA currently is an
indicator of that. This restriction only limits potential testing coverage.
This patch allows any sub-architecture to set CONFIG_NUMA if they wish.

Signed-off-by: Mel Gorman <mel@csn.ul.ie>
---

 arch/x86/Kconfig          |    2 +-
 include/asm-x86/acpi_32.h |    1 +
 include/linux/acpi.h      |    1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff -rup -X /usr/src/patchset-0.6/bin//dontdiff linux-2.6.24-rc8-005_non64GB/arch/x86/Kconfig linux-2.6.24-rc8-010_any32bit_x86/arch/x86/Kconfig
--- linux-2.6.24-rc8-005_non64GB/arch/x86/Kconfig	2008-01-17 18:22:26.000000000 +0000
+++ linux-2.6.24-rc8-010_any32bit_x86/arch/x86/Kconfig	2008-01-17 18:22:37.000000000 +0000
@@ -817,7 +817,7 @@ config X86_PAE
 config NUMA
 	bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)"
 	depends on SMP
-	depends on X86_64 || (X86_32 && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL)
+	depends on X86_64 || (X86_32 && ACPI && EXPERIMENTAL)
 	default n if X86_PC
 	default y if (X86_NUMAQ || X86_SUMMIT)
 	help
diff -rup -X /usr/src/patchset-0.6/bin//dontdiff linux-2.6.24-rc8-005_non64GB/include/asm-x86/acpi_32.h linux-2.6.24-rc8-010_any32bit_x86/include/asm-x86/acpi_32.h
--- linux-2.6.24-rc8-005_non64GB/include/asm-x86/acpi_32.h	2008-01-16 04:22:48.000000000 +0000
+++ linux-2.6.24-rc8-010_any32bit_x86/include/asm-x86/acpi_32.h	2008-01-17 18:22:37.000000000 +0000
@@ -84,6 +84,7 @@ int __acpi_release_global_lock(unsigned 
 extern void early_quirks(void);
 
 #ifdef CONFIG_ACPI
+#define NR_NODE_MEMBLKS MAX_NUMNODES
 extern int acpi_lapic;
 extern int acpi_ioapic;
 extern int acpi_noirq;
diff -rup -X /usr/src/patchset-0.6/bin//dontdiff linux-2.6.24-rc8-005_non64GB/include/linux/acpi.h linux-2.6.24-rc8-010_any32bit_x86/include/linux/acpi.h
--- linux-2.6.24-rc8-005_non64GB/include/linux/acpi.h	2008-01-16 04:22:48.000000000 +0000
+++ linux-2.6.24-rc8-010_any32bit_x86/include/linux/acpi.h	2008-01-17 18:22:37.000000000 +0000
@@ -94,7 +94,6 @@ void acpi_table_print_madt_entry (struct
 
 /* the following four functions are architecture-dependent */
 #ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
-#define NR_NODE_MEMBLKS MAX_NUMNODES
 #define acpi_numa_slit_init(slit) do {} while (0)
 #define acpi_numa_processor_affinity_init(pa) do {} while (0)
 #define acpi_numa_memory_affinity_init(ma) do {} while (0)

  parent reply	other threads:[~2008-01-18 15:37 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-01-18 15:35 [PATCH 0/2] Relax restrictions on setting CONFIG_NUMA on x86 Mel Gorman
2008-01-18 15:35 ` [PATCH 1/2] Do not require CONFIG_HIGHMEM64G to set " Mel Gorman
2008-01-18 16:17   ` Ingo Molnar
2008-01-18 15:36 ` Mel Gorman [this message]
2008-01-18 16:17   ` [PATCH 2/2] Allow any x86 sub-architecture type to set CONFIG_NUMA Ingo Molnar
2008-01-19  6:35 ` [PATCH 0/2] Relax restrictions on setting CONFIG_NUMA on x86 Andi Kleen
2008-01-19 16:07   ` Mel Gorman
2008-01-22 12:14     ` Ingo Molnar
2008-01-22 12:29       ` Mel Gorman
2008-01-22 15:39         ` Ingo Molnar
2008-01-22 13:33     ` Andi Kleen
2008-01-23 10:28       ` Mel Gorman
2008-01-23 10:45         ` Andi Kleen
2008-01-23 10:57           ` Mel Gorman
2008-01-23 11:11             ` Andi Kleen
2008-01-23 11:15             ` [PATCH 0/2] Relax restrictions on setting CONFIG_NUMA on x86 II Andi Kleen
2008-01-23 11:24               ` Mel Gorman
2008-01-23 13:48                 ` Andi Kleen
2008-01-23 14:15                   ` Mel Gorman
2008-01-21  0:38 ` [PATCH 0/2] Relax restrictions on setting CONFIG_NUMA on x86 KOSAKI Motohiro
2008-01-21 14:35   ` Mel Gorman
2008-01-21 14:49     ` Ingo Molnar
2008-01-21 16:27       ` Mel Gorman
2008-01-23  2:04   ` KOSAKI Motohiro
2008-01-23 10:22     ` Mel Gorman
2008-01-24  3:19       ` KOSAKI Motohiro
2008-01-23 10:23     ` Mel Gorman
2008-01-26 14:10       ` KOSAKI Motohiro
2008-01-26 17:10         ` KOSAKI Motohiro
2008-01-26 17:18         ` Mel Gorman
2008-01-27  6:54           ` KOSAKI Motohiro
2008-01-28 15:02             ` Ingo Molnar
2008-01-29  2:57               ` KOSAKI Motohiro
2008-01-29 11:34             ` Mel Gorman
2008-02-03  9:32               ` KOSAKI Motohiro

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080118153609.12646.97784.sendpatchset@skynet.skynet.ie \
    --to=mel@csn.ul.ie \
    --cc=apw@shadowen.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).