1. 10 1月, 2009 11 次提交
    • L
      x86: make 'constant_test_bit()' take an unsigned bit number · c4295fbb
      Linus Torvalds 提交于
      Ingo noticed that using signed arithmetic seems to confuse the gcc
      inliner, and make it potentially decide that it's all too complicated.
      
      (Yeah, yeah, it's a constant. It's always positive. Still..)
      
      Based-on: Ingo Molnar <mingo@elte.hu>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c4295fbb
    • H
      parisc: introduce asm/swab.h · e245b80c
      Harvey Harrison 提交于
      Fix for the linux/byteorder.h removal.
      Signed-off-by: NHarvey Harrison <harvey.harrison@gmail.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e245b80c
    • A
      x86: only scan the root bus in early PCI quirks · 8659c406
      Andi Kleen 提交于
      We found a situation on Linus' machine that the Nvidia timer quirk hit on
      a Intel chipset system.  The problem is that the system has a fancy Nvidia
      card with an own PCI bridge, and the early-quirks code looking for any
      NVidia bridge triggered on it incorrectly.  This didn't lead a boot
      failure by luck, but the timer routing code selecting the wrong timer
      first and some ugly messages.  It might lead to real problems on other
      systems.
      
      I checked all the devices which are currently checked for by early_quirks
      and it turns out they are all located in the root bus zero.
      
      So change the early-quirks loop to only scan bus 0.  This incidently also
      saves quite some unnecessary scanning work, because early_quirks doesn't
      go through all the non root busses.
      
      The graphics card is not on bus 0, so it is not matched anymore.
      Signed-off-by: NAndi Kleen <ak@linux.intel.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8659c406
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile · 4ce5f241
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile: (31 commits)
        powerpc/oprofile: fix whitespaces in op_model_cell.c
        powerpc/oprofile: IBM CELL: add SPU event profiling support
        powerpc/oprofile: fix cell/pr_util.h
        powerpc/oprofile: IBM CELL: cleanup and restructuring
        oprofile: make new cpu buffer functions part of the api
        oprofile: remove #ifdef CONFIG_OPROFILE_IBS in non-ibs code
        ring_buffer: fix ring_buffer_event_length()
        oprofile: use new data sample format for ibs
        oprofile: add op_cpu_buffer_get_data()
        oprofile: add op_cpu_buffer_add_data()
        oprofile: rework implementation of cpu buffer events
        oprofile: modify op_cpu_buffer_read_entry()
        oprofile: add op_cpu_buffer_write_reserve()
        oprofile: rename variables in add_ibs_begin()
        oprofile: rename add_sample() in cpu_buffer.c
        oprofile: rename variable ibs_allowed to has_ibs in op_model_amd.c
        oprofile: making add_sample_entry() inline
        oprofile: remove backtrace code for ibs
        oprofile: remove unused ibs macro
        oprofile: remove unused components in struct oprofile_cpu_buffer
        ...
      4ce5f241
    • L
      Merge git://git.infradead.org/mtd-2.6 · 7c51d57e
      Linus Torvalds 提交于
      * git://git.infradead.org/mtd-2.6: (67 commits)
        [MTD] [MAPS] Fix printk format warning in nettel.c
        [MTD] [NAND] add cmdline parsing (mtdparts=) support to cafe_nand
        [MTD] CFI: remove major/minor version check for command set 0x0002
        [MTD] [NAND] ndfc driver
        [MTD] [TESTS] Fix some size_t printk format warnings
        [MTD] LPDDR Makefile and KConfig
        [MTD] LPDDR extended physmap driver to support LPDDR flash
        [MTD] LPDDR added new pfow_base parameter
        [MTD] LPDDR Command set driver
        [MTD] LPDDR PFOW definition
        [MTD] LPDDR QINFO records definitions
        [MTD] LPDDR qinfo probing.
        [MTD] [NAND] pxa3xx: convert from ns to clock ticks more accurately
        [MTD] [NAND] pxa3xx: fix non-page-aligned reads
        [MTD] [NAND] fix nandsim sched.h references
        [MTD] [NAND] alauda: use USB API functions rather than constants
        [MTD] struct device - replace bus_id with dev_name(), dev_set_name()
        [MTD] fix m25p80 64-bit divisions
        [MTD] fix dataflash 64-bit divisions
        [MTD] [NAND] Set the fsl elbc ECCM according the settings in bootloader.
        ...
      
      Fixed up trivial debug conflicts in drivers/mtd/devices/{m25p80.c,mtd_dataflash.c}
      7c51d57e
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · a3a798c8
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (94 commits)
        ACPICA: hide private headers
        ACPICA: create acpica/ directory
        ACPI: fix build warning
        ACPI : Use RSDT instead of XSDT by adding boot option of "acpi=rsdt"
        ACPI: Avoid array address overflow when _CST MWAIT hint bits are set
        fujitsu-laptop: Simplify SBLL/SBL2 backlight handling
        fujitsu-laptop: Add BL power, LED control and radio state information
        ACPICA: delete utcache.c
        ACPICA: delete acdisasm.h
        ACPICA: Update version to 20081204.
        ACPICA: FADT: Update error msgs for consistency
        ACPICA: FADT: set acpi_gbl_use_default_register_widths to TRUE by default
        ACPICA: FADT parsing changes and fixes
        ACPICA: Add ACPI_MUTEX_TYPE configuration option
        ACPICA: Fixes for various ACPI data tables
        ACPICA: Restructure includes into public/private
        ACPI: remove private acpica headers from driver files
        ACPI: reboot.c: use new acpi_reset interface
        ACPICA: New: acpi_reset interface - write to reset register
        ACPICA: Move all public H/W interfaces to new hwxface
        ...
      a3a798c8
    • T
      libata: use WARN_ON_ONCE on hot paths · efcb3cf7
      Tejun Heo 提交于
      Convert WARN_ON() on command issue/completion paths to WARN_ON_ONCE()
      so that libata doesn't spam the machine even when one of those
      conditions triggers repeatedly.
      Signed-off-by: NTejun Heo <tj@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      efcb3cf7
    • D
      CRED: Must initialise the new creds in prepare_kernel_cred() · 43529c97
      David Howells 提交于
      The newly allocated creds in prepare_kernel_cred() must be initialised
      before get_uid() and get_group_info() can access them.  They should be
      copied from the old credentials.
      Reported-by: NSteve Dickson <steved@redhat.com>
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NSteve Dickson <steved@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      43529c97
    • D
      CRED: Missing put_cred() in prepare_kernel_cred() · 0de33681
      David Howells 提交于
      Missing put_cred() in the error handling path of prepare_kernel_cred().
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      Acked-by: NSteve Dickson <steved@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0de33681
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6 · 29a41e9e
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/parisc-2.6:
        parisc: export length of os_hpmc vector
        parisc: fix kernel crash (protection id trap) when compiling ruby1.9
        parisc: Use DEFINE_SPINLOCK
        parisc: add uevent helper for parisc bus
        parisc: fix ipv6 checksum
        parisc: quiet palo not-found message from "which"
        parisc: Replace NR_CPUS in parisc code
        parisc: trivial fixes
        parisc: fix braino in commit adding __space_to_prot
        parisc: factor out sid to protid conversion
        parisc: use leX_to_cpu in place of __fswabX
        parisc: fix GFP_KERNEL use while atomic in unwinder
        parisc: remove dead BIO_VMERGE_BOUNDARY and BIO_VMERGE_MAX_SIZE definitions
        parisc: set_time() catch errors
        parisc: use the new byteorder headers
        parisc: drivers/parisc/: make code static
        parisc: lib/: make code static
      29a41e9e
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx · d9e8a3a5
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (22 commits)
        ioat: fix self test for multi-channel case
        dmaengine: bump initcall level to arch_initcall
        dmaengine: advertise all channels on a device to dma_filter_fn
        dmaengine: use idr for registering dma device numbers
        dmaengine: add a release for dma class devices and dependent infrastructure
        ioat: do not perform removal actions at shutdown
        iop-adma: enable module removal
        iop-adma: kill debug BUG_ON
        iop-adma: let devm do its job, don't duplicate free
        dmaengine: kill enum dma_state_client
        dmaengine: remove 'bigref' infrastructure
        dmaengine: kill struct dma_client and supporting infrastructure
        dmaengine: replace dma_async_client_register with dmaengine_get
        atmel-mci: convert to dma_request_channel and down-level dma_slave
        dmatest: convert to dma_request_channel
        dmaengine: introduce dma_request_channel and private channels
        net_dma: convert to dma_find_channel
        dmaengine: provide a common 'issue_pending_all' implementation
        dmaengine: centralize channel allocation, introduce dma_find_channel
        dmaengine: up-level reference counting to the module level
        ...
      d9e8a3a5
  2. 09 1月, 2009 29 次提交