1.1 --- a/xen/arch/x86/irq.c	Tue Nov 20 17:26:48 2007 +0000
     1.2 +++ b/xen/arch/x86/irq.c	Wed Nov 21 09:45:22 2007 +0000
     1.3 @@ -15,7 +15,6 @@
     1.4  #include <xen/keyhandler.h>
     1.5  #include <xen/compat.h>
     1.6  #include <asm/current.h>
     1.7 -#include <asm/smpboot.h>
     1.8  #include <asm/iommu.h>
     1.9  
    1.10  /* opt_noirqbalance: If true, software IRQ balancing/affinity is disabled. */

     2.1 --- a/xen/arch/x86/physdev.c	Tue Nov 20 17:26:48 2007 +0000
     2.2 +++ b/xen/arch/x86/physdev.c	Wed Nov 21 09:45:22 2007 +0000
     2.3 @@ -8,7 +8,6 @@
     2.4  #include <xen/event.h>
     2.5  #include <xen/guest_access.h>
     2.6  #include <asm/current.h>
     2.7 -#include <asm/smpboot.h>
     2.8  #include <asm/hypercall.h>
     2.9  #include <public/xen.h>
    2.10  #include <public/physdev.h>

     3.1 --- a/xen/arch/x86/smp.c	Tue Nov 20 17:26:48 2007 +0000
     3.2 +++ b/xen/arch/x86/smp.c	Wed Nov 21 09:45:22 2007 +0000
     3.3 @@ -18,7 +18,6 @@
     3.4  #include <asm/smp.h>
     3.5  #include <asm/mc146818rtc.h>
     3.6  #include <asm/flushtlb.h>
     3.7 -#include <asm/smpboot.h>
     3.8  #include <asm/hardirq.h>
     3.9  #include <asm/ipi.h>
    3.10  #include <asm/hvm/support.h>

     4.1 --- a/xen/include/asm-powerpc/smpboot.h	Tue Nov 20 17:26:48 2007 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,21 +0,0 @@
     4.4 -/*
     4.5 - * This program is free software; you can redistribute it and/or modify
     4.6 - * it under the terms of the GNU General Public License as published by
     4.7 - * the Free Software Foundation; either version 2 of the License, or
     4.8 - * (at your option) any later version.
     4.9 - *
    4.10 - * This program is distributed in the hope that it will be useful,
    4.11 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    4.12 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    4.13 - * GNU General Public License for more details.
    4.14 - *
    4.15 - * You should have received a copy of the GNU General Public License
    4.16 - * along with this program; if not, write to the Free Software
    4.17 - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
    4.18 - *
    4.19 - * Copyright (C) IBM Corp. 2005
    4.20 - *
    4.21 - * Authors: Jimi Xenidis <jimix@watson.ibm.com>
    4.22 - */
    4.23 -
    4.24 -#include "../asm-x86/smpboot.h"

     5.1 --- a/xen/include/asm-x86/smpboot.h	Tue Nov 20 17:26:48 2007 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,16 +0,0 @@
     5.4 -#ifndef __ASM_SMPBOOT_H
     5.5 -#define __ASM_SMPBOOT_H
     5.6 -
     5.7 -static inline unsigned long apicid_to_phys_cpu_present(int apicid)
     5.8 -{
     5.9 -	return 1UL << apicid;
    5.10 -}
    5.11 -
    5.12 -extern volatile int logical_apicid_2_cpu[];
    5.13 -extern volatile int cpu_2_logical_apicid[];
    5.14 -extern volatile int physical_apicid_2_cpu[];
    5.15 -extern volatile int cpu_2_physical_apicid[];
    5.16 -
    5.17 -#define boot_apicid_to_cpu(apicid) physical_apicid_2_cpu[apicid]
    5.18 -
    5.19 -#endif