direct-io.hg

changeset 14396:d6ca67c0645e

minios: Fix an extern declaration and add an extra 'const' to
definition of a constant set of constant error strings.
Issues identified by Armand Puccetti.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kfraser@localhost.localdomain
date Thu Mar 15 15:27:08 2007 +0000 (2007-03-15)
parents 9ff349bde23a
children b926f66f29ab
files extras/mini-os/arch/x86/mm.c extras/mini-os/gnttab.c
line diff
     1.1 --- a/extras/mini-os/arch/x86/mm.c	Thu Mar 15 14:51:32 2007 +0000
     1.2 +++ b/extras/mini-os/arch/x86/mm.c	Thu Mar 15 15:27:08 2007 +0000
     1.3 @@ -49,7 +49,7 @@
     1.4  #endif
     1.5  
     1.6  unsigned long *phys_to_machine_mapping;
     1.7 -extern char *stack;
     1.8 +extern char stack[];
     1.9  extern void page_walk(unsigned long virt_addr);
    1.10  
    1.11  void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, 
    1.12 @@ -453,7 +453,7 @@ void arch_init_mm(unsigned long* start_p
    1.13      printk("  _text:        %p\n", &_text);
    1.14      printk("  _etext:       %p\n", &_etext);
    1.15      printk("  _edata:       %p\n", &_edata);
    1.16 -    printk("  stack start:  %p\n", &stack);
    1.17 +    printk("  stack start:  %p\n", stack);
    1.18      printk("  _end:         %p\n", &_end);
    1.19  
    1.20      /* First page follows page table pages and 3 more pages (store page etc) */
     2.1 --- a/extras/mini-os/gnttab.c	Thu Mar 15 14:51:32 2007 +0000
     2.2 +++ b/extras/mini-os/gnttab.c	Thu Mar 15 15:27:08 2007 +0000
     2.3 @@ -135,7 +135,7 @@ gnttab_alloc_and_grant(void **map)
     2.4      return gref;
     2.5  }
     2.6  
     2.7 -static const char *gnttabop_error_msgs[] = GNTTABOP_error_msgs;
     2.8 +static const char * const gnttabop_error_msgs[] = GNTTABOP_error_msgs;
     2.9  
    2.10  const char *
    2.11  gnttabop_error(int16_t status)