ia64/xen-unstable

changeset 14266:5dfad62b7a70

linux: no pc speaker device in domUs
Signed-off-by: Jan Beulich <jbeulich@novell.com>
author kfraser@localhost.localdomain
date Mon Mar 05 15:53:18 2007 +0000 (2007-03-05)
parents 59c066e8007d
children ff81ea60bc98
files linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Mon Mar 05 15:46:33 2007 +0000
     1.2 +++ b/linux-2.6-xen-sparse/arch/i386/kernel/setup-xen.c	Mon Mar 05 15:53:18 2007 +0000
     1.3 @@ -1847,6 +1847,9 @@ static __init int add_pcspkr(void)
     1.4  	struct platform_device *pd;
     1.5  	int ret;
     1.6  
     1.7 +	if (!is_initial_xendomain())
     1.8 +		return 0;
     1.9 +
    1.10  	pd = platform_device_alloc("pcspkr", -1);
    1.11  	if (!pd)
    1.12  		return -ENOMEM;
     2.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon Mar 05 15:46:33 2007 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/setup-xen.c	Mon Mar 05 15:53:18 2007 +0000
     2.3 @@ -1635,6 +1635,9 @@ static __init int add_pcspkr(void)
     2.4  	struct platform_device *pd;
     2.5  	int ret;
     2.6  
     2.7 +	if (!is_initial_xendomain())
     2.8 +		return 0;
     2.9 +
    2.10  	pd = platform_device_alloc("pcspkr", -1);
    2.11  	if (!pd)
    2.12  		return -ENOMEM;