diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index b6fc1f5e124039ebcd3e4c43935d4400ef1ede16..f60fac75ad0a654136f0413a722ca92901859be1 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -9,6 +9,9 @@
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License or (at your optional) any later version of the license.
+ *
+ * The Linux Foundation chooses to take subject only to the GPLv2 license
+ * terms, and distributes only under these terms.
  */
 
 #define pr_fmt(fmt) "cma: " fmt
@@ -52,8 +55,8 @@ static struct cma_area {
 	phys_addr_t base;
 	unsigned long size;
 	struct cma *cma;
-} cma_areas[MAX_CMA_AREAS] __initdata;
-static unsigned cma_area_count __initdata;
+} cma_areas[MAX_CMA_AREAS];
+static unsigned cma_area_count;
 
 
 static struct cma_map {