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

Commit 6bf79482 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: locking comments in memory and tempfile code 



Locking comments and emacs comment removal in the low-level memory and
temp file code.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b8831a1d

arch/um/include/tempfile.h

+0 −10
Original line number Diff line number Diff line
@@ -9,13 +9,3 @@ 
extern int make_tempfile(const char *template, char **tempname, int do_unlink);



#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:

 */

arch/um/kernel/mem.c

+2 −1
Original line number Diff line number Diff line
@@ -24,8 +24,9 @@ 
#include "init.h"

#include "kern_constants.h"



/* Changed during early boot */

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

unsigned long *empty_zero_page = NULL;

/* allocated in paging_init and unchanged thereafter */

unsigned long *empty_bad_page = NULL;

pgd_t swapper_pg_dir[PTRS_PER_PGD];

unsigned long long highmem;

arch/um/os-Linux/mem.c

+7 −0
Original line number Diff line number Diff line
@@ -20,7 +20,13 @@ 


#include <sys/param.h>



/* Modified by which_tmpdir, which is called during early boot */

static char *default_tmpdir = "/tmp";



/*

 *  Modified when creating the physical memory file and when checking

 * the tmp filesystem for usability, both happening during early boot.

 */

static char *tempdir = NULL;



static void __init find_tempdir(void)
@@ -83,6 +89,7 @@ static int next(int fd, char *buf, int size, char c) 
	return 1;

}



/* which_tmpdir is called only during early boot */

static int checked_tmpdir = 0;



/* Look for a tmpfs mounted at /dev/shm.  I couldn't find a cleaner