Update of /cvsroot/mkdump/mkexec/2.0/2.6/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14423/include/linux
Modified Files:
cpus.h
Log Message:
for debian
Index: cpus.h
===================================================================
RCS file: /cvsroot/mkdump/mkexec/2.0/2.6/include/linux/cpus.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** cpus.h 10 Jan 2006 00:40:35 -0000 1.5
--- cpus.h 11 Jan 2006 00:03:09 -0000 1.6
***************
*** 45,59 ****
#include <linux/smp.h>
#ifdef CONFIG_IA64
#define arch_cpu_to_apicid ia64_cpu_to_sapicid
#define ARCH_BAD_APICID (0xffff)
#error "FIXME: convert_apicid_to_cpu() u8 type broken for ia64"
! #else
#define arch_cpu_to_apicid x86_cpu_to_apicid
#define ARCH_BAD_APICID (0xff)
#endif
! #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) || defined(CONFIG_X86)
!
static inline u8 convert_apicid_to_cpu(u16 apic_id)
{
--- 45,61 ----
#include <linux/smp.h>
+ #if defined(CONFIG_IA64) || defined(CONFIG_X86_64) || defined(CONFIG_X86)
+
#ifdef CONFIG_IA64
#define arch_cpu_to_apicid ia64_cpu_to_sapicid
#define ARCH_BAD_APICID (0xffff)
#error "FIXME: convert_apicid_to_cpu() u8 type broken for ia64"
! #endif
! #if 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)
{
***************
*** 67,74 ****
}
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 9)) && defined(CONFIG_X86) && !defined(CONFIG_X86_64)
- /* i386, before 2.6.9 */
- #define get_processor_id() smp_processor_id()
- #else
/* Replacement for smp_processor_id() as on i386
* its 'current_thread_info()->cpu' gets corrupted during a stack overflow.
--- 69,72 ----
***************
*** 84,87 ****
--- 82,87 ----
return convert_apicid_to_cpu(apic_id);
}
+ #else /* i386, before 2.6.9 */
+ #define get_processor_id() smp_processor_id()
#endif
|
