# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1217257563 -3600
# Node ID 6f841a2545e06a55927661fdb7c318cc2163041e
# Parent 0dc50e764c8cb17fe6b3bdd2fb821984a45b6f9f
Default dma_bitsize is 30.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
xen/common/page_alloc.c | 12 +++---------
xen/include/asm-ia64/config.h | 2 --
xen/include/asm-x86/config.h | 2 --
3 files changed, 3 insertions(+), 13 deletions(-)
diff -r 0dc50e764c8c -r 6f841a2545e0 xen/common/page_alloc.c
--- a/xen/common/page_alloc.c Mon Jul 28 13:39:47 2008 +0100
+++ b/xen/common/page_alloc.c Mon Jul 28 16:06:03 2008 +0100
@@ -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 @@ static void pagealloc_keyhandler(unsigne
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(unsigne
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 -r 0dc50e764c8c -r 6f841a2545e0 xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h Mon Jul 28 13:39:47 2008 +0100
+++ b/xen/include/asm-ia64/config.h Mon Jul 28 16:06:03 2008 +0100
@@ -43,8 +43,6 @@
#define CONFIG_IOSAPIC
#define supervisor_mode_kernel (0)
-
-#define CONFIG_DMA_BITSIZE 32
#define PADDR_BITS 48
diff -r 0dc50e764c8c -r 6f841a2545e0 xen/include/asm-x86/config.h
--- a/xen/include/asm-x86/config.h Mon Jul 28 13:39:47 2008 +0100
+++ b/xen/include/asm-x86/config.h Mon Jul 28 16:06:03 2008 +0100
@@ -96,8 +96,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) \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home