Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 009ec2a9 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: style cleanup 



Style fixes in elf-i386.h and arch/um/kernel/mem.c.
      update the copyright
      get rid of an emacs formatting comment
      some formatting fixes
      inclusion trimming
      whitespace fixes

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 8192ab42

arch/um/kernel/mem.c

+41 −45
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



#include "linux/stddef.h"

#include "linux/kernel.h"

#include "linux/mm.h"

#include "linux/bootmem.h"

#include "linux/swap.h"

#include "linux/highmem.h"

#include "linux/gfp.h"

#include "asm/page.h"

#include "asm/fixmap.h"

#include "asm/pgalloc.h"

#include "kern_util.h"

#include <linux/stddef.h>

#include <linux/bootmem.h>

#include <linux/gfp.h>

#include <linux/highmem.h>

#include <linux/mm.h>

#include <linux/swap.h>

#include <asm/fixmap.h>

#include <asm/page.h>

#include "as-layout.h"

#include "init.h"

#include "kern.h"

#include "kern_util.h"

#include "mem_user.h"

#include "um_uaccess.h"

#include "os.h"

#include "linux/types.h"

#include "linux/string.h"

#include "init.h"

#include "kern_constants.h"



/* allocated in paging_init, zeroed in mem_init, and unchanged thereafter */

unsigned long *empty_zero_page = NULL;
@@ -206,7 +200,8 @@ static void __init fixaddr_user_init( void) 
	paddr = (unsigned long)alloc_bootmem_low_pages( size);

	memcpy( (void *)paddr, (void *)FIXADDR_USER_START, size);

	paddr = __pa(paddr);

	for ( ; size > 0; size-=PAGE_SIZE, vaddr+=PAGE_SIZE, paddr+=PAGE_SIZE){

	for ( ; size > 0; size -= PAGE_SIZE, vaddr += PAGE_SIZE,

		      paddr += PAGE_SIZE) {

		pgd = swapper_pg_dir + pgd_index(vaddr);

		pud = pud_offset(pgd, vaddr);

		pmd = pmd_offset(pud, vaddr);
@@ -291,7 +286,7 @@ void free_initmem(void) 
void free_initrd_mem(unsigned long start, unsigned long end)

{

	if (start < end)

		printk ("Freeing initrd memory: %ldk freed\n", 

		printk(KERN_INFO "Freeing initrd memory: %ldk freed\n",

		       (end - start) >> 10);

	for (; start < end; start += PAGE_SIZE) {

		ClearPageReserved(virt_to_page(start));
@@ -309,9 +304,10 @@ void show_mem(void) 
	int highmem = 0;

	struct page *page;



	printk("Mem-info:\n");

	printk(KERN_INFO "Mem-info:\n");

	show_free_areas();

	printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));

	printk(KERN_INFO "Free swap:       %6ldkB\n",

	       nr_swap_pages<<(PAGE_SHIFT-10));

	pfn = max_mapnr;

	while (pfn-- > 0) {

		page = pfn_to_page(pfn);
@@ -325,11 +321,11 @@ void show_mem(void) 
		else if (page_count(page))

			shared += page_count(page) - 1;

	}

	printk("%d pages of RAM\n", total);

	printk("%d pages of HIGHMEM\n", highmem);

	printk("%d reserved pages\n", reserved);

	printk("%d pages shared\n", shared);

	printk("%d pages swap cached\n", cached);

	printk(KERN_INFO "%d pages of RAM\n", total);

	printk(KERN_INFO "%d pages of HIGHMEM\n", highmem);

	printk(KERN_INFO "%d reserved pages\n", reserved);

	printk(KERN_INFO "%d pages shared\n", shared);

	printk(KERN_INFO "%d pages swap cached\n", cached);

}



/* Allocate and free page tables. */

include/asm-um/elf-i386.h

+4 −15
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2000 - 2003 Jeff Dike (jdike@addtoit.com)

 * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */

#ifndef __UM_ELF_I386_H
@@ -86,7 +86,7 @@ extern long elf_aux_hwcap; 
extern char * elf_aux_platform;

#define ELF_PLATFORM (elf_aux_platform)



#define SET_PERSONALITY(ex, ibcs2) do ; while(0)

#define SET_PERSONALITY(ex, ibcs2) do { } while (0)



extern unsigned long vsyscall_ehdr;

extern unsigned long vsyscall_end;
@@ -161,14 +161,3 @@ if ( vsyscall_ehdr ) { \ 
}



#endif
 


/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */