* Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> Hi Ingo,
>
> On Tue, 17 Jun 2008 07:58:16 +0200 Ingo Molnar <mingo@xxxxxxx> wrote:
> >
> > hm, i guess you mean you went back to the previous version?
>
> No, I dropped it completely, but I will try to remember that idea for
> next time. It is back today and seems ok again. Thanks for applying
> those patches.
well, note that those patches will go away on the next auto-x86-next
iteration, as they touch pure acpi code with no direct x86 component.
Please keep track of them separately.
Note that there's about half a dozen other potential bugs i've already
fixed in -tip and which are in various stages of getting propagated to
other trees. You might want to start tracking tip/out-of-tree, that's a
laundry list of (sometimes questionable) convenience fixes and hacks.
( If you start tracking tip/out-of-tree: i'm willing to drop any patch
in there in favor of an existing better fix [even if that fix is not
well-tested], but i'm not willing to drop anything in there on the
pure grounds of it crossing maintenance boundaries. I need those fixes
for -tip testing - and they cross maintenance boundaries, that's why
it's called tip/out-of-tree - it's fixes not covered by the topics in
-tip itself. )
> > which makes that acpi build bug not trigger in allmodconfig. But
> > this just obscures the bug.
>
> So do the acpi guys need a push? Can I help in that?
I've Cc:-ed Len. The recap, there was a pre-existing ACPI build problem,
which was made more prominent via this change:
| commit 6ca7b49a8d6ca765426540c8902d89f1345b14af
| Author: Yinghai Lu <yhlu.kernel@xxxxxxxxx>
| Date: Fri Jun 6 19:54:25 2008 -0700
|
| x86: add SRAT parsing to 64-bit
|
| parse the SRAT on 64-bit unconditionally.
as that ACPI build problem now triggers an an allmodconfig x86 64-bit
build. Would be nice if Len could have a look and pick up (or NAK/fix)
the two patches below from Russ Anderson and me. The ia64 fix is there
because ia64 really wants to do SRAT parsing to be bootable.
Ingo
---------------------->
commit d94325315f241f86bd07a2ce113cbf28dc98de72
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Thu May 1 09:51:47 2008 +0000
acpi: acpi numa init build fix
x86.git testing found the following build error on latest -git:
drivers/acpi/numa.c: In function 'acpi_numa_init':
drivers/acpi/numa.c:226: error: 'NR_NODE_MEMBLKS' undeclared (first use in this function)
drivers/acpi/numa.c:226: error: (Each undeclared identifier is reported only once
drivers/acpi/numa.c:226: error: for each function it appears in.)
with this config:
http://redhat.com/~mingo/misc/config-Wed_Apr_30_22_42_42_CEST_2008.bad
i suspect we dont want SRAT parsing when CONFIG_HAVE_ARCH_PARSE_SRAT
is unset - but the fix looks a bit ugly. Perhaps we should define
NR_NODE_MEMBLKS even in this case and just let the code fall back
to some sane behavior?
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
diff --git a/drivers/acpi/numa.c b/drivers/acpi/numa.c
index 5d59cb3..8cab8c5 100644
--- a/drivers/acpi/numa.c
+++ b/drivers/acpi/numa.c
@@ -176,6 +176,7 @@ acpi_parse_processor_affinity(struct acpi_subtable_header * header,
return 0;
}
+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
static int __init
acpi_parse_memory_affinity(struct acpi_subtable_header * header,
const unsigned long end)
@@ -193,6 +194,7 @@ acpi_parse_memory_affinity(struct acpi_subtable_header * header,
return 0;
}
+#endif
static int __init acpi_parse_srat(struct acpi_table_header *table)
{
@@ -221,9 +223,11 @@ int __init acpi_numa_init(void)
if (!acpi_table_parse(ACPI_SIG_SRAT, acpi_parse_srat)) {
acpi_table_parse_srat(ACPI_SRAT_TYPE_CPU_AFFINITY,
acpi_parse_processor_affinity, NR_CPUS);
+#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
acpi_table_parse_srat(ACPI_SRAT_TYPE_MEMORY_AFFINITY,
acpi_parse_memory_affinity,
NR_NODE_MEMBLKS);
+#endif
}
/* SLIT: System Locality Information Table */
commit aca9de453911d095a9701ee6ebbae7fd3d6c7c1e
Author: Russ Anderson <rja@xxxxxxx>
Date: Fri May 16 10:02:06 2008 -0500
acpi: fix boot breakage on Altix
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 16be414..1be94eb 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,6 +60,10 @@ config RWSEM_XCHGADD_ALGORITHM
bool
default y
+config HAVE_ARCH_PARSE_SRAT
+ bool
+ default y
+
config ARCH_HAS_ILOG2_U32
bool
default n
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 41f7ce7..b426ac5 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -93,7 +93,7 @@ int acpi_parse_mcfg (struct acpi_table_header *header);
void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
/* the following four functions are architecture-dependent */
-#ifdef CONFIG_HAVE_ARCH_PARSE_SRAT
+#if defined(CONFIG_HAVE_ARCH_PARSE_SRAT) && !defined(NR_NODE_MEMBLKS)
#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)
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
