Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756986Ab2ENQlO (ORCPT ); Mon, 14 May 2012 12:41:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:15249 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753490Ab2ENQlL (ORCPT ); Mon, 14 May 2012 12:41:11 -0400 Date: Mon, 14 May 2012 12:41:06 -0400 From: Dave Jones To: Linux Kernel Cc: Fedora Kernel Team , Al Viro , Paul Mackerras Subject: Remove empty /proc/device-tree when no openfirmware exists. Message-ID: <20120514164106.GB4439@redhat.com> Mail-Followup-To: Dave Jones , Linux Kernel , Fedora Kernel Team , Al Viro , Paul Mackerras MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1258 Lines: 29 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. ] Signed-off-by: Dave Jones 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/