Subject: + fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists.patch added to -mm tree To: davej@xxxxxxxxxx,benh@xxxxxxxxxxxxxxxxxxx,jwboyer@xxxxxxxxxxxxxxxxx,paulus@xxxxxxxxx,viro@xxxxxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Tue, 07 Jan 2014 16:37:37 -0800 The patch titled Subject: fs/proc/proc_devtree.c: remove empty /proc/device-tree when no openfirmware exists. has been added to the -mm tree. Its filename is fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists.patch This patch should soon appear at http://ozlabs.org/~akpm/mmots/broken-out/fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists.patch and later at http://ozlabs.org/~akpm/mmotm/broken-out/fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: Dave Jones <davej@xxxxxxxxxx> Subject: fs/proc/proc_devtree.c: remove empty /proc/device-tree when no openfirmware exists. Distribution kernels might want to build in support for /proc/device-tree for kernels that might end up running on hardware that doesn't support openfirmware. This results in an empty /proc/device-tree existing. Remove it if the OFW root node doesn't exist. This situation actually confuses grub2, resulting in install failures. grub2 sees the /proc/device-tree and picks the wrong install target cf. http://bzr.savannah.gnu.org/lh/grub/trunk/grub/annotate/4300/util/grub-install.in#L311 grub should be more robust, but still, leaving an empty proc dir seems pointless. Addresses https://bugzilla.redhat.com/show_bug.cgi?id=818378. Signed-off-by: Dave Jones <davej@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Paul Mackerras <paulus@xxxxxxxxx> Cc: Josh Boyer <jwboyer@xxxxxxxxxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/proc_devtree.c | 1 + 1 file changed, 1 insertion(+) diff -puN fs/proc/proc_devtree.c~fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists fs/proc/proc_devtree.c --- a/fs/proc/proc_devtree.c~fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists +++ a/fs/proc/proc_devtree.c @@ -232,6 +232,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; } _ Patches currently in -mm which might be from davej@xxxxxxxxxx are mm-thp-__get_page_tail_foll-can-use-get_huge_page_tail.patch mm-thp-turn-compound_head-into-bug_onpagetail-in-get_huge_page_tail.patch checkpatch-attempt-to-find-missing-switch-case-break.patch fs-proc-proc_devtreec-remove-empty-proc-device-tree-when-no-openfirmware-exists.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html