14 Jan, 2011

2 commits


12 Jan, 2011

7 commits

  • * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
    sparc64: Fix bootup regression due to perf init ordering.

    Linus Torvalds
     
  • * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (72 commits)
    powerpc/pseries: Fix build of topology stuff without CONFIG_NUMA
    powerpc/pseries: Fix VPHN build errors on non-SMP systems
    powerpc/83xx: add mpc8308_p1m DMA controller device-tree node
    powerpc/83xx: add DMA controller to mpc8308 device-tree node
    powerpc/512x: try to free dma descriptors in case of allocation failure
    powerpc/512x: add MPC8308 dma support
    powerpc/512x: fix the hanged dma transfer issue
    powerpc/512x: scatter/gather dma fix
    powerpc/powermac: Make auto-loading of therm_pm72 possible
    of/address: Use propper endianess in get_flags
    powerpc/pci: Use printf extension %pR for struct resource
    powerpc: Remove unnecessary casts of void ptr
    powerpc: Disable VPHN polling during a suspend operation
    powerpc/pseries: Poll VPA for topology changes and update NUMA maps
    powerpc: iommu: Add device name to iommu error printks
    powerpc: Record vma->phys_addr in ioremap()
    powerpc: Update compat_arch_ptrace
    powerpc: Fix PPC_PTRACE_SETHWDEBUG on PPC_BOOK3S
    powerpc/time: printk time stamp init not correct
    powerpc: Minor cleanups for machdep.h
    ...

    Linus Torvalds
     
  • Signed-off-by: Benjamin Herrenschmidt

    Benjamin Herrenschmidt
     
  • * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    microblaze: remove obsolete DEBUG_BOOTMEM
    microblaze: trivial: Fix removed the part of line
    microblaze: Fix __muldi3 function for little-endian.
    microblaze: Clear i/dcache for sw breakpoints
    microblaze: Remove useless early_init_dt_check_for_initrd
    microblaze: Fix unaligned exception for little endian platform
    microblaze: Add PVR for Microblaze v8.00.b
    microblaze: Correct PVR access macros
    Revert "microblaze: Simplify syscall rutine"
    microblaze: Fix initramfs
    arch/microblaze: Remove unnecessary semicolons

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
    x86: Fix Moorestown VRTC fixmap placement
    x86/gpio: Implement x86 gpio_to_irq convert function
    x86, UV: Fix APICID shift for Westmere processors
    x86: Use PCI method for enabling AMD extended config space before MSR method
    x86: tsc: Prevent delayed init if initial tsc calibration failed
    x86, lapic-timer: Increase the max_delta to 31 bits
    x86: Fix sparse non-ANSI function warnings in smpboot.c
    x86, numa: Fix CONFIG_DEBUG_PER_CPU_MAPS without NUMA emulation
    x86, AMD, PCI: Add AMD northbridge PCI device id for CPU families 12h and 14h
    x86, numa: Fix cpu to node mapping for sparse node ids
    x86, numa: Fake node-to-cpumask for NUMA emulation
    x86, numa: Fake apicid and pxm mappings for NUMA emulation
    x86, numa: Avoid compiling NUMA emulation functions without CONFIG_NUMA_EMU
    x86, numa: Reduce minimum fake node size to 32M

    Fix up trivial conflict in arch/x86/kernel/apic/x2apic_uv_x.c

    Linus Torvalds
     
  • …/git/tip/linux-2.6-tip

    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (28 commits)
    perf session: Fix infinite loop in __perf_session__process_events
    perf evsel: Support perf_evsel__open(cpus > 1 && threads > 1)
    perf sched: Use PTHREAD_STACK_MIN to avoid pthread_attr_setstacksize() fail
    perf tools: Emit clearer message for sys_perf_event_open ENOENT return
    perf stat: better error message for unsupported events
    perf sched: Fix allocation result check
    perf, x86: P4 PMU - Fix unflagged overflows handling
    dynamic debug: Fix build issue with older gcc
    tracing: Fix TRACE_EVENT power tracepoint creation
    tracing: Fix preempt count leak
    tracepoint: Add __rcu annotation
    tracing: remove duplicate null-pointer check in skb tracepoint
    tracing/trivial: Add missing comma in TRACE_EVENT comment
    tracing: Include module.h in define_trace.h
    x86: Save rbp in pt_regs on irq entry
    x86, dumpstack: Fix unused variable warning
    x86, NMI: Clean-up default_do_nmi()
    x86, NMI: Allow NMI reason io port (0x61) to be processed on any CPU
    x86, NMI: Remove DIE_NMI_IPI
    x86, NMI: Add priorities to handlers
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (39 commits)
    mmc: davinci: add support for SDIO irq handling
    mmc: fix division by zero in MMC core
    mmc: tmio_mmc: fix CMD irq handling
    mmc: tmio_mmc: handle missing HW interrupts
    mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc
    mmc: tmio_mmc: implement SDIO IRQ support
    mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers
    mmc: tmio_mmc: silence compiler warnings
    mmc: tmio_mmc: implement a bounce buffer for unaligned DMA
    mmc: tmio_mmc: merge the private header into the driver
    mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure
    mmc: tmio_mmc: allow multi-element scatter-gather lists
    mmc: Register debugfs dir before calling card probe function.
    mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK.
    mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan.
    mmc: Fix sd/sdio/mmc initialization frequency retries
    mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap
    mmc: dw_mmc: Add Synopsys DesignWare mmc host driver.
    mmc: add sdhci-tegra driver for Tegra SoCs
    mmc: sdhci: add quirk for max len ADMA descriptors
    ...

    Linus Torvalds
     

