lkml.org 
[lkml]   [2006]   [Jan]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 001/003]Fix unify mapping from pxm to node id.
    I'm sorry for my lazy work.
    There were some compile errors for i386 and ia64. Not only Paul-san,
    Bob-san and Andy-san also sent me result of complile or patches.
    (Thanks a lot!)
    To tell all of here and summarize what was wrong,
    I'll repost all patches to solve them. These are for 2.6.16-rc1-mm3.

    Andrew-san. Please apply.

    ----------------

    This is for fix unification from pxm to node id against i386.
    acpi_numa_processor_affinity_init() and other 3 function was defined for
    x86-64 and ia64. But i386 doesn't use them.
    This is just dummy function for compile.
    And some of garbages are removed.

    Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>

    Index: new_pxm/arch/i386/Kconfig
    ===================================================================
    --- new_pxm.orig/arch/i386/Kconfig
    +++ new_pxm/arch/i386/Kconfig
    @@ -141,6 +141,11 @@ config ACPI_SRAT
    depends on NUMA && (X86_SUMMIT || X86_GENERICARCH)
    select ACPI_NUMA

    +config HAVE_ARCH_PARSE_SRAT
    + bool
    + default y
    + depends on ACPI_SRAT
    +
    config X86_SUMMIT_NUMA
    bool
    default y
    Index: new_pxm/include/linux/acpi.h
    ===================================================================
    --- new_pxm.orig/include/linux/acpi.h
    +++ new_pxm/include/linux/acpi.h
    @@ -409,10 +409,18 @@ void acpi_table_print_madt_entry (acpi_t
    void acpi_table_print_srat_entry (acpi_table_entry_header *srat);

    /* 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)
    +#define acpi_numa_arch_fixup() do {} while (0)
    +#else
    void acpi_numa_slit_init (struct acpi_table_slit *slit);
    void acpi_numa_processor_affinity_init (struct acpi_table_processor_affinity *pa);
    void acpi_numa_memory_affinity_init (struct acpi_table_memory_affinity *ma);
    void acpi_numa_arch_fixup(void);
    +#endif

    #ifdef CONFIG_ACPI_HOTPLUG_CPU
    /* Arch dependent functions for cpu hotplug support */
    Index: new_pxm/arch/i386/kernel/srat.c
    ===================================================================
    --- new_pxm.orig/arch/i386/kernel/srat.c
    +++ new_pxm/arch/i386/kernel/srat.c
    @@ -39,7 +39,6 @@
    #define NODE_ARRAY_OFFSET(x) ((x) % 8) /* 8 bits/char */
    #define BMAP_SET(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] |= 1 << NODE_ARRAY_OFFSET(bit))
    #define BMAP_TEST(bmap, bit) ((bmap)[NODE_ARRAY_INDEX(bit)] & (1 << NODE_ARRAY_OFFSET(bit)))
    -#define MAX_PXM_DOMAINS 256 /* 1 byte and no promises about values */
    /* bitmap length; _PXM is at most 255 */
    #define PXM_BITMAP_LEN (MAX_PXM_DOMAINS / 8)
    static u8 pxm_bitmap[PXM_BITMAP_LEN]; /* bitmap of proximity domains */
    @@ -218,7 +217,6 @@ static int __init acpi20_parse_srat(stru
    {
    u8 *start, *end, *p;
    int i, j, nid;
    - u8 nid_to_pxm_map[MAX_NUMNODES];/* logical node ID to _PXM map */

    start = (u8 *)(&(sratp->reserved) + 1); /* skip header */
    p = start;
    --
    Yasunori Goto


    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-01-28 04:39    [W:0.035 / U:87.912 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site