summaryrefslogtreecommitdiffstats
path: root/linux-2.6-crash-driver.patch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@redhat.com>2011-03-18 13:15:43 -0400
committerKyle McMartin <kyle@redhat.com>2011-03-18 13:15:43 -0400
commit3f74cb629de607844ea60d7371c60ac2a6b8d36b (patch)
treec3fb276ff9f4bf209ac0b8777ee0121b9ee36fed /linux-2.6-crash-driver.patch
parenta725c00ed421e4eea7d02f5f2aea99f8f7de29df (diff)
downloadkernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.tar.gz
kernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.tar.xz
kernel-3f74cb629de607844ea60d7371c60ac2a6b8d36b.zip
update to 2.6.38-git6
Diffstat (limited to 'linux-2.6-crash-driver.patch')
-rw-r--r--linux-2.6-crash-driver.patch29
1 files changed, 15 insertions, 14 deletions
diff --git a/linux-2.6-crash-driver.patch b/linux-2.6-crash-driver.patch
index 0f11aba0d..b8377d321 100644
--- a/linux-2.6-crash-driver.patch
+++ b/linux-2.6-crash-driver.patch
@@ -220,20 +220,6 @@ index 5eb1ba7..3e525d2 100644
/*
* Fix up the linear direct mapping of the kernel to avoid cache attribute
* conflicts.
-diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
-index 3141dd3..153658c 100644
---- a/drivers/char/Kconfig
-+++ b/drivers/char/Kconfig
-@@ -471,6 +471,8 @@ config LEGACY_PTYS
- security. This option enables these legacy devices; on most
- systems, it is safe to say N.
-
-+config CRASH
-+ tristate "Crash Utility memory driver"
-
- config LEGACY_PTY_COUNT
- int "Maximum number of legacy PTY in use"
-
diff --git a/drivers/char/crash.c b/drivers/char/crash.c
new file mode 100644
index 0000000..e5437de
@@ -379,3 +365,18 @@ index ba53ec9..6588b33 100644
js-rtc-y = rtc.o
+
+obj-$(CONFIG_CRASH) += crash.o
+
+diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
+index 04f8b2d..e8fb997 100644
+--- a/drivers/char/Kconfig
++++ b/drivers/char/Kconfig
+@@ -4,6 +4,9 @@
+
+ menu "Character devices"
+
++config CRASH
++ tristate "Crash Utility memory driver"
++
+ source "drivers/tty/Kconfig"
+
+ config DEVKMEM