ia64/linux-2.6.18-xen.hg

changeset 464:8c6d994a3f79

Fix section type conflict in hrtimer.c

Backport from git d316c57ff6bfad9557462b9100f25c6260d2b774

Signed-off-by: Aron Griffis <aron@hp.com>
author Keir Fraser <keir.fraser@citrix.com>
date Mon Mar 03 11:02:08 2008 +0000 (2008-03-03)
parents 2233e5a04c90
children 1cf7ba68d855
files kernel/hrtimer.c
line diff
     1.1 --- a/kernel/hrtimer.c	Mon Mar 03 11:01:56 2008 +0000
     1.2 +++ b/kernel/hrtimer.c	Mon Mar 03 11:02:08 2008 +0000
     1.3 @@ -59,7 +59,7 @@ static ktime_t ktime_get(void)
     1.4   *
     1.5   * returns the time in ktime_t format
     1.6   */
     1.7 -static ktime_t ktime_get_real(void)
     1.8 +ktime_t ktime_get_real(void)
     1.9  {
    1.10  	struct timespec now;
    1.11