mkexec/2.0/2.6/include/linux cpus.h,1.7,1.8

[Itsuro O. <od...@us...>]

Update of /cvsroot/mkdump/mkexec/2.0/2.6/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17361/include/linux

Modified Files:
	cpus.h 
Log Message:
for x86_64 before 2.6.9


Index: cpus.h
===================================================================
RCS file: /cvsroot/mkdump/mkexec/2.0/2.6/include/linux/cpus.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cpus.h	11 Jan 2006 00:09:35 -0000	1.7
--- cpus.h	9 Feb 2006 23:46:17 -0000	1.8
***************
*** 51,60 ****
  #define ARCH_BAD_APICID         (0xffff)
  #error "FIXME: convert_apicid_to_cpu() u8 type broken for ia64"
! #elif defined(CONFIG_x86_64) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9))
  #define arch_cpu_to_apicid      x86_cpu_to_apicid
  #define ARCH_BAD_APICID         (0xff)
  #endif
  
! #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9))
  static inline u8 convert_apicid_to_cpu(u16 apic_id)
  {
--- 51,60 ----
  #define ARCH_BAD_APICID         (0xffff)
  #error "FIXME: convert_apicid_to_cpu() u8 type broken for ia64"
! #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9)
  #define arch_cpu_to_apicid      x86_cpu_to_apicid
  #define ARCH_BAD_APICID         (0xff)
  #endif
  
! #if defined(CONFIG_IA64) || (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 9))
  static inline u8 convert_apicid_to_cpu(u16 apic_id)
  {
***************
*** 81,85 ****
  	return convert_apicid_to_cpu(apic_id);
  }
! #else /* i386, before 2.6.9 */
  #define get_processor_id() smp_processor_id()
  #define convert_apicid_to_cpu(apic_id) (0xff)
--- 81,85 ----
  	return convert_apicid_to_cpu(apic_id);
  }
! #else /* before 2.6.9 */
  #define get_processor_id() smp_processor_id()
  #define convert_apicid_to_cpu(apic_id) (0xff)