1. 23 11月, 2006 6 次提交
    • L
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 490a6e24
      Linus Torvalds 提交于
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [PATCH] make au1xxx-ide compile again
        [MIPS] Hack for SB1 cache issues
      490a6e24
    • M
      [PATCH] make au1xxx-ide compile again · ec7080d1
      Manuel Lauss 提交于
      The Au1xx IDE controller driver doesn't compile:
      
        CC      drivers/ide/mips/au1xxx-ide.o
      /linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:480: error: conflicting types for 'auide_ddma_tx_callback'
      include2/asm/mach-au1x00/au1xxx_ide.h:174: error: previous declaration of 'auide_ddma_tx_callback' was here
      /linux-2.6.19-rc6-work/drivers/ide/mips/au1xxx-ide.c:486: error: conflicting types for 'auide_ddma_rx_callback'
      include2/asm/mach-au1x00/au1xxx_ide.h:176: error: previous declaration of 'auide_ddma_rx_callback' was here
      Signed-off-by: NManuel Lauss <mano@roarinelk.homelinux.net>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      ec7080d1
    • T
      [MIPS] Hack for SB1 cache issues · eb482875
      Thiemo Seufer 提交于
      Removing flush_icache_page a while ago broke SB1 which was using an empty
      flush_data_cache_page function.  This glues things well enough so a more
      efficient but also more intrusive solution can be found later.
      Signed-Off-By: NThiemo Seufer <ths@networkno.de>
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      eb482875
    • L
      [AGP] Allocate AGP pages with GFP_DMA32 by default · 66c669ba
      Linus Torvalds 提交于
      Not all graphic page remappers support physical addresses over the 4GB
      mark for remapping, so while some do (the AMD64 GART always did, and I
      just fixed the i965 to do so properly), we're safest off just forcing
      GFP_DMA32 allocations to make sure graphics pages get allocated in the
      low 32-bit address space by default.
      
      AGP sub-drivers that really care, and can do better, could just choose
      to implement their own allocator (or we could add another "64-bit safe"
      default allocator for their use), but quite frankly, you're not likely
      to care in practice.
      
      So for now, this trivial change means that we won't be allocating pages
      that we can't map correctly by mistake on x86-64.
      
      [ On traditional 32-bit x86, this could never happen, because GFP_KERNEL
        would never allocate any highmem memory anyway ]
      Acked-by: NAndi Kleen <ak@suse.de>
      Acked-by: NDave Jones <davej@redhat.com>
      Cc: Eric Anholt <eric@anholt.net>
      Cc: Keith Packard <keithp@keithp.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      66c669ba
    • L
      [AGP] Fix intel 965 AGP memory mapping function · 7d915a38
      Linus Torvalds 提交于
      This introduces a i965-specific "mask_memory()" function that knows
      about the extended physical addresses that the i965 supports.  This
      allows us to correctly map in physical memory in the >4GB range into the
      GTT.
      
      Also simplify/clean-up the i965 case for the aperture sizing by just
      returning the fixed 512kB size from "fetch_size()".  We don't really
      care that not all of the aperture may be visible - the only thing that
      cares about the aperture size is the Intel "stolen memory" calculation,
      which depends on the fixed size.
      
      Cc: Keith Packard <keithp@keithp.com>
      Cc: Eric Anholt <eric@anholt.net>
      Cc: Dave Jones <davej@redhat.com>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      7d915a38
    • L
      Don't call "note_interrupt()" with irq descriptor lock held · b42172fc
      Linus Torvalds 提交于
      This reverts commit f72fa707, and solves
      the problem that it tried to fix by simply making "__do_IRQ()" call the
      note_interrupt() function without the lock held, the way everybody else
      does.
      
      It should be noted that all interrupt handling code must never allow the
      descriptor actors to be entered "recursively" (that's why we do all the
      magic IRQ_PENDING stuff in the first place), so there actually is
      exclusion at that much higher level, even in the absense of locking.
      Acked-by: NVivek Goyal <vgoyal@in.ibm.com>
      Acked-by: NPavel Emelianov <xemul@openvz.org>
      Cc: Andrew Morton <akpm@osdl.org>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: Adrian Bunk <bunk@stusta.de>
      Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
      b42172fc
  2. 22 11月, 2006 24 次提交
  3. 21 11月, 2006 10 次提交