Xen devel - Aug 2009 - [PATCH] x86: properly __init-annotate time.c

Signed-off-by: Jan Beulich <jbeulich@novell.com>

--- 2009-08-18.orig/xen/arch/x86/time.c	2009-07-15 16:34:17.000000000 +0200
+++ 2009-08-18/xen/arch/x86/time.c	2009-08-24 17:37:15.000000000 +0200
@@ -32,7 +32,7 @@
 #include <io_ports.h>
 
 /* opt_clocksource: Force clocksource to one of: pit, hpet, cyclone, acpi. */
-static char opt_clocksource[10];
+static char __initdata opt_clocksource[10];
 string_param("clocksource", opt_clocksource);
 
 int opt_softtsc;
@@ -387,13 +387,13 @@ static u64 read_pit_count(void)
     return count32;
 }
 
-static int init_pit(struct platform_timesource *pts)
+static int __init init_pit(struct platform_timesource *pts)
 {
     using_pit = 1;
     return 1;
 }
 
-static struct platform_timesource plt_pit +static struct platform_timesource
__initdata plt_pit  {
     .id = "pit",
     .name = "PIT",
@@ -412,7 +412,7 @@ static u64 read_hpet_count(void)
     return hpet_read32(HPET_COUNTER);
 }
 
-static int init_hpet(struct platform_timesource *pts)
+static int __init init_hpet(struct platform_timesource *pts)
 {
     u64 hpet_rate = hpet_setup();
 
@@ -431,7 +431,7 @@ static void resume_hpet(struct platform_
     pts->frequency = hpet_rate;
 }
 
-static struct platform_timesource plt_hpet +static struct platform_timesource
__initdata plt_hpet  {
     .id = "hpet",
     .name = "HPET",
@@ -466,7 +466,7 @@ static u64 read_cyclone_count(void)
     return *cyclone_timer;
 }
 
-static volatile u32 *map_cyclone_reg(unsigned long regaddr)
+static volatile u32 *__init map_cyclone_reg(unsigned long regaddr)
 {
     unsigned long pageaddr = regaddr &  PAGE_MASK;
     unsigned long offset   = regaddr & ~PAGE_MASK;
@@ -474,7 +474,7 @@ static volatile u32 *map_cyclone_reg(uns
     return (volatile u32 *)(fix_to_virt(FIX_CYCLONE_TIMER) + offset);
 }
 
-static int init_cyclone(struct platform_timesource *pts)
+static int __init init_cyclone(struct platform_timesource *pts)
 {
     u32 base;
     
@@ -496,7 +496,7 @@ static int init_cyclone(struct platform_
     return 1;
 }
 
-static struct platform_timesource plt_cyclone +static struct
platform_timesource __initdata plt_cyclone  {
     .id = "cyclone",
     .name = "IBM Cyclone",
@@ -520,7 +520,7 @@ static u64 read_pmtimer_count(void)
     return inl(pmtmr_ioport);
 }
 
-static int init_pmtimer(struct platform_timesource *pts)
+static int __init init_pmtimer(struct platform_timesource *pts)
 {
     if ( pmtmr_ioport == 0 )
         return 0;
@@ -528,7 +528,7 @@ static int init_pmtimer(struct platform_
     return 1;
 }
 
-static struct platform_timesource plt_pmtimer +static struct
platform_timesource __initdata plt_pmtimer  {
     .id = "acpi",
     .name = "ACPI PM Timer",
@@ -634,9 +634,9 @@ static void resume_platform_timer(void)
     plt_stamp = plt_src.read_counter();
 }
 
-static void init_platform_timer(void)
+static void __init init_platform_timer(void)
 {
-    static struct platform_timesource * const plt_timers[] = {
+    static struct platform_timesource * __initdata plt_timers[] = {
         &plt_cyclone, &plt_hpet, &plt_pmtimer, &plt_pit
     };
 




_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel