summaryrefslogtreecommitdiff
path: root/cleopatre
diff options
context:
space:
mode:
Diffstat (limited to 'cleopatre')
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/Documentation/kernel-parameters.txt5
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/Documentation/x86_64/boot-options.txt5
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/arch/x86/kernel/traps_64.c11
-rw-r--r--cleopatre/linux-2.6.25.10-spc300/kernel/panic.c10
4 files changed, 15 insertions, 16 deletions
diff --git a/cleopatre/linux-2.6.25.10-spc300/Documentation/kernel-parameters.txt b/cleopatre/linux-2.6.25.10-spc300/Documentation/kernel-parameters.txt
index dafd001bf8..5aa32e7476 100644
--- a/cleopatre/linux-2.6.25.10-spc300/Documentation/kernel-parameters.txt
+++ b/cleopatre/linux-2.6.25.10-spc300/Documentation/kernel-parameters.txt
@@ -1346,6 +1346,11 @@ and is between 256 and 4096 characters. It is defined in the file
nr_uarts= [SERIAL] maximum number of UARTs to be registered.
+ oops=panic Always panic on oopses. Default is to just kill the process,
+ but there is a small probability of deadlocking the machine.
+ This will also cause panics on machine check exceptions.
+ Useful together with panic=30 to trigger a reboot.
+
opl3= [HW,OSS]
Format: <io>
diff --git a/cleopatre/linux-2.6.25.10-spc300/Documentation/x86_64/boot-options.txt b/cleopatre/linux-2.6.25.10-spc300/Documentation/x86_64/boot-options.txt
index 34abae4e94..ce9667b4f3 100644
--- a/cleopatre/linux-2.6.25.10-spc300/Documentation/x86_64/boot-options.txt
+++ b/cleopatre/linux-2.6.25.10-spc300/Documentation/x86_64/boot-options.txt
@@ -289,11 +289,6 @@ IOMMU (input/output memory management unit)
Debugging
- oops=panic Always panic on oopses. Default is to just kill the process,
- but there is a small probability of deadlocking the machine.
- This will also cause panics on machine check exceptions.
- Useful together with panic=30 to trigger a reboot.
-
kstack=N Print N words from the kernel stack in oops dumps.
pagefaulttrace Dump all page faults. Only useful for extreme debugging
diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/x86/kernel/traps_64.c b/cleopatre/linux-2.6.25.10-spc300/arch/x86/kernel/traps_64.c
index 0454666819..c215d5444f 100644
--- a/cleopatre/linux-2.6.25.10-spc300/arch/x86/kernel/traps_64.c
+++ b/cleopatre/linux-2.6.25.10-spc300/arch/x86/kernel/traps_64.c
@@ -1159,17 +1159,6 @@ void __init trap_init(void)
cpu_init();
}
-
-static int __init oops_setup(char *s)
-{
- if (!s)
- return -EINVAL;
- if (!strcmp(s, "panic"))
- panic_on_oops = 1;
- return 0;
-}
-early_param("oops", oops_setup);
-
static int __init kstack_setup(char *s)
{
if (!s)
diff --git a/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c b/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
index 24af9f8bac..2ee48fcd92 100644
--- a/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
+++ b/cleopatre/linux-2.6.25.10-spc300/kernel/panic.c
@@ -299,6 +299,16 @@ void oops_exit(void)
print_oops_end_marker();
}
+static int __init oops_setup(char *s)
+{
+ if (!s)
+ return -EINVAL;
+ if (!strcmp(s, "panic"))
+ panic_on_oops = 1;
+ return 0;
+}
+early_param("oops", oops_setup);
+
#ifdef WANT_WARN_ON_SLOWPATH
void warn_on_slowpath(const char *file, int line)
{