ia64/xen-unstable

changeset 10042:f6ebf236faee

Fix the building of the Xen TPM driver as module and prevents front-
and backends to be rmmod'ed by removing their module_exit line.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com>
author kaf24@firebug.cl.cam.ac.uk
date Thu May 11 13:42:20 2006 +0100 (2006-05-11)
parents e96f98f9c289
children 6b7c54556ac8
files linux-2.6-xen-sparse/drivers/char/tpm/Kconfig linux-2.6-xen-sparse/drivers/char/tpm/Makefile linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/Kconfig	Thu May 11 11:33:07 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/Kconfig	Thu May 11 13:42:20 2006 +0100
     1.3 @@ -53,10 +53,9 @@ config TCG_XEN
     1.4  	tristate "XEN TPM Interface"
     1.5  	depends on TCG_TPM && XEN
     1.6  	---help---
     1.7 -	  If you want to make TPM support available to a Xen
     1.8 -	  user domain, say Yes and it will
     1.9 -          be accessible from within Linux. To compile this driver
    1.10 -          as a module, choose M here; the module will be called
    1.11 -          tpm_xen.
    1.12 +	  If you want to make TPM support available to a Xen user domain,
    1.13 +	  say Yes and it will be accessible from within Linux.
    1.14 +	  To compile this driver as a module, choose M here; the module
    1.15 +	  will be called tpm_xenu.
    1.16  
    1.17  endmenu
     2.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/Makefile	Thu May 11 11:33:07 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/Makefile	Thu May 11 13:42:20 2006 +0100
     2.3 @@ -8,4 +8,5 @@ endif
     2.4  obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
     2.5  obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
     2.6  obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
     2.7 -obj-$(CONFIG_TCG_XEN) += tpm_xen.o tpm_vtpm.o
     2.8 +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
     2.9 +tpm_xenu-y = tpm_xen.o tpm_vtpm.o
     3.1 --- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Thu May 11 11:33:07 2006 +0100
     3.2 +++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c	Thu May 11 13:42:20 2006 +0100
     3.3 @@ -752,7 +752,6 @@ static void __exit tpmif_exit(void)
     3.4  }
     3.5  
     3.6  module_init(tpmif_init);
     3.7 -module_exit(tpmif_exit);
     3.8  
     3.9  MODULE_LICENSE("Dual BSD/GPL");
    3.10  
     4.1 --- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c	Thu May 11 11:33:07 2006 +0100
     4.2 +++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c	Thu May 11 13:42:20 2006 +0100
     4.3 @@ -1071,8 +1071,6 @@ static void __exit tpmback_exit(void)
     4.4  	misc_deregister(&vtpms_miscdevice);
     4.5  }
     4.6  
     4.7 -module_exit(tpmback_exit);
     4.8 -
     4.9  MODULE_LICENSE("Dual BSD/GPL");
    4.10  
    4.11  /*