diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-16 08:37:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-16 08:37:50 -0500 |
| commit | 1d6edcbfed2af33c748f2beb399810a0441888da (patch) | |
| tree | fe88d63e5ef1dbe1915f90e02429e8b6934859da /arch/sandbox/cpu/os.c | |
| parent | f6206f8587fc7ec82a57dbbeb5de0f94b3c2ef49 (diff) | |
| parent | 4c6e27f63c88d065a98f438085dfc36af47d3a23 (diff) | |
Merge tag 'pull-14nov18' of git://git.denx.de/u-boot-dm
- virtio implementation and supporting patches
- DM_FLAG_PRE_RELOC fixes
- regmap improvements
- minor buildman and sandbox things
Diffstat (limited to 'arch/sandbox/cpu/os.c')
| -rw-r--r-- | arch/sandbox/cpu/os.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index 07e46471fe5..325ded51d8a 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -174,7 +174,12 @@ void *os_malloc(size_t length) struct os_mem_hdr *hdr; int page_size = getpagesize(); - hdr = mmap(NULL, length + page_size, + /* + * Use an address that is hopefully available to us so that pointers + * to this memory are fairly obvious. If we end up with a different + * address, that's fine too. + */ + hdr = mmap((void *)0x10000000, length + page_size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); if (hdr == MAP_FAILED) |