lkml.org 
[lkml]   [2005]   [Sep]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Date
    From
    SubjectRe: 2.6.13-mm2
    On Sun, Sep 11, 2005 at 08:07:25PM -0700, Martin J. Bligh wrote:
    > Finally got my damned x440 box back - won't build -mm2 (-mm1 is fine)
    >
    > arch/i386/kernel/srat.c:141: #error "MAX_NR_ZONES != 3, chunk_to_zone requires review"
    > make[1]: *** [arch/i386/kernel/srat.o] Error 1
    > make: *** [arch/i386/kernel] Error 2
    > 09/11/05-00:57:13 Build the kernel. Failed rc = 2
    > 09/11/05-00:57:13 build: kernel build Failed rc = 1
    > 09/11/05-00:57:13 command complete: (2) rc=126
    >
    > x86_64-dma32.patch:-#define MAX_NR_ZONES 3 /* Sync this wi
    > h ZONES_SHIFT */
    > x86_64-dma32.patch:-#define ZONES_SHIFT 2 /* ceil(log2(MAX_NR_ZON
    > S)) */
    > x86_64-dma32.patch:+#define MAX_NR_ZONES 4 /* Sync this wi
    > h ZONES_SHIFT */
    > x86_64-dma32.patch:+#define ZONES_SHIFT 3 /* ceil(log2(MAX_NR_ZON
    > S)) */
    >
    > Andi, does that need changing on ia32 as well as x86_64, or are you
    > just missing some ifdefs? Looks to me like the rest of the patch is
    > specific to x86_64.

    It should be a straight forward fix - the new zone is empty on i386.
    Ok I reviewed chunk_to_zone and it should be ok with the new empty
    zone. So just the appended patch should work. Can you test?

    -AndI

    Make i386 compile again with fourth DMA32 zone

    The code should deal with an additiona empty zone, so fix up the
    #error.

    Signed-off-by: Andi Kleen <ak@suse.de>

    Index: linux/arch/i386/kernel/srat.c
    ===================================================================
    --- linux.orig/arch/i386/kernel/srat.c
    +++ linux/arch/i386/kernel/srat.c
    @@ -137,8 +137,8 @@ static void __init parse_memory_affinity
    "enabled and removable" : "enabled" ) );
    }

    -#if MAX_NR_ZONES != 3
    -#error "MAX_NR_ZONES != 3, chunk_to_zone requires review"
    +#if MAX_NR_ZONES != 4
    +#error "MAX_NR_ZONES != 4, chunk_to_zone requires review"
    #endif
    /* Take a chunk of pages from page frame cstart to cend and count the number
    * of pages in each zone, returned via zones[].


    -
    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: 2005-09-12 07:05    [W:0.027 / U:0.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site