1. 18 2月, 2011 30 次提交
  2. 16 2月, 2011 10 次提交
    • L
      Linux 2.6.38-rc5 · 85e2efbb
      Linus Torvalds 提交于
      85e2efbb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 048f039f
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: set flow handler for secondary interrupt controller of 5249
        m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support
        m68knommu: fix dereference of port.tty
        m68knommu: add missing linker __modver section
        m68knommu: fix mis-named variable int set_irq_chip loop
        m68knommu: add optimize memmove() function
        m68k: remove arch specific non-optimized memcmp()
        m68knommu: fix use of un-defined _TIF_WORK_MASK
        m68knommu: Rename m548x_wdt.c to m54xx_wdt.c
        m68knommu: fix m548x_wdt.c compilation after headers renaming
        m68knommu: Remove dependencies on nonexistent M68KNOMMU
      048f039f
    • G
      m68knommu: set flow handler for secondary interrupt controller of 5249 · 86d306c9
      Greg Ungerer 提交于
      The secondary interrupt controller of the ColdFire 5249 code is not
      setting the edge triggered flow handler. Set it.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      86d306c9
    • G
      m68knommu: remove use of IRQ_FLG_LOCK from 68360 platform support · 4531dab4
      Greg Ungerer 提交于
      The m68knommu arch does not define or use IRQ_FLG_LOCK in its irq
      subsystem. Remove obsolete use of it.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      4531dab4
    • G
      m68knommu: fix dereference of port.tty · bc0c36d3
      Greg Ungerer 提交于
      The struct_tty associated with a port is now a direct pointer
      from within the local private driver info struct. So fix all uses
      of it.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      bc0c36d3
    • G
      m68knommu: add missing linker __modver section · 81174262
      Greg Ungerer 提交于
      Add missing linker section __modver to fix:
      
        LD      vmlinux
      /usr/local/bin/../m68k-uclinux/bin/ld.real: error: no memory region specified for loadable section `__modver'
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      81174262
    • G
      m68knommu: fix mis-named variable int set_irq_chip loop · b14769d9
      Greg Ungerer 提交于
      Compiling for 68360 targets gives:
      
        CC      arch/m68knommu/platform/68360/ints.o
      arch/m68knommu/platform/68360/ints.c: In function ‘init_IRQ’:
      arch/m68knommu/platform/68360/ints.c:135:16: error: ‘irq’ undeclared (first use in this function)
      arch/m68knommu/platform/68360/ints.c:135:16: note: each undeclared identifier is reported only once for each function it appears in
      
      Fix variable name used.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      b14769d9
    • G
      m68knommu: add optimize memmove() function · 982cd252
      Greg Ungerer 提交于
      Add an m68k/coldfire optimized memmove() function for the m68knommu arch.
      This is the same function as used by m68k. Simple speed tests show this
      is faster once buffers are larger than 4 bytes, and significantly faster
      on much larger buffers (4 times faster above about 100 bytes).
      
      This also goes part of the way to fixing a regression caused by commit
      ea61bc46 ("m68k/m68knommu: merge MMU and
      non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is
      the 68x328 and 68360 families). They currently have no memmove() fucntion
      defined, since there was none in the m68knommu/lib functions.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      982cd252
    • G
      m68k: remove arch specific non-optimized memcmp() · f9d693d2
      Greg Ungerer 提交于
      The m68k arch implements its own memcmp() function. It is not optimized
      in any way (it is the most strait forward coding of memcmp you can get).
      Remove it and use the kernels standard memcmp() implementation.
      
      This also goes part of the way to fixing a regression caused by commit
      ea61bc46 ("m68k/m68knommu: merge MMU and
      non-MMU string.h"), which breaks non-coldfire non-mmu builds (which is
      the 68x328 and 68360 families). They currently have no memcmp() function
      defined, since there is none in the m68knommu/lib functions.
      Signed-off-by: NGreg Ungerer <gerg@uclinux.org>
      Acked-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      f9d693d2
    • L
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · b90be866
      Linus Torvalds 提交于
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (27 commits)
        drm/radeon/kms: hopefully fix pll issues for real (v3)
        drm/radeon/kms: add bounds checking to avivo pll algo
        drm: fix wrong usages of drm_device in DRM Developer's Guide
        drm/radeon/kms: fix a few more atombios endian issues
        drm/radeon/kms: improve 6xx/7xx CS error output
        drm/radeon/kms: check AA resolve registers on r300
        drm/radeon/kms: fix tracking of BLENDCNTL, COLOR_CHANNEL_MASK, and GB_Z on r300
        drm/radeon/kms: use linear aligned for evergreen/ni bo blits
        drm/radeon/kms: use linear aligned for 6xx/7xx bo blits
        drm/radeon: fix race between GPU reset and TTM delayed delete thread.
        drm/radeon/kms: evergreen/ni big endian fixes (v2)
        drm/radeon/kms: 6xx/7xx big endian fixes
        drm/radeon/kms: atombios big endian fixes
        drm/radeon: 6xx/7xx non-kms endian fixes
        drm/radeon/kms: optimize CS state checking for r100->r500
        drm: do not leak kernel addresses via /proc/dri/*/vma
        drm/radeon/kms: add connector table for mac g5 9600
        radeon mkregtable: Add missing fclose() calls
        drm/radeon/kms: fix interlaced modes on dce4+
        drm/radeon: fix memory debugging since d961db75
        ...
      b90be866