1. 01 3月, 2010 22 次提交
  2. 28 2月, 2010 18 次提交
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 847f9c60
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits)
        m68k: Define sigcontext ABI of ColdFire
        m68knommu: NPTL support for uClinux
        m68k: Add NPTL support
        m68k: Eliminate unused variable in page_to_phys()
        m68k: Switch to generic siginfo layout
        macfb: fix 24-bit visual and stuff
        macfb: cleanup
        fbdev: add some missing mac modes
        mac68k: start CUDA early
        valkyriefb: various fixes
        fbdev: mac_var_to_mode() fix
        mac68k: move macsonic and macmace platform devices
        mac68k: move mac_esp platform device
        mac68k: replace mac68k SCC code with platform device
        pmac-zilog: add platform driver
        pmac-zilog: cleanup
        mac68k: rework SWIM platform device
        mac68k: cleanup
        ataflop: Killl warning about unused variable flags
        m68k: Use DIV_ROUND_CLOSEST
        ...
      847f9c60
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · 79811647
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (35 commits)
        [S390] time: remove unused code
        [S390] zcore: Add prefix registers to dump header
        [S390] correct vdso version string
        [S390] add support for compressed kernels
        [S390] Define new s390 ELF note sections in elf.h
        [S390] codepage conversion of kernel parameter line
        [S390] seq_file: convert drivers/s390/
        [S390] add z9-ec/z10 instruction to kernel disassembler
        [S390] dasd: correct offline processing
        [S390] dasd: fix refcounting.
        [S390] dasd: fix online/offline race
        [S390] use kprobes_built_in() in mm/fault code
        [S390] bug: use relative pointers in bug table entries
        [S390] Cleanup struct _lowcore usage and defines.
        [S390] free_initmem: reduce code duplication
        [S390] Replace ENOTSUPP usage with EOPNOTSUPP
        [S390] spinlock: check virtual cpu running status
        [S390] sysinfo: fix SYSIB 3,2,2 structure
        [S390] add MACHINE_IS_LPAR flag
        [S390] qdio: optimize cache line usage of struct qdio_irq
        ...
      79811647
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · f1dd6ad5
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (141 commits)
        MIPS: Alchemy: defconfig updates
        MIPS: Alchemy: Fix Au1100 ethernet build failure
        MIPS: Alchemy: Repair db1500/bosporus builds
        MIPS: ARC: Cleanup unused definitions from sgialib.h
        MIPS: Cobalt: convert legacy port addresses to GT-64111 bus addresses
        MIPS: Alchemy: use 36bit addresses for PCMCIA resources.
        MIPS: Cobalt: Fix theoretical port aliasing issue
        MIPS: Use ALIGN(x, bytes) instead of __ALIGN_MASK(x, bytes - 1)
        MIPS: Crazy spinlock speed test.
        MIPS: Optimize spinlocks.
        MIPS: Alchemy: devboard PM needs to save CPLD registers.
        MIPS: PowerTV: Eliminate duplicate opcode definition macros
        MIPS: Lemote 2F: Move printks out of port_access_lock.
        MIPS: PNX833x: Convert IRQ controller locks to raw spinlocks.
        MIPS: Octeon: Replace spinlock with raw_spinlocks in dma-octeon.c.
        MIPS: Octeon: Replace rwlocks in irq_chip handlers with raw_spinlocks.
        MIPS: Octeon: Convert octeon_irq_msi_lock to raw spinlock.
        MIPS: Loongson: Remove pointless sample_lock from oprofile code.
        MIPS: SNI: Convert sni_rm200_i8259A_lock to raw spinlock.
        MIPS: i8259: Convert IRQ controller lock to raw spinlock.
        ...
      f1dd6ad5
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6 · 8d37a371
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6: (49 commits)
        pcmcia: validate late-added resources
        pcmcia: allow for extension of resource interval
        pcmcia: remove useless msleep in ds.c
        pcmcia: use read_cis_mem return value
        pcmcia: handle error in serial_cs config calls
        pcmcia: add locking to pcmcia_{read,write}_cis_mem
        pcmcia: avoid prod_id memleak
        pcmcia: avoid sysfs-related lockup for cardbus
        pcmcia: use state machine for extended requery
        pcmcia: delay re-scanning and re-querying of PCMCIA bus
        pcmcia: use pccardd to handle eject, insert, suspend and resume requests
        pcmcia: use ops_mutex for rsrc_{mgr,nonstatic} locking
        pcmcia: use mutex for dynid lock
        pcmcia: assert locking to struct pcmcia_device
        pcmcia: add locking documentation
        pcmcia: simplify locking
        pcmcia: add locking to struct pcmcia_socket->pcmcia_state()
        pcmcia: protect s->device_count
        pcmcia: properly lock skt->irq, skt->irq_mask
        pcmcia: lock ops->set_socket
        ...
      8d37a371
    • L
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · ef1a8de8
      Linus Torvalds 提交于
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (88 commits)
        powerpc: Fix lwsync feature fixup vs. modules on 64-bit
        powerpc: Convert pmc_owner_lock to raw_spinlock
        powerpc: Convert die.lock to raw_spinlock
        powerpc: Convert tlbivax_lock to raw_spinlock
        powerpc: Convert mpic locks to raw_spinlock
        powerpc: Convert pmac_pic_lock to raw_spinlock
        powerpc: Convert big_irq_lock to raw_spinlock
        powerpc: Convert feature_lock to raw_spinlock
        powerpc: Convert i8259_lock to raw_spinlock
        powerpc: Convert beat_htab_lock to raw_spinlock
        powerpc: Convert confirm_error_lock to raw_spinlock
        powerpc: Convert ipic_lock to raw_spinlock
        powerpc: Convert native_tlbie_lock to raw_spinlock
        powerpc: Convert beatic_irq_mask_lock to raw_spinlock
        powerpc: Convert nv_lock to raw_spinlock
        powerpc: Convert context_lock to raw_spinlock
        powerpc/85xx: Add NOR, LEDs and PIB support for MPC8568E-MDS boards
        powerpc/86xx: Enable VME driver on the GE SBC610
        powerpc/86xx: Enable VME driver on the GE PPC9A
        powerpc/86xx: Add MSI section to GE PPC9A DTS
        ...
      ef1a8de8
    • M
      m68k: Define sigcontext ABI of ColdFire · 00ebfe58
      Maxim Kuvyrkov 提交于
      The following patch defines sigcontext ABI of ColdFire.  Due to ISA
      restrictions ColdFire needs different rt_sigreturn trampoline.
      
      And due to ColdFire FP registers being 8-bytes instead of 12-bytes on
      m68k, sigcontext and fpregset structures should be updated.
      
      Regarding the sc_fpstate[16+6*8] field, it would've been enough 16
      bytes to store ColdFire's FP state.  To accomodate GLIBC's libSegFault
      it would'be been enough 6*8 bytes (room for the 6 non-call-clobbered
      FP registers).  I set it to 16+6*8 to provide some extra space for any
      future changes in the ColdFire FPU.
      Signed-off-by: NMaxim Kuvyrkov <maxim@codesourcery.com>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      00ebfe58
    • M
      m68knommu: NPTL support for uClinux · a58f7534
      Maxim Kuvyrkov 提交于
      Port syscalls for NPTL support to m68knommu.
      Signed-off-by: NMaxim Kuvyrkov <maxim@codesourcery.com>
      Acked-by: NGreg Ungerer <gerg@uclinux.org>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      a58f7534
    • M
      m68k: Add NPTL support · 9674cdc7
      Maxim Kuvyrkov 提交于
      This patch adds several syscalls, that provide necessary
      functionality to support NPTL on m68k/ColdFire.
      The syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and
      atomic_barrier.
      The cmpxchg syscall is required for ColdFire as it doesn't support 'cas'
      instruction.
      
      Also a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to
      inspect the TLS storage.
      Signed-off-by: NMaxim Kuvyrkov <maxim@codesourcery.com>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      9674cdc7
    • G
      m68k: Eliminate unused variable in page_to_phys() · f54bcdc2
      Geert Uytterhoeven 提交于
      "pgdat" is unused, so we can eliminate it and turn page_to_phys()
      into a single-line macro.
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      f54bcdc2
    • M
      m68k: Switch to generic siginfo layout · 5da3a65d
      Maxim Kuvyrkov 提交于
      This patch switches m68k to generic siginfo layout.  The custom layout
      of m68k's `struct siginfo' had several issues due to not considering
      aliasing of members in the union, e.g., _uid32 was at different offsets
      in ._kill, ._rt and ._sigchld.
      Signed-off-by: NMaxim Kuvyrkov <maxim@codesourcery.com>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      5da3a65d
    • F
      macfb: fix 24-bit visual and stuff · 99e11ab2
      Finn Thain 提交于
      Lots of changes. Remove volatile keywords. Take the advice in the comments
      and change video_slot to slot_addr. Factor out fifteen or so "channel >>
      8" shifts into three shifts higher up the call graph. Make
      csc_setpalette() atomic, pass the correct color values. Check for
      ioremap() failure. Add missing break statement, thus fixing 24 bit console
      visual (blue background bug). Remove some uninformative printk() noise.
      Add a description for powerbook 140/170 graphics.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      99e11ab2
    • F
      macfb: cleanup · 34c41d0a
      Finn Thain 提交于
      Cleanup whitespace and code style. Remove unused #includes and prototypes.
      Remove obsolete, redundant or misleading comments. Remove dead code and
      redundant initialisers.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      34c41d0a
    • F
      fbdev: add some missing mac modes · 1bb63845
      Finn Thain 提交于
      Add the missing mac video modes for the Portrait and 12" RGB displays. The
      specs come from the Mac LC III developer note.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      1bb63845
    • F
      mac68k: start CUDA early · 18814ee8
      Finn Thain 提交于
      The valkyriefb driver needs the CUDA to work in order to set the video
      mode at boot. So initialise the device earlier, and bring the m68k code
      closer to the powermac code.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      18814ee8
    • F
      valkyriefb: various fixes · 11e8faca
      Finn Thain 提交于
      Valkyriefb and macfb will adopt the same card if they get the chance, so
      remove valkyrie support from macfb. Also fix the "valkyriefb: can't do
      832x624x8" problem reported by Raylynn Knight some time ago, by adding
      vmode 13 support for CONFIG_MAC. Also add vmode 11 since that works too.
      Make use of the monitor sense lines on 68k Macs too. Also some cleanups.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      11e8faca
    • F
      fbdev: mac_var_to_mode() fix · d876c11a
      Finn Thain 提交于
      The valkyriefb driver assumes that this logic holds:
      
      mac_vmode_to_var(X, cmode, &var);
      mac_var_to_vmode(&var, &vmode, &cmode);
      assert(vmode == X);
      
      But it doesn't hold because mac_var_to_vmode() can return a mode with a
      slower pixel clock, even when a match is available. So we end up with this
      failure:
      
      using video mode 11 and color mode 0.
      valkyriefb: vmode 12 not valid.
      valkyriefb: can't set default video mode
      valkyriefb: vmode 12 not valid.
      
      Rather than have mac_var_to_mode() return the first reasonable mode it
      finds, have it return the mode that is closest to the requested one (or
      the mode with the closest longer pixel clock period if there is no exact
      match).
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      d876c11a
    • F
      mac68k: move macsonic and macmace platform devices · eeb9c182
      Finn Thain 提交于
      Move platform device code from the drivers to the platform init function.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      eeb9c182
    • F
      mac68k: move mac_esp platform device · cff75f1f
      Finn Thain 提交于
      Move platform device code from the driver to the platform init function.
      Signed-off-by: NFinn Thain <fthain@telegraphics.com.au>
      Signed-off-by: NGeert Uytterhoeven <geert@linux-m68k.org>
      cff75f1f