x86 fixes
Linus,
Please pull the latest x86-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus
out-of-topic modifications in x86-fixes-for-linus:
--------------------------------------------------
drivers/pci/hotplug/cpqphp_core.c # 8248771: x86, pci: move arch/x86/pci/pci.h drivers/pci/hotplug/cpqphp_pci.c # 8248771: x86, pci: move arch/x86/pci/pci.h drivers/pci/hotplug/ibmphp_core.c # 8248771: x86, pci: move arch/x86/pci/pci.h
Thanks,
Ingo
------------------>
Cliff Wickman (1):
x86, UV: remove erroneous BAU initialization
Cyrill Gorcunov (2):
x86: mach-default setup.c cleanups
x86: early_printk - use sizeof instead of hardcoded number
H. Peter Anvin (1):
x86: unify the implementation of FPU traps
Ingo Brueckl (1):
x86: convert permanent_kmaps_init() from macro to inline
Ingo Molnar (1):
x86: clean up comment style in arch/x86/kernel/traps.c
Jaswinder Singh (2):
x86: reboot.c declare port_cf9_safe before they get used
x86: apic.c x2apic_preenabled and disable_x2apic should be static
Jaswinder Singh Rajput (17):
x86: introducing asm/sys_ia32.h
x86: apic.c declare pic_mode before they get used
x86: io_apic.c io_apic_sync should be static
x86: efi.c declare add_efi_memmap before they get used
x86_64: pci-gart_64.c iommu_fullflush should be static
x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
x86: amd_iommu_init.c: iommu_enable and iommu_enable_event_logging should be static
x86: amd_iommu.c: prealloc_protection_domains should be static
x86: genx2apic_phys.c: x2apic_send_IPI_self and init_x2apic_ldr should be static
x86: bios_uv.c: uv_systab should be static
x86: apic.c: xapic_icr_read and x2apic_icr_read should be static
x86: uv_bau.h: fix dubious bitfield
x86: xsave.c: restore_user_xstate should be static
x86: cpuid.c fix style problems
x86: ldt.c fix style problems
x86: nmi.c fix style problems
x86: mpparse.c fix style problems
Ravikiran G Thirumalai (1):
x86: fix incorrect __read_mostly on _boot_cpu_pda
Rusty Russell (1):
x86: remove impossible test in mtrr/main.c
arch/x86/ia32/ia32_signal.c | 3 +-
arch/x86/ia32/ipc32.c | 1 +
arch/x86/ia32/sys_ia32.c | 2 +-
arch/x86/include/asm/apic.h | 3 +-
arch/x86/include/asm/efi.h | 1 +
arch/x86/include/asm/mpspec.h | 2 +-
arch/x86/{pci/pci.h => include/asm/pci_x86.h} | 17 +++--
arch/x86/include/asm/sys_ia32.h | 101 +++++++++++++++++++++++++
arch/x86/include/asm/uv/uv_bau.h | 46 ++++++------
arch/x86/kernel/amd_iommu.c | 2 +-
arch/x86/kernel/amd_iommu_init.c | 4 +-
arch/x86/kernel/apic.c | 8 +-
arch/x86/kernel/bios_uv.c | 2 +-
arch/x86/kernel/cpu/mtrr/main.c | 6 +-
arch/x86/kernel/cpuid.c | 6 +-
arch/x86/kernel/early_printk.c | 2 +-
arch/x86/kernel/genx2apic_phys.c | 4 +-
arch/x86/kernel/head64.c | 2 +-
arch/x86/kernel/io_apic.c | 2 +-
arch/x86/kernel/ldt.c | 4 +-
arch/x86/kernel/mmconf-fam10h_64.c | 3 +-
arch/x86/kernel/mpparse.c | 10 +-
arch/x86/kernel/nmi.c | 3 +-
arch/x86/kernel/pci-gart_64.c | 2 +-
arch/x86/kernel/reboot.c | 2 +-
arch/x86/kernel/tlb_uv.c | 9 --
arch/x86/kernel/traps.c | 33 +++++----
arch/x86/kernel/xsave.c | 2 +-
arch/x86/mach-default/setup.c | 15 ++--
arch/x86/pci/acpi.c | 2 +-
arch/x86/pci/amd_bus.c | 2 +-
arch/x86/pci/common.c | 3 +-
arch/x86/pci/direct.c | 2 +-
arch/x86/pci/early.c | 2 +-
arch/x86/pci/fixup.c | 3 +-
arch/x86/pci/i386.c | 2 +-
arch/x86/pci/init.c | 2 +-
arch/x86/pci/irq.c | 3 +-
arch/x86/pci/legacy.c | 2 +-
arch/x86/pci/mmconfig-shared.c | 3 +-
arch/x86/pci/mmconfig_32.c | 2 +-
arch/x86/pci/mmconfig_64.c | 3 +-
arch/x86/pci/numaq_32.c | 2 +-
arch/x86/pci/olpc.c | 2 +-
arch/x86/pci/pcbios.c | 5 +-
arch/x86/pci/visws.c | 3 +-
drivers/pci/hotplug/cpqphp_core.c | 2 +-
drivers/pci/hotplug/cpqphp_pci.c | 2 +-
drivers/pci/hotplug/ibmphp_core.c | 2 +-
49 files changed, 217 insertions(+), 129 deletions(-)
rename arch/x86/{pci/pci.h => include/asm/pci_x86.h} (88%)
create mode 100644 arch/x86/include/asm/sys_ia32.harch/x86/ia32/ia32_signal.c +1 -2
@@ -24,15 +24,14 @@#include <asm/ucontext.h> #include <asm/uaccess.h> #include <asm/i387.h> -#include <asm/ia32.h> #include <asm/ptrace.h> #include <asm/ia32_unistd.h> #include <asm/user32.h> #include <asm/sigcontext32.h> #include <asm/proto.h> #include <asm/vdso.h> -#include <asm/sigframe.h> +#include <asm/sys_ia32.h> #define DEBUG_SIG 0
arch/x86/ia32/ipc32.c +1 -0
@@ -8,6 +8,7 @@#include <linux/shm.h> #include <linux/ipc.h> #include <linux/compat.h> +#include <asm/sys_ia32.h> asmlinkage long sys32_ipc (u32 call,int first,int second,int third,compat_uptr_t ptr,u32 fifth)
arch/x86/ia32/sys_ia32.c +1 -1
@@ -44,8 +44,8 @@#include <asm/types.h> #include <asm/uaccess.h> #include <asm/atomic.h> -#include <asm/ia32.h> #include <asm/vgtod.h> +#include <asm/sys_ia32.h> #define AA (__x) ((unsigned long)(__x))
arch/x86/include/asm/apic.h +1 -2
@@ -54,7 +54,6 @@ extern int disable_apic;extern int is_vsmp_box (void );extern void xapic_wait_icr_idle (void );extern u32 safe_xapic_wait_icr_idle (void ); -extern u64 xapic_icr_read (void );extern void xapic_icr_write (u32 ,u32 );extern int setup_profiling_timer (unsigned int );
@@ -93,7 +92,7 @@ static inline u32 native_apic_msr_read(u32 reg) }#ifndef CONFIG_X86_32 -extern int x2apic, x2apic_preenabled; +extern int x2apic;extern void check_x2apic (void );extern void enable_x2apic (void );extern void enable_IR_x2apic (void );
arch/x86/include/asm/efi.h +1 -0
@@ -90,6 +90,7 @@ extern void __iomem *efi_ioremap(unsigned long addr, unsigned long size);#endif /* CONFIG_X86_32 */ +extern int add_efi_memmap;extern void efi_reserve_early (void );extern void efi_call_phys_prelog (void );extern void efi_call_phys_epilog (void );
arch/x86/include/asm/mpspec.h +1 -1
@@ -6,13 +6,13 @@#include <asm/mpspec_def.h> extern int apic_version[MAX_APICS ]; +extern int pic_mode;#ifdef CONFIG_X86_32 #include <mach_mpspec.h> extern unsigned int def_to_bigsmp;extern u8 apicid_2_node[]; -extern int pic_mode;#ifdef CONFIG_X86_NUMAQ extern int mp_bus_id_to_node[MAX_MP_BUSSES ];
arch/x86/include/asm/pci_x86.h renamed from arch/x86/pci/pci.h +10 -7
@@ -57,7 +57,8 @@ extern struct pci_ops pci_root_ops;struct irq_info {u8 bus, devfn;/* Bus, device and function */ struct { -u8 link;/* IRQ line ID, chipset dependent, 0=not routed */ +u8 link;/* IRQ line ID, chipset dependent, +0 = not routed */ u16 bitmap;/* Available IRQs */ } __attribute__((packed)) irq[4 ];u8 slot;/* Slot number, 0=onboard */
@@ -69,11 +70,13 @@ struct irq_routing_table {u16 version;/* PIRQ_VERSION */ u16 size;/* Table size in bytes */ u8 rtr_bus, rtr_devfn;/* Where the interrupt router lies */ -u16 exclusive_irqs;/* IRQs devoted exclusively to PCI usage */ -u16 rtr_vendor, rtr_device;/* Vendor and device ID of interrupt router */ +u16 exclusive_irqs;/* IRQs devoted exclusively to +PCI usage */ +u16 rtr_vendor, rtr_device;/* Vendor and device ID of +interrupt router */ u32 miniport_data;/* Crap */ u8 rfu[11 ]; -u8 checksum;/* Modulo 256 checksum must give zero */ +u8 checksum;/* Modulo 256 checksum must give 0 */ struct irq_info slots[0 ]; } __attribute__((packed));
@@ -148,15 +151,15 @@ static inline unsigned int mmio_config_readl(void __iomem *pos)static inline void mmio_config_writeb (void __iomem *pos,u8 val) { - asmvolatile ("movb %%al,(%1)" ::"a" (val),"r" (pos) :"memory" ); + asmvolatile ("movb %%al,(%1)" : :"a" (val),"r" (pos) :"memory" ); }static inline void mmio_config_writew (void __iomem *pos,u16 val) { - asmvolatile ("movw %%ax,(%1)" ::"a" (val),"r" (pos) :"memory" ); + asmvolatile ("movw %%ax,(%1)" : :"a" (val),"r" (pos) :"memory" ); }static inline void mmio_config_writel (void __iomem *pos,u32 val) { - asmvolatile ("movl %%eax,(%1)" ::"a" (val),"r" (pos) :"memory" ); + asmvolatile ("movl %%eax,(%1)" : :"a" (val),"r" (pos) :"memory" ); }
arch/x86/include/asm/sys_ia32.h new file +101 -0
101 lines not on this page · raw message
arch/x86/include/asm/uv/uv_bau.h +23 -23
84 lines not on this page · raw message
arch/x86/kernel/amd_iommu.c +1 -1
@@ -1296,7 +1296,7 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask)* we don't need to preallocate the protection domains anymore. * For now we have to. */ -void prealloc_protection_domains (void ) +static void prealloc_protection_domains (void ) {struct pci_dev *dev =NULL ;struct dma_ops_domain *dma_dom;
arch/x86/kernel/amd_iommu_init.c +2 -2
@@ -243,7 +243,7 @@ static void __init iommu_feature_disable(struct amd_iommu *iommu, u8 bit) }/* Function to enable the hardware */ -void __init iommu_enable (struct amd_iommu *iommu) +static void __init iommu_enable (struct amd_iommu *iommu) { printk(KERN_INFO "AMD IOMMU: Enabling IOMMU " "at %02x:%02x.%x cap 0x%hx\n",
@@ -256,7 +256,7 @@ void __init iommu_enable(struct amd_iommu *iommu) }/* Function to enable IOMMU event logging and event interrupts */ -void __init iommu_enable_event_logging (struct amd_iommu *iommu) +static void __init iommu_enable_event_logging (struct amd_iommu *iommu) {iommu_feature_enable (iommu,CONTROL_EVT_LOG_EN );iommu_feature_enable (iommu,CONTROL_EVT_INT_EN );
arch/x86/kernel/apic.c +4 -4
@@ -98,8 +98,8 @@ __setup("apicpmtimer", setup_apicpmtimer);#ifdef HAVE_X2APIC int x2apic;/* x2apic enabled before OS handover */ -int x2apic_preenabled; -int disable_x2apic; +static int x2apic_preenabled; +static int disable_x2apic;static __init int setup_nox2apic (char *str) { disable_x2apic =1 ;
@@ -226,7 +226,7 @@ void xapic_icr_write(u32 low, u32 id)apic_write (APIC_ICR , low); } -u64 xapic_icr_read (void ) +static u64 xapic_icr_read (void ) {u32 icr1, icr2;
@@ -266,7 +266,7 @@ void x2apic_icr_write(u32 low, u32 id)wrmsrl (APIC_BASE_MSR + (APIC_ICR >>4 ), ((__u64 ) id) <<32 | low); } -u64 x2apic_icr_read (void ) +static u64 x2apic_icr_read (void ) {unsigned long val;
arch/x86/kernel/bios_uv.c +1 -1
@@ -25,7 +25,7 @@#include <asm/uv/bios.h> #include <asm/uv/uv_hub.h> -struct uv_systab uv_systab; +static struct uv_systab uv_systab;s64 uv_bios_call (enum uv_bios_cmd which,u64 a1,u64 a2,u64 a3,u64 a4,u64 a5) {
arch/x86/kernel/cpu/mtrr/main.c +2 -4
@@ -824,16 +824,14 @@ static int enable_mtrr_cleanup __initdata =static int __init disable_mtrr_cleanup_setup (char *str) { -if (enable_mtrr_cleanup !=-1 ) - enable_mtrr_cleanup =0 ; + enable_mtrr_cleanup =0 ;return 0 ; }early_param ("disable_mtrr_cleanup" , disable_mtrr_cleanup_setup);static int __init enable_mtrr_cleanup_setup (char *str) { -if (enable_mtrr_cleanup !=-1 ) - enable_mtrr_cleanup =1 ; + enable_mtrr_cleanup =1 ;return 0 ; }early_param ("enable_mtrr_cleanup" , enable_mtrr_cleanup_setup);
arch/x86/kernel/cpuid.c +3 -3
@@ -39,10 +39,10 @@#include <linux/device.h> #include <linux/cpu.h> #include <linux/notifier.h> +#include <linux/uaccess.h> #include <asm/processor.h> #include <asm/msr.h> -#include <asm/uaccess.h> #include <asm/system.h> static struct class *cpuid_class;
@@ -82,7 +82,7 @@ static loff_t cpuid_seek(struct file *file, loff_t offset, int orig) }static ssize_t cpuid_read (struct file *file,char __user *buf, -size_t count,loff_t * ppos) +size_t count,loff_t *ppos) {char __user *tmp = buf;struct cpuid_regs cmd;
@@ -117,7 +117,7 @@ static int cpuid_open(struct inode *inode, struct file *file)unsigned int cpu;struct cpuinfo_x86 *c;int ret =0 ; - +lock_kernel (); cpu =iminor (file->f_path.dentry->d_inode);
arch/x86/kernel/early_printk.c +1 -1
@@ -886,7 +886,7 @@ asmlinkage void early_printk(const char *fmt, ...)va_list ap;va_start (ap, fmt); - n =vscnprintf (buf,512 , fmt, ap); + n =vscnprintf (buf,sizeof (buf), fmt, ap); early_console->write (early_console, buf, n);va_end (ap); }
arch/x86/kernel/genx2apic_phys.c +2 -2
@@ -161,12 +161,12 @@ static unsigned int phys_pkg_id(int index_msb)return current_cpu_data.initial_apicid >> index_msb; } -void x2apic_send_IPI_self (int vector) +static void x2apic_send_IPI_self (int vector) {apic_write (APIC_SELF_IPI , vector); } -void init_x2apic_ldr (void ) +static void init_x2apic_ldr (void ) {return ; }
arch/x86/kernel/head64.c +1 -1
@@ -27,7 +27,7 @@#include <asm/trampoline.h> /* boot cpu pda */ -static struct x8664_pda _boot_cpu_pda__read_mostly ; +static struct x8664_pda _boot_cpu_pda;#ifdef CONFIG_SMP /*
arch/x86/kernel/io_apic.c +1 -1
@@ -706,7 +706,7 @@ static void __unmask_IO_APIC_irq(struct irq_cfg *cfg) }#ifdef CONFIG_X86_64 -void io_apic_sync (struct irq_pin_list *entry) +static void io_apic_sync (struct irq_pin_list *entry) {/* * Synchronize the IO-APIC and the CPU by doing
arch/x86/kernel/ldt.c +2 -2
@@ -12,8 +12,8 @@#include <linux/mm.h> #include <linux/smp.h> #include <linux/vmalloc.h> +#include <linux/uaccess.h> -#include <asm/uaccess.h> #include <asm/system.h> #include <asm/ldt.h> #include <asm/desc.h>
@@ -93,7 +93,7 @@ static inline int copy_ldt(mm_context_t *new, mm_context_t *old)if (err <0 )return err; -for (i =0 ; i < old->size; i++) +for (i =0 ; i < old->size; i++)write_ldt_entry (new->ldt, i, old->ldt + i *LDT_ENTRY_SIZE );return 0 ; }
arch/x86/kernel/mmconf-fam10h_64.c +1 -2
@@ -13,8 +13,7 @@#include <asm/msr.h> #include <asm/acpi.h> #include <asm/mmconfig.h> - -#include "../pci/pci.h" +#include <asm/pci_x86.h> struct pci_hostbridge_probe {u32 bus;
arch/x86/kernel/mpparse.c +5 -5
@@ -16,14 +16,14 @@#include <linux/bitops.h> #include <linux/acpi.h> #include <linux/module.h> +#include <linux/smp.h> +#include <linux/acpi.h> -#include <asm/smp.h> #include <asm/mtrr.h> #include <asm/mpspec.h> #include <asm/pgalloc.h> #include <asm/io_apic.h> #include <asm/proto.h> -#include <asm/acpi.h> #include <asm/bios_ebda.h> #include <asm/e820.h> #include <asm/trampoline.h>
@@ -95,8 +95,8 @@ static void __init MP_bus_info(struct mpc_config_bus *m)#endif if (strncmp (str,BUSTYPE_ISA ,sizeof (BUSTYPE_ISA ) -1 ) ==0 ) { -set_bit (m->mpc_busid, mp_bus_not_pci); -#if defined(CONFIG_EISA ) || defined (CONFIG_MCA ) +set_bit (m->mpc_busid, mp_bus_not_pci); +#if defined(CONFIG_EISA ) || defined(CONFIG_MCA ) mp_bus_id_to_type[m->mpc_busid] =MP_BUS_ISA ;#endif }else if (strncmp (str,BUSTYPE_PCI ,sizeof (BUSTYPE_PCI ) -1 ) ==0 ) {
@@ -104,7 +104,7 @@ static void __init MP_bus_info(struct mpc_config_bus *m) x86_quirks->mpc_oem_pci_bus (m);clear_bit (m->mpc_busid, mp_bus_not_pci); -#if defined(CONFIG_EISA ) || defined (CONFIG_MCA ) +#if defined(CONFIG_EISA ) || defined(CONFIG_MCA ) mp_bus_id_to_type[m->mpc_busid] = MP_BUS_PCI; }else if (strncmp (str,BUSTYPE_EISA ,sizeof (BUSTYPE_EISA ) -1 ) ==0 ) { mp_bus_id_to_type[m->mpc_busid] =MP_BUS_EISA ;
arch/x86/kernel/nmi.c +1 -2
@@ -26,11 +26,10 @@#include <linux/kernel_stat.h> #include <linux/kdebug.h> #include <linux/smp.h> +#include <linux/nmi.h> #include <asm/i8259.h> #include <asm/io_apic.h> -#include <asm/smp.h> -#include <asm/nmi.h> #include <asm/proto.h> #include <asm/timer.h>
arch/x86/kernel/pci-gart_64.c +1 -1
@@ -52,7 +52,7 @@ static u32 *iommu_gatt_base; /* Remapping table */* to trigger bugs with some popular PCI cards, in particular 3ware (but * has been also also seen with Qlogic at least). */ -int iommu_fullflush =1 ; +static int iommu_fullflush =1 ;/* Allocation bitmap for the remapping area: */ static DEFINE_SPINLOCK (iommu_bitmap_lock);
arch/x86/kernel/reboot.c +1 -1
@@ -12,6 +12,7 @@#include <asm/proto.h> #include <asm/reboot_fixups.h> #include <asm/reboot.h> +#include <asm/pci_x86.h> #include <asm/virtext.h> #ifdef CONFIG_X86_32
@@ -24,7 +25,6 @@#include <mach_ipi.h> -/* * Power off function, if any */
arch/x86/kernel/tlb_uv.c +0 -9
@@ -582,7 +582,6 @@ static int __init uv_ptc_init(void)static struct bau_control *__init uv_table_bases_init (int blade,int node) {int i; -int *ip;struct bau_msg_status *msp;struct bau_control *bau_tabp;
@@ -599,13 +598,6 @@ static struct bau_control * __init uv_table_bases_init(int blade, int node)bau_cpubits_clear (&msp->seen_by, (int )uv_blade_nr_possible_cpus (blade)); - bau_tabp->watching = -kmalloc_node (sizeof (int ) *DEST_NUM_RESOURCES ,GFP_KERNEL , node); -BUG_ON (!bau_tabp->watching); - -for (i =0 , ip = bau_tabp->watching; i <DEST_Q_SIZE ; i++, ip++) - *ip =0 ; - uv_bau_table_bases[blade] = bau_tabp;return bau_tabp;
@@ -628,7 +620,6 @@ uv_table_bases_finish(int blade, int node, int cur_cpu, bcp->bau_msg_head = bau_tablesp->va_queue_first; bcp->va_queue_first = bau_tablesp->va_queue_first; bcp->va_queue_last = bau_tablesp->va_queue_last; - bcp->watching = bau_tablesp->watching; bcp->msg_statuses = bau_tablesp->msg_statuses; bcp->descriptor_base = adp; }
arch/x86/kernel/traps.c +19 -14
@@ -292,8 +292,10 @@ dotraplinkage void do_double_fault(struct pt_regs *regs, long error_code) tsk->thread.error_code = error_code; tsk->thread.trap_no =8 ; -/* This is always a kernel trap and never fixable (and thus must -never return). */ +/* +* This is always a kernel trap and never fixable (and thus must +* never return). +*/ for (;;)die (str, regs, error_code); }
@@ -520,9 +522,11 @@ dotraplinkage void __kprobes do_int3(struct pt_regs *regs, long error_code) }#ifdef CONFIG_X86_64 -/* Help handler running on IST stack to switch back to user stack -for scheduling or signal handling. The actual stack switch is done in -entry.S */ +/* +* Help handler running on IST stack to switch back to user stack +* for scheduling or signal handling. The actual stack switch is done in +* entry.S +*/ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs) {struct pt_regs *regs = eregs;
@@ -532,8 +536,10 @@ asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs)/* Exception from user space */ else if (user_mode(eregs)) regs =task_pt_regs (current); -/* Exception from kernel and interrupts are enabled. Move to -kernel process stack. */ +/* +* Exception from kernel and interrupts are enabled. Move to +* kernel process stack. +*/ else if (eregs->flags & X86_EFLAGS_IF) regs = (struct pt_regs *)(eregs->sp -=sizeof (struct pt_regs ));if (eregs != regs)
@@ -685,12 +691,7 @@ void math_error(void __user *ip) cwd =get_fpu_cwd (task); swd =get_fpu_swd (task); - err = swd & ~cwd &0x3f ; - -#ifdef CONFIG_X86_32 -if (!err) -return ; -#endif + err = swd & ~cwd;if (err &0x001 ) {/* Invalid op */ /*
@@ -708,7 +709,11 @@ void math_error(void __user *ip) }else if (err &0x020 ) {/* Precision */ info.si_code =FPE_FLTRES ; }else { - info.si_code = __SI_FAULT|SI_KERNEL ;/* WTF? */ +/* +* If we're using IRQ 13, or supposedly even some trap 16 +* implementations, it's possible we get a spurious trap... +*/ +return ;/* Spurious trap, no error */ }force_sig_info (SIGFPE , &info, task); }
arch/x86/kernel/xsave.c +1 -1
@@ -159,7 +159,7 @@ int save_i387_xstate(void __user *buf)* Restore the extended state if present. Otherwise, restore the FP/SSE * state. */ -int restore_user_xstate (void __user *buf) +static int restore_user_xstate (void __user *buf) {struct _fpx_sw_bytes fx_sw_user;u64 mask;
arch/x86/mach-default/setup.c +7 -8
@@ -133,29 +133,28 @@ void __init time_init_hook(void)**/ void mca_nmi_hook (void ) { -/* If I recall correctly, there's a whole bunch of other things that +/* +* If I recall correctly, there's a whole bunch of other things that * we can do to check for NMI problems, but that's all I know about * at the moment. */ - -printk ("NMI generated from unknown source!\n" ); +pr_warning ("NMI generated from unknown source!\n" ); }#endif static __init int no_ipi_broadcast (char *str) {get_option (&str, &no_broadcast); -printk ("Using %s mode\n" , no_broadcast ?"No IPI Broadcast" : -"IPI Broadcast" ); +pr_info ("Using %s mode\n" , + no_broadcast ?"No IPI Broadcast" :"IPI Broadcast" );return 1 ; } -__setup ("no_ipi_broadcast=" , no_ipi_broadcast);static int __init print_ipi_mode (void ) { -printk ("Using IPI %s mode\n" , no_broadcast ?"No-Shortcut" : -"Shortcut" ); +pr_info ("Using IPI %s mode\n" , + no_broadcast ?"No-Shortcut" :"Shortcut" );return 0 ; }
arch/x86/pci/acpi.c +1 -1
@@ -4,7 +4,7 @@#include <linux/irq.h> #include <linux/dmi.h> #include <asm/numa.h> -#include "pci.h" +#include <asm/pci_x86.h> struct pci_root_info {char *name;
arch/x86/pci/amd_bus.c +1 -1
@@ -2,7 +2,7 @@#include <linux/pci.h> #include <linux/topology.h> #include <linux/cpu.h> -#include "pci.h" +#include <asm/pci_x86.h> #ifdef CONFIG_X86_64 #include <asm/pci-direct.h>
arch/x86/pci/common.c +1 -2
@@ -14,8 +14,7 @@#include <asm/segment.h> #include <asm/io.h> #include <asm/smp.h> - -#include "pci.h" +#include <asm/pci_x86.h> unsigned int pci_probe =PCI_PROBE_BIOS |PCI_PROBE_CONF1 |PCI_PROBE_CONF2 |PCI_PROBE_MMCONF ;
arch/x86/pci/direct.c +1 -1
@@ -5,7 +5,7 @@#include <linux/pci.h> #include <linux/init.h> #include <linux/dmi.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Functions for accessing PCI base (first 256 bytes) and extended
arch/x86/pci/early.c +1 -1
@@ -2,7 +2,7 @@#include <linux/pci.h> #include <asm/pci-direct.h> #include <asm/io.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Direct PCI access. This is used for PCI accesses in early boot before the PCI subsystem works. */
arch/x86/pci/fixup.c +1 -2
@@ -6,8 +6,7 @@#include <linux/dmi.h> #include <linux/pci.h> #include <linux/init.h> -#include "pci.h" - +#include <asm/pci_x86.h> static void __devinit pci_fixup_i450nx (struct pci_dev *d) {
arch/x86/pci/i386.c +1 -1
@@ -34,8 +34,8 @@#include <asm/pat.h> #include <asm/e820.h> +#include <asm/pci_x86.h> -#include "pci.h" static int skip_isa_ioresource_align (struct pci_dev *dev) {
arch/x86/pci/init.c +1 -1
@@ -1,6 +1,6 @@#include <linux/pci.h> #include <linux/init.h> -#include "pci.h" +#include <asm/pci_x86.h> /* arch_initcall has too random ordering, so call the initializers in the right sequence from here. */
arch/x86/pci/irq.c +1 -2
@@ -16,8 +16,7 @@#include <asm/io_apic.h> #include <linux/irq.h> #include <linux/acpi.h> - -#include "pci.h" +#include <asm/pci_x86.h> #define PIRQ_SIGNATURE (('$' << 0) + ('P' << 8) + ('I' << 16) + ('R' << 24))#define PIRQ_VERSION 0x0100
arch/x86/pci/legacy.c +1 -1
@@ -3,7 +3,7 @@*/ #include <linux/init.h> #include <linux/pci.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * Discover remaining PCI buses in case there are peer host bridges.
arch/x86/pci/mmconfig-shared.c +1 -2
@@ -15,8 +15,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* aperture is up to 256MB but BIOS may reserve less */ #define MMCONFIG_APER_MIN (2 * 1024*1024)
arch/x86/pci/mmconfig_32.c +1 -1
@@ -13,7 +13,7 @@#include <linux/init.h> #include <linux/acpi.h> #include <asm/e820.h> -#include "pci.h" +#include <asm/pci_x86.h> /* Assume systems with more busses have correct MCFG */ #define mmcfg_virt_addr ((void __iomem *) fix_to_virt(FIX_PCIE_MCFG))
arch/x86/pci/mmconfig_64.c +1 -2
@@ -10,8 +10,7 @@#include <linux/acpi.h> #include <linux/bitmap.h> #include <asm/e820.h> - -#include "pci.h" +#include <asm/pci_x86.h> /* Static virtual mapping of the MMCONFIG aperture */ struct mmcfg_virt {
arch/x86/pci/numaq_32.c +1 -1
@@ -7,7 +7,7 @@#include <linux/nodemask.h> #include <mach_apic.h> #include <asm/mpspec.h> -#include "pci.h" +#include <asm/pci_x86.h> #define XQUAD_PORTIO_BASE 0xfe400000#define XQUAD_PORTIO_QUAD 0x40000/* 256k per quad. */
arch/x86/pci/olpc.c +1 -1
@@ -29,7 +29,7 @@#include <linux/init.h> #include <asm/olpc.h> #include <asm/geode.h> -#include "pci.h" +#include <asm/pci_x86.h> /* * In the tables below, the first two line (8 longwords) are the
arch/x86/pci/pcbios.c +2 -3
@@ -6,9 +6,8 @@#include <linux/init.h> #include <linux/module.h> #include <linux/uaccess.h> -#include "pci.h" -#include "pci-functions.h" - +#include <asm/pci_x86.h> +#include <asm/mach-default/pci-functions.h> /* BIOS32 signature: "_32_" */ #define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24))
arch/x86/pci/visws.c +1 -2
@@ -9,11 +9,10 @@#include <linux/init.h> #include <asm/setup.h> +#include <asm/pci_x86.h> #include <asm/visws/cobalt.h> #include <asm/visws/lithium.h> -#include "pci.h" -static int pci_visws_enable_irq (struct pci_dev *dev) {return 0 ; }static void pci_visws_disable_irq (struct pci_dev *dev) { }
drivers/pci/hotplug/cpqphp_core.c +1 -1
@@ -45,7 +45,7 @@#include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */ +#include <asm/pci_x86.h> /* Global variables */
drivers/pci/hotplug/cpqphp_pci.c +1 -1
@@ -37,7 +37,7 @@#include "../pci.h" #include "cpqphp.h" #include "cpqphp_nvram.h" -#include "../../../arch/x86/pci/pci.h" /* horrible hack showing how processor dependent we are... */ +#include <asm/pci_x86.h> u8 cpqhp_nic_irq;
drivers/pci/hotplug/ibmphp_core.c +1 -1
@@ -35,7 +35,7 @@#include <linux/delay.h> #include <linux/wait.h> #include "../pci.h" -#include "../../../arch/x86/pci/pci.h" /* for struct irq_routing_table */ +#include <asm/pci_x86.h> /* for struct irq_routing_table */ #include "ibmphp.h" #define attn_on (sl) ibmphp_hpc_writeslot (sl, HPC_SLOT_ATTNON)