Default dma_bitsize is 30.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c
index d497fdfd57bcf2de863bb0403069b66f6aed5db3..0c6bff28743b6a1da9c2475a10d7596159e49989 100644 (file)
--- a/xen/common/page_alloc.c
+++ b/xen/common/page_alloc.c
@@ -55,7 +55,7 @@ boolean_param("bootscrub", opt_bootscrub);
 /*
  * Bit width of the DMA heap.
  */
-static unsigned int dma_bitsize = CONFIG_DMA_BITSIZE;
+static unsigned int dma_bitsize = 30;
 static void __init parse_dma_bits(char *s)
 {
     unsigned int v = simple_strtol(s, NULL, 0);
@@ -281,11 +281,7 @@ unsigned long __init alloc_boot_pages(
  */
 
 #define MEMZONE_XEN 0
-#ifdef PADDR_BITS
 #define NR_ZONES    (PADDR_BITS - PAGE_SHIFT)
-#else
-#define NR_ZONES    (BITS_PER_LONG - PAGE_SHIFT)
-#endif
 
 #define pfn_dom_zone_type(_pfn) (fls(_pfn) - 1)
 
@@ -938,7 +934,7 @@ unsigned long avail_domheap_pages(void)
 static void pagealloc_keyhandler(unsigned char key)
 {
     unsigned int zone = MEMZONE_XEN;
-    unsigned long total = 0;
+    unsigned long n, total = 0;
 
     printk("Physical memory information:\n");
     printk("    Xen heap: %lukB free\n",
@@ -946,9 +942,7 @@ static void pagealloc_keyhandler(unsigned char key)
 
     while ( ++zone < NR_ZONES )
     {
-        unsigned long n;
-
-        if ( zone == dma_bitsize - PAGE_SHIFT )
+        if ( zone == (dma_bitsize - PAGE_SHIFT) )
         {
             printk("    DMA heap: %lukB free\n", total << (PAGE_SHIFT-10));
             total = 0;

diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index f22f8cea67dc4da0bec19497a87511caa7d7f1d1..aaf0613677dc7fdc2cf2cfa2135733115acb2b59 100644 (file)
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -44,8 +44,6 @@
 #define CONFIG_IOSAPIC
 #define supervisor_mode_kernel (0)
 
-#define CONFIG_DMA_BITSIZE 32
-
 #define PADDR_BITS     48
 
 /* If PERFC is used, include privop maps.  */

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 19bb4209f5cf397d88a8bec677d1cee6a77f35db..68d82791f1877f2feb02b11f9849dba899f95aa4 100644 (file)
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -97,8 +97,6 @@
 /* Primary stack is restricted to 8kB by guard pages. */
 #define PRIMARY_STACK_SIZE 8192
 
-#define CONFIG_DMA_BITSIZE 32
-
 #define BOOT_TRAMPOLINE 0x8c000
 #define bootsym_phys(sym)                                 \
     (((unsigned long)&(sym)-(unsigned long)&trampoline_start)+BOOT_TRAMPOLINE)