Commit 80e39311 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: SMP locking commentary



Add some more commentary about various pieces of global data not needing
locking.

Also got rid of unmap_physmem since that is no longer used.
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 3a24ebf0
...@@ -368,7 +368,6 @@ static struct platform_driver uml_net_driver = { ...@@ -368,7 +368,6 @@ static struct platform_driver uml_net_driver = {
.name = DRIVER_NAME, .name = DRIVER_NAME,
}, },
}; };
static int driver_registered;
static void net_device_release(struct device *dev) static void net_device_release(struct device *dev)
{ {
...@@ -383,6 +382,12 @@ static void net_device_release(struct device *dev) ...@@ -383,6 +382,12 @@ static void net_device_release(struct device *dev)
free_netdev(netdev); free_netdev(netdev);
} }
/*
* Ensures that platform_driver_register is called only once by
* eth_configure. Will be set in an initcall.
*/
static int driver_registered;
static void eth_configure(int n, void *init, char *mac, static void eth_configure(int n, void *init, char *mac,
struct transport *transport) struct transport *transport)
{ {
......
...@@ -56,7 +56,6 @@ extern void setup_physmem(unsigned long start, unsigned long usable, ...@@ -56,7 +56,6 @@ extern void setup_physmem(unsigned long start, unsigned long usable,
unsigned long len, unsigned long long highmem); unsigned long len, unsigned long long highmem);
extern void add_iomem(char *name, int fd, unsigned long size); extern void add_iomem(char *name, int fd, unsigned long size);
extern unsigned long phys_offset(unsigned long phys); extern unsigned long phys_offset(unsigned long phys);
extern void unmap_physmem(void);
extern void map_memory(unsigned long virt, unsigned long phys, extern void map_memory(unsigned long virt, unsigned long phys,
unsigned long len, int r, int w, int x); unsigned long len, int r, int w, int x);
......
...@@ -22,17 +22,20 @@ ...@@ -22,17 +22,20 @@
unsigned long *empty_zero_page = NULL; unsigned long *empty_zero_page = NULL;
/* allocated in paging_init and unchanged thereafter */ /* allocated in paging_init and unchanged thereafter */
unsigned long *empty_bad_page = NULL; unsigned long *empty_bad_page = NULL;
/*
* Initialized during boot, and readonly for initializing page tables
* afterwards
*/
pgd_t swapper_pg_dir[PTRS_PER_PGD]; pgd_t swapper_pg_dir[PTRS_PER_PGD];
/* Initialized at boot time, and readonly after that */
unsigned long long highmem; unsigned long long highmem;
int kmalloc_ok = 0; int kmalloc_ok = 0;
/* Used during early boot */
static unsigned long brk_end; static unsigned long brk_end;
void unmap_physmem(void)
{
os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
}
static void map_cb(void *unused) static void map_cb(void *unused)
{ {
map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
......
...@@ -164,10 +164,10 @@ __uml_setup("iomem=", parse_iomem, ...@@ -164,10 +164,10 @@ __uml_setup("iomem=", parse_iomem,
* setup_iomem, both of which run during early boot. Afterwards, it's * setup_iomem, both of which run during early boot. Afterwards, it's
* unchanged. * unchanged.
*/ */
struct iomem_region *iomem_regions = NULL; struct iomem_region *iomem_regions;
/* Initialized in parse_iomem */ /* Initialized in parse_iomem and unchanged thereafter */
int iomem_size = 0; int iomem_size;
unsigned long find_iomem(char *driver, unsigned long *len_out) unsigned long find_iomem(char *driver, unsigned long *len_out)
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment