ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Remove /proc/device-tree when openfirmware init fails. (rhbz 818378)

Browse Source
This commit is contained in:
Dave Jones 2012-05-07 12:03:03 -04:00
parent 55ad8544e8
commit 6a501c420a
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs-proc-devtree-remove_proc_entry.patch Normal file
View File

@ -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;
}

7
kernel.spec
View File

@ -705,6 +705,8 @@ Patch2901: linux-2.6-v4l-dvb-experimental.patch
# NFSv4 # NFSv4
# patches headed upstream # patches headed upstream
Patch10000: fs-proc-devtree-remove_proc_entry.patch
Patch12016: disable-i8042-check-on-apple-mac.patch Patch12016: disable-i8042-check-on-apple-mac.patch
Patch12303: dmar-disable-when-ricoh-multifunction.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 ApplyOptionalPatch linux-2.6-v4l-dvb-experimental.patch
# Patches headed upstream # Patches headed upstream
ApplyPatch fs-proc-devtree-remove_proc_entry.patch
ApplyPatch disable-i8042-check-on-apple-mac.patch ApplyPatch disable-i8042-check-on-apple-mac.patch
# rhbz#605888 # rhbz#605888
@ -2325,6 +2329,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %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 * Mon May 07 2012 Josh Boyer <jwboyer@redhat.com> - 3.4.0-0.rc6.git0.1
- Linux v3.4-rc6 - Linux v3.4-rc6
- Disable debugging options. - Disable debugging options.