Revision 14f24e14 linux-user/main.c

b/linux-user/main.c
39 39
char *exec_path;
40 40

  
41 41
int singlestep;
42
#if defined(CONFIG_USE_GUEST_BASE)
43 42
unsigned long mmap_min_addr;
43
#if defined(CONFIG_USE_GUEST_BASE)
44 44
unsigned long guest_base;
45 45
int have_guest_base;
46 46
#endif
......
2812 2812
     * proper page alignment for guest_base.
2813 2813
     */
2814 2814
    guest_base = HOST_PAGE_ALIGN(guest_base);
2815
#endif /* CONFIG_USE_GUEST_BASE */
2815 2816

  
2816 2817
    /*
2817 2818
     * Read in mmap_min_addr kernel parameter.  This value is used
2818 2819
     * When loading the ELF image to determine whether guest_base
2819
     * is needed.
2820
     *
2821
     * When user has explicitly set the quest base, we skip this
2822
     * test.
2820
     * is needed.  It is also used in mmap_find_vma.
2823 2821
     */
2824
    if (!have_guest_base) {
2822
    {
2825 2823
        FILE *fp;
2826 2824

  
2827 2825
        if ((fp = fopen("/proc/sys/vm/mmap_min_addr", "r")) != NULL) {
......
2833 2831
            fclose(fp);
2834 2832
        }
2835 2833
    }
2836
#endif /* CONFIG_USE_GUEST_BASE */
2837 2834

  
2838 2835
    /*
2839 2836
     * Prepare copy of argv vector for target.

Also available in: Unified diff