11 Jan, 2011

21 commits

  • The x86 fixmaps need to be all together... unfortunately the
    VRTC one was misplaced.

    This patch makes sure the MRST VRTC fixmap is put prior to the
    __end_of_permanent_fixed_addresses marker.

    Signed-off-by: Arjan van de Ven
    Signed-off-by: Alan Cox
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Arjan van de Ven
     
  • We need this for x86 MID platforms where GPIO interrupts are
    used. No special magic is needed so the default 1:1 behaviour
    will do nicely.

    Signed-off-by: Alek Du
    Signed-off-by: Jacob Pan
    Signed-off-by: Alan Cox
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Alek Du
     
  • Westmere processors use a different algorithm for
    assigning APICIDs on SGI UV systems. The location of the
    node number within the apicid is now a function of the
    processor type.

    Signed-off-by: Jack Steiner
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Jack Steiner
     
  • While both methods should work equivalently well for the native
    case, the Xen Dom0 case can't reliably work with the MSR one,
    since there's no guarantee that the virtual CPUs it has
    available fully cover all necessary physical ones.

    As per the suggestion of Robert Richter the patch only adds the
    PCI method, but leaves the MSR one as a fallback to cover new
    systems the PCI IDs of which may not have got added to the code
    base yet.

    The only change in v2 is the breaking out of the new CPI
    initialization method into a separate function, as requested by
    Ingo.

    Signed-off-by: Jan Beulich
    Acked-by: Robert Richter
    Cc: Andreas Herrmann3
    Cc: Joerg Roedel
    Cc: Jeremy Fitzhardinge
    LKML-Reference:
    Signed-off-by: Ingo Molnar

    Jan Beulich
     
  • commit a8760ec (x86: Check tsc available/disabled in the delayed init
    function) missed to prevent the setup of the delayed init function in
    case the initial tsc calibration failed. This results in the same
    divide by zero bug as we have seen without the tsc disabled check.

    Skip the delayed work setup when tsc_khz (the initial calibration
    value) is 0.

    Bisected-and-tested-by: Kirill A. Shutemov
    Cc: John Stultz
    Signed-off-by: Thomas Gleixner

    Thomas Gleixner
     
  • The header asm/hvcall.h was previously included indirectly via
    smp.h. On non-SMP systems, however, these declarations are excluded
    and the build breaks. This is easily fixed by including asm/hvcall.h
    directly.

    The VPHN feature is only meaningful on NUMA systems that implement
    the SPLPAR option, so exclude the VPHN code on systems without
    SPLPAR enabled.

    Also, expose unmap_cpu_from_node() on systems with SPLPAR enabled,
    even if CONFIG_HOTPLUG_CPU is disabled.

    Lastly, map_cpu_to_node() is now needed by VPHN to manipulate the
    node masks after boot time, so remove the __cpuinit annotation to
    fix a section mismatch.

    Signed-off-by: Jesse Larrew

    Jesse Larrew
     
  • Benjamin Herrenschmidt
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
    Blackfin: encode cpu-rev into uImage name
    Blackfin: bf54x: don't ack GPIO ints when unmasking them
    Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
    Blackfin: boards: add missing "static" to peripheral lists
    Blackfin: DNP5370: new board port
    Blackfin: bf518f-ezbrd: fix dsa resources
    Blackfin: move "-m elf32bfin" to general LDFLAGS
    Blackfin: kgdb_test: make sure to initialize num2
    Blackfin: kgdb: disable preempt schedule when running single step in kgdb
    Blackfin: kgdb: disable interrupt when single stepping in ADEOS
    Blackfin: SMP: kgdb: apply anomaly 257 work around
    Blackfin: fix building IPIPE code when XIP is enabled
    Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
    Blackfin: sport_uart resources: remove unused secondary RX/TX pins
    Blackfin: tll6527m: fix spelling in unused code (struct name)
    Blackfin: bf527-ezkit: add adau1373 chip address
    Blackfin: no-mpu: fix masking of small uncached dma region
    Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
    MAINTAINERS: update Analog Devices support info
    Blackfin: dpmc.h: pull in new pll.h
    ...

    Linus Torvalds
     
  • * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68knommu: Need to check __get_user()/__put_user() result
    m68knommu: signal.c __user annotations
    m68knommu: Equivalent of "m68k: handle new gcc's"
    m68knommu: f_pcr has been gone since headers' merge
    m68knommu: Don't lose state if sigframe setup fails
    m68knommu: Handle multiple pending signals
    m68knommu: Switch to saner sigsuspend
    m68knommu: Don't bother with SA_ONESHOT
    m68k: Check __get_user()/__put_user() return value
    m68k: Missing syscall_trace() on sigreturn
    m68k: Fix stack mangling logics in sigreturn
    m68k: If we fail to set sigframe up, just leave regs alone...
    m68k: Don't lose state if sigframe setup fails
    m68k: Simplify the singlestepping handling in signals
    m68k: Switch to saner sigsuspend()
    m68k: Resetting sa_handler in local copy of k_sigaction is pointless
    m68k/sun3: Kill pte_unmap() warnings

    Linus Torvalds
     
  • * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] Avoid array overflow if there are too many cpus in SRAT table
    [IA64] Remove unlikely from cpu_is_offline
    [IA64] irq_ia64, use set_irq_chip
    [IA64] perfmon: Change vmalloc to vzalloc and drop memset.
    [IA64] eliminate race condition in smp_flush_tlb_mm

    Linus Torvalds
     
  • * 'for-torvalds' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    ux500: allow 5500 and 8500 to be built together
    ux500: modem_irq is only for 5500
    ux500: dynamic SOC detection
    ux500: rename MOP board Kconfig
    ux500: remove build-time changing macros

    Linus Torvalds
     
  • * 'msm-smp' of git://codeaurora.org/quic/kernel/davidb/linux-msm:
    msm: add SMP support for msm
    msm: hotplug: support cpu hotplug on msm
    msm: timer: SMP timer support for msm
    msm: scm-boot: Support for setting cold/warm boot addresses
    msm: Secure Channel Manager (SCM) support

    Linus Torvalds
     
  • Signed-off-by: Rabin Vincent
    Signed-off-by: Linus Walleij

    Rabin Vincent
     
  • Signed-off-by: Rabin Vincent
    [Modified to hit the right file]
    Signed-off-by: Linus Walleij

    Rabin Vincent
     
  • Dynamically detect the DBx500 SOC an revision based on the ASIC ID.

    Signed-off-by: Rabin Vincent
    Signed-off-by: Linus Walleij

    Rabin Vincent
     
  • Rename the MOP board Kconfig entries to the same name as the machine
    type, so that the machine_is_*() macros work correctly.

    Signed-off-by: Rabin Vincent
    [Updated to match changes in the tree]
    Signed-off-by: Linus Walleij

    Rabin Vincent
     
  • To allow the possiblity of building U8500 and U5500 support in the same
    image.

    Signed-off-by: Rabin Vincent
    [Rebased to latest changes in Russells tree]
    Signed-off-by: Linus Walleij

    Rabin Vincent
     
  • * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (29 commits)
    of/flattree: forward declare struct device_node in of_fdt.h
    ipmi: explicitly include of_address.h and of_irq.h
    sparc: explicitly cast negative phandle checks to s32
    powerpc/405: Fix missing #{address,size}-cells in i2c node
    powerpc/5200: dts: refactor dts files
    powerpc/5200: dts: Change combatible strings on localbus
    powerpc/5200: dts: remove unused properties
    powerpc/5200: dts: rename nodes to prepare for refactoring dts files
    of/flattree: Update dtc to current mainline.
    of/device: Don't register disabled devices
    powerpc/dts: fix syntax bugs in bluestone.dts
    of: Fixes for OF probing on little endian systems
    of: make drivers depend on CONFIG_OF instead of CONFIG_PPC_OF
    of/flattree: Add of_flat_dt_match() helper function
    of_serial: explicitly include of_irq.h
    of/flattree: Refactor unflatten_device_tree and add fdt_unflatten_tree
    of/flattree: Reorder unflatten_dt_node
    of/flattree: Refactor unflatten_dt_node
    of/flattree: Add non-boottime device tree functions
    of/flattree: Add Kconfig for EARLY_FLATTREE
    ...

    Fix up trivial conflict in arch/sparc/prom/tree_32.c as per Grant.

    Linus Torvalds
     
  • Remove kobject.h from files which don't need it, notably,
    sched.h and fs.h.

    Signed-off-by: Alexey Dobriyan
    Signed-off-by: Linus Torvalds

    Alexey Dobriyan
     
  • * 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/event: validate irq before get evtchn by irq
    xen/fb: fix potential memory leak
    xen/fb: fix xenfb suspend/resume race.
    xen: disable ACPI NUMA for PV guests
    xen/irq: Cleanup the find_unbound_irq

    Linus Torvalds
     
  • * 'stable/generic' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen: HVM X2APIC support
    apic: Move hypervisor detection of x2apic to hypervisor.h

    Linus Torvalds
     

10 Jan, 2011

10 commits