x86 fixes for 2.6.33-rc4
H. Peter Anvin
reviewerHi Linus,
The following changes since commit 2c1f1895ef2aa8f0e5497893eff71304aef332e1:
Linus Torvalds (1):
Merge branch 'drm-linus' of git://git.kernel.org/.../airlied/drm-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip.git x86-fixes-for-linus
Heiko Carstens (1):
x86: copy_from_user() should not return -EFAULT
Rusty Russell (1):
Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"
Suresh Siddha (1):
x86, irq: Check move_in_progress before freeing the vector mapping
Yinghai Lu (2):
x86: Fix size for ex trampoline with 32bit x86/pci: Intel ioh bus num reg accessing fix
arch/x86/Kconfig.cpu | 2 +- arch/x86/include/asm/uaccess_32.h | 5 ++--- arch/x86/include/asm/uaccess_64.h | 5 ++--- arch/x86/kernel/apic/io_apic.c | 7 +++++++ arch/x86/kernel/e820.c | 4 ++-- arch/x86/pci/intel_bus.c | 4 ++++ 6 files changed, 18 insertions(+), 9 deletions(-)
arch/x86/Kconfig.cpu +1 -1
@@ -396,7 +396,7 @@ config X86_TSC config X86_CMPXCHG64 def_bool y - depends on !M386 && !M486 + depends on X86_PAE || X86_64 || MCORE2 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MATOM # this should be set for all -march=.. options where the compiler # generates cmov.
arch/x86/include/asm/uaccess_32.h +2 -3
@@ -205,14 +205,13 @@ static inline unsigned long __must_check copy_from_user(void *to, unsigned long n) {int sz =__compiletime_object_size (to); -int ret = -EFAULT ;if (likely (sz ==-1 || sz >= n)) - ret =_copy_from_user (to, from, n); + n =_copy_from_user (to, from, n);else copy_from_user_overflow (); -return ret; +return n; } long __must_check strncpy_from_user(char *dst, const char __user *src,
arch/x86/include/asm/uaccess_64.h +2 -3
@@ -30,16 +30,15 @@ static inline unsigned long __must_check copy_from_user(void *to, unsigned long n) {int sz =__compiletime_object_size (to); -int ret = -EFAULT ;might_fault ();if (likely (sz ==-1 || sz >= n)) - ret =_copy_from_user (to, from, n); + n =_copy_from_user (to, from, n);#ifdef CONFIG_DEBUG_VM else WARN(1, "Buffer overflow detected!\n");#endif -return ret; +return n; } static __always_inline __must_check
arch/x86/kernel/apic/io_apic.c +7 -0
@@ -2434,6 +2434,13 @@ asmlinkage void smp_irq_move_cleanup_interrupt(void) cfg =irq_cfg (irq);raw_spin_lock (&desc->lock); +/* +* Check if the irq migration is in progress. If so, we +* haven't received the cleanup request yet for this irq. +*/ +if (cfg->move_in_progress) + goto unlock; +if (vector == cfg->vector &&cpumask_test_cpu (me, cfg->domain)) goto unlock;
arch/x86/kernel/e820.c +2 -2
@@ -733,13 +733,13 @@ struct early_res { };static struct early_res early_res[MAX_EARLY_RES ]__initdata = { {0 ,PAGE_SIZE ,"BIOS data page" ,1 },/* BIOS data page */ -#ifdef CONFIG_X86_32 +#if defined(CONFIG_X86_32) && defined(CONFIG_X86_TRAMPOLINE)/* * But first pinch a few for the stack/trampoline stuff * FIXME: Don't need the extra page at 4K, but need to fix * trampoline before removing it. (see the GDT stuff) */ - {PAGE_SIZE ,PAGE_SIZE ,"EX TRAMPOLINE" ,1 }, + {PAGE_SIZE ,PAGE_SIZE +PAGE_SIZE ,"EX TRAMPOLINE" ,1 }, #endif {}
arch/x86/pci/intel_bus.c +4 -0
@@ -49,6 +49,10 @@ static void __devinit pci_root_bus_res(struct pci_dev *dev)u64 mmioh_base, mmioh_end;int bus_base, bus_end; +/* some sys doesn't get mmconf enabled */ +if (dev->cfg_size <0x120 ) +return ; +if (pci_root_num >=PCI_ROOT_NR ) {printk (KERN_DEBUG "intel_bus.c: PCI_ROOT_NR is too small\n" );return ;