Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8e78234 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-fixes-for-linus' of... 

Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (27 commits)
  x86: mpparse.c fix style problems
  x86: nmi.c fix style problems
  x86: ldt.c fix style problems
  x86: cpuid.c fix style problems
  x86, UV: remove erroneous BAU initialization
  x86: fix incorrect __read_mostly on _boot_cpu_pda
  x86: convert permanent_kmaps_init() from macro to inline
  x86: early_printk - use sizeof instead of hardcoded number
  x86: xsave.c: restore_user_xstate should be static
  x86: uv_bau.h: fix dubious bitfield
  x86: apic.c: xapic_icr_read and x2apic_icr_read should be static
  x86: bios_uv.c: uv_systab should be static
  x86: genx2apic_phys.c: x2apic_send_IPI_self and init_x2apic_ldr should be static
  x86: amd_iommu.c: prealloc_protection_domains should be static
  x86: amd_iommu_init.c: iommu_enable and iommu_enable_event_logging should be static
  x86, pci: move arch/x86/pci/pci.h to arch/x86/include/asm/pci_x86.h
  x86_64: pci-gart_64.c iommu_fullflush should be static
  x86: efi.c declare add_efi_memmap before they get used
  x86: io_apic.c io_apic_sync should be static
  x86: apic.c declare pic_mode before they get used
  ...
parents 6680598b 47dabdc7

arch/x86/ia32/ia32_signal.c

+1 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);