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

Commit 73395a00 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: distribute exports to where exported stuff is defined 



ksyms.c is down to the stuff defined in various USER_OBJS

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent a34978cb

arch/um/kernel/exec.c

+10 −8
Original line number Diff line number Diff line
@@ -3,14 +3,15 @@ 
 * Licensed under the GPL

 */



#include "linux/stddef.h"

#include "linux/fs.h"

#include "linux/ptrace.h"

#include "linux/sched.h"

#include "linux/slab.h"

#include "asm/current.h"

#include "asm/processor.h"

#include "asm/uaccess.h"

#include <linux/stddef.h>

#include <linux/module.h>

#include <linux/fs.h>

#include <linux/ptrace.h>

#include <linux/sched.h>

#include <linux/slab.h>

#include <asm/current.h>

#include <asm/processor.h>

#include <asm/uaccess.h>

#include "as-layout.h"

#include "mem_user.h"

#include "skas.h"
@@ -41,6 +42,7 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) 
	PT_REGS_IP(regs) = eip;

	PT_REGS_SP(regs) = esp;

}

EXPORT_SYMBOL(start_thread);



static long execve1(const char *file,

		    const char __user *const __user *argv,

arch/um/kernel/irq.c

+1 −0
Original line number Diff line number Diff line
@@ -258,6 +258,7 @@ void deactivate_fd(int fd, int irqnum) 


	ignore_sigio_fd(fd);

}

EXPORT_SYMBOL(deactivate_fd);



/*

 * Called just before shutdown in order to provide a clean exec

arch/um/kernel/ksyms.c

+1 −37
Original line number Diff line number Diff line
@@ -3,33 +3,11 @@ 
 * Licensed under the GPL

 */



#include "linux/module.h"

#include "linux/syscalls.h"

#include "asm/tlbflush.h"

#include "asm/uaccess.h"

#include "as-layout.h"

#include "kern_util.h"

#include "mem_user.h"

#include <linux/module.h>

#include "os.h"



EXPORT_SYMBOL(uml_physmem);

EXPORT_SYMBOL(set_signals);

EXPORT_SYMBOL(get_signals);

EXPORT_SYMBOL(kernel_thread);

EXPORT_SYMBOL(sys_waitpid);

EXPORT_SYMBOL(flush_tlb_range);



EXPORT_SYMBOL(high_physmem);

EXPORT_SYMBOL(empty_zero_page);

EXPORT_SYMBOL(handle_page_fault);

EXPORT_SYMBOL(find_iomem);



EXPORT_SYMBOL(strnlen_user);

EXPORT_SYMBOL(strncpy_from_user);

EXPORT_SYMBOL(copy_to_user);

EXPORT_SYMBOL(copy_from_user);

EXPORT_SYMBOL(clear_user);

EXPORT_SYMBOL(uml_strdup);



EXPORT_SYMBOL(os_stat_fd);

EXPORT_SYMBOL(os_stat_file);
@@ -57,24 +35,10 @@ EXPORT_SYMBOL(os_connect_socket); 
EXPORT_SYMBOL(os_accept_connection);

EXPORT_SYMBOL(os_rcv_fd);

EXPORT_SYMBOL(run_helper);

EXPORT_SYMBOL(start_thread);

EXPORT_SYMBOL(os_major);

EXPORT_SYMBOL(os_minor);

EXPORT_SYMBOL(os_makedev);



EXPORT_SYMBOL(add_sigio_fd);

EXPORT_SYMBOL(ignore_sigio_fd);

EXPORT_SYMBOL(deactivate_fd);

EXPORT_SYMBOL(sigio_broken);
 


#ifdef CONFIG_SMP



/* required for SMP */



extern void __write_lock_failed(rwlock_t *rw);

EXPORT_SYMBOL(__write_lock_failed);



extern void __read_lock_failed(rwlock_t *rw);

EXPORT_SYMBOL(__read_lock_failed);



#endif

arch/um/kernel/mem.c

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 */



#include <linux/stddef.h>

#include <linux/module.h>

#include <linux/bootmem.h>

#include <linux/highmem.h>

#include <linux/mm.h>
@@ -20,6 +21,7 @@ 


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

unsigned long *empty_zero_page = NULL;

EXPORT_SYMBOL(empty_zero_page);

/* allocated in paging_init and unchanged thereafter */

static unsigned long *empty_bad_page = NULL;

arch/um/kernel/physmem.c

+12 −9
Original line number Diff line number Diff line
@@ -3,20 +3,22 @@ 
 * Licensed under the GPL

 */



#include "linux/bootmem.h"

#include "linux/mm.h"

#include "linux/pfn.h"

#include "asm/page.h"

#include "as-layout.h"

#include "init.h"

#include "kern.h"

#include "mem_user.h"

#include "os.h"

#include <linux/module.h>

#include <linux/bootmem.h>

#include <linux/mm.h>

#include <linux/pfn.h>

#include <asm/page.h>

#include <as-layout.h>

#include <init.h>

#include <kern.h>

#include <mem_user.h>

#include <os.h>



static int physmem_fd = -1;



/* Changed during early boot */

unsigned long high_physmem;

EXPORT_SYMBOL(high_physmem);



extern unsigned long long physmem_size;
@@ -184,6 +186,7 @@ unsigned long find_iomem(char *driver, unsigned long *len_out) 


	return 0;

}

EXPORT_SYMBOL(find_iomem);



static int setup_iomem(void)

{