From: Grant Likely on
On Mon, Jun 28, 2010 at 7:00 PM, Andres Salomon <dilinger(a)queued.net> wrote:
>
> Microblaze and PPC both use PROC_DEVICETREE, and OLPC will as well.. put
> the Kconfig option into fs/ rather than in arch/*/Kconfig.
>
> Signed-off-by: Andres Salomon <dilinger(a)queued.net>
> ---
> �arch/microblaze/Kconfig | � �8 --------
> �arch/powerpc/Kconfig � �| � �8 --------
> �fs/proc/Kconfig � � � � | � �8 ++++++++
> �3 files changed, 8 insertions(+), 16 deletions(-)
>
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 76818f9..b66c962 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -128,14 +128,6 @@ config OF
> � � � �def_bool y
> � � � �select OF_FLATTREE
>
> -config PROC_DEVICETREE
> - � � � bool "Support for device tree in /proc"
> - � � � depends on PROC_FS
> - � � � help
> - � � � � This option adds a device-tree directory under /proc which contains
> - � � � � an image of the device tree that the kernel copies from Open
> - � � � � Firmware or other boot firmware. If unsure, say Y here.
> -
> �endmenu
>
> �menu "Advanced setup"
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 328774b..8a56e8b 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -578,14 +578,6 @@ config SCHED_SMT
> � � � � �when dealing with POWER5 cpus at a cost of slightly increased
> � � � � �overhead in some places. If unsure say N here.
>
> -config PROC_DEVICETREE
> - � � � bool "Support for device tree in /proc"
> - � � � depends on PROC_FS
> - � � � help
> - � � � � This option adds a device-tree directory under /proc which contains
> - � � � � an image of the device tree that the kernel copies from Open
> - � � � � Firmware or other boot firmware. If unsure, say Y here.
> -
> �config CMDLINE_BOOL
> � � � �bool "Default bootloader kernel arguments"
>
> diff --git a/fs/proc/Kconfig b/fs/proc/Kconfig
> index 50f8f06..858a859 100644
> --- a/fs/proc/Kconfig
> +++ b/fs/proc/Kconfig
> @@ -39,6 +39,14 @@ config PROC_VMCORE
> � � � � help
> � � � � Exports the dump image of crashed kernel in ELF format.
>
> +config PROC_DEVICETREE
> + � � � bool "Support for device tree in /proc"
> + � � � depends on PROC_FS && (PPC || MICROBLAZE)
> + � � � help
> + � � � � This option adds a device-tree directory under /proc which contains
> + � � � � an image of the device tree that the kernel copies from Open
> + � � � � Firmware or other boot firmware. If unsure, say Y here.
> +

Looks good to me. However, I've changed the depends line to the following.

depends on PROC_FS && OF && !SPARC

Cheers,
g.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/