[PATCH 1/1] UBUNTU: [Config] generic-pae switch to M586TSC

[Stefan Bader]

This will (only) enable additional drivers and only affects the generic-pae
flavour in which there should be no system enabled without TSC.

Andy Whitcroft wrote:
> BugLink: http://bugs.launchpad.net/bugs/519448
> 
> Xen dom-U support is currently not available in the 32bit kernels.
> This is because the generic-pae kernel is only an M586 kernel which
> does not support the TSC, a required element for XEN support.  From the
> available documentation it seems that all cpus which support PAE must
> also have support for TSC.  This means that we can switch the generic-pae
> kernel from M586 to M586TSC safely.  In M586TSC most XEN may then be
> enabled successfully.  Enable M586TSC and thereby XEN.
> 
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
Acked-by: Stefan Bader <stefan.bader at canonical.com>
> ---
>  debian.master/config/amd64/config.common.amd64     |    1 +
>  debian.master/config/config.common.ubuntu          |    2 --
>  debian.master/config/i386/config.common.i386       |    1 -
>  debian.master/config/i386/config.flavour.386       |    2 ++
>  debian.master/config/i386/config.flavour.generic   |    2 ++
>  .../config/i386/config.flavour.generic-pae         |    4 +++-
>  debian.master/config/lpia/config.common.lpia       |    1 +
>  7 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64
> index 1741528..4f17400 100644
> --- a/debian.master/config/amd64/config.common.amd64
> +++ b/debian.master/config/amd64/config.common.amd64
> @@ -60,6 +60,7 @@ CONFIG_LLC2=m
>  CONFIG_LOG_BUF_SHIFT=18
>  # CONFIG_M486 is not set
>  # CONFIG_M586 is not set
> +# CONFIG_M586TSC is not set
>  CONFIG_MII=m
>  CONFIG_MMC_BLOCK=m
>  CONFIG_MOUSE_PS2=m
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index d9279d7..94e6614 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -2081,7 +2081,6 @@ CONFIG_LZO_DECOMPRESS=m
>  CONFIG_M25PXX_USE_FAST_READ=y
>  # CONFIG_M386 is not set
>  # CONFIG_M586MMX is not set
> -# CONFIG_M586TSC is not set
>  # CONFIG_M686 is not set
>  CONFIG_MA600_DONGLE=m
>  CONFIG_MAC80211=m
> @@ -4441,7 +4440,6 @@ CONFIG_X86_CMPXCHG64=y
>  CONFIG_X86_CPU=y
>  CONFIG_X86_CPUFREQ_NFORCE2=y
>  CONFIG_X86_CPUID=m
> -# CONFIG_X86_CPU_DEBUG is not set
>  CONFIG_X86_DEBUGCTLMSR=y
>  # CONFIG_X86_DS is not set
>  # CONFIG_X86_ELAN is not set
> diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386
> index 7eb63ee..4c70b7e 100644
> --- a/debian.master/config/i386/config.common.i386
> +++ b/debian.master/config/i386/config.common.i386
> @@ -142,7 +142,6 @@ CONFIG_SPI=y
>  CONFIG_SSB_B43_PCI_BRIDGE=y
>  # CONFIG_STANDALONE is not set
>  CONFIG_SUNGEM=m
> -# CONFIG_SYS_HYPERVISOR is not set
>  CONFIG_TCG_TPM=m
>  CONFIG_TCP_CONG_ADVANCED=y
>  CONFIG_TIPC=m
> diff --git a/debian.master/config/i386/config.flavour.386 b/debian.master/config/i386/config.flavour.386
> index 97ae98e..92270fd 100644
> --- a/debian.master/config/i386/config.flavour.386
> +++ b/debian.master/config/i386/config.flavour.386
> @@ -9,9 +9,11 @@ CONFIG_HIGHMEM4G=y
>  # CONFIG_HIGHMEM64G is not set
>  CONFIG_M486=y
>  # CONFIG_M586 is not set
> +# CONFIG_M586TSC is not set
>  # CONFIG_PHYS_ADDR_T_64BIT is not set
>  CONFIG_SCSI_SPI_ATTRS=m
>  CONFIG_SCSI_SYM53C8XX_2=m
> +# CONFIG_SYS_HYPERVISOR is not set
>  CONFIG_VIRTIO=m
>  CONFIG_VIRTIO_BLK=m
>  CONFIG_VIRTIO_NET=m
> diff --git a/debian.master/config/i386/config.flavour.generic b/debian.master/config/i386/config.flavour.generic
> index 8549c0e..d9b4ccc 100644
> --- a/debian.master/config/i386/config.flavour.generic
> +++ b/debian.master/config/i386/config.flavour.generic
> @@ -9,9 +9,11 @@ CONFIG_HIGHMEM4G=y
>  # CONFIG_HIGHMEM64G is not set
>  # CONFIG_M486 is not set
>  CONFIG_M586=y
> +# CONFIG_M586TSC is not set
>  # CONFIG_PHYS_ADDR_T_64BIT is not set
>  CONFIG_SCSI_SPI_ATTRS=m
>  CONFIG_SCSI_SYM53C8XX_2=m
> +# CONFIG_SYS_HYPERVISOR is not set
>  CONFIG_VIRTIO=m
>  CONFIG_VIRTIO_BLK=m
>  CONFIG_VIRTIO_NET=m
> diff --git a/debian.master/config/i386/config.flavour.generic-pae b/debian.master/config/i386/config.flavour.generic-pae
> index adf7a31..e029ee3 100644
> --- a/debian.master/config/i386/config.flavour.generic-pae
> +++ b/debian.master/config/i386/config.flavour.generic-pae
> @@ -8,10 +8,12 @@ CONFIG_DEFAULT_IOSCHED="cfq"
>  # CONFIG_HIGHMEM4G is not set
>  CONFIG_HIGHMEM64G=y
>  # CONFIG_M486 is not set
> -CONFIG_M586=y
> +# CONFIG_M586 is not set
> +CONFIG_M586TSC=y
>  CONFIG_PHYS_ADDR_T_64BIT=y
>  CONFIG_SCSI_SPI_ATTRS=y
>  CONFIG_SCSI_SYM53C8XX_2=y
> +CONFIG_SYS_HYPERVISOR=y
>  CONFIG_VIRTIO=y
>  CONFIG_VIRTIO_BLK=y
>  CONFIG_VIRTIO_NET=y
> diff --git a/debian.master/config/lpia/config.common.lpia b/debian.master/config/lpia/config.common.lpia
> index 1bae163..78816fb 100644
> --- a/debian.master/config/lpia/config.common.lpia
> +++ b/debian.master/config/lpia/config.common.lpia
> @@ -67,6 +67,7 @@ CONFIG_LLC2=m
>  CONFIG_LOG_BUF_SHIFT=17
>  # CONFIG_M486 is not set
>  CONFIG_M586=y
> +# CONFIG_M586TSC is not set
>  CONFIG_MII=m
>  CONFIG_MMC_BLOCK=m
>  CONFIG_MOUSE_PS2=m