1. 25 Nov, 2006 24 commits
  2. 23 Nov, 2006 5 commits
  3. 22 Nov, 2006 11 commits
    • Manuel Lauss's avatar
      [PATCH] make au1xxx-ide compile again · ec7080d1
      Manuel Lauss authored
      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: default avatarManuel Lauss <mano@roarinelk.homelinux.net>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      ec7080d1
    • Thiemo Seufer's avatar
      [MIPS] Hack for SB1 cache issues · eb482875
      Thiemo Seufer authored
      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: default avatarThiemo Seufer <ths@networkno.de>
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      eb482875
    • Linus Torvalds's avatar
      [AGP] Allocate AGP pages with GFP_DMA32 by default · 66c669ba
      Linus Torvalds authored
      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: default avatarAndi Kleen <ak@suse.de>
      Acked-by: default avatarDave Jones <davej@redhat.com>
      Cc: Eric Anholt <eric@anholt.net>
      Cc: Keith Packard <keithp@keithp.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      66c669ba
    • Kristoffer Ericson's avatar
      [ARM] 3941/1: [Jornada7xx] - Addition to MAINTAINERS · 21f37bc3
      Kristoffer Ericson authored
      Adding myself to the MAINTAINERS file.
      Signed-off-by: default avatarKristoffer Ericson <Kristoffer_e1@hotmail.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      21f37bc3
    • Dan Williams's avatar
      [ARM] 3942/1: ARM: comment: consistent_sync should not be called directly · 105ef9a0
      Dan Williams authored
      /*
       * Note: Drivers should NOT use this function directly, as it will break
       * platforms with CONFIG_DMABOUNCE.
       * Use the driver DMA support - see dma-mapping.h (dma_sync_*)
       */
      Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      105ef9a0
    • Linus Torvalds's avatar
      [AGP] Fix intel 965 AGP memory mapping function · 7d915a38
      Linus Torvalds authored
      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: default avatarLinus Torvalds <torvalds@osdl.org>
      7d915a38
    • Linus Torvalds's avatar
      Don't call "note_interrupt()" with irq descriptor lock held · b42172fc
      Linus Torvalds authored
      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: default avatarVivek Goyal <vgoyal@in.ibm.com>
      Acked-by: default avatarPavel 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: default avatarLinus Torvalds <torvalds@osdl.org>
      b42172fc
    • Linus Torvalds's avatar
      Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc · 0f9005a6
      Linus Torvalds authored
      * 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc:
        [POWERPC] Fix ucc_geth of_device discovery on mpc832x
        [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class"
        [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
      0f9005a6
    • Linus Torvalds's avatar
      Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 · c5dd2733
      Linus Torvalds authored
      * master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
        [TG3]: Add missing unlock in tg3_open() error path.
        [IPV6]: Fix address/interface handling in UDP and DCCP, according to the scoping architecture.
        [IRDA]: Lockdep fix.
        [BLUETOOTH]: Fix unaligned access in hci_send_to_sock.
        [XFRM]: nlmsg length not computed correctly in the presence of subpolicies
        [XFRM]: Sub-policies broke policy events
        [IGMP]: Fix IGMPV3_EXP() normalization bit shift value.
        [Bluetooth] Ignore L2CAP config requests on disconnect
        [Bluetooth] Always include MTU in L2CAP config responses
        [Bluetooth] Check if RFCOMM session is still attached to the TTY
        [Bluetooth] Handling pending connect attempts after inquiry
        [Bluetooth] Attach low-level connections to the Bluetooth bus
        [IPV6] IP6TUNNEL: Add missing nf_reset() on input path.
        [IPV6] IP6TUNNEL: Delete all tunnel device when unloading module.
        [IPV6] ROUTE: Do not enable router reachability probing in router mode.
        [IPV6] ROUTE: Prefer reachable nexthop only if the caller requests.
        [IPV6] ROUTE: Try to use router which is not known unreachable.
      c5dd2733
    • Kim Phillips's avatar
      [POWERPC] Fix ucc_geth of_device discovery on mpc832x · 8746ed3d
      Kim Phillips authored
      mpc832x, as in mpc8360, needs to explicitly find and create the
      platform device for ucc_geth in 2.6.19.  This code will likely be
      readapted to Benh's new of_ methods for 2.6.20.
      Signed-off-by: default avatarKim Phillips <kim.phillips@freescale.com>
      Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
      8746ed3d
    • Ira W. Snyder's avatar
      [TG3]: Add missing unlock in tg3_open() error path. · 12862086
      Ira W. Snyder authored
      Sparse noticed a locking imbalance in tg3_open(). This patch adds an
      unlock to one of the error paths, so that tg3_open() always exits
      without the lock held.
      Signed-off-by: default avatarIra W. Snyder <kernel@irasnyder.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      12862086