Eric Lee / smarc-fsl-linux-kernel

06 Apr, 2012

3 commits

20 Mar, 2012

1 commit

21 Feb, 2012

5 commits

10 Feb, 2012

4 commits

06 Feb, 2012

3 commits

04 Feb, 2012

2 commits

03 Feb, 2012

2 commits

  • c84e295b3   Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze ... Browse Code »

    * 'next' of git://git.monstr.eu/linux-2.6-microblaze:
    Revert "microblaze: Add topology init"

    Linus Torvalds
     
  • 2f2fde927   Merge branches 'core-urgent-for-linus', 'perf-urgent-for-linus', 'sched-urgent-f… ... Browse Code »

    …or-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

    * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    bugs, x86: Fix printk levels for panic, softlockups and stack dumps

    * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    perf top: Fix number of samples displayed
    perf tools: Fix strlen() bug in perf_event__synthesize_event_type()
    perf tools: Fix broken build by defining _GNU_SOURCE in Makefile
    x86/dumpstack: Remove unneeded check in dump_trace()
    perf: Fix broken interrupt rate throttling

    * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    sched/rt: Fix task stack corruption under __ARCH_WANT_INTERRUPTS_ON_CTXSW
    sched: Fix ancient race in do_exit()
    sched/nohz: Fix nohz cpu idle load balancing state with cpu hotplug
    sched/s390: Fix compile error in sched/core.c
    sched: Fix rq->nr_uninterruptible update race

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/reboot: Remove VersaLogic Menlow reboot quirk
    x86/reboot: Skip DMI checks if reboot set by user
    x86: Properly parenthesize cmpxchg() macro arguments

    Linus Torvalds
     

02 Feb, 2012

1 commit

  • c6df4b17c   lib: Fix multiple definitions of clz_tab ... Browse Code »

    Both sparc 32-bit's software divide assembler and MPILIB provide
    clz_tab[] with identical contents.

    Break it out into a seperate object file and select it when
    SPARC32 or MPILIB is set.

    Reported-by: Al Viro
    Signed-off-by: David S. Miller
    Signed-off-by: James Morris

    David Miller
     

31 Jan, 2012

3 commits

30 Jan, 2012

2 commits

  • e6d36a653   x86/reboot: Remove VersaLogic Menlow reboot quirk ... Browse Code »

    This commit removes the reboot quirk originally added by commit
    e19e074 ("x86: Fix reboot problem on VersaLogic Menlow boards").

    Testing with a VersaLogic Ocelot (VL-EPMs-21a rev 1.00 w/ BIOS
    6.5.102) revealed the following regarding the reboot hang
    problem:

    - v2.6.37 reboot=bios was needed.

    - v2.6.38-rc1: behavior changed, reboot=acpi is needed,
    reboot=kbd and reboot=bios results in system hang.

    - v2.6.38: VersaLogic patch (e19e074 "x86: Fix reboot problem on
    VersaLogic Menlow boards") was applied prior to v2.6.38-rc7. This
    patch sets a quirk for VersaLogic Menlow boards that forces the use
    of reboot=bios, which doesn't work anymore.

    - v3.2: It seems that commit 660e34c ("x86: Reorder reboot method
    preferences") changed the default reboot method to acpi prior to
    v3.0-rc1, which means the default behavior is appropriate for the
    Ocelot. No VersaLogic quirk is required.

    The Ocelot board used for testing can successfully reboot w/out
    having to pass any reboot= arguments for all 3 current versions
    of the BIOS.

    Signed-off-by: Michael D Labriola
    Cc: Matthew Garrett
    Cc: Michael D Labriola
    Cc: Kushal Koolwal
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/87vcnub9hu.fsf@gmail.com
    Signed-off-by: Ingo Molnar

    Michael D Labriola
     
  • 5955633e9   x86/reboot: Skip DMI checks if reboot set by user ... Browse Code »

    Skip DMI checks for vendor specific reboot quirks if the user
    passed in a reboot= arg on the command line - we should never
    override user choices.

    Signed-off-by: Michael D Labriola
    Cc: Alan Cox
    Cc: Michael D Labriola
    Cc: Matthew Garrett
    Cc: Linus Torvalds
    Link: http://lkml.kernel.org/r/87wr8ab9od.fsf@gmail.com
    Signed-off-by: Ingo Molnar

    Michael D Labriola
     

29 Jan, 2012

3 commits

  • 6c334f4f6   Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/… ... Browse Code »

    …kernel/git/konrad/xen

    * 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
    xen/granttable: Disable grant v2 for HVM domains.
    x86: xen: size struct xen_spinlock to always fit in arch_spinlock_t

    Linus Torvalds
     
  • deb9b4ce9   Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (31 commits)
    ARM: 7304/1: ioremap: fix boundary check when reusing static mapping
    ARM: 7301/1: Rename the T() macro to TUSER() to avoid namespace conflicts
    ARM: 7299/1: ftrace: clear zero bit in reported IPs for Thumb-2
    ARM: 7298/1: realview: fix mapping of MPCore private memory region
    PCMCIA: fix sa1111 oops on remove
    ARM: 7288/1: mach-sa1100: add missing module_init() call
    ARM: 7297/1: smp_twd: make sure timer is stopped before registering it
    ARM: 7296/1: proc-v7.S: remove HARVARD_CACHE preprocessor guards
    ARM: 7295/1: cortex-a7: move proc_info out of !CONFIG_ARM_LPAE block
    ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP
    ARM: 7291/1: cache: assume 64-byte L1 cachelines for ARMv7 CPUs
    ARM: 7290/1: vmlinux.lds.S: align the exception fixup table to a 4-byte boundary
    ARM: 7289/1: vmlinux.lds.S: do not hardcode cacheline size as 32 bytes
    MFD: ucb1x00-ts: fix resume failure
    MFD: ucb1x00-core: fix gpiolib direction_output handling
    MFD: ucb1x00-core: fix missing restore of io output data on resume
    MFD: mcp-core: fix mcp_priv() to be more type safe
    MFD: mcp-core: fix complaints from the genirq layer
    Revert "ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus."
    Revert "ARM: sa1100: Refactor mcp-sa11x0 to use platform resources."
    ...

    Fix up conflict due to arch/arm/mach-mx5/Kconfig having been merged into
    mach-imx5 (commit 784a90c0a7d8: "ARM i.MX: Merge i.MX5 support into
    mach-imx"), but the ARM_L1_CACHE_SHIFT_6 entry was moved to be driven by
    the CPU_V7 logic from it in the old location in rmk's branch (commit
    a092f2b15399: "ARM: 7291/1: cache: assume 64-byte L1 cachelines for
    ARMv7 CPUs").

    Linus Torvalds
     
  • 81bc3009e   Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    arm-soc fixes for 3.3-rc:

    AT91 needed reset fixes which resulted in some minor code refactoring,
    it also adds a feature-removal for one of their platforms for 3.4.
    The USB patches have been acked by Greg K-H.

    i.MX and ux500 both have some minor fixes, nothing controversial.

    * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
    arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
    ARM: imx: iomux-v1.h: Fix build error due to __init annotation
    ARM: at91: Fix at91sam9g45 and at91cap9 reset
    ARM: at91: make rstc soc independent
    ARM: at91: introduce AT91_SAM9_ALT_RESET to select the at91sam9 alternative reset
    ARM: at91: merge at91cap9_ddrsdr.h in at91sam9_ddrsdr.h
    ARM: at91: fix cap9 ddrsdr register
    ARM/USB: at91/ohci-at91: rename vbus_pin_inverted to vbus_pin_active_low
    USB: at91: fix clk_get error handling
    ARM: at91: removal of CAP9 SoC family
    ARM: at91: fix at91rm9200 soc subtype handling
    mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
    mach-ux500: enable ARM errata 764369
    mach-ux500: do not override outer.inv_all
    mach-ux500: musb: now musb is always in OTG mode
    ARM: imx6: add missing twd_clk for imx6q clock

    Linus Torvalds
     

28 Jan, 2012

3 commits

  • d0caf2925   x86/dumpstack: Remove unneeded check in dump_trace() ... Browse Code »

    Smatch complains that we have some inconsistent NULL checking.

    If "task" were NULL then it would lead to a NULL dereference
    later. We can remove this test because earlier on in the
    function we have:

    if (!task)
    task = current;

    Signed-off-by: Dan Carpenter
    Acked-by: Frederic Weisbecker
    Cc: Namhyung Kim
    Cc: Peter Zijlstra
    Cc: Clemens Ladisch
    Link: http://lkml.kernel.org/r/20120128105246.GA25092@elgon.mountain
    Signed-off-by: Ingo Molnar

    Dan Carpenter
     
  • 3c424f359   ARM: 7304/1: ioremap: fix boundary check when reusing static mapping ... Browse Code »
    92

    Since commit 576d2f2525612ecb5af029a76f21f22a3b82563d "ARM: add
    generic ioremap optimization by reusing static mappings" ioremap()
    is trying to reuse existing static mapping when possible.

    The condition checking boundaries of the requested and existing
    mappings didn't take in-page offset into consideration though,
    which lead to obscure and hard to debug problems when requested
    mapping crossed end of the static one.

    Signed-off-by: Pawel Moll
    Acked-by: Nicolas Pitre
    Signed-off-by: Russell King

    Pawel Moll
     
  • 6c02b7b16   Merge commit 'v3.3-rc1' into stable/for-linus-fixes-3.3 ... Browse Code »

    * commit 'v3.3-rc1': (9775 commits)
    Linux 3.3-rc1
    x86, syscall: Need __ARCH_WANT_SYS_IPC for 32 bits
    qnx4: don't leak ->BitMap on late failure exits
    qnx4: reduce the insane nesting in qnx4_checkroot()
    qnx4: di_fname is an array, for crying out loud...
    KEYS: Permit key_serial() to be called with a const key pointer
    keys: fix user_defined key sparse messages
    ima: fix cred sparse warning
    uml: fix compile for x86-64
    MPILIB: Add a missing ENOMEM check
    tpm: fix (ACPI S3) suspend regression
    nvme: fix merge error due to change of 'make_request_fn' fn type
    xen: using EXPORT_SYMBOL requires including export.h
    gpio: tps65910: Use correct offset for gpio initialization
    acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec
    intel_idle: Split up and provide per CPU initialization func
    ACPI processor: Remove unneeded variable passed by acpi_processor_hotadd_init V2
    tg3: Fix single-vector MSI-X code
    openvswitch: Fix multipart datapath dumps.
    ipv6: fix per device IP snmp counters
    ...

    Konrad Rzeszutek Wilk
     

27 Jan, 2012

8 commits

  • 5e9638643   Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes ... Browse Code »

    * 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
    arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
    ARM: imx: iomux-v1.h: Fix build error due to __init annotation

    Olof Johansson
     
  • d8c4cd746   Merge branch 'fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/gi… ... Browse Code »

    …t/linusw/linux-stericsson into fixes

    * 'fixes-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
    mach-ux500: no MMC_CAP_SD_HIGHSPEED on Snowball
    mach-ux500: enable ARM errata 764369
    mach-ux500: do not override outer.inv_all
    mach-ux500: musb: now musb is always in OTG mode

    Olof Johansson
     
  • 3c8cee3b4   Merge branch 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes ... Browse Code »

    * 'imx6/fixes' of git://git.linaro.org/people/shawnguo/linux-2.6:
    ARM: imx6: add missing twd_clk for imx6q clock

    Olof Johansson
     
  • c75d5c5d8   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
    sparc32: forced setting of mode of sun4m per-cpu timers

    Linus Torvalds
     
  • 9a95b9e74   Merge branch 'sa11x0-mcp-fixes' into fixes Browse Code »
    Russell King
     
  • 2d3c7efa5   Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Browse Code »

    * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
    x86/microcode_amd: Add support for CPU family specific container files
    x86/amd: Add missing feature flag for fam15h models 10h-1fh processors
    x86/boot-image: Don't leak phdrs in arch/x86/boot/compressed/misc.c::Parse_elf()
    x86/numachip: Drop unnecessary conflict with EDAC
    x86/uv: Fix uninitialized spinlocks
    x86/uv: Fix uv_gpa_to_soc_phys_ram() shift

    Linus Torvalds
     
  • 0dbfe8dda   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
    m68k: Fix assembler constraint to prevent overeager gcc optimisation
    mac_esp: rename irq
    mac_scsi: dont enable mac_scsi irq before requesting it
    macfb: fix black and white modes
    m68k/irq: Remove obsolete IRQ_FLG_* definitions

    Fix up trivial conflict in arch/m68k/kernel/process_mm.c as per Geert.

    Linus Torvalds
     
  • b0f4c4b32   bugs, x86: Fix printk levels for panic, softlockups and stack dumps ... Browse Code »

    rsyslog will display KERN_EMERG messages on a connected
    terminal. However, these messages are useless/undecipherable
    for a general user.

    For example, after a softlockup we get:

    Message from syslogd@intel-s3e37-04 at Jan 25 14:18:06 ...
    kernel:Stack:

    Message from syslogd@intel-s3e37-04 at Jan 25 14:18:06 ...
    kernel:Call Trace:

    Message from syslogd@intel-s3e37-04 at Jan 25 14:18:06 ...
    kernel:Code: ff ff a8 08 75 25 31 d2 48 8d 86 38 e0 ff ff 48 89
    d1 0f 01 c8 0f ae f0 48 8b 86 38 e0 ff ff a8 08 75 08 b1 01 4c 89 e0 0f 01 c9 ea 69 dd ff 4c 29 e8 48 89 c7 e8 0f bc da ff 49 89 c4 49 89

    This happens because the printk levels for these messages are
    incorrect. Only an informational message should be displayed on
    a terminal.

    I modified the printk levels for various messages in the kernel
    and tested the output by using the drivers/misc/lkdtm.c kernel
    modules (ie, softlockups, panics, hard lockups, etc.) and
    confirmed that the console output was still the same and that
    the output to the terminals was correct.

    For example, in the case of a softlockup we now see the much
    more informative:

    Message from syslogd@intel-s3e37-04 at Jan 25 10:18:06 ...
    BUG: soft lockup - CPU4 stuck for 60s!

    instead of the above confusing messages.

    AFAICT, the messages no longer have to be KERN_EMERG. In the
    most important case of a panic we set console_verbose(). As for
    the other less severe cases the correct data is output to the
    console and /var/log/messages.

    Successfully tested by me using the drivers/misc/lkdtm.c module.

    Signed-off-by: Prarit Bhargava
    Cc: dzickus@redhat.com
    Cc: Linus Torvalds
    Cc: Andrew Morton
    Link: http://lkml.kernel.org/r/1327586134-11926-1-git-send-email-prarit@redhat.com
    Signed-off-by: Ingo Molnar

    Prarit Bhargava