aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Revert "[PATCH] usb: drivers/usb/core/devio.c dereferences a userspace pointer"Linus Torvalds2006-06-24
| | | | | | | | | | | | | This reverts commit 786dc1d3d7333f269e17d742886eac2188a2d9cc. As Al so eloquently points out, the patch is crap. The old code was fine, the new code was bogus. It never dereferenced a user pointer, the "->" operator was to an array member, which gives the _address_ of the member (in user space), not an actual dereference at all. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge branch 'drm-patches' of ↵Linus Torvalds2006-06-24
|\ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 * 'drm-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm: radeon constify radeon microcode Add i915 ioctls to configure pipes for vblank interrupt. drm: update radeon to 1.25 add r200 vertex program support drm: radeon add a tcl state flush before accessing tcl vector space
| * drm: radeon constify radeon microcodeDave Airlie2006-06-24
| | | | | | | | | | From: Tilman (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * Add i915 ioctls to configure pipes for vblank interrupt.Dave Airlie2006-06-24
| | | | | | | | | | | | | | | | | | i915 vblanks can be generated from either pipe a or b, however a disabled pipe generates no interrupts. This change allows the X server to select which pipe generates vblank interrupts. From: Keith Packard <keith.packard@intel.com> via DRM CVS Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: update radeon to 1.25 add r200 vertex program supportDave Airlie2006-06-24
| | | | | | | | | | | | | | | | | | Add support for r200 vertex programs (R200_EMIT_VAP_PVS_CNTL, and new packet type for making it possible to address whole tcl vector space and have a larger count) From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
| * drm: radeon add a tcl state flush before accessing tcl vector spaceDave Airlie2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | Do a tcl state flush before accessing tcl vector space. This fixes some more problems with flickering (bug #6637). drm may not be appropriate place for this, since doing that flush there might both be overkill and insufficient in some cases. However, it's hard to figure out when that flush is needed, so this has to suffice. There does not seem to be a performance penalty associated with it. From: Roland Scheidegger (DRM CVS) Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge branch 'intelfb-patches' of ↵Linus Torvalds2006-06-24
|\ \ | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6 * 'intelfb-patches' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelfb-2.6: intelfb delousing
| * | intelfb delousingAl Viro2006-06-24
| |/ | | | | | | | | | | | | | | | | ring_head is offset in card memory, not iomem pointer. Fixed, removed fuckloads of amazingly bogus casts somebody had sprinkled all over the place. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Dave Airlie <airlied@linux.ie>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6Linus Torvalds2006-06-24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: (40 commits) [SPARC64]: Update defconfig. [SPARC64]: Make auxio a real driver. [PARPORT] sunbpp: Convert to new SBUS device framework. [Documentation]: Update probing info in sbus_drivers.txt [SCSI] qlogicpti: Convert to new SBUS device framework. [SCSI] esp: Fix bug in esp_remove_common. [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find(). [NET] myri_sbus: Kill unused next_module struct member. [NET] myri_sbus: Convert to new SBUS device layer. [NET] sunqe: Convert to new SBUS driver layer. [NET] sunbmac: Convert over to new SBUS device framework. [NET] sunlance: Convert to new SBUS driver framework. [NET] sunhme: Convert to new SBUS driver framework. [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs. [SCSI] sparc: Port esp to new SBUS driver layer. [SOUND] sparc: Port amd7930 to new SBUS device layer. [SBUS]: Rewrite and plug into of_device framework. [SPARC]: Port of_device layer and make ebus use it. [SPARC]: Port sparc64 in-kernel device tree code to sparc32. [SPARC64]: Add of_device layer and make ebus/isa use it. ...
| * | [SPARC64]: Update defconfig.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Make auxio a real driver.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [PARPORT] sunbpp: Convert to new SBUS device framework.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [Documentation]: Update probing info in sbus_drivers.txtDavid S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] qlogicpti: Convert to new SBUS device framework.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] esp: Fix bug in esp_remove_common.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | Do not try to kfree(esp), scsi_host_put() takes care of that. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Kill useless loop over sdevs in quattro_sbus_find().David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] myri_sbus: Kill unused next_module struct member.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] myri_sbus: Convert to new SBUS device layer.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunqe: Convert to new SBUS driver layer.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunbmac: Convert over to new SBUS device framework.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunlance: Convert to new SBUS driver framework.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Convert to new SBUS driver framework.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | And make it a real PCI driver too. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [NET] sunhme: Kill __sparc__ and __sparc_v9__ ifdefs.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | Use CONFIG_SPARC and CONFIG_SPARC64 instead. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SCSI] sparc: Port esp to new SBUS driver layer.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | This also turns the driver into a new-style scsi driver. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SOUND] sparc: Port amd7930 to new SBUS device layer.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SBUS]: Rewrite and plug into of_device framework.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | I severely apologize, I was still learning how to program in C when I wrote this stuff 10 years ago... Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC]: Port of_device layer and make ebus use it.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC]: Port sparc64 in-kernel device tree code to sparc32.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Add of_device layer and make ebus/isa use it.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sparcspkr and power drivers are converted, to make sure it works. Eventually the SBUS device layer will use this as a sub-class. I really cannot cut loose on that bit until sparc32 is given the same infrastructure. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Expand of_*() interfaces some more.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | Import some more stuff from powerpc. Add of_device_is_compatible(), and of_find_compatible_node(). Export some more of the other routines to modules. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Kill unused local vars in map_prom_timers().David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Kill off some more prom_getproperty() remnants.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | The remaining ones occur before we have imported the device tree. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert Cheetah memory controller driver to in-kernel PROM tree.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert central bus layer to in-kernel PROM device tree.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Kill ebus/isa range and interrupt mapping struct members.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | Unused outside of initial bus probe scan. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Use in-kernel PROM tree for EBUS and ISA.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert sparc64 PCI layer to in-kernel device tree.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | One thing this change pointed out was that we really should pull the "get 'local-mac-address' property" logic into a helper function all the network drivers can call. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Must run smp_setup_cpu_possible_map() after paging_init()David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | Otherwise the in-kernel PROM device tree isn't built yet, and therefore the present cpu bits don't get set properly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Fix for Niagara memory corruption.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some sun4v systems, after netboot the ethernet controller and it's DMA mappings can be left active. The net result is that the kernel can end up using memory the ethernet controller will continue to DMA into, resulting in corruption. To deal with this, we are more careful about importing IOMMU translations which OBP has left in the IO-TLB. If the mapping maps into an area the firmware claimed was free and available memory for the kernel to use, we demap instead of import that IOMMU entry. This is going to cause the network chip to take a PCI master abort on the next DMA it attempts, if it has been left going like this. All tests show that this is handled properly by the PCI layer and the e1000 drivers. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Minor bug fix to obp_read_memory().David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | If we end up zero'ing out the size of one of the entries, pop it out of the array completely because some code that examines these things cannot handle a zero length element properly. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert cpu_find_by_*() interface to in-kernel PROM device tree.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Add of_getintprop_default().David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | This encodes a common idiomatic coding pattern used when dealing with integer properties. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Convert sun4v virtual-device layer to in-kernel PROM device tree.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Rate limited kernel unaligned trap logging, ala IA64.David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Disable verbose PCI IRQ probing messages by default.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | Allow them to be enabled with "pci=irq_verbose" on the boot command line. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Use in-kernel OBP device tree for PCI controller probing.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | It can be pushed even further down, but this is a first step. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Add of_find_node_by_{name,type}().David S. Miller2006-06-24
| | | | | | | | | | | | Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SPARC64]: Import OBP device tree into kernel data structures.David S. Miller2006-06-24
| | | | | | | | | | | | | | | | | | | | | | | | | | | The basic framework is based on the PowerPC OF code. This code even tries to get the device addressing components correct in the full path names. Signed-off-by: David S. Miller <davem@davemloft.net>
| * | [SBUS]: Start cleaning up generic sbus support layer.David S. Miller2006-06-24
| |/ | | | | | | | | | | | | In particular, move the IRQ probing out to sparc32/sparc64 arch specific code where it belongs. Signed-off-by: David S. Miller <davem@davemloft.net>
* | Enable minimal per-device resume tracingLinus Torvalds2006-06-24
| | | | | | | | | | | | | | | | | | This is the minimal resume trace code to find which device resume (if any) results in problems. Usually, you'd use the information this generates as a starting point to adding more fine-grained trace event points. Signed-off-by: Linus Torvalds <torvalds@osdl.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-11 19:19:31 -0500