Eric Lee / smarc-fsl-linux-kernel

19 Sep, 2009

2 commits

  • 515b696b2   Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (262 commits)
    sh: mach-ecovec24: Add user debug switch support
    sh: Kill off unused se_skipped in alignment trap notification code.
    sh: Wire up HAVE_SYSCALL_TRACEPOINTS.
    video: sh_mobile_lcdcfb: use both register sets for display panning
    video: sh_mobile_lcdcfb: implement display panning
    sh: Fix up sh7705 flush_dcache_page() build.
    sh: kfr2r09: document the PLL/FLL RF relationship.
    sh: mach-ecovec24: need asm/clock.h.
    sh: mach-ecovec24: deassert usb irq on boot.
    sh: Add KEYSC support for EcoVec24
    sh: add kycr2_delay for sh_keysc
    sh: cpufreq: Include CPU id in info messages.
    sh: multi-evt support for SH-X3 proto CPU.
    sh: clkfwk: remove bogus set_bus_parent() from SH7709.
    sh: Fix the indication point of the liquid crystal of AP-325RXA(AP3300)
    sh: Add EcoVec24 romImage defconfig
    sh: USB disable process is needed if romImage boot for EcoVec24
    sh: EcoVec24: add HIZA setting for LED
    sh: EcoVec24: write MAC address in boot
    sh: Add romImage support for EcoVec24
    ...

    Linus Torvalds
     
  • fa877c71e   Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 ... Browse Code »

    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
    [IA64] Clean up linker script using standard macros.
    [IA64] Use standard macros for page-aligned data.
    [IA64] Use .ref.text, not .text.init for start_ap.
    [IA64] sgi-xp: fix printk format warnings
    [IA64] ioc4_serial: fix printk format warnings
    [IA64] mbcs: fix printk format warnings
    [IA64] pci_br, fix infinite loop in find_free_ate()
    [IA64] kdump: Short path to freeze CPUs
    [IA64] kdump: Try INIT regardless of
    [IA64] kdump: Mask INIT first in panic-kdump path
    [IA64] kdump: Don't return APs to SAL from kdump
    [IA64] kexec: Unregister MCA handler before kexec
    [IA64] kexec: Make INIT safe while transition to
    [IA64] kdump: Mask MCA/INIT on frozen cpus

    Fix up conflict in arch/ia64/kernel/vmlinux.lds.S as per Tony's
    suggestion.

    Linus Torvalds
     

18 Sep, 2009

1 commit

  • f205ce83a   Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... Browse Code »

    * 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
    ...

    Linus Torvalds
     

16 Sep, 2009

1 commit

15 Sep, 2009

2 commits

12 Sep, 2009

3 commits

03 Sep, 2009

1 commit

02 Sep, 2009

1 commit

23 Aug, 2009

2 commits

21 Aug, 2009

1 commit

18 Aug, 2009

1 commit

17 Aug, 2009

1 commit

  • 433a915fc   ARM: S5PC100: UART and Serial ... Browse Code »

    Serial driver of S5PC100 is the same as S3C6400, so S5PC100 shares the serial
    driver with S3C6400. Uart driver is copied from plat-s3c64xx to plat-s5pc1xx,
    as I do not use plat-s3c64xx directory.

    Signed-off-by: Byungho Min
    [ben-linux@fluff.org: title fixup]
    Signed-off-by: Ben Dooks

    James Min
     

15 Aug, 2009

1 commit

14 Aug, 2009

1 commit

13 Aug, 2009

1 commit

08 Aug, 2009

1 commit

  • 36b8659f9   Merge master.kernel.org:/home/rmk/linux-2.6-arm ... Browse Code »

    * master.kernel.org:/home/rmk/linux-2.6-arm: (30 commits)
    ARM: 5639/1: arm: clkdev.c should include
    ARM: 5638/1: arch/arm/kernel/signal.c: use correct address space for CRUNCH
    ARM: 5637/1: [KS8695] Don't reference CLOCK_TICK_RATE in drivers
    ARM: S3C64XX: serial: Fix section mismatch warning
    ARM: S3C24XX: serial: Fix section mismatch warnings
    ARM: S3C: PWM fix for low duty cycle
    ARM: 5597/1: [PCI] reset all internal hardware prior PCI initialization
    ARM: 5627/1: Fix restoring of lr at the end of mcount
    ARM: 5624/1: Document cache aliasing region
    S3C64XX: Fix ARMCLK configuration
    S3C64XX: Fix get_rate() for ARMCLK
    S3C24XX: GPIO: Fix pin range check in s3c_gpiolib_getchip
    mx3 defconfig update
    mx27 defconfig update
    ARM: 5623/1: Treo680: ir shutdown typo fix
    ARM: includecheck fix: plat-stmp3xxx/pinmux.c
    ARM: includecheck fix: plat-s3c64xx/pm.c
    ARM: includecheck fix: mach-omap2/mcbsp.c
    ARM: includecheck fix: mach-omap1/mcbsp.c
    ARM: includecheck fix: board-sffsdr.c
    ...

    Linus Torvalds
     

07 Aug, 2009

1 commit

06 Aug, 2009

1 commit

31 Jul, 2009

3 commits

  • e1ca4aed1   Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc ... Browse Code »

    * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
    powerpc: Update defconfigs for embedded 6xx/7xxx, 8xx, 8{3,5,6}xxx
    powerpc/86xx: Update GE Fanuc sbc310 default configuration
    powerpc/86xx: Update defconfig for GE Fanuc's PPC9A
    cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c
    powerpc/83xx: Fix PCI IO base address on MPC837xE-RDB boards
    powerpc/85xx: Don't scan for TBI PHY addresses on MPC8569E-MDS boards
    powerpc/85xx: Fix ethernet link detection on MPC8569E-MDS boards
    powerpc/mm: Fix SMP issue with MMU context handling code

    Linus Torvalds
     
  • 909db8029   ARM: S3C64XX: serial: Fix section mismatch warning ... Browse Code »

    Rename the structure to avoid the following warning:

    WARNING: vmlinux.o(.data+0x11ef4): Section mismatch in reference from the variable
    s3c6400_serial_drv to the function .devexit.text:s3c24xx_serial_remove()
    The variable s3c6400_serial_drv references
    the function __devexit s3c24xx_serial_remove()
    If the reference is valid then annotate the
    variable with __exit* (see linux/init.h) or name the variable:
    *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,

    Signed-off-by: Ramax Lo
    Signed-off-by: Ben Dooks

    Ramax Lo
     
  • 8fe70a5f7   ARM: S3C24XX: serial: Fix section mismatch warnings ... Browse Code »

    During kernel build process, the following warning was found:

    WARNING: drivers/serial/built-in.o(.data+0x304): Section mismatch in reference from
    the variable s3c2440_serial_drv to the function .devexit.text:s3c24xx_serial_remove()
    The variable s3c2440_serial_drv references the function __devexit s3c24xx_serial_remove()
    If the reference is valid then annotate the variable with
    __exit* (see linux/init.h) or name the variable:
    *driver, *_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console,

    The same warning happened for s3c241x platform. We rename variables to avoid
    these warnings. These changes also apply to s3c2400 & s3c24a0 for consistency.

    Signed-off-by: Ramax Lo
    Signed-off-by: Ben Dooks

    Ramax Lo
     

30 Jul, 2009

2 commits

  • 6e900de3f   cpm_uart: Don't use alloc_bootmem in cpm_uart_cpm2.c ... Browse Code »

    This is another alloc_bootmem() -> kzalloc() change, this time to
    fix the non-fatal badness caused when booting with a cpm2_uart console.

    Signed-off-by: Mark Ware
    Signed-off-by: Kumar Gala

    Mark Ware
     
  • 8da14b5fc   drivers/serial/atmel_serial.c: fix compile when CONFIG_SERIAL_ATMEL=Y and CONFIG… ... Browse Code »

    …_SERIAL_ATMEL_CONSOLE=N

    When SERIAL_ATMEL_CONSOLE is disabled, ATMEL_CONSOLE_DEVICE is set to
    NULL, and trying to access ATMEL_CONSOLE_DEVICE->flags in
    atmel_serial_probe makes the compile fail. This fixes the issue by only
    accessing it if CONFIG_SERIAL_ATMEL_CONSOLE is defined

    Signed-off-by: Albin Tonnerre <albin.tonnerre@free-electrons.com>
    Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
    Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

    Albin Tonnerre
     

29 Jul, 2009

1 commit

  • fd78a76ae   sh: Rework irqflags tracing to fix up CONFIG_PROVE_LOCKING. ... Browse Code »

    This cleans up the irqflags tracing code quite a bit and ties it
    in to various missing callsites that caused an imbalance when
    CONFIG_PROVE_LOCKING was enabled.

    Previously this was catching on:

    987 #ifdef CONFIG_PROVE_LOCKING
    988 DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
    989 DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
    990 #endif
    991 retval = -EAGAIN;

    with hardirqs being doubly enabled, and subsequently bailing out
    with the following call trace:

    Call trace:
    [] __lock_acquire+0x616/0x6a6
    [] do_fork+0xf8/0x2b0
    [] trace_hardirqs_on_caller+0xd4/0x114
    [] _spin_unlock_irq+0x20/0x64
    [] __lock_acquire+0x616/0x6a6
    [] kernel_thread+0x48/0x70
    [] ____call_usermodehelper+0x0/0x110
    [] ____call_usermodehelper+0x0/0x110
    [] kernel_thread_helper+0x0/0x14
    [] __call_usermodehelper+0x38/0x70
    [] worker_thread+0x150/0x274
    [] lock_release+0x0/0x198
    [] __call_usermodehelper+0x0/0x70
    [] autoremove_wake_function+0x0/0x30
    [] kthread+0x3e/0x70
    [] worker_thread+0x0/0x274
    [] kernel_thread_helper+0x8/0x14
    [] kthread+0x0/0x70
    [] kernel_thread_helper+0x0/0x14

    Reported-by: Nobuhiro Iwamatsu
    Signed-off-by: Stuart Menefy
    Signed-off-by: Matt Fleming
    Signed-off-by: Paul Mundt

    Stuart Menefy
     

17 Jul, 2009

2 commits

09 Jul, 2009

1 commit

  • ad361c988   Remove multiple KERN_ prefixes from printk formats ... Browse Code »

    Commit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f ("printk: clean up
    handling of log-levels and newlines") changed printk semantics. printk
    lines with multiple KERN_ prefixes are no longer emitted as
    before the patch.

    is now included in the output on each additional use.

    Remove all uses of multiple KERN_s in formats.

    Signed-off-by: Joe Perches
    Signed-off-by: Linus Torvalds

    Joe Perches
     

07 Jul, 2009

2 commits

03 Jul, 2009

2 commits

  • ada8e9514   Update Yoichi Yuasa's e-mail address ... Browse Code »

    Signed-off-by: Yoichi Yuasa
    Signed-off-by: Ralf Baechle

    Yoichi Yuasa
     
  • 44e18e9ed   sh-sci: update receive error handling for muxed irqs ... Browse Code »

    This patch updates the receive error code for muxed
    interrupts in the sh-sci driver.

    Receive error interrupts may be generated by the hardware
    if RE or REIE bits in SCSCR are set. Update the muxed
    interrupt handling code to acknowledge error interrupts
    if RE or REIE is set, instead of only acknowledging if
    REIE is set.

    Without this patch error interrupts may be generated but
    never acked resulting in a "nobody cared" crash.

    Signed-off-by: Magnus Damm
    Signed-off-by: Paul Mundt

    Magnus Damm
     

01 Jul, 2009

1 commit

  • c4285b47b   parport/serial: add support for NetMos 9901 Multi-IO card ... Browse Code »

    Add support for the PCI-Express NetMos 9901 Multi-IO card.

    0001:06:00.0 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.1 Serial controller [0700]: NetMos Technology Device [9710:9901] (prog-if 02 [16550])
    Subsystem: Device [a000:1000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Kernel driver in use: serial
    Kernel modules: 8250_pci

    0001:06:00.2 Parallel controller [0701]: NetMos Technology Device [9710:9901] (prog-if 03 [IEEE1284])
    Subsystem: Device [a000:2000]
    Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
    Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- SERR-
    Region 2: Memory at 80101000 (32-bit, non-prefetchable) [size=4K]
    Region 4: Memory at 80100000 (32-bit, non-prefetchable) [size=4K]
    Capabilities:
    Kernel driver in use: parport_pc
    Kernel modules: parport_pc

    [ 16.760181] PCI parallel port detected: 416c:0100, I/O at 0x812010(0x0), IRQ 65
    [ 16.760225] parport0: PC-style at 0x812010, irq 65 [PCSPP,TRISTATE,EPP]
    [ 16.851842] serial 0001:06:00.0: enabling device (0004 -> 0007)
    [ 16.883776] 0001:06:00.0: ttyS0 at I/O 0x812030 (irq = 65) is a ST16650V2
    [ 16.893832] serial 0001:06:00.1: enabling device (0004 -> 0007)
    [ 16.926537] 0001:06:00.1: ttyS1 at I/O 0x812020 (irq = 65) is a ST16650V2

    Signed-off-by: Michael Buesch
    Cc: Alan Cox
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Michael Buesch
     

25 Jun, 2009

3 commits

23 Jun, 2009

1 commit