1. 25 11月, 2005 5 次提交
    • R
      [ARM] Do not call flush_tlb_kernel_range() with IRQs disabled. · 5edf71ae
      Russell King 提交于
      We must not call TLB maintainence operations with interrupts disabled,
      otherwise we risk a lockup in the SMP IPI code.
      
      This means that consistent_free() can not be called from a context with
      IRQs disabled.  In addition, we must not hold the lock in consistent_free
      when we call flush_tlb_kernel_range().  However, we must continue to
      prevent consistent_alloc() from re-using the memory region until we've
      finished tearing down the mapping and dealing with the TLB.
      
      Therefore, leave the vm_region entry in the list, but mark it inactive
      before dropping the lock and starting the tear-down process.  After the
      mapping has been torn down, re-acquire the lock and remove the entry
      from the list.
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      5edf71ae
    • R
      [ARM] Remove mach-types.h from head.S · 3c0bdac3
      Russell King 提交于
      We don't really need to check whether the machine type is Netwinder
      or CATS before setting up the PCI IO mapping for debugging.  This
      allows us to eliminate asm/mach-types.h from head.S
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      3c0bdac3
    • R
      [ARM] Remove asm/hardware.h include from SA1100 io.h · 225937bd
      Russell King 提交于
      Unfortunately, we have a symbol clash between the SA-1100 header and
      some drivers.  Since everywhere which needs SA1100 specifics includes
      asm/hardware.h, we don't need to include it in the SA1100 io.h header.
      
      In file included from drivers/net/wireless/wavelan_cs.p.h:459,
                       from drivers/net/wireless/wavelan_cs.c:60:
      drivers/net/wireless/wavelan_cs.h:97:1: warning: "LCSR" redefined
      In file included from include/asm/arch/hardware.h:56,
                       from include/asm/hardware.h:16,
                       from include/asm/arch/io.h:13,
                       from include/asm/io.h:71,
                       from drivers/net/wireless/wavelan_cs.p.h:433,
                       from drivers/net/wireless/wavelan_cs.c:60:
      include/asm/arch/SA-1100.h:1907:1: warning: this is the location of the previous definition
      Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>
      225937bd
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · cd0cca7b
      Linus Torvalds 提交于
      cd0cca7b
    • J
      [PATCH] fbcon: fix obvious bug in fbcon logo rotation code · 6d9885a8
      Jasper Spaans 提交于
      This code fixes a tiny problem with the recent fbcon rotation changes:
      fb_prepare_logo doesn't check the return value of fb_find_logo and that
      causes a crash for my while booting.
      
      Obvious & working & tested fix is here.
      Signed-off-by: NJasper Spaans <jasper@vs19.net>
      Acked-by: NAntonino Daplas <adaplas@pol.net>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      6d9885a8
  2. 24 11月, 2005 35 次提交