1. 27 3月, 2006 35 次提交
  2. 26 3月, 2006 5 次提交
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-serial · 36ddf5bb
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-serial:
        [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion
        [SERIAL] amba-pl010: Remove accessor macros
        [SERIAL] remove 8250_acpi (replaced by 8250_pnp and PNPACPI)
        [SERIAL] icom: select FW_LOADER
      36ddf5bb
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · a41622ea
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 3030/2: fix permission check in the obscur cmpxchg syscall
        [ARM] nommu: rename compressed/head.S symbols to a new style
        [ARM] select TLS_REG_EMUL and NEEDS_SYSCALL_FOR_CMPXCHG
        [ARM] nommu: Move hardware page table definitions to pgtable-hwdef.h
        [ARM] Move read of processor ID out of lookup_processor_type()
        [ARM] Fix typo in tlbflush.h
        [ARM] noMMU: removes TLB codes in nommu mode
        [ARM] noMMU: block sys_fork in nommu mode
        [ARM] 3399/1: Fix link problem when CONFIG_PRINTK is disabled
        [ARM] 3398/1: Fix the VFP registers loading/storing base address
        [ARM] 3397/1: AT91RM9200 Header update
        [ARM] 3385/1: Battery support for sharp zaurus sl-5500 (collie)
        [ARM] SMP: don't set cpu_*_map in smp_prepare_boot_cpu
        include/linux/clk.h is betraying its ARM origins
        [ARM] Move enable_irq and disable_irq to assembler.h
        [ARM] 3391/1: use PLAT8250_DEV_PLATFORM{,1} for platform device id instead of 0/1
      a41622ea
    • A
      [PATCH] Fix compilation of processor_idle.c on IA64 · 0b5c59a1
      Andi Kleen 提交于
      Broken earlier by me by a x86-64 patch.
      
      The code was optimized away, but the compiler still complained about an
      undeclared function.
      Signed-off-by: NAndi Kleen <ak@suse.de>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      0b5c59a1
    • L
      [ARM] 3383/3: ixp2000: ixdp2x01 platform serial conversion · 104c7b03
      Lennert Buytenhek 提交于
      Patch from Lennert Buytenhek
      
      Add a PLAT8250_DEV_PLATFORM2, and convert the two ixdp2x01 CPLD serial
      ports to use platform serial devices with ids PLAT8250_DEV_PLATFORM[12].
      (The on-chip xscale UART is PLAT8250_DEV_PLATFORM, id #0.)
      Signed-off-by: NLennert Buytenhek <buytenh@wantstofly.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      104c7b03
    • N
      [ARM] 3030/2: fix permission check in the obscur cmpxchg syscall · 2ce9804f
      Nicolas Pitre 提交于
      Patch from Nicolas Pitre
      
      Quoting RMK:
      
      |pte_write() just says that the page _may_ be writable. It doesn't say
      |that the MMU is programmed to allow writes. If pte_dirty() doesn't
      |return true, that means that the page is _not_ writable from userspace.
      |If you write to it from kernel mode (without using put_user) you'll
      |bypass the MMU read-only protection and may end up writing to a page
      |owned by two separate processes.
      Signed-off-by: NNicolas Pitre <nico@cam.org>
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      2ce9804f