diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-19 23:36:17 -0400 |
commit | c00046c279a2521075250fad682ca0acc10d4fd7 (patch) | |
tree | 78a7e9089c26f199ad9b0161bb564b7c1ca6daf9 /init | |
parent | 9abbf7d028b1598b40ebdc81c48f30da7f3d5bf5 (diff) | |
parent | 8e8a1407ac23b43cec0412338c1b4f5e1c664550 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits)
fix do_sys_open() prototype
sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake
Documentation: Fix typo in SubmitChecklist.
Typo: depricated -> deprecated
Add missing profile=kvm option to Documentation/kernel-parameters.txt
fix typo about TBI in e1000 comment
proc.txt: Add /proc/stat field
small documentation fixes
Fix compiler warning in smount example program from sharedsubtree.txt
docs/sysfs: add missing word to sysfs attribute explanation
documentation/ext3: grammar fixes
Documentation/java.txt: typo and grammar fixes
Documentation/filesystems/vfs.txt: typo fix
include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros
trivial copy_data_pages() tidy up
Fix typo in arch/x86/kernel/tsc_32.c
file link fix for Pegasus USB net driver help
remove unused return within void return function
Typo fixes retrun -> return
x86 hpet.h: remove broken links
...
Diffstat (limited to 'init')
-rw-r--r-- | init/main.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/init/main.c b/init/main.c index 0dd0e7a1f632..f605a969ea61 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -70,15 +70,7 @@ | |||
70 | /* | 70 | /* |
71 | * This is one of the first .c files built. Error out early if we have compiler | 71 | * This is one of the first .c files built. Error out early if we have compiler |
72 | * trouble. | 72 | * trouble. |
73 | * | ||
74 | * Versions of gcc older than that listed below may actually compile and link | ||
75 | * okay, but the end product can have subtle run time bugs. To avoid associated | ||
76 | * bogus bug reports, we flatly refuse to compile with a gcc that is known to be | ||
77 | * too old from the very beginning. | ||
78 | */ | 73 | */ |
79 | #if (__GNUC__ < 3) || (__GNUC__ == 3 && __GNUC_MINOR__ < 2) | ||
80 | #error Sorry, your GCC is too old. It builds incorrect kernels. | ||
81 | #endif | ||
82 | 74 | ||
83 | #if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 0 | 75 | #if __GNUC__ == 4 && __GNUC_MINOR__ == 1 && __GNUC_PATCHLEVEL__ == 0 |
84 | #warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. | 76 | #warning gcc-4.1.0 is known to miscompile the kernel. A different compiler version is recommended. |
@@ -288,7 +280,7 @@ static int __init unknown_bootoption(char *param, char *val) | |||
288 | return 0; | 280 | return 0; |
289 | 281 | ||
290 | /* | 282 | /* |
291 | * Preemptive maintenance for "why didn't my mispelled command | 283 | * Preemptive maintenance for "why didn't my misspelled command |
292 | * line work?" | 284 | * line work?" |
293 | */ | 285 | */ |
294 | if (strchr(param, '.') && (!val || strchr(param, '.') < val)) { | 286 | if (strchr(param, '.') && (!val || strchr(param, '.') < val)) { |