diff options
| author | Andi Kleen <ak@muc.de> | 2003-02-21 23:48:01 -0800 |
|---|---|---|
| committer | Adam Belay <ambx1@neo.rr.com> | 2003-02-21 23:48:01 -0800 |
| commit | 0af95031265eab131a50dea77cfddecc67973dba (patch) | |
| tree | 006215b7d9700dfd3b046e613909c40f93cc5beb | |
| parent | b5f3160ff3ebad1c79efd6a999dd85c20c1edfbf (diff) | |
[PATCH] Fix some 64bit warnings
Fix some annoying warnings that happen on x86-64.
- Predeclare pt_regs in binfmts.h. For some reason it isn't included
implicitely there.
- use unsigned long, not long for interrupt flags in posix-timers.c
| -rw-r--r-- | include/linux/binfmts.h | 2 | ||||
| -rw-r--r-- | kernel/posix-timers.c | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/include/linux/binfmts.h b/include/linux/binfmts.h index bd929e344d75..b51f0cbc76e4 100644 --- a/include/linux/binfmts.h +++ b/include/linux/binfmts.h @@ -3,6 +3,8 @@ #include <linux/capability.h> +struct pt_regs; + /* * MAX_ARG_PAGES defines the number of pages allocated for arguments * and envelope for the new program. 32 should suffice, this gives diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index 926b9f8fa8bb..95ada3e0f563 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c @@ -154,8 +154,8 @@ static int do_posix_gettime(struct k_clock *clock, struct timespec *tp); int do_posix_clock_monotonic_gettime(struct timespec *tp); int do_posix_clock_monotonic_settime(struct timespec *tp); -static struct k_itimer *lock_timer(timer_t timer_id, long *flags); -static inline void unlock_timer(struct k_itimer *timr, long flags); +static struct k_itimer *lock_timer(timer_t timer_id, unsigned long *flags); +static inline void unlock_timer(struct k_itimer *timr, unsigned long flags); /* * Initialize everything, well, just everything in Posix clocks/timers ;) @@ -266,7 +266,7 @@ do_schedule_next_timer(struct siginfo *info) { struct k_itimer *timr; - long flags; + unsigned long flags; timr = lock_timer(info->si_tid, &flags); @@ -347,7 +347,7 @@ static void posix_timer_fn(unsigned long __data) { struct k_itimer *timr = (struct k_itimer *) __data; - long flags; + unsigned long flags; spin_lock_irqsave(&timr->it_lock, flags); timer_notify_task(timr); @@ -561,7 +561,7 @@ good_timespec(const struct timespec *ts) } static inline void -unlock_timer(struct k_itimer *timr, long flags) +unlock_timer(struct k_itimer *timr, unsigned long flags) { spin_unlock_irqrestore(&timr->it_lock, flags); } @@ -576,7 +576,7 @@ unlock_timer(struct k_itimer *timr, long flags) */ static struct k_itimer * -lock_timer(timer_t timer_id, long *flags) +lock_timer(timer_t timer_id, unsigned long *flags) { struct k_itimer *timr; /* @@ -668,7 +668,7 @@ sys_timer_gettime(timer_t timer_id, struct itimerspec *setting) { struct k_itimer *timr; struct itimerspec cur_setting; - long flags; + unsigned long flags; timr = lock_timer(timer_id, &flags); if (!timr) |