From 1db22516176beacd43b92d8823de421e5b1ffa5a Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 21 Jan 2008 17:18:24 -0800
Subject: [PATCH] --- yaml --- r: 75598 b: refs/heads/master c:
 0ec160dd48b666ddef39d639323d0da26d0b710d h: refs/heads/master v: v3

---
 [refs]                 | 2 +-
 trunk/kernel/hrtimer.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 48511b625240..a4474c2760e0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5569a565f7315fe7241cf963f2cc74e53871e11
+refs/heads/master: 0ec160dd48b666ddef39d639323d0da26d0b710d
diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c
index e65dd0b47cdc..f994bb8065e6 100644
--- a/trunk/kernel/hrtimer.c
+++ b/trunk/kernel/hrtimer.c
@@ -1378,7 +1378,7 @@ sys_nanosleep(struct timespec __user *rqtp, struct timespec __user *rmtp)
 /*
  * Functions related to boot-time initialization:
  */
-static void __devinit init_hrtimers_cpu(int cpu)
+static void __cpuinit init_hrtimers_cpu(int cpu)
 {
 	struct hrtimer_cpu_base *cpu_base = &per_cpu(hrtimer_bases, cpu);
 	int i;