===== arch/ppc64/kernel/chrp_setup.c 1.47 vs edited =====
*** /home/moilanen/sbx/linux-2.6/BitKeeper/tmp/bk_chrp_setup.c-1.47_T8bKaF	2004-04-27 05:07:31 +00:00
--- arch/ppc64/kernel/chrp_setup.c	2004-06-09 16:38:23 +00:00
*************** chrp_progress(char *s, unsigned short he
*** 405,414 ****
  
  extern void setup_default_decr(void);
  
- /* Some sane defaults: 125 MHz timebase, 1GHz processor */
- #define DEFAULT_TB_FREQ		125000000UL
- #define DEFAULT_PROC_FREQ	(DEFAULT_TB_FREQ * 8)
- 
  void __init pSeries_calibrate_decr(void)
  {
  	struct device_node *cpu;
--- 405,410 ----
===== arch/ppc64/kernel/time.c 1.30 vs edited =====
*** /home/moilanen/sbx/linux-2.6/BitKeeper/tmp/bk_time.c-1.30_TupeZw	2004-05-31 17:41:03 +00:00
--- arch/ppc64/kernel/time.c	2004-06-09 16:38:24 +00:00
*************** static unsigned long first_settimeofday 
*** 81,87 ****
  
  #define XSEC_PER_SEC (1024*1024)
  
! unsigned long tb_ticks_per_jiffy;
  unsigned long tb_ticks_per_usec;
  unsigned long tb_ticks_per_sec;
  unsigned long next_xtime_sync_tb;
--- 81,87 ----
  
  #define XSEC_PER_SEC (1024*1024)
  
! unsigned long tb_ticks_per_jiffy = DEFAULT_TB_FREQ / HZ;
  unsigned long tb_ticks_per_usec;
  unsigned long tb_ticks_per_sec;
  unsigned long next_xtime_sync_tb;
===== include/asm-ppc64/eeh.h 1.10 vs edited =====
*** /home/moilanen/sbx/linux-2.6/BitKeeper/tmp/bk_eeh.h-1.10_XhZlsA	2004-06-01 09:27:13 +00:00
--- include/asm-ppc64/eeh.h	2004-06-09 16:38:28 +00:00
***************
*** 24,29 ****
--- 24,30 ----
  #include <linux/init.h>
  
  struct pci_dev;
+ struct device_node;
  
  /* I/O addresses are converted to EEH "tokens" such that a driver will cause
   * a bad page fault if the address is used directly (i.e. these addresses are
===== include/asm-ppc64/processor.h 1.45 vs edited =====
*** /home/moilanen/sbx/linux-2.6/BitKeeper/tmp/bk_processor.h-1.45_nCcpY2	2004-06-01 09:27:47 +00:00
--- include/asm-ppc64/processor.h	2004-06-09 16:38:28 +00:00
*************** GLUE(.,name):
*** 440,445 ****
--- 440,448 ----
  
  #endif /* __ASSEMBLY__ */
  
+ /* Some sane defaults: 125 MHz timebase, 1GHz processor */
+ #define DEFAULT_TB_FREQ		125000000UL
+ #define DEFAULT_PROC_FREQ	(DEFAULT_TB_FREQ * 8)
  
  /* Macros for setting and retrieving special purpose registers */
  
===== include/asm-ppc64/time.h 1.7 vs edited =====
*** /home/moilanen/sbx/linux-2.6/BitKeeper/tmp/bk_time.h-1.7_ZyJHwv	2002-06-10 02:37:26 +00:00
--- include/asm-ppc64/time.h	2004-06-09 16:38:28 +00:00
***************
*** 20,26 ****
--- 20,30 ----
  
  #include <asm/processor.h>
  #include <asm/paca.h>
+ #ifdef CONFIG_PPC_ISERIES
  #include <asm/iSeries/HvCall.h>
+ #endif
+ 
+ #define HAVE_ARCH_GET_TB
  
  /* time.c */
  extern unsigned long tb_ticks_per_jiffy;