|
|
![](http://www.xen.org/images/globals/pixel.gif) |
|
|
|
|
|
|
|
xen-changelog
[Xen-changelog] Fix the building of the Xen TPM driver as module and pre
# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f6ebf236faee94e4f5d05cf2f3f092edb710aa1d
# Parent e96f98f9c289ca23b0b3ff7e5d897290ef2b142f
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@xxxxxxxxxx>
---
linux-2.6-xen-sparse/drivers/char/tpm/Kconfig | 9 ++++-----
linux-2.6-xen-sparse/drivers/char/tpm/Makefile | 3 ++-
linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c | 1 -
linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c | 2 --
4 files changed, 6 insertions(+), 9 deletions(-)
diff -r e96f98f9c289 -r f6ebf236faee
linux-2.6-xen-sparse/drivers/char/tpm/Kconfig
--- a/linux-2.6-xen-sparse/drivers/char/tpm/Kconfig Thu May 11 11:33:07
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/Kconfig Thu May 11 13:42:20
2006 +0100
@@ -53,10 +53,9 @@ config TCG_XEN
tristate "XEN TPM Interface"
depends on TCG_TPM && XEN
---help---
- If you want to make TPM support available to a Xen
- user domain, say Yes and it will
- be accessible from within Linux. To compile this driver
- as a module, choose M here; the module will be called
- tpm_xen.
+ If you want to make TPM support available to a Xen user domain,
+ say Yes and it will be accessible from within Linux.
+ To compile this driver as a module, choose M here; the module
+ will be called tpm_xenu.
endmenu
diff -r e96f98f9c289 -r f6ebf236faee
linux-2.6-xen-sparse/drivers/char/tpm/Makefile
--- a/linux-2.6-xen-sparse/drivers/char/tpm/Makefile Thu May 11 11:33:07
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/Makefile Thu May 11 13:42:20
2006 +0100
@@ -8,4 +8,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
-obj-$(CONFIG_TCG_XEN) += tpm_xen.o tpm_vtpm.o
+obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
+tpm_xenu-y = tpm_xen.o tpm_vtpm.o
diff -r e96f98f9c289 -r f6ebf236faee
linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c
--- a/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c Thu May 11 11:33:07
2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/char/tpm/tpm_xen.c Thu May 11 13:42:20
2006 +0100
@@ -752,7 +752,6 @@ static void __exit tpmif_exit(void)
}
module_init(tpmif_init);
-module_exit(tpmif_exit);
MODULE_LICENSE("Dual BSD/GPL");
diff -r e96f98f9c289 -r f6ebf236faee
linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c Thu May 11
11:33:07 2006 +0100
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/tpmback.c Thu May 11
13:42:20 2006 +0100
@@ -1071,8 +1071,6 @@ static void __exit tpmback_exit(void)
misc_deregister(&vtpms_miscdevice);
}
-module_exit(tpmback_exit);
-
MODULE_LICENSE("Dual BSD/GPL");
/*
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
<Prev in Thread] |
Current Thread |
[Next in Thread> |
- [Xen-changelog] Fix the building of the Xen TPM driver as module and prevents front-,
Xen patchbot-unstable <=
|
|
|
|
|