[master] 218d4fb The params pointer itself is not volatile, only what it points to.

[Poul-Henning Kamp]

commit 218d4fb0b434f346e3ed27652d3525810b9a7d32
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue May 24 07:09:05 2011 +0000

    The params pointer itself is not volatile, only what it points to.

diff --git a/bin/varnishd/heritage.h b/bin/varnishd/heritage.h
index 2198b59..ad3b363 100644
--- a/bin/varnishd/heritage.h
+++ b/bin/varnishd/heritage.h
@@ -214,7 +214,7 @@ struct params {
  * We declare this a volatile pointer, so that reads of parameters
  * become atomic, leaving the CLI thread lattitude to change the values
  */
-extern volatile struct params * volatile params;
+extern volatile struct params * params;
 extern struct heritage heritage;
 
 void child_main(void);
diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
index 5bcea1a..b36f28c 100644
--- a/bin/varnishd/varnishd.c
+++ b/bin/varnishd/varnishd.c
@@ -71,7 +71,7 @@
 #endif
 
 struct heritage		heritage;
-volatile struct params	* volatile params;
+volatile struct params	*params;
 unsigned		d_flag = 0;
 pid_t			mgt_pid;
 struct vev_base		*mgt_evb;