1. 19 Sep, 2009 3 commits
  2. 18 Sep, 2009 13 commits
    • Jack Steiner's avatar
      x86: SGI UV: Map MMIO-High memory range · daf7b9c9
      Jack Steiner authored
      UV depends on the MMRHI space being identity mapped. The patch:
      
      	x86: Make 64-bit efi_ioremap use ioremap on MMIO regions
      
      changed this to make efi regions at a different address using
      ioremap. Add the identity mapping to uv_system_init.
      
      ( Note this code was previously present but was deleted when BIOS
        added the ranges to the EFI map - previous efi code identify
        mapped the ranges. )
      Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
      LKML-Reference: <20090909154339.GA7946@sgi.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      daf7b9c9
    • Jack Steiner's avatar
      x86: SGI UV: Add volatile semantics to macros that access chipset registers · 8dc579e8
      Jack Steiner authored
      Add volatile-semantics to the SGI UV read/write macros that are
      used to access chipset memory mapped registers. No direct
      references to volatile are made. Instead the readq/writeq macros
      are used.
      Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
      Cc: linux-mm@kvack.org
      Cc: dwalker@fifo99.com
      Cc: cfriesen@nortel.com
      LKML-Reference: <20090910143149.GA14273@sgi.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      8dc579e8
    • Jack Steiner's avatar
      x86: SGI UV: Fix IPI macros · d2374aec
      Jack Steiner authored
      The UV BIOS has changed the way interrupt remapping is being done.
      This affects the id used for sending IPIs. The upper id bits no
      longer need to be masked off.
      Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
      Cc: <stable@kernel.org>
      LKML-Reference: <20090909154104.GA25083@sgi.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      d2374aec
    • Daniel Walker's avatar
      x86: apic: Convert BUG() to BUG_ON() · c2777f98
      Daniel Walker authored
      This was done using Coccinelle's BUG_ON semantic patch.
      Signed-off-by: default avatarDaniel Walker <dwalker@fifo99.com>
      Cc: Julia Lawall <julia@diku.dk>
      LKML-Reference: <1252777220-30796-1-git-send-email-dwalker@fifo99.com>
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      c2777f98
    • Andi Kleen's avatar
      x86: Remove final bits of CONFIG_X86_OLD_MCE · bc3eb707
      Andi Kleen authored
      Caught by Linus.
      Reported-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
      Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
      Cc: Huang Ying <ying.huang@intel.com>
      Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
      Cc: Borislav Petkov <borislav.petkov@amd.com>
      [ fixed up context conflict manually. ]
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      bc3eb707
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · df58bee2
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
        x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
        x86, mce: CE in last bank prevents panic by unknown MCE
        x86, mce: Fake panic support for MCE testing
        x86, mce: Move debugfs mce dir creating to mce.c
        x86, mce: Support specifying raise mode for software MCE injection
        x86, mce: Support specifying context for software mce injection
        x86, mce: fix reporting of Thermal Monitoring mechanism enabled
        x86, mce: remove never executed code
        x86, mce: add missing __cpuinit tags
        x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
        x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
        x86: mce: Lower maximum number of banks to architecture limit
        x86: mce: macros to compute banks MSRs
        x86: mce: Move per bank data in a single datastructure
        x86: mce: Move code in mce.c
        x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
        x86: mce: Remove old i386 machine check code
        x86: mce: Update X86_MCE description in x86/Kconfig
        x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE
        x86, mce: use atomic_inc_return() instead of add by 1
        ...
      
      Manually fixed up trivial conflicts:
      	Documentation/feature-removal-schedule.txt
      	arch/x86/kernel/cpu/mcheck/mce.c
      df58bee2
    • Linus Torvalds's avatar
      Merge branch 'sched-core-for-linus' of... · dcbf77b9
      Linus Torvalds authored
      Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (37 commits)
        sched: Fix SD_POWERSAVING_BALANCE|SD_PREFER_LOCAL vs SD_WAKE_AFFINE
        sched: Stop buddies from hogging the system
        sched: Add new wakeup preemption mode: WAKEUP_RUNNING
        sched: Fix TASK_WAKING & loadaverage breakage
        sched: Disable wakeup balancing
        sched: Rename flags to wake_flags
        sched: Clean up the load_idx selection in select_task_rq_fair
        sched: Optimize cgroup vs wakeup a bit
        sched: x86: Name old_perf in a unique way
        sched: Implement a gentler fair-sleepers feature
        sched: Add SD_PREFER_LOCAL
        sched: Add a few SYNC hint knobs to play with
        sched: Fix sync wakeups again
        sched: Add WF_FORK
        sched: Rename sync arguments
        sched: Rename select_task_rq() argument
        sched: Feature to disable APERF/MPERF cpu_power
        x86: sched: Provide arch implementations using aperf/mperf
        x86: Add generic aperf/mperf code
        x86: Move APERF/MPERF into a X86_FEATURE
        ...
      
      Fix up trivial conflict in arch/x86/include/asm/processor.h due to
      nearby addition of amd_get_nb_id() declaration from the EDAC merge.
      dcbf77b9
    • Linus Torvalds's avatar
      Merge branch 'x86-fixes-for-linus' of... · ca043a66
      Linus Torvalds authored
      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:
        x86, pat: don't use rb-tree based lookup in reserve_memtype()
        x86: Increase MIN_GAP to include randomized stack
      ca043a66
    • Linus Torvalds's avatar
      Merge branch 'tracing-core-for-linus' of... · 1218259b
      Linus Torvalds authored
      Merge branch 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'tracing-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (44 commits)
        vsnprintf: remove duplicate comment of vsnprintf
        softirq: add BLOCK_IOPOLL to softirq_to_name
        oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP
        tracing: switch function prints from %pf to %ps
        vsprintf: add %ps that is the same as %pS but is like %pf
        tracing: Fix minor bugs for __unregister_ftrace_function_probe
        tracing: remove notrace from __kprobes annotation
        tracing: optimize global_trace_clock cachelines
        MAINTAINERS: Update tracing tree details
        ftrace: document function and function graph implementation
        tracing: make testing syscall events a separate configuration
        tracing: remove some unused macros
        ftrace: add compile-time check on F_printk()
        tracing: fix F_printk() typos
        tracing: have TRACE_EVENT macro use __flags to not shadow parameter
        tracing: add static to generated TRACE_EVENT functions
        ring-buffer: typecast cmpxchg to fix PowerPC warning
        tracing: add filter event logic to special, mmiotrace and boot tracers
        tracing: remove trace_event_types.h
        tracing: use the new trace_entries.h to create format files
        ...
      1218259b
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev · ca9a702e
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
        libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers
        pata_amd: do not filter out valid modes in nv_mode_filter
        sata_promise: update reset code
        sata_promise: disable hotplug on 1st gen chips
        libata: fix spurious WARN_ON_ONCE() on port freeze
        ahci: restore pci_intx() handling
      ca9a702e
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 · bbe5a96f
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
        sparc: Update defconfigs.
        sparc: Kill PROM console driver.
      bbe5a96f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 · f205ce83
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (66 commits)
        be2net: fix some cmds to use mccq instead of mbox
        atl1e: fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
        pkt_sched: Fix qstats.qlen updating in dump_stats
        ipv6: Log the affected address when DAD failure occurs
        wl12xx: Fix print_mac() conversion.
        af_iucv: fix race when queueing skbs on the backlog queue
        af_iucv: do not call iucv_sock_kill() twice
        af_iucv: handle non-accepted sockets after resuming from suspend
        af_iucv: fix race in __iucv_sock_wait()
        iucv: use correct output register in iucv_query_maxconn()
        iucv: fix iucv_buffer_cpumask check when calling IUCV functions
        iucv: suspend/resume error msg for left over pathes
        wl12xx: switch to %pM to print the mac address
        b44: the poll handler b44_poll must not enable IRQ unconditionally
        ipv6: Ignore route option with ROUTER_PREF_INVALID
        bonding: make ab_arp select active slaves as other modes
        cfg80211: fix SME connect
        rc80211_minstrel: fix contention window calculation
        ssb/sdio: fix printk format warnings
        p54usb: add Zcomax XG-705A usbid
        ...
      f205ce83
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 3dc95666
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (51 commits)
        MIPS: BCM63xx: Add integrated ethernet mac support.
        MIPS: BCM63xx: Add support for the Broadcom BCM63xx family of SOCs.
        MIPS: BCM63xx: Add Broadcom 63xx CPU definitions.
        MIPS: Octeon:  Move some platform device registration to its own file.
        MIPS: Don't corrupt page tables on vmalloc fault.
        MIPS: Shrink the size of tlb handler
        MIPS: Alchemy: override loops_per_jiffy detection
        MIPS: hw_random: Add hardware RNG for Octeon SOCs.
        MIPS: Octeon:  Add hardware RNG platform device.
        MIPS: Remove useless zero initializations.
        MIPS: Alchemy: get rid of allow_au1k_wait
        MIPS: Octeon: Set kernel_uses_llsc to false on non-SMP builds.
        MIPS: Allow kernel use of LL/SC to be separate from the presence of LL/SC.
        MIPS: Get rid of CONFIG_CPU_HAS_LLSC
        MIPS: Malta: Remove pointless use use of CONFIG_CPU_HAS_LLSC
        MIPS: Rewrite clearing of ll_bit on context switch in C
        MIPS: Rewrite sysmips(MIPS_ATOMIC_SET, ...) in C with inline assembler
        MIPS: Consolidate all CONFIG_CPU_HAS_LLSC use in a single C file.
        MIPS: Clean up linker script using new linker script macros.
        MIPS: Use PAGE_SIZE in assembly instead of _PAGE_SIZE.
        ...
      3dc95666
  3. 17 Sep, 2009 24 commits