aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig16
-rw-r--r--init/main.c6
2 files changed, 13 insertions, 9 deletions
diff --git a/init/Kconfig b/init/Kconfig
index b170aa1d43bd..29d9e47ee0da 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -80,16 +80,20 @@ config LOCALVERSION_AUTO
80 default y 80 default y
81 help 81 help
82 This will try to automatically determine if the current tree is a 82 This will try to automatically determine if the current tree is a
83 release tree by looking for git tags that 83 release tree by looking for git tags that belong to the current
84 belong to the current top of tree revision. 84 top of tree revision.
85 85
86 A string of the format -gxxxxxxxx will be added to the localversion 86 A string of the format -gxxxxxxxx will be added to the localversion
87 if a git based tree is found. The string generated by this will be 87 if a git-based tree is found. The string generated by this will be
88 appended after any matching localversion* files, and after the value 88 appended after any matching localversion* files, and after the value
89 set in CONFIG_LOCALVERSION 89 set in CONFIG_LOCALVERSION.
90 90
91 Note: This requires Perl, and a git repository, but not necessarily 91 (The actual string used here is the first eight characters produced
92 the git or cogito tools to be installed. 92 by running the command:
93
94 $ git rev-parse --verify HEAD
95
96 which is done within the script "scripts/setlocalversion".)
93 97
94config SWAP 98config SWAP
95 bool "Support for paging of anonymous memory (swap)" 99 bool "Support for paging of anonymous memory (swap)"
diff --git a/init/main.c b/init/main.c
index 80f09f31bfab..df982ff5d2b0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -82,7 +82,7 @@
82#warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. 82#warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended.
83#endif 83#endif
84 84
85static int init(void *); 85static int kernel_init(void *);
86 86
87extern void init_IRQ(void); 87extern void init_IRQ(void);
88extern void fork_init(unsigned long); 88extern void fork_init(unsigned long);
@@ -431,7 +431,7 @@ static void __init setup_command_line(char *command_line)
431static void noinline rest_init(void) 431static void noinline rest_init(void)
432 __releases(kernel_lock) 432 __releases(kernel_lock)
433{ 433{
434 kernel_thread(init, NULL, CLONE_FS | CLONE_SIGHAND); 434 kernel_thread(kernel_init, NULL, CLONE_FS | CLONE_SIGHAND);
435 numa_default_policy(); 435 numa_default_policy();
436 unlock_kernel(); 436 unlock_kernel();
437 437
@@ -768,7 +768,7 @@ static int noinline init_post(void)
768 panic("No init found. Try passing init= option to kernel."); 768 panic("No init found. Try passing init= option to kernel.");
769} 769}
770 770
771static int __init init(void * unused) 771static int __init kernel_init(void * unused)
772{ 772{
773 lock_kernel(); 773 lock_kernel();
774 /* 774 /*