]> git.hungrycats.org Git - linux/commitdiff
ia64: Sync with 2.5.64.
authorDavid Mosberger <davidm@tiger.hpl.hp.com>
Thu, 6 Mar 2003 05:34:32 +0000 (21:34 -0800)
committerDavid Mosberger <davidm@tiger.hpl.hp.com>
Thu, 6 Mar 2003 05:34:32 +0000 (21:34 -0800)
1  2 
arch/ia64/ia32/sys_ia32.c
arch/ia64/kernel/irq.c
arch/ia64/kernel/perfmon.c
arch/ia64/kernel/signal.c
arch/ia64/kernel/smp.c
arch/ia64/kernel/time.c
arch/ia64/mm/hugetlbpage.c
arch/ia64/sn/kernel/setup.c
include/asm-ia64/mmzone.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index bf603c14232846c793a1c4bd485049d94ced07c8,6db7474cf811194c0c413e527080600df5b5cfa7..4d76e2193854c30badb64c5a2056ab8032480b86
@@@ -25,9 -25,9 +25,9 @@@
  #include <asm/system.h>
  
  extern unsigned long wall_jiffies;
- extern unsigned long last_time_offset;
+ extern unsigned long last_nsec_offset;
  
 -u64 jiffies_64;
 +u64 jiffies_64 = INITIAL_JIFFIES;
  
  #ifdef CONFIG_IA64_DEBUG_IRQ
  
Simple merge
Simple merge
Simple merge