diff options
| author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-28 16:06:03 +0100 |
|---|---|---|
| committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-28 16:06:03 +0100 |
| commit | f5219467e716306e268d8939b53f3b7afe3106b0 (patch) | |
| tree | d440989d85f345ab996b96829b489b0aa1b3ba33 | |
| parent | bddc6f497ed57e1bf1f6d90756a6ad256606224d (diff) | |
| download | xen-f5219467e716306e268d8939b53f3b7afe3106b0.tar.gz xen-f5219467e716306e268d8939b53f3b7afe3106b0.tar.bz2 xen-f5219467e716306e268d8939b53f3b7afe3106b0.zip | |
Default dma_bitsize is 30.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
| -rw-r--r-- | xen/common/page_alloc.c | 12 | ||||
| -rw-r--r-- | xen/include/asm-ia64/config.h | 2 | ||||
| -rw-r--r-- | xen/include/asm-x86/config.h | 2 |
3 files changed, 3 insertions, 13 deletions
diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index d497fdfd57..0c6bff2874 100644 --- 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 f22f8cea67..aaf0613677 100644 --- 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 19bb4209f5..68d82791f1 100644 --- 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) |