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:
parent
9218b17149
commit
36e4546304
|
@ -216,7 +216,7 @@ static void __init fixaddr_user_init( void)
|
|||
#endif
|
||||
}
|
||||
|
||||
void paging_init(void)
|
||||
void __init paging_init(void)
|
||||
{
|
||||
unsigned long zones_size[MAX_NR_ZONES], vaddr;
|
||||
int i;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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 len)
|
|||
return 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 len)
|
|||
}
|
||||
|
||||
|
||||
void check_tmpexec(void)
|
||||
void __init check_tmpexec(void)
|
||||
{
|
||||
void *addr;
|
||||
int err, fd = create_tmp_file(UM_KERN_PAGE_SIZE);
|
||||
|
|
|
@ -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 length)
|
|||
return err;
|
||||
}
|
||||
|
||||
int can_drop_memory(void)
|
||||
int __init can_drop_memory(void)
|
||||
{
|
||||
void *addr;
|
||||
int fd, ok = 0;
|
||||
|
|
|
@ -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();
|
||||
|
|
Loading…
Reference in New Issue