summaryrefslogtreecommitdiffstats
path: root/module
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-03-17 14:55:59 -0700
committerBrian Behlendorf <[email protected]>2009-03-17 14:55:59 -0700
commit0cbaeb117ae0e77d05c7709a4f5dbfad9daa799f (patch)
tree81a09cc96cc7ad76168081200834ac03614fae82 /module
parente11d6c5f50ff1cb9a75f5c6a6895846f73564422 (diff)
Allow spl_config.h to be included by dependant packages
We need dependent packages to be able to include spl_config.h so they can leverage the configure checks the SPL has done. This is important because several of the spl headers need the results of these checks to work properly. Unfortunately, the autoheader build product is always private to a particular build and defined certain common things. (PACKAGE, VERSION, etc). This prevents other packages which also use autoheader from being include because the definitions conflict. To avoid this problem the SPL build system leverage AH_BOTTOM to include a spl_unconfig.h at the botton of the autoheader build product. This custom include undefs all known shared symbols to prevent the confict. This does however mean that those definition are also not availble to the SPL package either. The SPL package therefore uses the equivilant SPL_META_* definitions.
Diffstat (limited to 'module')
-rw-r--r--module/spl/spl-generic.c8
-rw-r--r--module/splat/splat-ctl.c4
2 files changed, 6 insertions, 6 deletions
diff --git a/module/spl/spl-generic.c b/module/spl/spl-generic.c
index c23abf6ff..76a8de472 100644
--- a/module/spl/spl-generic.c
+++ b/module/spl/spl-generic.c
@@ -43,7 +43,7 @@
#define DEBUG_SUBSYSTEM S_GENERIC
-char spl_version[16] = "SPL v" VERSION;
+char spl_version[16] = "SPL v" SPL_META_VERSION;
long spl_hostid = 0;
EXPORT_SYMBOL(spl_hostid);
@@ -340,7 +340,7 @@ static int __init spl_init(void)
if ((rc = set_kallsyms_lookup_name()))
GOTO(out7, rc = -EADDRNOTAVAIL);
- printk("SPL: Loaded Solaris Porting Layer v%s\n", VERSION);
+ printk("SPL: Loaded Solaris Porting Layer v%s\n", SPL_META_VERSION);
RETURN(rc);
out7:
kstat_fini();
@@ -358,7 +358,7 @@ out:
debug_fini();
printk("SPL: Failed to Load Solaris Porting Layer v%s, "
- "rc = %d\n", VERSION, rc);
+ "rc = %d\n", SPL_META_VERSION, rc);
return rc;
}
@@ -366,7 +366,7 @@ static void spl_fini(void)
{
ENTRY;
- printk("SPL: Unloaded Solaris Porting Layer v%s\n", VERSION);
+ printk("SPL: Unloaded Solaris Porting Layer v%s\n", SPL_META_VERSION);
kstat_fini();
proc_fini();
vn_fini();
diff --git a/module/splat/splat-ctl.c b/module/splat/splat-ctl.c
index d7aed023c..2ff62ffb0 100644
--- a/module/splat/splat-ctl.c
+++ b/module/splat/splat-ctl.c
@@ -638,7 +638,7 @@ splat_init(void)
NULL, SPLAT_NAME);
printk(KERN_INFO "SPLAT: Loaded Solaris Porting LAyer "
- "Tests v%s\n", VERSION);
+ "Tests v%s\n", SPL_META_VERSION);
return 0;
error:
printk(KERN_ERR "SPLAT: Error registering splat device, %d\n", rc);
@@ -671,7 +671,7 @@ splat_fini(void)
ASSERT(list_empty(&splat_module_list));
printk(KERN_INFO "SPLAT: Unloaded Solaris Porting LAyer "
- "Tests v%s\n", VERSION);
+ "Tests v%s\n", SPL_META_VERSION);
}
module_init(splat_init);