Re: [patch 2/3] x86/boot: adding hw subarch ID for Moorestown

From: Daniele Calore
Date: Tue Sep 01 2009 - 06:49:05 EST


Hi,

I think there is a typo (copy/paste error), see below:

On Sun, 30 Aug 2009 13:46:28 -0000
Thomas Gleixner <tglx@xxxxxxxxxxxxx> wrote:

> From: Jacob Pan <jacob.jun.pan@xxxxxxxxx>
> Date: Thu, 11 Jun 2009 20:34:47 -0700
> Subject: [patch 2/3] [PATCH] x86/boot: adding hw subarch ID for
> Moorestown
>
> x86 bootprotocol 2.07 has introduced hardware_subarch ID in the boot
> parameters provided by FW. We use it to identify Moorestown platforms.
>
> The subarchitecture ID will help select a set of platform features and
> x86_quirks.
>
> [ tglx: Cleanup and paravirt fix ]
>
> Signed-off-by: Jacob Pan <jacob.jun.pan@xxxxxxxxx>
> Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
> ---
> Documentation/x86/boot.txt | 1 +
> arch/x86/include/asm/bootparam.h | 10 ++++++++++
> arch/x86/kernel/head_32.S | 1 +
> 3 files changed, 12 insertions(+)
>
> Index: linux-2.6-tip/Documentation/x86/boot.txt
> ===================================================================
> --- linux-2.6-tip.orig/Documentation/x86/boot.txt
> +++ linux-2.6-tip/Documentation/x86/boot.txt
> @@ -599,6 +599,7 @@ Protocol: 2.07+
> 0x00000000 The default x86/PC environment
> 0x00000001 lguest
> 0x00000002 Xen
> + 0x00000003 Moorestown MID
>
> Field name: hardware_subarch_data
> Type: write (subarch-dependent)
> Index: linux-2.6-tip/arch/x86/include/asm/bootparam.h
> ===================================================================
> --- linux-2.6-tip.orig/arch/x86/include/asm/bootparam.h
> +++ linux-2.6-tip/arch/x86/include/asm/bootparam.h
> @@ -109,4 +109,14 @@ struct boot_params {
> __u8 _pad9[276]; /* 0xeec */
> } __attribute__((packed));
>
> +enum {
> + X86_SUBARCH_PC = 0,
> + X86_SUBARCH_LGUEST,
> + X86_SUBARCH_XEN,
> + X86_SUBARCH_MRST,
> + X86_NR_SUBARCHS,
> +};
> +
> +
> +
> #endif /* _ASM_X86_BOOTPARAM_H */
> Index: linux-2.6-tip/arch/x86/kernel/head_32.S
> ===================================================================
> --- linux-2.6-tip.orig/arch/x86/kernel/head_32.S
> +++ linux-2.6-tip/arch/x86/kernel/head_32.S
> @@ -157,6 +157,7 @@ subarch_entries:
> .long default_entry /* normal x86/PC */
> .long lguest_entry /* lguest hypervisor */
> .long xen_entry /* Xen hypervisor */
> + .long default_entry /* Moorestown MID */

Typo: s/default_entry/mrst_entry

> num_subarch_entries = (. - subarch_entries) / 4
> .previous
> #endif /* CONFIG_PARAVIRT */


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