Patchwork [Precise,SRU,1/1] UBUNTU: [Config] re-disable CONFIG_SOUND_OSS_PRECLAIM

login
register
mail settings
Submitter Andy Whitcroft
Date March 6, 2013, 9:42 a.m.
Message ID <1362562960-13659-1-git-send-email-apw@canonical.com>
Download mbox | patch
Permalink /patch/225458/
State New
Headers show

Comments

Andy Whitcroft - March 6, 2013, 9:42 a.m.
We intended to turn off CONFIG_SOUND_OSS in maverick timeframe:

    https://lists.ubuntu.com/archives/kernel-team/2010-May/010647.html

We inadvertantly reenabled it for some early ARM work in the commit below:

  commit d5a54f43f357d4814f2c3d53ca3d5c3f6fddebe0
  Author: Andy Whitcroft <apw@canonical.com>
  Date:   Thu Jan 12 14:32:10 2012 +0000

    UBUNTU: [Config] pull ARM sound modules =m

These being enabled prevent the very userspace shims we intended to use for
OSS consumers, given that none of them are enabled in the current kernel.

Turn off CONFIG_SOUND_OSS_PRECLAIM as that is actually the bit which breaks
other users.  If you do use the in theory redundant driver it will still
function with this change.

BugLink: http://bugs.launchpad.net/bugs/1105230
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/config/config.common.ubuntu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Colin King - March 6, 2013, 10:03 a.m.
On 06/03/13 09:42, Andy Whitcroft wrote:
> We intended to turn off CONFIG_SOUND_OSS in maverick timeframe:
>
>      https://lists.ubuntu.com/archives/kernel-team/2010-May/010647.html
>
> We inadvertantly reenabled it for some early ARM work in the commit below:
>
>    commit d5a54f43f357d4814f2c3d53ca3d5c3f6fddebe0
>    Author: Andy Whitcroft <apw@canonical.com>
>    Date:   Thu Jan 12 14:32:10 2012 +0000
>
>      UBUNTU: [Config] pull ARM sound modules =m
>
> These being enabled prevent the very userspace shims we intended to use for
> OSS consumers, given that none of them are enabled in the current kernel.
>
> Turn off CONFIG_SOUND_OSS_PRECLAIM as that is actually the bit which breaks
> other users.  If you do use the in theory redundant driver it will still
> function with this change.
>
> BugLink: http://bugs.launchpad.net/bugs/1105230
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>   debian.master/config/config.common.ubuntu | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index d145e8e..53e231a 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -5028,7 +5028,7 @@ CONFIG_SONYPI=m
>   CONFIG_SONYPI_COMPAT=y
>   CONFIG_SONY_LAPTOP=m
>   CONFIG_SOUND_OSS_CORE=y
> -CONFIG_SOUND_OSS_CORE_PRECLAIM=y
> +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
>   # CONFIG_SOUND_PRIME is not set
>   CONFIG_SP5100_TCO=m
>   CONFIG_SPARSEMEM=y
>

Seems very reasonable to me.

Acked-by: Colin Ian King <colin.king@canonical.com>
Stefan Bader - March 6, 2013, 10:42 a.m.
On 06.03.2013 10:42, Andy Whitcroft wrote:
> We intended to turn off CONFIG_SOUND_OSS in maverick timeframe:
> 
>     https://lists.ubuntu.com/archives/kernel-team/2010-May/010647.html
> 
> We inadvertantly reenabled it for some early ARM work in the commit below:
> 
>   commit d5a54f43f357d4814f2c3d53ca3d5c3f6fddebe0
>   Author: Andy Whitcroft <apw@canonical.com>
>   Date:   Thu Jan 12 14:32:10 2012 +0000
> 
>     UBUNTU: [Config] pull ARM sound modules =m
> 
> These being enabled prevent the very userspace shims we intended to use for
> OSS consumers, given that none of them are enabled in the current kernel.
> 
> Turn off CONFIG_SOUND_OSS_PRECLAIM as that is actually the bit which breaks
> other users.  If you do use the in theory redundant driver it will still
> function with this change.
> 
> BugLink: http://bugs.launchpad.net/bugs/1105230
> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  debian.master/config/config.common.ubuntu | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
> index d145e8e..53e231a 100644
> --- a/debian.master/config/config.common.ubuntu
> +++ b/debian.master/config/config.common.ubuntu
> @@ -5028,7 +5028,7 @@ CONFIG_SONYPI=m
>  CONFIG_SONYPI_COMPAT=y
>  CONFIG_SONY_LAPTOP=m
>  CONFIG_SOUND_OSS_CORE=y
> -CONFIG_SOUND_OSS_CORE_PRECLAIM=y
> +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
>  # CONFIG_SOUND_PRIME is not set
>  CONFIG_SP5100_TCO=m
>  CONFIG_SPARSEMEM=y
>
Tim Gardner - March 6, 2013, 1:10 p.m.

Patch

diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index d145e8e..53e231a 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -5028,7 +5028,7 @@  CONFIG_SONYPI=m
 CONFIG_SONYPI_COMPAT=y
 CONFIG_SONY_LAPTOP=m
 CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
 # CONFIG_SOUND_PRIME is not set
 CONFIG_SP5100_TCO=m
 CONFIG_SPARSEMEM=y