git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
cpu
/
bugs.c
diff --git
a/arch/x86/kernel/cpu/bugs.c
b/arch/x86/kernel/cpu/bugs.c
index 9b95edcfc6ae23696fc7566087adc601afa6f388..027e5c003b167df8ed361e8e33c0a6af698f8344 100644
(file)
--- a/
arch/x86/kernel/cpu/bugs.c
+++ b/
arch/x86/kernel/cpu/bugs.c
@@
-25,14
+25,6
@@
static int __init no_halt(char *s)
__setup("no-hlt", no_halt);
-static int __init mca_pentium(char *s)
-{
- mca_pentium_flag = 1;
- return 1;
-}
-
-__setup("mca-pentium", mca_pentium);
-
static int __init no_387(char *s)
{
boot_cpu_data.hard_math = 0;