Skip to content

Commit

Permalink
NOMMU: Delete askedalloc and realalloc variables
Browse files Browse the repository at this point in the history
Delete the askedalloc and realalloc variables as nothing actually uses the
value calculated.

Signed-off-by: David Howells <dhowells@redhat.com>
Tested-by: Mike Frysinger <vapier.adi@gmail.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
David Howells committed Jan 8, 2009
1 parent 9c93af1 commit 4183638
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions mm/nommu.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ void *high_memory;
struct page *mem_map;
unsigned long max_mapnr;
unsigned long num_physpages;
unsigned long askedalloc, realalloc;
atomic_long_t vm_committed_space = ATOMIC_LONG_INIT(0);
int sysctl_overcommit_memory = OVERCOMMIT_GUESS; /* heuristic overcommit */
int sysctl_overcommit_ratio = 50; /* default is 50% */
Expand Down Expand Up @@ -1042,22 +1041,11 @@ unsigned long do_mmap_pgoff(struct file *file,
/* okay... we have a mapping; now we have to register it */
result = (void *) vma->vm_start;

if (vma->vm_flags & VM_MAPPED_COPY) {
realalloc += kobjsize(result);
askedalloc += len;
}

realalloc += kobjsize(vma);
askedalloc += sizeof(*vma);

current->mm->total_vm += len >> PAGE_SHIFT;

add_nommu_vma(vma);

shared:
realalloc += kobjsize(vml);
askedalloc += sizeof(*vml);

add_vma_to_mm(current->mm, vml);

up_write(&nommu_vma_sem);
Expand Down Expand Up @@ -1124,14 +1112,8 @@ static void put_vma(struct mm_struct *mm, struct vm_area_struct *vma)

/* IO memory and memory shared directly out of the pagecache from
* ramfs/tmpfs mustn't be released here */
if (vma->vm_flags & VM_MAPPED_COPY) {
realalloc -= kobjsize((void *) vma->vm_start);
askedalloc -= vma->vm_end - vma->vm_start;
if (vma->vm_flags & VM_MAPPED_COPY)
kfree((void *) vma->vm_start);
}

realalloc -= kobjsize(vma);
askedalloc -= sizeof(*vma);

if (vma->vm_file) {
fput(vma->vm_file);
Expand Down Expand Up @@ -1177,8 +1159,6 @@ int do_munmap(struct mm_struct *mm, unsigned long addr, size_t len)
put_vma(mm, vml->vma);

*parent = vml->next;
realalloc -= kobjsize(vml);
askedalloc -= sizeof(*vml);
kfree(vml);

update_hiwater_vm(mm);
Expand Down Expand Up @@ -1220,9 +1200,6 @@ void exit_mmap(struct mm_struct * mm)
while ((tmp = mm->context.vmlist)) {
mm->context.vmlist = tmp->next;
put_vma(mm, tmp->vma);

realalloc -= kobjsize(tmp);
askedalloc -= sizeof(*tmp);
kfree(tmp);
}

Expand Down Expand Up @@ -1276,9 +1253,6 @@ unsigned long do_mremap(unsigned long addr,
/* all checks complete - do it */
vma->vm_end = vma->vm_start + new_len;

askedalloc -= old_len;
askedalloc += new_len;

return vma->vm_start;
}
EXPORT_SYMBOL(do_mremap);
Expand Down

0 comments on commit 4183638

Please sign in to comment.