diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-31 10:06:46 +0000 |
| commit | 1f04c0a24b2f3cfe89c802a24396263623e3512d (patch) | |
| tree | d7e2216b6e65b833c0c2b79b478d13ce17dbf296 /init | |
| parent | 07b188ab773e183871e57b33ae37bf635c9f12ba (diff) | |
| parent | e2f2e58e7968f8446b1078a20a18bf8ea12b4fbc (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'init')
| -rw-r--r-- | init/Kconfig | 4 | ||||
| -rw-r--r-- | init/main.c | 11 |
2 files changed, 2 insertions, 13 deletions
diff --git a/init/Kconfig b/init/Kconfig index d5a1a1228fa..3dcbd5bfd49 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -60,8 +60,8 @@ config INIT_ENV_ARG_LIMIT default 32 if !USERMODE default 128 if USERMODE help - This is the value of the two limits on the number of argument and of - env.var passed to init from the kernel command line. + Maximum of each of the number of arguments and environment + variables passed to init from the kernel command line. endmenu diff --git a/init/main.c b/init/main.c index f142d403534..4075d97e94b 100644 --- a/init/main.c +++ b/init/main.c @@ -64,10 +64,6 @@ #endif #endif -#ifdef CONFIG_X86_LOCAL_APIC -#include <asm/smp.h> -#endif - /* * Versions of gcc older than that listed below may actually compile * and link okay, but the end product can have subtle run time bugs. @@ -314,14 +310,7 @@ extern void setup_arch(char **); #ifndef CONFIG_SMP -#ifdef CONFIG_X86_LOCAL_APIC -static void __init smp_init(void) -{ - APIC_init_uniprocessor(); -} -#else #define smp_init() do { } while (0) -#endif static inline void setup_per_cpu_areas(void) { } static inline void smp_prepare_cpus(unsigned int maxcpus) { } |