# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1251709718 -3600
# Node ID 030fb43b848ac008912197858084260d7ea8b77b
# Parent 709a42e8514688b5c955fef4472de7553e6d7544
x86: properly __init-annotate time.c
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
xen/arch/x86/time.c | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff -r 709a42e85146 -r 030fb43b848a xen/arch/x86/time.c
--- a/xen/arch/x86/time.c Mon Aug 31 10:06:53 2009 +0100
+++ b/xen/arch/x86/time.c Mon Aug 31 10:08:38 2009 +0100
@@ -33,7 +33,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;
@@ -391,13 +391,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",
@@ -416,7 +416,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();
@@ -435,7 +435,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",
@@ -470,7 +470,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;
@@ -478,7 +478,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;
@@ -500,7 +500,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",
@@ -524,7 +524,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;
@@ -532,7 +532,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",
@@ -638,9 +638,9 @@ static void resume_platform_timer(void)
plt_stamp = plt_src.read_counter();
}
-static void init_platform_timer(void)
-{
- static struct platform_timesource * const plt_timers[] = {
+static void __init init_platform_timer(void)
+{
+ static struct platform_timesource * __initdata plt_timers[] = {
&plt_cyclone, &plt_hpet, &plt_pmtimer, &plt_pit
};
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home