Skip to content

Commit

Permalink
[PATCH] uml: locking comments in memory and tempfile code
Browse files Browse the repository at this point in the history
Locking comments and emacs comment removal in the low-level memory and
temp file code.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Feb 11, 2007
1 parent b8831a1 commit 6bf7948
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 deletions.
10 changes: 0 additions & 10 deletions arch/um/include/tempfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:
*/
3 changes: 2 additions & 1 deletion arch/um/kernel/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions arch/um/os-Linux/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 6bf7948

Please sign in to comment.