Skip to content

Commit

Permalink
s390x/helper: Remove s390_cpu_physical_memory_map
Browse files Browse the repository at this point in the history
The function is now not used anymore, so it can be removed safely.

Signed-off-by: Thomas Huth <thuth@linux.vnet.ibm.com>
Signed-off-by: Jens Freimann <jfrei@linux.vnet.ibm.com>
Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: David Hildenbrand <dahi@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
  • Loading branch information
huth authored and borntraeger committed Feb 18, 2015
1 parent 63ceef6 commit e95d24f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 29 deletions.
4 changes: 0 additions & 4 deletions target-s390x/cpu.h
Expand Up @@ -350,10 +350,6 @@ int s390_cpu_handle_mmu_fault(CPUState *cpu, vaddr address, int rw,
#include "ioinst.h"

#ifndef CONFIG_USER_ONLY
void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr *len,
int is_write);
void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len,
int is_write);
static inline hwaddr decode_basedisp_s(CPUS390XState *env, uint32_t ipb)
{
hwaddr addr = 0;
Expand Down
25 changes: 0 additions & 25 deletions target-s390x/helper.c
Expand Up @@ -229,31 +229,6 @@ static void cpu_unmap_lowcore(LowCore *lowcore)
cpu_physical_memory_unmap(lowcore, sizeof(LowCore), 1, sizeof(LowCore));
}

void *s390_cpu_physical_memory_map(CPUS390XState *env, hwaddr addr, hwaddr *len,
int is_write)
{
hwaddr start = addr;

/* Mind the prefix area. */
if (addr < 8192) {
/* Map the lowcore. */
start += env->psa;
*len = MIN(*len, 8192 - addr);
} else if ((addr >= env->psa) && (addr < env->psa + 8192)) {
/* Map the 0 page. */
start -= env->psa;
*len = MIN(*len, 8192 - start);
}

return cpu_physical_memory_map(start, len, is_write);
}

void s390_cpu_physical_memory_unmap(CPUS390XState *env, void *addr, hwaddr len,
int is_write)
{
cpu_physical_memory_unmap(addr, len, is_write, len);
}

static void do_svc_interrupt(CPUS390XState *env)
{
uint64_t mask, addr;
Expand Down

0 comments on commit e95d24f

Please sign in to comment.