ia64/xen-unstable

changeset 18182:6f841a2545e0

Default dma_bitsize is 30.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Jul 28 16:06:03 2008 +0100 (2008-07-28)
parents 0dc50e764c8c
children 445681d122c0
files xen/common/page_alloc.c xen/include/asm-ia64/config.h xen/include/asm-x86/config.h
line diff
     1.1 --- a/xen/common/page_alloc.c	Mon Jul 28 13:39:47 2008 +0100
     1.2 +++ b/xen/common/page_alloc.c	Mon Jul 28 16:06:03 2008 +0100
     1.3 @@ -55,7 +55,7 @@ boolean_param("bootscrub", opt_bootscrub
     1.4  /*
     1.5   * Bit width of the DMA heap.
     1.6   */
     1.7 -static unsigned int dma_bitsize = CONFIG_DMA_BITSIZE;
     1.8 +static unsigned int dma_bitsize = 30;
     1.9  static void __init parse_dma_bits(char *s)
    1.10  {
    1.11      unsigned int v = simple_strtol(s, NULL, 0);
    1.12 @@ -281,11 +281,7 @@ unsigned long __init alloc_boot_pages(
    1.13   */
    1.14  
    1.15  #define MEMZONE_XEN 0
    1.16 -#ifdef PADDR_BITS
    1.17  #define NR_ZONES    (PADDR_BITS - PAGE_SHIFT)
    1.18 -#else
    1.19 -#define NR_ZONES    (BITS_PER_LONG - PAGE_SHIFT)
    1.20 -#endif
    1.21  
    1.22  #define pfn_dom_zone_type(_pfn) (fls(_pfn) - 1)
    1.23  
    1.24 @@ -938,7 +934,7 @@ unsigned long avail_domheap_pages(void)
    1.25  static void pagealloc_keyhandler(unsigned char key)
    1.26  {
    1.27      unsigned int zone = MEMZONE_XEN;
    1.28 -    unsigned long total = 0;
    1.29 +    unsigned long n, total = 0;
    1.30  
    1.31      printk("Physical memory information:\n");
    1.32      printk("    Xen heap: %lukB free\n",
    1.33 @@ -946,9 +942,7 @@ static void pagealloc_keyhandler(unsigne
    1.34  
    1.35      while ( ++zone < NR_ZONES )
    1.36      {
    1.37 -        unsigned long n;
    1.38 -
    1.39 -        if ( zone == dma_bitsize - PAGE_SHIFT )
    1.40 +        if ( zone == (dma_bitsize - PAGE_SHIFT) )
    1.41          {
    1.42              printk("    DMA heap: %lukB free\n", total << (PAGE_SHIFT-10));
    1.43              total = 0;
     2.1 --- a/xen/include/asm-ia64/config.h	Mon Jul 28 13:39:47 2008 +0100
     2.2 +++ b/xen/include/asm-ia64/config.h	Mon Jul 28 16:06:03 2008 +0100
     2.3 @@ -44,8 +44,6 @@
     2.4  #define CONFIG_IOSAPIC
     2.5  #define supervisor_mode_kernel (0)
     2.6  
     2.7 -#define CONFIG_DMA_BITSIZE 32
     2.8 -
     2.9  #define PADDR_BITS	48
    2.10  
    2.11  /* If PERFC is used, include privop maps.  */
     3.1 --- a/xen/include/asm-x86/config.h	Mon Jul 28 13:39:47 2008 +0100
     3.2 +++ b/xen/include/asm-x86/config.h	Mon Jul 28 16:06:03 2008 +0100
     3.3 @@ -97,8 +97,6 @@
     3.4  /* Primary stack is restricted to 8kB by guard pages. */
     3.5  #define PRIMARY_STACK_SIZE 8192
     3.6  
     3.7 -#define CONFIG_DMA_BITSIZE 32
     3.8 -
     3.9  #define BOOT_TRAMPOLINE 0x8c000
    3.10  #define bootsym_phys(sym)                                 \
    3.11      (((unsigned long)&(sym)-(unsigned long)&trampoline_start)+BOOT_TRAMPOLINE)