Eric Lee / smarc-fsl-linux-kernel

29 Apr, 2009

1 commit

  • 16752e2ea   m68k: arch/m68k/kernel/sun3-head.S needs <linux/init.h> ... Browse Code »

    Fix this:

    arch/m68k/kernel/sun3-head.S: Assembler messages:
    arch/m68k/kernel/sun3-head.S:32: Error: Unknown operator -- statement `__head' ignored

    Introduced by commit 6f335cab0431d5df4995bcd4fd952d4c746d5a86 ("m68k:
    convert to use __HEAD and HEAD_TEXT macros."), which started using
    __HEAD without adding the appropriate include.

    Signed-off-by: Geert Uytterhoeven
    Signed-off-by: Linus Torvalds

    Geert Uytterhoeven
     

27 Apr, 2009

1 commit

  • 6f335cab0   m68k: convert to use __HEAD and HEAD_TEXT macros. ... Browse Code »

    This has the consequence of changing the section name use for head
    code from ".text.head" to ".head.text". Since this commit changes all
    users in the architecture, this change should be harmless.

    Signed-off-by: Tim Abbott
    Cc: Geert Uytterhoeven
    Cc: Roman Zippel
    Acked-by: Sam Ravnborg
    Signed-off-by: Linus Torvalds

    Tim Abbott
     

23 Apr, 2009

2 commits

06 Apr, 2009

1 commit

  • 714f83d5d   Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... Browse Code »

    * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
    tracing, net: fix net tree and tracing tree merge interaction
    tracing, powerpc: fix powerpc tree and tracing tree interaction
    ring-buffer: do not remove reader page from list on ring buffer free
    function-graph: allow unregistering twice
    trace: make argument 'mem' of trace_seq_putmem() const
    tracing: add missing 'extern' keywords to trace_output.h
    tracing: provide trace_seq_reserve()
    blktrace: print out BLK_TN_MESSAGE properly
    blktrace: extract duplidate code
    blktrace: fix memory leak when freeing struct blk_io_trace
    blktrace: fix blk_probes_ref chaos
    blktrace: make classic output more classic
    blktrace: fix off-by-one bug
    blktrace: fix the original blktrace
    blktrace: fix a race when creating blk_tree_root in debugfs
    blktrace: fix timestamp in binary output
    tracing, Text Edit Lock: cleanup
    tracing: filter fix for TRACE_EVENT_FORMAT events
    ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
    x86: kretprobe-booster interrupt emulation code fix
    ...

    Fix up trivial conflicts in
    arch/parisc/include/asm/ftrace.h
    include/linux/memory.h
    kernel/extable.c
    kernel/module.c

    Linus Torvalds
     

04 Apr, 2009

2 commits

  • bad6a5c08   Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc ... Browse Code »

    * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:
    powerpc/ps3: Add rtc-ps3
    powerpc: Hook up rtc-generic, and kill rtc-ppc
    m68k: Hook up rtc-generic
    parisc: rtc: Rename rtc-parisc to rtc-generic
    parisc: rtc: Add missing module alias
    parisc: rtc: platform_driver_probe() fixups
    parisc: rtc: get_rtc_time() returns unsigned int

    Linus Torvalds
     
  • 5de1ccbe5   Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu ... Browse Code »

    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits)
    m68knommu: improve compile arch switch settings
    m68knommu: fix 5407 ColdFire UART vector setup
    m68knommu: fix 5307 ColdFire UART vector setup
    m68knommu: fix 5249 ColdFire UART vector setup
    m68knommu: fix 5249 ColdFire UART setup
    m68knommu: fix end of uart table marker
    m68knommu: switch to using generic_handle_irq()
    m68k: merge the mmu and non-mmu versions of tlbflush.h
    m68knommu: introduce basic clk infrastructure
    m68k: merge the mmu and non-mmu versions of module.h
    m68knommu: add missing interrupt line definition for UART 2
    m68k: merge the mmu and non-mmu versions of mmu_context.h
    m68k: merge the mmu and non-mmu versions of current.h
    m68k: merge the mmu and non-mmu versions of div64.h
    m68k: merge the mmu and non-mmu versions of bugs.h
    m68k: merge the mmu and non-mmu versions of bug.h
    m68k: use the mmu version of cache.h for m68knommu as well
    m68k: use the mmu version of bootinfo.h for m68knommu as well
    m68k: merge the mmu and non-mmu versions of fb.h
    m68k: merge the mmu and non-mmu versions of segment.h
    ...

    Linus Torvalds
     

03 Apr, 2009

1 commit

02 Apr, 2009

2 commits

27 Mar, 2009

9 commits

  • f94116aee   ide: cleanup <asm-m68k/ide.h> ... Browse Code »

    * Remove superfluous include.

    * No need to re-define in/out*() macros as they are no longer used
    by m68k host drivers.

    * readl() and writel() are not used by core IDE code.

    * Use raw_*_swapw() directly in {falcon,q40}ide.c and remove
    {in,out}sw_swapw() macros.

    Cc: Geert Uytterhoeven
    Cc: Michael Schmitz
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • e354c1d80   ide: remove IDE_ARCH_LOCK (v2) ... Browse Code »

    * Add ->{get,release}_lock methods to struct ide_port_info
    and struct ide_host.

    * Convert core IDE code, m68k IDE code and falconide support to use
    ->{get,release}_lock methods instead of ide_{get,release}_lock().

    * Remove IDE_ARCH_LOCK.

    v2:
    * Build fix from Geert updating ide_{get,release}_lock() callers in
    falconide.c.

    Cc: Geert Uytterhoeven
    Cc: Michael Schmitz
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • d15a613ba   ide: remove IDE_ARCH_INTR (v2) ... Browse Code »

    This micro-optimization is not worth it. Just always check for
    existence of ->ack_intr method in ide_intr() and ide_timer_expiry().

    v2:
    Fix brown-paper-bag bug spotted by David D. Kilzer.

    Cc: Geert Uytterhoeven
    Cc: Michael Schmitz
    Cc: "David D. Kilzer"
    Signed-off-by: Bartlomiej Zolnierkiewicz

    Bartlomiej Zolnierkiewicz
     
  • 4496d937a   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: irq_node.handler() should return irqreturn_t
    m68k: section mismatch fixes: Atari SCSI
    m68k: section mismatch fixes: DMAsound for Atari
    MAINTAINERS: Replace dead link to m68k CVS repository by link to new git repository
    m68k: mac - Add SWIM floppy support
    m68k: mac - Add a new entry in mac_model to identify the floppy controller type.
    m68k: Add install target

    Linus Torvalds
     
  • 08abe18af   Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ ... Browse Code »

    Conflicts:
    drivers/net/wimax/i2400m/usb-notif.c

    David S. Miller
     
  • 4b2873ba0   m68k: irq_node.handler() should return irqreturn_t ... Browse Code »

    commit b5dc7840b3ebe9c7967dd8ba73db957767009ff9 ("m68k: introduce irq
    controller") reverted the return type of struct irq_node.handler() from
    irqreturn_t to int. Change it back to irqreturn_t, else it will give a
    compiler warning when irqreturn_t is turned into an enum in the near future:

    | arch/m68k/kernel/ints.c:231: warning: assignment from incompatible pointer type

    Signed-off-by: Geert Uytterhoeven

    Geert Uytterhoeven
     
  • 8852ecd97   m68k: mac - Add SWIM floppy support ... Browse Code »

    It allows to read data from a floppy, but not to write to, and to eject the
    floppy (useful on our Mac without eject button).

    Signed-off-by: Laurent Vivier
    Signed-off-by: Geert Uytterhoeven

    Laurent Vivier
     
  • 7ad93b42b   m68k: mac - Add a new entry in mac_model to identify the floppy controller type. ... Browse Code »

    This patch adds a field "floppy_type" which can take the following values:

    MAC_FLOPPY_IWM for an IWM based mac
    MAC_FLOPPY_SWIM_ADDR1 for a SWIM based mac with controller at VIA1 + 0x1E000
    MAC_FLOPPY_SWIM_ADDR2 for a SWIM based mac with controller at VIA1 + 0x16000
    MAC_FLOPPY_IOP for an IOP based mac
    MAC_FLOPPY_AV for an AV based mac

    Signed-off-by: Laurent Vivier
    Signed-off-by: Geert Uytterhoeven

    Laurent Vivier
     
  • 612bfc9e6   m68k: Add install target ... Browse Code »

    This patch enables the use of "make install" on m68k architecture
    to copy kernel to /boot.

    Signed-off-by: Laurent Vivier
    Signed-off-by: Geert Uytterhoeven

    Laurent Vivier
     

24 Mar, 2009

21 commits