1. 28 8月, 2007 6 次提交
    • H
      fix bogus hotplug cpu warning · d243769d
      Hugh Dickins 提交于
      Fix bogus DEBUG_PREEMPT warning on x86_64, when cpu brought online after
      bootup: current_is_keventd is right to note its use of smp_processor_id
      is preempt-safe, but should use raw_smp_processor_id to avoid the warning.
      Signed-off-by: NHugh Dickins <hugh@veritas.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      d243769d
    • H
      reverse CONFIG_ACPI_PROC_EVENT default · 721ebe00
      Hugh Dickins 提交于
      Sigh.  Again an ACPI assault on the Thinkpad's Fn+F4 to suspend to RAM.
      The default and text for CONFIG_THINKPAD_ACPI_INPUT_ENABLED were fixed
      in -rc3, but now commit 14e04fb3 ("ACPI:
      Schedule /proc/acpi/event for removal") introduces the ACPI_PROC_EVENT
      config entry, and defaults it to 'n' to disable it again.
      
      Change default to y, and add comment to make it clearer that n is for
      future distros.
      Signed-off-by: NHugh Dickins <hugh@veritas.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Len Brown <len.brown@intel.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      721ebe00
    • H
      fix maxcpus=N parsing · 81340977
      Hugh Dickins 提交于
      Commit 61ec7567 ('ACPI: boot correctly
      with "nosmp" or "maxcpus=0"') broke 'maxcpus=' handling on x86[-64].
      
      maxcpus=N is now having no effect on x86_64, and freezing bootup on i386
      (because of inconsistency with the separate maxcpus parsing down in
      arch/i386, I guess).  That's because early_param parsing is a little
      different from __setup parsing, and needs the "=" omitted: then it seems
      to work as the original commit intended (no mention of IO-APIC in
      /proc/interrupts when maxcpus=0).
      Signed-off-by: NHugh Dickins <hugh@veritas.com>
      Cc: Andrew Morton <akpm@linux-foundation.org>
      Cc: Len Brown <len.brown@intel.com>
      Cc: Andi Kleen <ak@suse.de>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      81340977
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 88ede820
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (60 commits)
        [MIPS] Fulong doesn't need ISA DMA.
        [MIPS] IP27: intr_sconnect_level: don't disable interrupts.
        [MIPS] IP27: startup_bridge_irq: connect interrupt.
        [MIPS] IP27: shutdown_bridge_irq: don't free irq.
        [MIPS] Sort out handling of ISA-less PCI systems.
        [MIPS] Add __cmpdi2
        [MIPS] HOTPLUG: Make register_pci_controller __devinit.
        [MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.
        [MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus.
        [MIPS] Delete duplicate inclusion of <linux/delay.h>.
        [MIPS] Polish <asm/edac.h>.
        [MIPS] IP22: Export sgi_gfxaddr for use by the Newport console driver.
        [MIPS] Maintain si_code field properly for FP exceptions
        [MIPS] SMTC: Fix duplicate status dumps on NMI
        [MIPS] Unconditionally writeback and invalidate caches on kexec.
        [PATCH] rtc: Make rtc-rs5c348 driver hotplug-aware
        [MIPS] Fix gcc 3.3 warning.
        [MIPS] Fix invalid semicolon after if statement
        [MIPS] Update Cobalt defconfig
        [MIPS] Update workpad_defconfig
        ...
      88ede820
    • L
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · 96665822
      Linus Torvalds 提交于
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix SLB initialization at boot time
        [POWERPC] Fix undefined reference to device_power_up/resume
        [POWERPC] cell: Update cell_defconfig for 2.6.23
        [POWERPC] axonram: Do not delete gendisks queue in error path
        [POWERPC] axonram: Module modification for latest firmware API changes
        [POWERPC] cell: Support pinhole-reset on IBM cell blades
        [POWERPC] spu_manage: Use newer physical-id attribute
        [POWERPC] pasemi: Another IOMMU bugfix for 64K PAGE_SIZE
      96665822
    • L
      Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · d96a2a5c
      Linus Torvalds 提交于
      * 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
        [PARISC] Add NOTES section
        [PARISC] Use compat_sys_getdents
        [PARISC] Do not allow STI_CONSOLE to be modular
        [PARISC] Clean up sti_flush
        [PARISC] Add dummy isa_(bus|virt)_to_(virt|bus) inlines
        [PARISC] Add empty <asm-parisc/vga.h>
      d96a2a5c
  2. 27 8月, 2007 34 次提交