hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <jdike@linux.intel.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>
This commit is contained in:
Jeff Dike 2007-05-06 14:51:11 -07:00 committed by Linus Torvalds
parent 9218b17149
commit 36e4546304
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/kernel/mem.c
View File

@ -216,7 +216,7 @@ static void __init fixaddr_user_init( void)
#endif #endif
} }
void paging_init(void) void __init paging_init(void)
{ {
unsigned long zones_size[MAX_NR_ZONES], vaddr; unsigned long zones_size[MAX_NR_ZONES], vaddr;
int i; int i;

2
arch/um/os-Linux/main.c
View File

@ -120,7 +120,7 @@ extern int uml_exitcode;
extern void scan_elf_aux( char **envp); 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; char **new_argv;
int ret, i, err; int ret, i, err;

9
arch/um/os-Linux/mem.c
View File

@ -164,7 +164,8 @@ found:
* (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger). * (file: kernel/tt/ptproxy/proxy.c, proc: start_debugger).
* So it isn't 'static' yet. * 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; char *tempname;
int fd; int fd;
@ -205,7 +206,7 @@ out:
* This proc is used in start_up.c * This proc is used in start_up.c
* So it isn't 'static'. * 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; int fd, err;
char zero; char zero;
@ -241,7 +242,7 @@ int create_tmp_file(unsigned long long len)
return fd; return fd;
} }
int create_mem_file(unsigned long long len) int __init create_mem_file(unsigned long long len)
{ {
int err, fd; int err, fd;
@ -256,7 +257,7 @@ int create_mem_file(unsigned long long len)
} }
void check_tmpexec(void) void __init check_tmpexec(void)
{ {
void *addr; void *addr;
int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE); int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE);

5
arch/um/os-Linux/process.c
View File

@ -21,6 +21,7 @@
#include "skas_ptrace.h" #include "skas_ptrace.h"
#include "kern_constants.h" #include "kern_constants.h"
#include "uml-config.h" #include "uml-config.h"
#include "init.h"
#define ARBITRARY_ADDR -1 #define ARBITRARY_ADDR -1
#define FAILURE_PID -1 #define FAILURE_PID -1
@ -192,7 +193,7 @@ int os_unmap_memory(void *addr, int len)
#define MADV_REMOVE KERNEL_MADV_REMOVE #define MADV_REMOVE KERNEL_MADV_REMOVE
#endif #endif
int os_drop_memory(void *addr, int length) int __init os_drop_memory(void *addr, int length)
{ {
int err; int err;
@ -202,7 +203,7 @@ int os_drop_memory(void *addr, int length)
return err; return err;
} }
int can_drop_memory(void) int __init can_drop_memory(void)
{ {
void *addr; void *addr;
int fd, ok = 0; int fd, ok = 0;

4
arch/um/os-Linux/start_up.c
View File

@ -329,7 +329,7 @@ static void __init check_ptrace(void)
extern void check_tmpexec(void); extern void check_tmpexec(void);
static void check_coredump_limit(void) static void __init check_coredump_limit(void)
{ {
struct rlimit lim; struct rlimit lim;
int err = getrlimit(RLIMIT_CORE, &lim); int err = getrlimit(RLIMIT_CORE, &lim);
@ -350,7 +350,7 @@ static void check_coredump_limit(void)
else printf("%lu\n", lim.rlim_max); 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 */ /* Print out the core dump limits early */
check_coredump_limit(); check_coredump_limit();