UML - Add missing __init declarations
PATCH 7/7 UML - Add missing __init declarations
The build started finding calls from non-init to init functions. These are just cases of init functions not being properly marked, so this patch fixes that.
Signed-off-by Jeff Dike <[email protected]>
--
arch/um/kernel/mem.c | 2 +- arch/um/os-Linux/main.c | 2 +- arch/um/os-Linux/mem.c | 9 +++++---- arch/um/os-Linux/process.c | 5 +++-- arch/um/os-Linux/start_up.c | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-)
arch/um/kernel/mem.c +1 -1
@@ -217,7 +217,7 @@ static void __init fixaddr_user_init( vo#endif } -void paging_init (void ) +void __init paging_init (void ) {unsigned long zones_size[MAX_NR_ZONES ], vaddr;int i;
arch/um/os-Linux/main.c +1 -1
@@ -120,7 +120,7 @@ extern int uml_exitcode;extern void scan_elf_aux (char **envp); -int main (int argc,char **argv,char **envp) +int __init main (int argc,char **argv,char **envp) {char **new_argv;int ret, i, err;
arch/um/os-Linux/mem.c +5 -4
@@ -164,7 +164,8 @@ found:* (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger). * So it isn't 'static' yet. */ -int make_tempfile (const char *template,char **out_tempname,int do_unlink) +int __init make_tempfile (const char *template,char **out_tempname, +int do_unlink) {char *tempname;int fd;
@@ -205,7 +206,7 @@ out:* This proc is used in start_up.c * So it isn't 'static'. */ -int create_tmp_file (unsigned long long len) +int __init create_tmp_file (unsigned long long len) {int fd, err;char zero;
@@ -241,7 +242,7 @@ int create_tmp_file(unsigned long long lreturn fd; } -int create_mem_file (unsigned long long len) +int __init create_mem_file (unsigned long long len) {int err, fd;
@@ -256,7 +257,7 @@ int create_mem_file(unsigned long long l } -void check_tmpexec (void ) +void __init check_tmpexec (void ) {void *addr;int err, fd =create_tmp_file (UM_KERN_PAGE_SIZE );
arch/um/os-Linux/process.c +3 -2
@@ -21,6 +21,7 @@#include "skas_ptrace.h" #include "kern_constants.h" #include "uml-config.h" +#include "init.h" #define ARBITRARY_ADDR -1#define FAILURE_PID -1
@@ -192,7 +193,7 @@ int os_unmap_memory(void *addr, int len)#define MADV_REMOVE KERNEL_MADV_REMOVE#endif -int os_drop_memory (void *addr,int length) +int __init os_drop_memory (void *addr,int length) {int err;
@@ -202,7 +203,7 @@ int os_drop_memory(void *addr, int lengtreturn err; } -int can_drop_memory (void ) +int __init can_drop_memory (void ) {void *addr;int fd, ok =0 ;
arch/um/os-Linux/start_up.c +2 -2
@@ -329,7 +329,7 @@ static void __init check_ptrace(void)extern void check_tmpexec (void ); -static void check_coredump_limit (void ) +static void __init check_coredump_limit (void ) {struct rlimit lim;int err =getrlimit (RLIMIT_CORE , &lim);
@@ -350,7 +350,7 @@ static void check_coredump_limit(void)else printf ("%lu\n" , lim.rlim_max); } -void os_early_checks (void ) +void __init os_early_checks (void ) {/* Print out the core dump limits early */ check_coredump_limit ();
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel