Doug / smarc-fsl-linux-kernel

24 Apr, 2009

1 commit

  • 9fe9293d1   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:
    m68knommu: update the default config for the ColdFire 5407C3 board
    m68knommu: update the default config for the ColdFire 5307C3 board
    m68knommu: update the default config for the ColdFire 5257EVB board
    m68knommu: update the default config for the ColdFire 5249EVB.
    m68knommu: add a defconfig for the ColdFire M5272C3 board
    m68knommu: update the defconfig for the ColdFire 5208evb board
    m68knommu: fix DMA support for ColdFire
    m68knommu: remove unused kernel stats offsets
    m68knommu: fix missing .data.cacheline_aligned section
    m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC.

    Linus Torvalds
     

23 Apr, 2009

2 commits

22 Apr, 2009

10 commits

04 Apr, 2009

1 commit

  • 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

30 Mar, 2009

1 commit

27 Mar, 2009

1 commit

24 Mar, 2009

9 commits

11 Mar, 2009

2 commits

27 Feb, 2009

1 commit

27 Jan, 2009

8 commits

  • add8240ee   m68knommu: fix 5329 ColdFire periphal addressing ... Browse Code »

    The 5329 ColdFire peripheral IO register addresses are not relative to
    the MBAR register. So fix the serial platform setup array and IRQ acking
    to use just the direct addresses.

    Signed-off-by: Matt Waddel
    Signed-off-by: Greg Ungerer

    Matt Waddel
     
  • f3221a39d   m68knommu: fix syscall restarting ... Browse Code »

    Make restart blocks working, required for proper syscall restarting.
    Derived from same changes for m68k arch by Andreas Schwab

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • d88ffccbc   m68knommu: remove the obsolete and long unused comempci chip support ... Browse Code »

    Signed-off-by: Greg Ungerer

    Greg Ungerer
     
  • e81588517   m68knommu: remove the no longer used PCI support option ... Browse Code »

    Signed-off-by: Adrian Bunk
    Signed-off-by: Greg Ungerer

    Adrian Bunk
     
  • 3947fca78   m68knommu: remove obsolete and unused eLIA board ... Browse Code »

    Greg Ungerer said about this board:
    Only ever a handful where made, and that was in 1999.

    Signed-off-by: Adrian Bunk
    Signed-off-by: Greg Ungerer

    Adrian Bunk
     
  • e0212e721   m68knommu: set NO_DMA ... Browse Code »

    m68knommu does not set the Kconfig NO_DMA variable, but also does
    not provide the required functions, resulting in the following
    build error triggered by commit a40c24a13366e324bc0ff8c3bb107db89312c984
    (net: Add SKB DMA mapping helper functions.):

    ..
    LD vmlinux
    net/built-in.o: In function `skb_dma_unmap':
    (.text+0xac5e): undefined reference to `dma_unmap_single'
    net/built-in.o: In function `skb_dma_unmap':
    (.text+0xac7a): undefined reference to `dma_unmap_page'
    net/built-in.o: In function `skb_dma_map':
    (.text+0xacdc): undefined reference to `dma_map_single'
    net/built-in.o: In function `skb_dma_map':
    (.text+0xace8): undefined reference to `dma_mapping_error'
    net/built-in.o: In function `skb_dma_map':
    (.text+0xad10): undefined reference to `dma_map_page'
    net/built-in.o: In function `skb_dma_map':
    (.text+0xad82): undefined reference to `dma_unmap_page'
    net/built-in.o: In function `skb_dma_map':
    (.text+0xadc6): undefined reference to `dma_unmap_single'
    make[1]: *** [vmlinux] Error 1

    Signed-off-by: Adrian Bunk
    Signed-off-by: Greg Ungerer

    Adrian Bunk
     
  • c7bcd0df1   m68knommu: use one exist from execption ... Browse Code »

    Part of the code that did not make sense to me got removed by Greg.
    This is part two:

    The first compare is to check whether the interrupts are disabled or not.
    Depending on the result we exectute the RESTORE_ALL macro is not only
    restoring the stack but also returning to caller.
    The test for pending softirq has been removed because it is allready done
    in irq_exit().
    Since system_call() is allso using the SAVE_ALL macro and returning via
    ret_from_exception label I see no reason why we could not do this here
    as well. This is also handy because if we return from the timer interrupt
    and we need to resched than we check for this :)

    Signed-off-by: Sebastian Siewior
    Signed-off-by: Greg Ungerer

    Sebastian Siewior
     
  • ac3d266bf   Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu ... Browse Code »

    * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
    m68k,m68knommu: merge header files

    Resolve trivial conflict in arch/m68knommu/include/asm/Kbuild

    Linus Torvalds
     

16 Jan, 2009

1 commit

  • 49148020b   m68k,m68knommu: merge header files ... Browse Code »

    Merge header files for m68k and m68knommu to the single location:

    arch/m68k/include/asm

    The majority of this patch was the result of the
    script that is included in the changelog below.

    The script was originally written by Arnd Bergman and
    exten by me to cover a few more files.

    When the header files differed the script uses the following:

    The original m68k file is named _mm.h [mm for memory manager]
    The m68knommu file is named _no.h [no for no memory manager]

    The files uses the following include guard:

    This include gaurd works as the m68knommu toolchain set
    the __uClinux__ symbol - so this should work in userspace too.

    Merging the header files for m68k and m68knommu exposes the
    (unexpected?) ABI differences thus it is easier to actually
    identify these and thus to fix them.

    The commit has been build tested with both a m68k and
    a m68knommu toolchain - with success.

    The commit has also been tested with "make headers_check"
    and this patch fixes make headers_check for m68knommu.

    The script used:
    TARGET=arch/m68k/include/asm
    SOURCE=arch/m68knommu/include/asm

    INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
    linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
    oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
    shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
    termbits.h termios.h tlb.h types.h user.h"

    EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
    ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
    sections.h topology.h"

    NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
    elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
    m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
    m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
    m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
    mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
    mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
    nettel.h quicc_simple.h smp.h"

    FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
    cacheflush.h checksum.h current.h delay.h div64.h \
    dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
    irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
    module.h page.h page_offset.h param.h pci.h pgalloc.h \
    pgtable.h processor.h ptrace.h scatterlist.h segment.h \
    setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
    thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
    unaligned.h unistd.h"

    mergefile() {
    BASE=${1%.h}
    git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
    git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h

    cat << EOF > ${TARGET}/$1
    EOF

    git add ${TARGET}/$1
    }

    set -e

    mkdir -p ${TARGET}

    git mv include/asm-m68k/* ${TARGET}
    rmdir include/asm-m68k

    git rm ${SOURCE}/Kbuild
    for F in $INCLUDE $EQUAL; do
    git rm ${SOURCE}/$F
    done

    for F in $NOMUUFILES; do
    git mv ${SOURCE}/$F ${TARGET}/$F
    done

    for F in $FILES ; do
    mergefile $F
    done

    rmdir arch/m68knommu/include/asm
    rmdir arch/m68knommu/include

    Cc: Arnd Bergmann
    Cc: Geert Uytterhoeven
    Signed-off-by: Sam Ravnborg
    Signed-off-by: Greg Ungerer

    Sam Ravnborg
     

15 Jan, 2009

2 commits

  • bca268565   Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 ... Browse Code »

    * 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
    [CVE-2009-0029] s390 specific system call wrappers
    [CVE-2009-0029] System call wrappers part 33
    [CVE-2009-0029] System call wrappers part 32
    [CVE-2009-0029] System call wrappers part 31
    [CVE-2009-0029] System call wrappers part 30
    [CVE-2009-0029] System call wrappers part 29
    [CVE-2009-0029] System call wrappers part 28
    [CVE-2009-0029] System call wrappers part 27
    [CVE-2009-0029] System call wrappers part 26
    [CVE-2009-0029] System call wrappers part 25
    [CVE-2009-0029] System call wrappers part 24
    [CVE-2009-0029] System call wrappers part 23
    [CVE-2009-0029] System call wrappers part 22
    [CVE-2009-0029] System call wrappers part 21
    [CVE-2009-0029] System call wrappers part 20
    [CVE-2009-0029] System call wrappers part 19
    [CVE-2009-0029] System call wrappers part 18
    [CVE-2009-0029] System call wrappers part 17
    [CVE-2009-0029] System call wrappers part 16
    [CVE-2009-0029] System call wrappers part 15
    ...

    Linus Torvalds
     
  • 74d96f018   byteorder: make swab.h include asm/swab.h like a regular header ... Browse Code »

    Add swab.h to kbuild.asm and remove the individual entries from
    each arch, mark as unifdef as some arches have some kernel-only
    bits inside.

    Signed-off-by: Harvey Harrison
    Signed-off-by: Linus Torvalds

    Harvey Harrison