[Xen-changelog] [xen-unstable] minios: Fix an extern declaration and add an extra 'const' to

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1173972428 0
# Node ID d6ca67c0645e30bb4cecf1ddbccecf0c74ca2021
# Parent  9ff349bde23abfc320c7f03a88162db8bb5c31e0
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@xxxxxxxxxxxxx>
---
 extras/mini-os/arch/x86/mm.c |    4 ++--
 extras/mini-os/gnttab.c      |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 9ff349bde23a -r d6ca67c0645e extras/mini-os/arch/x86/mm.c
--- a/extras/mini-os/arch/x86/mm.c      Thu Mar 15 14:51:32 2007 +0000
+++ b/extras/mini-os/arch/x86/mm.c      Thu Mar 15 15:27:08 2007 +0000
@@ -49,7 +49,7 @@
 #endif
 
 unsigned long *phys_to_machine_mapping;
-extern char *stack;
+extern char stack[];
 extern void page_walk(unsigned long virt_addr);
 
 void new_pt_frame(unsigned long *pt_pfn, unsigned long prev_l_mfn, 
@@ -453,7 +453,7 @@ void arch_init_mm(unsigned long* start_p
     printk("  _text:        %p\n", &_text);
     printk("  _etext:       %p\n", &_etext);
     printk("  _edata:       %p\n", &_edata);
-    printk("  stack start:  %p\n", &stack);
+    printk("  stack start:  %p\n", stack);
     printk("  _end:         %p\n", &_end);
 
     /* First page follows page table pages and 3 more pages (store page etc) */
diff -r 9ff349bde23a -r d6ca67c0645e extras/mini-os/gnttab.c
--- a/extras/mini-os/gnttab.c   Thu Mar 15 14:51:32 2007 +0000
+++ b/extras/mini-os/gnttab.c   Thu Mar 15 15:27:08 2007 +0000
@@ -135,7 +135,7 @@ gnttab_alloc_and_grant(void **map)
     return gref;
 }
 
-static const char *gnttabop_error_msgs[] = GNTTABOP_error_msgs;
+static const char * const gnttabop_error_msgs[] = GNTTABOP_error_msgs;
 
 const char *
 gnttabop_error(int16_t status)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog