diff -r f58b0c778b90 xen/arch/x86/domain_build.c --- a/xen/arch/x86/domain_build.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/arch/x86/domain_build.c Thu Dec 21 10:34:37 2006 +0100 @@ -55,12 +55,12 @@ static long dom0_nrpages, dom0_min_nrpag * If +ve: The specified amount is an absolute value. * If -ve: The specified amount is subtracted from total available memory. */ -static long parse_amt(char *s, char **ps) +static long parse_amt(const char *s, const char **ps) { long pages = parse_size_and_unit((*s == '-') ? s+1 : s, ps) >> PAGE_SHIFT; return (*s == '-') ? -pages : pages; } -static void parse_dom0_mem(char *s) +static void parse_dom0_mem(const char *s) { do { if ( !strncmp(s, "min:", 4) ) @@ -152,7 +152,8 @@ static void process_dom0_ioports_disable static void process_dom0_ioports_disable(void) { unsigned long io_from, io_to; - char *t, *u, *s = opt_dom0_ioports_disable; + char *t, *s = opt_dom0_ioports_disable; + const char *u; if ( *s == '\0' ) return; @@ -892,7 +893,7 @@ int construct_dom0(struct domain *d, return 0; } -int elf_sanity_check(Elf_Ehdr *ehdr) +int elf_sanity_check(const Elf_Ehdr *ehdr) { if ( !IS_ELF(*ehdr) || #if defined(__i386__) diff -r f58b0c778b90 xen/arch/x86/hvm/platform.c --- a/xen/arch/x86/hvm/platform.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/arch/x86/hvm/platform.c Thu Dec 21 10:34:37 2006 +0100 @@ -1153,7 +1153,8 @@ unsigned long copy_to_user_hvm(void *to, return 0; } - return hvm_copy_to_guest_virt((unsigned long)to, (void *)from, len); +#define __UNCONST(x) (void *)(unsigned long)(x) + return hvm_copy_to_guest_virt((unsigned long)to, __UNCONST(from), len); } unsigned long copy_from_user_hvm(void *to, const void *from, unsigned len) diff -r f58b0c778b90 xen/arch/x86/time.c --- a/xen/arch/x86/time.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/arch/x86/time.c Thu Dec 21 10:34:37 2006 +0100 @@ -41,7 +41,7 @@ unsigned long cpu_khz; /* CPU clock fre unsigned long cpu_khz; /* CPU clock frequency in kHz. */ unsigned long hpet_address; DEFINE_SPINLOCK(rtc_lock); -unsigned long volatile jiffies; +volatile unsigned long jiffies; static u32 wc_sec, wc_nsec; /* UTC time at last 'time update'. */ static DEFINE_SPINLOCK(wc_lock); @@ -148,7 +148,7 @@ void timer_interrupt(int irq, void *dev_ ASSERT(local_irq_is_enabled()); /* Update jiffies counter. */ - (*(unsigned long *)&jiffies)++; + (*(volatile unsigned long *)&jiffies)++; /* Rough hack to allow accurate timers to sort-of-work with no APIC. */ if ( !cpu_has_apic ) diff -r f58b0c778b90 xen/common/elf.c --- a/xen/common/elf.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/elf.c Thu Dec 21 10:34:38 2006 +0100 @@ -16,7 +16,7 @@ #include static void loadelfsymtab(struct domain_setup_info *dsi, int doload); -static inline int is_loadable_phdr(Elf_Phdr *phdr) +static inline int is_loadable_phdr(const Elf_Phdr *phdr) { return ((phdr->p_type == PT_LOAD) && ((phdr->p_flags & (PF_W|PF_X)) != 0)); @@ -26,7 +26,7 @@ static inline int is_loadable_phdr(Elf_P * Fallback for kernels containing only the legacy __xen_guest string * and no ELF notes. */ -static int is_xen_guest_section(Elf_Shdr *shdr, const char *shstrtab) +static int is_xen_guest_section(const Elf_Shdr *shdr, const char *shstrtab) { return strcmp(&shstrtab[shdr->sh_name], "__xen_guest") == 0; } @@ -102,19 +102,19 @@ static unsigned long long xen_guest_nume /* * Interface to the Xen ELF notes. */ -#define ELFNOTE_NAME(_n_) ((void*)(_n_) + sizeof(*(_n_))) +#define ELFNOTE_NAME(_n_) ((const void*)(_n_) + sizeof(*(_n_))) #define ELFNOTE_DESC(_n_) (ELFNOTE_NAME(_n_) + (((_n_)->namesz+3)&~3)) #define ELFNOTE_NEXT(_n_) (ELFNOTE_DESC(_n_) + (((_n_)->descsz+3)&~3)) -static int is_xen_elfnote_section(const char *image, Elf_Shdr *shdr) -{ - Elf_Note *note; +static int is_xen_elfnote_section(const char *image, const Elf_Shdr *shdr) +{ + const Elf_Note *note; if ( shdr->sh_type != SHT_NOTE ) return 0; - for ( note = (Elf_Note *)(image + shdr->sh_offset); - note < (Elf_Note *)(image + shdr->sh_offset + shdr->sh_size); + for ( note = (const Elf_Note *)(image + shdr->sh_offset); + note < (const Elf_Note *)(image + shdr->sh_offset + shdr->sh_size); note = ELFNOTE_NEXT(note) ) { if ( !strncmp(ELFNOTE_NAME(note), "Xen", 4) ) @@ -124,15 +124,15 @@ static int is_xen_elfnote_section(const return 0; } -static Elf_Note *xen_elfnote_lookup(struct domain_setup_info *dsi, int type) -{ - Elf_Note *note; +static const Elf_Note *xen_elfnote_lookup(struct domain_setup_info *dsi, int type) +{ + const Elf_Note *note; if ( !dsi->__elfnote_section ) return NULL; - for ( note = (Elf_Note *)dsi->__elfnote_section; - note < (Elf_Note *)dsi->__elfnote_section_end; + for ( note = (const Elf_Note *)dsi->__elfnote_section; + note < (const Elf_Note *)dsi->__elfnote_section_end; note = ELFNOTE_NEXT(note) ) { if ( strncmp(ELFNOTE_NAME(note), "Xen", 4) ) @@ -147,7 +147,7 @@ static Elf_Note *xen_elfnote_lookup(stru const char *xen_elfnote_string(struct domain_setup_info *dsi, int type) { - Elf_Note *note; + const Elf_Note *note; if ( !dsi->__elfnote_section ) return xen_guest_string(dsi, type); @@ -162,7 +162,7 @@ unsigned long long xen_elfnote_numeric(s unsigned long long xen_elfnote_numeric(struct domain_setup_info *dsi, int type, int *defined) { - Elf_Note *note; + const Elf_Note *note; *defined = 0; @@ -179,10 +179,10 @@ unsigned long long xen_elfnote_numeric(s { case 4: *defined = 1; - return *(uint32_t*)ELFNOTE_DESC(note); + return *(const uint32_t*)ELFNOTE_DESC(note); case 8: *defined = 1; - return *(uint64_t*)ELFNOTE_DESC(note); + return *(const uint64_t*)ELFNOTE_DESC(note); default: printk("ERROR: unknown data size %#x for numeric type note %#x\n", note->descsz, type); @@ -192,9 +192,9 @@ unsigned long long xen_elfnote_numeric(s int parseelfimage(struct domain_setup_info *dsi) { - Elf_Ehdr *ehdr = (Elf_Ehdr *)dsi->image_addr; - Elf_Phdr *phdr; - Elf_Shdr *shdr; + const Elf_Ehdr *ehdr = (const Elf_Ehdr *)dsi->image_addr; + const Elf_Phdr *phdr; + const Elf_Shdr *shdr; Elf_Addr kernstart = ~0, kernend = 0, vaddr, virt_entry; const char *shstrtab, *p; const char *image = (char *)dsi->image_addr; @@ -222,12 +222,12 @@ int parseelfimage(struct domain_setup_in /* Look for .notes segment containing at least one Xen note */ for ( h = 0; h < ehdr->e_shnum; h++ ) { - shdr = (Elf_Shdr *)(image + ehdr->e_shoff + (h*ehdr->e_shentsize)); + shdr = (const Elf_Shdr *)(image + ehdr->e_shoff + (h*ehdr->e_shentsize)); if ( !is_xen_elfnote_section(image, shdr) ) continue; - dsi->__elfnote_section = (void *)image + shdr->sh_offset; + dsi->__elfnote_section = (const void *)image + shdr->sh_offset; dsi->__elfnote_section_end = - (void *)image + shdr->sh_offset + shdr->sh_size; + (const void *)image + shdr->sh_offset + shdr->sh_size; break; } @@ -240,16 +240,16 @@ int parseelfimage(struct domain_setup_in printk("ELF image has no section-header strings table.\n"); return -EINVAL; } - shdr = (Elf_Shdr *)(image + ehdr->e_shoff + + shdr = (const Elf_Shdr *)(image + ehdr->e_shoff + (ehdr->e_shstrndx*ehdr->e_shentsize)); shstrtab = image + shdr->sh_offset; for ( h = 0; h < ehdr->e_shnum; h++ ) { - shdr = (Elf_Shdr *)(image + ehdr->e_shoff + (h*ehdr->e_shentsize)); + shdr = (const Elf_Shdr *)(image + ehdr->e_shoff + (h*ehdr->e_shentsize)); if ( is_xen_guest_section(shdr, shstrtab) ) { - dsi->__xen_guest_string = (char *)image + shdr->sh_offset; + dsi->__xen_guest_string = (const char *)image + shdr->sh_offset; break; } } @@ -346,7 +346,7 @@ int parseelfimage(struct domain_setup_in for ( h = 0; h < ehdr->e_phnum; h++ ) { - phdr = (Elf_Phdr *)(image + ehdr->e_phoff + (h*ehdr->e_phentsize)); + phdr = (const Elf_Phdr *)(image + ehdr->e_phoff + (h*ehdr->e_phentsize)); if ( !is_loadable_phdr(phdr) ) continue; vaddr = phdr->p_paddr - dsi->elf_paddr_offset + dsi->v_start; diff -r f58b0c778b90 xen/common/kernel.c --- a/xen/common/kernel.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/kernel.c Thu Dec 21 10:34:38 2006 +0100 @@ -20,7 +20,8 @@ int tainted; void cmdline_parse(char *cmdline) { - char opt[100], *optval, *p = cmdline, *q; + char opt[100], *optval, *q; + const char *p = cmdline; struct kernel_param *param; if ( p == NULL ) @@ -70,13 +71,13 @@ void cmdline_parse(char *cmdline) break; case OPT_UINT: *(unsigned int *)param->var = - simple_strtol(optval, (char **)&optval, 0); + simple_strtol(optval, (const char **)&optval, 0); break; case OPT_BOOL: *(int *)param->var = 1; break; case OPT_CUSTOM: - ((void (*)(char *))param->var)(optval); + ((void (*)(const char *))param->var)(optval); break; } } diff -r f58b0c778b90 xen/common/kexec.c --- a/xen/common/kexec.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/kexec.c Thu Dec 21 10:34:38 2006 +0100 @@ -37,7 +37,7 @@ spinlock_t kexec_lock = SPIN_LOCK_UNLOCK xen_kexec_reserve_t kexec_crash_area; -static void __init parse_crashkernel(char *str) +static void __init parse_crashkernel(const char *str) { unsigned long start, size; diff -r f58b0c778b90 xen/common/lib.c --- a/xen/common/lib.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/lib.c Thu Dec 21 10:34:38 2006 +0100 @@ -439,11 +439,14 @@ s64 __moddi3(s64 a, s64 b) #endif /* BITS_PER_LONG == 32 */ -unsigned long long parse_size_and_unit(const char *s, char **ps) -{ - unsigned long long ret = simple_strtoull(s, (char **)&s, 0); - - switch (*s) { +unsigned long long parse_size_and_unit(const char *s, const char **ps) +{ + unsigned long long ret; + const char *s1; + + ret = simple_strtoull(s, &s1, 0); + + switch (*s1) { case 'G': case 'g': ret <<= 10; case 'M': case 'm': @@ -459,7 +462,7 @@ unsigned long long parse_size_and_unit(c } if (ps != NULL) - *ps = (char *)s; + *ps = s1; return ret; } diff -r f58b0c778b90 xen/common/page_alloc.c --- a/xen/common/page_alloc.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/page_alloc.c Thu Dec 21 10:34:38 2006 +0100 @@ -197,7 +197,7 @@ void init_boot_pages(paddr_t ps, paddr_t void init_boot_pages(paddr_t ps, paddr_t pe) { unsigned long bad_spfn, bad_epfn, i; - char *p; + const char *p; ps = round_pgup(ps); pe = round_pgdown(pe); @@ -586,7 +586,7 @@ void *alloc_xenheap_pages(unsigned int o } -void free_xenheap_pages(void *v, unsigned int order) +void free_xenheap_pages(const void *v, unsigned int order) { unsigned long flags; diff -r f58b0c778b90 xen/common/string.c --- a/xen/common/string.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/string.c Thu Dec 21 10:34:38 2006 +0100 @@ -7,6 +7,8 @@ #include #include #include + +#define __UNCONST(x) (void *)(unsigned long)(x) #ifndef __HAVE_ARCH_STRNICMP /** @@ -204,7 +206,7 @@ char * strchr(const char * s, int c) for(; *s != (char) c; ++s) if (*s == '\0') return NULL; - return (char *) s; + return __UNCONST(s); } #endif @@ -219,7 +221,7 @@ char * strrchr(const char * s, int c) const char *p = s + strlen(s); do { if (*p == (char)c) - return (char *)p; + return __UNCONST(p); } while (--p >= s); return NULL; } @@ -296,7 +298,7 @@ char * strpbrk(const char * cs,const cha for( sc1 = cs; *sc1 != '\0'; ++sc1) { for( sc2 = ct; *sc2 != '\0'; ++sc2) { if (*sc1 == *sc2) - return (char *) sc1; + return __UNCONST(sc1); } } return NULL; @@ -481,12 +483,12 @@ char * strstr(const char * s1,const char l2 = strlen(s2); if (!l2) - return (char *) s1; + return __UNCONST(s1); l1 = strlen(s1); while (l1 >= l2) { l1--; if (!memcmp(s1,s2,l2)) - return (char *) s1; + return __UNCONST(s1); s1++; } return NULL; @@ -508,7 +510,7 @@ void *memchr(const void *s, int c, size_ const unsigned char *p = s; while (n-- != 0) { if ((unsigned char)c == *p++) { - return (void *)(p-1); + return __UNCONST(p-1); } } return NULL; diff -r f58b0c778b90 xen/common/time.c --- a/xen/common/time.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/time.c Thu Dec 21 10:34:38 2006 +0100 @@ -40,7 +40,7 @@ struct tm gmtime(unsigned long t) struct tm tbuf; long days, rem; int y; - unsigned short int *ip; + const unsigned short int *ip; days = t / SECS_PER_DAY; rem = t % SECS_PER_DAY; @@ -66,7 +66,7 @@ struct tm gmtime(unsigned long t) } tbuf.tm_year = y - 1900; tbuf.tm_yday = days; - ip = (unsigned short int *)__mon_lengths[__isleap(y)]; + ip = (const unsigned short int *)__mon_lengths[__isleap(y)]; for ( y = 0; days >= ip[y]; ++y ) days -= ip[y]; tbuf.tm_mon = y; diff -r f58b0c778b90 xen/common/vsprintf.c --- a/xen/common/vsprintf.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/vsprintf.c Thu Dec 21 10:34:38 2006 +0100 @@ -28,7 +28,7 @@ * @endp: A pointer to the end of the parsed string will be placed here * @base: The number base to use */ -unsigned long simple_strtoul(const char *cp,char **endp,unsigned int base) +unsigned long simple_strtoul(const char *cp,const char **endp,unsigned int base) { unsigned long result = 0,value; @@ -52,7 +52,7 @@ unsigned long simple_strtoul(const char cp++; } if (endp) - *endp = (char *)cp; + *endp = cp; return result; } @@ -64,7 +64,7 @@ EXPORT_SYMBOL(simple_strtoul); * @endp: A pointer to the end of the parsed string will be placed here * @base: The number base to use */ -long simple_strtol(const char *cp,char **endp,unsigned int base) +long simple_strtol(const char *cp,const char **endp,unsigned int base) { if(*cp=='-') return -simple_strtoul(cp+1,endp,base); @@ -79,7 +79,7 @@ EXPORT_SYMBOL(simple_strtol); * @endp: A pointer to the end of the parsed string will be placed here * @base: The number base to use */ -unsigned long long simple_strtoull(const char *cp,char **endp,unsigned int base) +unsigned long long simple_strtoull(const char *cp,const char **endp,unsigned int base) { unsigned long long result = 0,value; @@ -103,7 +103,7 @@ unsigned long long simple_strtoull(const cp++; } if (endp) - *endp = (char *)cp; + *endp = cp; return result; } @@ -115,7 +115,7 @@ EXPORT_SYMBOL(simple_strtoull); * @endp: A pointer to the end of the parsed string will be placed here * @base: The number base to use */ -long long simple_strtoll(const char *cp,char **endp,unsigned int base) +long long simple_strtoll(const char *cp,const char **endp,unsigned int base) { if(*cp=='-') return -simple_strtoull(cp+1,endp,base); diff -r f58b0c778b90 xen/common/xmalloc.c --- a/xen/common/xmalloc.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/common/xmalloc.c Thu Dec 21 10:34:38 2006 +0100 @@ -87,7 +87,7 @@ static void *data_from_header(struct xma #endif } -static struct xmalloc_hdr *header_from_data(const void *p) +static struct xmalloc_hdr *header_from_data(void *p) { #if XMALLOC_DEBUG unsigned char *data = (unsigned char *)p - SMP_CACHE_BYTES; @@ -208,7 +208,7 @@ void *_xmalloc(size_t size, size_t align return xmalloc_new_page(size); } -void xfree(const void *p) +void xfree(void *p) { unsigned long flags; struct xmalloc_hdr *i, *tmp, *hdr; diff -r f58b0c778b90 xen/drivers/char/ns16550.c --- a/xen/drivers/char/ns16550.c Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/drivers/char/ns16550.c Thu Dec 21 10:34:38 2006 +0100 @@ -300,7 +300,7 @@ static int parse_parity_char(int c) return; \ } while ( 0 ) -static void ns16550_parse_port_config(struct ns16550 *uart, char *conf) +static void ns16550_parse_port_config(struct ns16550 *uart, const char *conf) { int baud; diff -r f58b0c778b90 xen/include/asm-x86/bitops.h --- a/xen/include/asm-x86/bitops.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/asm-x86/bitops.h Thu Dec 21 10:34:40 2006 +0100 @@ -246,7 +246,7 @@ static __inline__ int constant_test_bit( return ((1U << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0; } -static __inline__ int variable_test_bit(int nr, const volatile void * addr) +static __inline__ int variable_test_bit(int nr, volatile void * addr) { int oldbit; @@ -288,7 +288,7 @@ static inline unsigned int __scanbit(uns */ #define find_first_bit(addr,size) \ ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(*(unsigned long *)addr)) : \ + (__scanbit(*(const unsigned long *)addr)) : \ __find_first_bit(addr,size))) /** @@ -299,7 +299,7 @@ static inline unsigned int __scanbit(uns */ #define find_next_bit(addr,size,off) \ ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off) + (__scanbit((*(unsigned long *)addr) >> (off)))) : \ + ((off) + (__scanbit((*(const unsigned long *)addr) >> (off)))) : \ __find_next_bit(addr,size,off))) /** @@ -312,7 +312,7 @@ static inline unsigned int __scanbit(uns */ #define find_first_zero_bit(addr,size) \ ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - (__scanbit(~*(unsigned long *)addr)) : \ + (__scanbit(~*(const unsigned long *)addr)) : \ __find_first_zero_bit(addr,size))) /** @@ -323,7 +323,7 @@ static inline unsigned int __scanbit(uns */ #define find_next_zero_bit(addr,size,off) \ ((__builtin_constant_p(size) && (size) <= BITS_PER_LONG ? \ - ((off)+(__scanbit(~(((*(unsigned long *)addr)) >> (off))))) : \ + ((off)+(__scanbit(~(((*(const unsigned long *)addr)) >> (off))))) : \ __find_next_zero_bit(addr,size,off))) diff -r f58b0c778b90 xen/include/asm-x86/system.h --- a/xen/include/asm-x86/system.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/asm-x86/system.h Thu Dec 21 10:34:40 2006 +0100 @@ -19,7 +19,7 @@ #define xchg(ptr,v) ((__typeof__(*(ptr)))__xchg((unsigned long)(v),(ptr),sizeof(*(ptr)))) struct __xchg_dummy { unsigned long a[100]; }; -#define __xg(x) ((struct __xchg_dummy *)(x)) +#define __xg(x) ((volatile struct __xchg_dummy *)(x)) /* diff -r f58b0c778b90 xen/include/asm-x86/uaccess.h --- a/xen/include/asm-x86/uaccess.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/asm-x86/uaccess.h Thu Dec 21 10:34:40 2006 +0100 @@ -140,7 +140,7 @@ extern void __put_user_bad(void); }) struct __large_struct { unsigned long buf[100]; }; -#define __m(x) (*(struct __large_struct *)(x)) +#define __m(x) (*(const struct __large_struct *)(x)) /* * Tell gcc we read from memory instead of writing: this is because @@ -200,16 +200,16 @@ __copy_to_user(void __user *to, const vo switch (n) { case 1: - __put_user_size(*(u8 *)from, (u8 __user *)to, 1, ret, 1); + __put_user_size(*(const u8 *)from, (u8 __user *)to, 1, ret, 1); return ret; case 2: - __put_user_size(*(u16 *)from, (u16 __user *)to, 2, ret, 2); + __put_user_size(*(const u16 *)from, (u16 __user *)to, 2, ret, 2); return ret; case 4: - __put_user_size(*(u32 *)from, (u32 __user *)to, 4, ret, 4); + __put_user_size(*(const u32 *)from, (u32 __user *)to, 4, ret, 4); return ret; case 8: - __put_user_size(*(u64 *)from, (u64 __user *)to, 8, ret, 8); + __put_user_size(*(const u64 *)from, (u64 __user *)to, 8, ret, 8); return ret; } } diff -r f58b0c778b90 xen/include/xen/elf.h --- a/xen/include/xen/elf.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/elf.h Thu Dec 21 10:34:41 2006 +0100 @@ -526,7 +526,7 @@ extern const char *xen_elfnote_string(st extern const char *xen_elfnote_string(struct domain_setup_info *dsi, int type); #ifdef Elf_Ehdr -extern int elf_sanity_check(Elf_Ehdr *ehdr); +extern int elf_sanity_check(const Elf_Ehdr *ehdr); #endif #endif /* __XEN_ELF_H__ */ diff -r f58b0c778b90 xen/include/xen/kernel.h --- a/xen/include/xen/kernel.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/kernel.h Thu Dec 21 10:34:41 2006 +0100 @@ -42,7 +42,7 @@ * */ #define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + typeof( ((type *)0)->member ) *__mptr = (ptr); \ (type *)( (char *)__mptr - offsetof(type,member) );}) /* diff -r f58b0c778b90 xen/include/xen/lib.h --- a/xen/include/xen/lib.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/lib.h Thu Dec 21 10:34:41 2006 +0100 @@ -74,15 +74,15 @@ extern int vscnprintf(char *buf, size_t __attribute__ ((format (printf, 3, 0))); long simple_strtol( - const char *cp,char **endp, unsigned int base); + const char *cp,const char **endp, unsigned int base); unsigned long simple_strtoul( - const char *cp,char **endp, unsigned int base); + const char *cp,const char **endp, unsigned int base); long long simple_strtoll( - const char *cp,char **endp, unsigned int base); + const char *cp,const char **endp, unsigned int base); unsigned long long simple_strtoull( - const char *cp,char **endp, unsigned int base); + const char *cp,const char **endp, unsigned int base); -unsigned long long parse_size_and_unit(const char *s, char **ps); +unsigned long long parse_size_and_unit(const char *s, const char **ps); #define TAINT_UNSAFE_SMP (1<<0) #define TAINT_MACHINE_CHECK (1<<1) diff -r f58b0c778b90 xen/include/xen/mm.h --- a/xen/include/xen/mm.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/mm.h Thu Dec 21 10:34:41 2006 +0100 @@ -55,7 +55,7 @@ void scrub_heap_pages(void); /* Xen suballocator. These functions are interrupt-safe. */ void init_xenheap_pages(paddr_t ps, paddr_t pe); void *alloc_xenheap_pages(unsigned int order); -void free_xenheap_pages(void *v, unsigned int order); +void free_xenheap_pages(const void *v, unsigned int order); #define alloc_xenheap_page() (alloc_xenheap_pages(0)) #define free_xenheap_page(v) (free_xenheap_pages(v,0)) diff -r f58b0c778b90 xen/include/xen/sched.h --- a/xen/include/xen/sched.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/sched.h Thu Dec 21 10:34:41 2006 +0100 @@ -202,8 +202,8 @@ struct domain_setup_info * You should use the xen_elfnote_* accessors below in order to * pickup the correct one and retain backwards compatibility. */ - void *__elfnote_section, *__elfnote_section_end; - char *__xen_guest_string; + const void *__elfnote_section, *__elfnote_section_end; + const char *__xen_guest_string; }; extern struct vcpu *idle_vcpu[NR_CPUS]; diff -r f58b0c778b90 xen/include/xen/xmalloc.h --- a/xen/include/xen/xmalloc.h Wed Dec 20 15:22:46 2006 +0000 +++ b/xen/include/xen/xmalloc.h Thu Dec 21 10:34:41 2006 +0100 @@ -12,7 +12,7 @@ #define xmalloc_bytes(_bytes) (_xmalloc(_bytes, SMP_CACHE_BYTES)) /* Free any of the above. */ -extern void xfree(const void *); +extern void xfree(void *); /* Underlying functions */ extern void *_xmalloc(size_t size, size_t align);