1. 20 Sep, 2009 7 commits
  2. 19 Sep, 2009 3 commits
  3. 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
  4. 17 Sep, 2009 17 commits
    • H. Peter Anvin's avatar
      Merge branch 'x86/pat' into x86/urgent · 3bb045f1
      H. Peter Anvin authored
      Merge reason:
      
      Suresh Siddha (1):
            x86, pat: don't use rb-tree based lookup in reserve_memtype()
      
      ... requires previous x86/pat commits already pushed to Linus.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      3bb045f1
    • Suresh Siddha's avatar
      x86, pat: don't use rb-tree based lookup in reserve_memtype() · dcb73bf4
      Suresh Siddha authored
      Recent enhancement of rb-tree based lookup exposed a  bug with the lookup
      mechanism in the reserve_memtype() which ensures that there are no conflicting
      memtype requests for the memory range.
      
      memtype_rb_search() returns an entry which has a start address <= new start
      address. And from here we traverse the linear linked list to check if there
      any conflicts with the existing mappings. As the rbtree is based on the
      start address of the memory range, it is quite possible that we have several
      overlapped mappings whose start address is much less than new requested start
      but the end is >= new requested end. This results in conflicting memtype
      mappings.
      
      Same bug exists with the old code which uses cached_entry from where
      we traverse the linear linked list. But the new rb-tree code exposes this
      bug fairly easily.
      
      For now, don't use the memtype_rb_search() and always start the search from
      the head of linear linked list in reserve_memtype(). Linear linked list
      for most of the systems grow's to few 10's of entries(as we track memory type
      of RAM pages using struct page). So we should be ok for now.
      
      We still retain the rbtree and use it to speed up free_memtype() which
      doesn't have the same bug(as we know what exactly we are searching for
      in free_memtype).
      
      Also use list_for_each_entry_from() in free_memtype() so that we start
      the search from rb-tree lookup result.
      Reported-by: default avatarMarkus Trippelsdorf <markus@trippelsdorf.de>
      Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
      Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
      LKML-Reference: <1253136483.4119.12.camel@sbs-t61.sc.intel.com>
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      dcb73bf4
    • John(Jung-Ik) Lee's avatar
      libata: Add pata_atp867x driver for Artop/Acard ATP867X controllers · d15d6e6c
      John(Jung-Ik) Lee authored
      This is a new pata driver for ARTOP 867X 64bit 4-channel UDMA133 ATA ctrls.
      Based on the Atp867 data sheet rev 1.2, Acard, and in part on early ide codes
      from Eric Uhrhane <ericu@google.com>.
      Signed-off-by: default avatarJohn(Jung-Ik) Lee <jilee@google.com>
      Reviewed-by: default avatarGrant Grundler <grundler@google.com>
      Reviewed-by: default avatarGwendal Gringo <gwendal@google.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      d15d6e6c
    • Robert Hancock's avatar
      pata_amd: do not filter out valid modes in nv_mode_filter · 90950a25
      Robert Hancock authored
      On a Compaq Presario V3000 laptop (NVIDIA MCP51 chipset), pata_amd selects
      PIO0 mode for the PATA DVD-RAM drive instead of MWDMA2 which it supports:
      
      ata4.00: ATAPI: HL-DT-ST DVDRAM GSA-4084N, KQ09, max MWDMA2
      ata4: nv_mode_filter: 0x39f&0x7001->0x1, BIOS=0x0 (0x0) ACPI=0x7001 (60:600:0x11)
      ata4.00: configured for PIO0
      
      For some reason, the BIOS-set UDMA configuration returns 0 and the ACPI _GTM
      reports that UDMA2 and PIO0 are enabled. This causes nv_mode_filter to end up
      allowing only PIO0 and UDMA0-2. Since the drive doesn't support UDMA we end up
      using PIO0.
      
      Since the controllers should always support PIO4, MWDMA2 and UDMA2 regardless
      of what cable type is used, let's make sure we don't filter out these modes
      regardless of what wacky settings the BIOS is using.
      Signed-off-by: default avatarRobert Hancock <hancockrwd@gmail.com>
      Cc: stable@kernel.org
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      90950a25
    • Mikael Pettersson's avatar
      sata_promise: update reset code · ff7cddf5
      Mikael Pettersson authored
      sata_promise's reset code has deviated quite a bit from
      the Promise reference driver's, and it has been observed
      to fail to recover from errors in some cases.
      
      This patch thus updates the reset code to more closely
      match the reference driver:
      
      - soft reset (pdc_reset_port):
        * wait for ATA engine to not be in packet command mode
          (2nd gen only)
        * write reset bit in PDC_CTLSTAT before the first read
          in the loop
        * for 2nd gen SATA follow up with FPDMA reset and clearing
          error status registers
      - hard reset (pdc_sata_hardreset):
        * wait for ATA engine to not be in packet command mode
          (2nd gen only)
        * reset ATA engine via the PCI control register
        * Tejun's change to use non-waiting hardreset + follow-up SRST
      
      I'm not changing the hotplug mask bits since they are taken care
      of by sata_promise's ->freeze() and ->thaw() operations. And I'm
      not writing the PMP port # because that's always zero (for now).
      
      Tested here on various controllers. In particular, one disk
      which used to timeout and fail to recover from certain hdparm
      and smartmonctl commands now works nicely.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      ff7cddf5
    • Mikael Pettersson's avatar
      sata_promise: disable hotplug on 1st gen chips · 0ae6654d
      Mikael Pettersson authored
      1st generation Promise SATA chips are prone to generating spurious
      hotplug events which can disrupt normal operation. This has been
      observed on 20376 and 20378 chips. This patch thus disables hotplug
      support on 1st gen chips while leaving it enabled for 2nd gen chips.
      
      The pdc_sata_hotplug_offset() function becomes redundant so it is
      removed.
      
      Tested on 1st gen 20376 and 20378 mainboard chips and on a 2nd gen
      SATA300 PCI card.
      Signed-off-by: default avatarMikael Pettersson <mikpe@it.uu.se>
      Tested-by: default avatarKurt Roeckx <kurt@roeckx.be>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      0ae6654d
    • Tejun Heo's avatar
      libata: fix spurious WARN_ON_ONCE() on port freeze · 4dc738ed
      Tejun Heo authored
      Commit 54c38444 makes libata abort qcs
      after the port is frozen.  This is necessary to guarantee that TF
      registers are accessed after the DMA engine is shutdown after an
      error.  However, this triggers WARN_ON_ONCE() check in
      ata_qc_complete() spuriously.  Move WARN_ON_ONCE() downwards such that
      failing commands while frozen doesn't trigger it.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Cc: stable <stable@kernel.org>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      4dc738ed
    • Tejun Heo's avatar
      ahci: restore pci_intx() handling · 31b239ad
      Tejun Heo authored
      Commit a5bfc471 dropped explicit
      pci_intx() manipulation from ahci because it seemed unnecessary and
      ahci doesn't seem to be the right place to be tweaking it if it were.
      This was largely okay but there are exceptions.  There was one on an
      embedded platform which was fixed via firmware and now bko#14124
      reports it on a HP DL320.
      
        http://bugzilla.kernel.org/show_bug.cgi?id=14124
      
      I still think this isn't something libata drivers should be caring
      about (the only ones which are calling pci_intx() explicitly are
      libata ones and one other driver) but for now reverting the change
      seems to be the right thing to do.
      Signed-off-by: default avatarTejun Heo <tj@kernel.org>
      Reported-by: default avatarThomas Jarosch <thomas.jarosch@intra2net.com>
      Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
      31b239ad
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · b938fb6f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
        ALSA: hda - Fix MSI GX620 mixer
        ASoC: remove unused #include <linux/version.h>
        ASoC: S3C lrsync function made to work with IRQs disabled.
        ALSA: hda - Fix Dell S14 pin setup
        ALSA: hda - Fix IDT92HD83* codec setup
        ASoC: Fix display of stream name in DAPM debugfs
        ALSA: hda - Add support for HP dv6
        ALSA: hda - Fix HP/line-out initialization with IDT/STAC codecs
        ALSA: hda - Set default GPIO for IDT92HD71bxx
        ALSA: hda - Set default GPIO for STAC/IDT codecs
        ASoC: Clean up error handling in MPC5200 DMA setup
        ALSA: hda - Add missing model=auto entry for ALC269
      b938fb6f
    • Steven Rostedt's avatar
      vsnprintf: remove duplicate comment of vsnprintf · 0efb4d20
      Steven Rostedt authored
      Remove the duplicate comment of bstr_printf that is the same as the
      vsnprintf.
      
      Add the 's' option to the comment for the pointer function. This is
      more of an internal function so the little duplication of the comment
      here is OK.
      Reported-by: default avatarZhaolei <zhaolei@cn.fujitsu.com>
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      0efb4d20
    • Li Zefan's avatar
      softirq: add BLOCK_IOPOLL to softirq_to_name · 5dd4de58
      Li Zefan authored
      With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
      show_softirq_name() needs to be updated.
      Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
      LKML-Reference: <4AB20398.8070209@cn.fujitsu.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      5dd4de58
    • Christian Borntraeger's avatar
      oprofile: fix oprofile regression: select RING_BUFFER_ALLOW_SWAP · 9a5963eb
      Christian Borntraeger authored
      commit 85bac32c
          ring-buffer: only enable ring_buffer_swap_cpu when needed
      broke oprofile (at least on s390, but likely on all platforms).
      
      this patch lets oprofile select RING_BUFER_ALLOW_SWAP to make
      ring_buffer_swap_cpu usable for oprofile.
      Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
      LKML-Reference: <200909162156.49239.borntraeger@de.ibm.com>
      Cc: Ingo Molnar <mingo@elte.hu>
      Cc: Robert Richter <robert.richter@amd.com>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      9a5963eb
    • Steven Rostedt's avatar
      tracing: switch function prints from %pf to %ps · b375a11a
      Steven Rostedt authored
      For direct function pointers (like what mcount provides) PowerPC64
      requires the use of %ps, otherwise nothing is printed.
      
      This patch converts all prints of functions retrieved through mcount
      to use the %ps format from the %pf.
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      b375a11a
    • Steven Rostedt's avatar
      vsprintf: add %ps that is the same as %pS but is like %pf · 91adcd2c
      Steven Rostedt authored
      On PowerPC64 function pointers do not point directly at the functions,
      but instead point to pointers to the functions. The output of %pF expects
      to point to a pointer to the function, whereas %pS will show the function
      itself.
      
      mcount returns the direct pointer to the function and not the pointer to
      the pointer. Thus %pS must be used to show this. The function tracer
      requires printing of the functions without offsets and uses the %pf
      instead.
      
       %pF produces run_local_timers+0x4/0x1f
       %pf produces just run_local_timers
      
      For PowerPC64, we need to use the direct pointer, and we only have
      %pS which will produce .run_local_timers+0x4/0x1f
      
      This patch creates a %ps that matches the %pf as %pS matches %pF.
      
      Cc: Linus Torvalds <torvalds@linux-foundation.org>
      Cc: Zhao Lei <zhaolei@cn.fujitsu.com>
      Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
      91adcd2c
    • Takashi Iwai's avatar
      Merge branch 'fix/hda' into for-linus · 87bfa1db
      Takashi Iwai authored
      * fix/hda:
        ALSA: hda - Fix MSI GX620 mixer
        ALSA: hda - Fix Dell S14 pin setup
        ALSA: hda - Fix IDT92HD83* codec setup
        ALSA: hda - Add support for HP dv6
        ALSA: hda - Fix HP/line-out initialization with IDT/STAC codecs
        ALSA: hda - Set default GPIO for IDT92HD71bxx
        ALSA: hda - Set default GPIO for STAC/IDT codecs
        ALSA: hda - Add missing model=auto entry for ALC269
      87bfa1db
    • Takashi Iwai's avatar
      Merge branch 'fix/asoc' into for-linus · 673bca19
      Takashi Iwai authored
      * fix/asoc:
        ASoC: remove unused #include <linux/version.h>
        ASoC: S3C lrsync function made to work with IRQs disabled.
        ASoC: Fix display of stream name in DAPM debugfs
        ASoC: Clean up error handling in MPC5200 DMA setup
      673bca19
    • Ingo Molnar's avatar
      Merge branch 'linus' into tracing/core · 45bd00d3
      Ingo Molnar authored
      Merge reason: Pick up kernel/softirq.c update for dependent fix.
      Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
      45bd00d3