aboutsummaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-15 15:27:08 +0000
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>2007-03-15 15:27:08 +0000
commit5f3c8af40d85f8112fa146a66adbc31a6a41ba2f (patch)
treeb6a3dee8371785f3a12fd85d07caef047bf32d22 /extras
parent4da77d5b3ff6ec26b384c972406140d50e127f70 (diff)
downloadxen-5f3c8af40d85f8112fa146a66adbc31a6a41ba2f.tar.gz
xen-5f3c8af40d85f8112fa146a66adbc31a6a41ba2f.tar.bz2
xen-5f3c8af40d85f8112fa146a66adbc31a6a41ba2f.zip
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>
Diffstat (limited to 'extras')
-rw-r--r--extras/mini-os/arch/x86/mm.c4
-rw-r--r--extras/mini-os/gnttab.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/extras/mini-os/arch/x86/mm.c b/extras/mini-os/arch/x86/mm.c
index d1508f8263..15ed4877a8 100644
--- a/extras/mini-os/arch/x86/mm.c
+++ b/extras/mini-os/arch/x86/mm.c
@@ -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_pfn_p, unsigned long* max_pfn_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 --git a/extras/mini-os/gnttab.c b/extras/mini-os/gnttab.c
index 4d75897a98..b22f51ceae 100644
--- a/extras/mini-os/gnttab.c
+++ b/extras/mini-os/gnttab.c
@@ -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)