git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
ia64
/
kernel
/
setup.c
diff --git
a/arch/ia64/kernel/setup.c
b/arch/ia64/kernel/setup.c
index
8aff39d
..
462fd9f
100644
(file)
--- a/
arch/ia64/kernel/setup.c
+++ b/
arch/ia64/kernel/setup.c
@@
-375,10
+375,9
@@
setup_arch (char **cmdline_p)
}
#endif
}
#endif
- /* enable IA-64 Machine Check Abort Handling unless disabled */
- if (!strstr(saved_command_line, "nomca"))
- ia64_mca_init();
-
+ /* enable IA-64 Machine Check Abort Handling */
+ ia64_mca_init();
+
platform_setup(cmdline_p);
paging_init();
}
platform_setup(cmdline_p);
paging_init();
}