54ae36f24b
The calculation of CONFIG_STUB_CODE and CONFIG_STUB_DATA didn't take into account anything but 3G/1G and 2G/2G, leaving the other vmsplits out in the cold. I'd rather not duplicate the four known host vmsplit cases for each of these symbols. I'd also like to calculate them based on the highest userspace address. The Kconfig language seems not to allow calculation of hex constants, so I moved this to as-layout.h. CONFIG_STUB_CODE, CONFIG_STUB_DATA, and CONFIG_STUB_START are now gone. In their place are STUB_CODE, STUB_DATA, and STUB_START in as-layout.h. i386 and x86_64 seem to differ as to whether an unadorned constant is an int or a long, so I cast them to unsigned long so they can be printed consistently. However, they are also used in stub.S, where C types don't work so well. So, there are ASM_ versions of these constants for use in stub.S. I also ifdef-ed the non-asm-friendly portion of as-layout.h. With this in place, most of the rest of this patch is changing CONFIG_STUB_* to STUB_*, except in stub.S, where they are changed to ASM_STUB_*. defconfig has the old symbols deleted. I also print these addresses out in case there is any problem mapping them on the host. The two stub.S files had some trailing whitespace, so that is cleaned up here. [akpm@linux-foundation.org: coding-style fixes] Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
59 lines
1.4 KiB
C
59 lines
1.4 KiB
C
/*
|
|
* Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
|
|
* Licensed under the GPL
|
|
*/
|
|
|
|
#ifndef __START_H__
|
|
#define __START_H__
|
|
|
|
#include "uml-config.h"
|
|
#include "kern_constants.h"
|
|
|
|
/*
|
|
* Assembly doesn't want any casting, but C does, so define these
|
|
* without casts here, and define new symbols with casts inside the C
|
|
* section.
|
|
*/
|
|
#define ASM_STUB_CODE (UML_CONFIG_TOP_ADDR - 2 * UM_KERN_PAGE_SIZE)
|
|
#define ASM_STUB_DATA (UML_CONFIG_TOP_ADDR - UM_KERN_PAGE_SIZE)
|
|
#define ASM_STUB_START ASM_STUB_CODE
|
|
|
|
/*
|
|
* This file is included by the assembly stubs, which just want the
|
|
* definitions above.
|
|
*/
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define STUB_CODE ((unsigned long) ASM_STUB_CODE)
|
|
#define STUB_DATA ((unsigned long) ASM_STUB_DATA)
|
|
#define STUB_START ((unsigned long) ASM_STUB_START)
|
|
|
|
#include "sysdep/ptrace.h"
|
|
|
|
struct cpu_task {
|
|
int pid;
|
|
void *task;
|
|
};
|
|
|
|
extern struct cpu_task cpu_tasks[];
|
|
|
|
extern unsigned long low_physmem;
|
|
extern unsigned long high_physmem;
|
|
extern unsigned long uml_physmem;
|
|
extern unsigned long uml_reserved;
|
|
extern unsigned long end_vm;
|
|
extern unsigned long start_vm;
|
|
extern unsigned long long highmem;
|
|
|
|
extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
|
|
extern unsigned long _unprotected_end;
|
|
extern unsigned long brk_start;
|
|
|
|
extern int linux_main(int argc, char **argv);
|
|
|
|
extern void (*sig_info[])(int, struct uml_pt_regs *);
|
|
|
|
#endif
|
|
|
|
#endif
|