diff options
| -rw-r--r-- | fs-proc-devtree-remove_proc_entry.patch | 12 | ||||
| -rw-r--r-- | kernel.spec | 7 |
2 files changed, 19 insertions, 0 deletions
diff --git a/fs-proc-devtree-remove_proc_entry.patch b/fs-proc-devtree-remove_proc_entry.patch new file mode 100644 index 000000000..c32e79e6e --- /dev/null +++ b/fs-proc-devtree-remove_proc_entry.patch @@ -0,0 +1,12 @@ +diff --git a/fs/proc/proc_devtree.c b/fs/proc/proc_devtree.c +index 927cbd1..f060f28 100644 +--- a/fs/proc/proc_devtree.c ++++ b/fs/proc/proc_devtree.c +@@ -233,6 +233,7 @@ void __init proc_device_tree_init(void) + return; + root = of_find_node_by_path("/"); + if (root == NULL) { ++ remove_proc_entry("device-tree", NULL); + pr_debug("/proc/device-tree: can't find root\n"); + return; + } diff --git a/kernel.spec b/kernel.spec index f3e259fe3..baea33913 100644 --- a/kernel.spec +++ b/kernel.spec @@ -705,6 +705,8 @@ Patch2901: linux-2.6-v4l-dvb-experimental.patch # NFSv4 # patches headed upstream +Patch10000: fs-proc-devtree-remove_proc_entry.patch + Patch12016: disable-i8042-check-on-apple-mac.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch @@ -1414,6 +1416,8 @@ ApplyOptionalPatch linux-2.6-v4l-dvb-update.patch ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch # Patches headed upstream +ApplyPatch fs-proc-devtree-remove_proc_entry.patch + ApplyPatch disable-i8042-check-on-apple-mac.patch # rhbz#605888 @@ -2325,6 +2329,9 @@ fi # ||----w | # || || %changelog +* Mon May 07 2012 Dave Jones <davej@redhat.com> +- Remove /proc/device-tree when openfirmware init fails. (rhbz 818378) + * Mon May 07 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git0.1 - Linux v3.4-rc6 - Disable debugging options. |